| Message ID | 1482324956-5382-1-git-send-email-christophe.milard@linaro.org |
|---|---|
| State | Accepted |
| Commit | 4aaa74fceecee7b1538546d0b67347569c1239c6 |
| Headers | show |
Ping. Should be easy to review :-) On 21 December 2016 at 13:55, Christophe Milard <christophe.milard@linaro.org> wrote: > Fixing a set of iritating typos. just in comments. > > Signed-off-by: Christophe Milard <christophe.milard@linaro.org> > --- > > Since V1: > another typo found by Bill > > platform/linux-generic/_ishm.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c > index 449e357..a49c8e4 100644 > --- a/platform/linux-generic/_ishm.c > +++ b/platform/linux-generic/_ishm.c > @@ -75,7 +75,7 @@ > /* > * Maximum number of internal shared memory blocks. > * > - * This the the number of separate ISHM areas that can be reserved concurrently > + * This is the number of separate ISHM areas that can be reserved concurrently > * (Note that freeing such blocks may take time, or possibly never happen > * if some of the block ownwers never procsync() after free). This number > * should take that into account) > @@ -236,7 +236,7 @@ static void procsync(void); > * Take a piece of the preallocated virtual space to fit "size" bytes. > * (best fit). Size must be rounded up to an integer number of pages size. > * Possibly split the fragment to keep track of remaining space. > - * Returns the allocated fragment (best_fragmnt) and the corresponding address. > + * Returns the allocated fragment (best_fragment) and the corresponding address. > * External caller must ensure mutex before the call! > */ > static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align, > @@ -282,11 +282,11 @@ static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align, > > /* > * if there is room between previous fragment and new one, (due to > - * alignement requirement) then fragment (split) the space between > + * alignment requirement) then fragment (split) the space between > * the end of the previous fragment and the beginning of the new one: > */ > if (border - (uintptr_t)(*best_fragmnt)->start > 0) { > - /* frangment space, i.e. take a new fragment descriptor... */ > + /* fragment space, i.e. take a new fragment descriptor... */ > rem_fragmnt = ishm_ftbl->unused_fragmnts; > if (!rem_fragmnt) { > ODP_ERR("unable to get shmem fragment descriptor!\n."); > @@ -316,7 +316,7 @@ static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align, > if (remainder == 0) > return (*best_fragmnt)->start; > > - /* otherwise, frangment space, i.e. take a new fragment descriptor... */ > + /* otherwise, fragment space, i.e. take a new fragment descriptor... */ > rem_fragmnt = ishm_ftbl->unused_fragmnts; > if (!rem_fragmnt) { > ODP_ERR("unable to get shmem fragment descriptor!\n."); > @@ -503,7 +503,7 @@ static void delete_file(ishm_block_t *block) > * performs the mapping, possibly allocating a fragment of the pre-reserved > * VA space if the _ODP_ISHM_SINGLE_VA flag was given. > * Sets fd, and returns the mapping address. > - * This funstion will also set the _ODP_ISHM_SINGLE_VA flag if the alignment > + * This function will also set the _ODP_ISHM_SINGLE_VA flag if the alignment > * requires it > * Mutex must be assured by the caller. > */ > @@ -724,7 +724,7 @@ static void procsync(void) > > last = ishm_proctable->nb_entries; > while (i < last) { > - /* if the procecess sequence number doesn't match the main > + /* if the process sequence number doesn't match the main > * table seq number, this entry is obsolete > */ > block = &ishm_tbl->block[ishm_proctable->entry[i].block_index]; > @@ -1033,7 +1033,7 @@ static int block_free(int block_index) > } > > /* > - * Free and unmap internal shared memory, intentified by its block number: > + * Free and unmap internal shared memory, identified by its block number: > * return -1 on error. 0 if OK. > */ > int _odp_ishm_free_by_index(int block_index) > @@ -1049,7 +1049,7 @@ int _odp_ishm_free_by_index(int block_index) > } > > /* > - * free and unmap internal shared memory, intentified by its block name: > + * free and unmap internal shared memory, identified by its block name: > * return -1 on error. 0 if OK. > */ > int _odp_ishm_free_by_name(const char *name) > @@ -1460,8 +1460,8 @@ static int do_odp_ishm_term_local(void) > * Go through the table of visible blocks for this process, > * decreasing the refcnt of each visible blocks, and issuing > * warning for those no longer referenced by any process. > - * Note that non-referenced blocks are nor freeed: this is > - * deliberate as this would imply that the sementic of the > + * Note that non-referenced blocks are not freed: this is > + * deliberate as this would imply that the semantic of the > * freeing function would differ depending on whether we run > * with odp_thread as processes or pthreads. With this approach, > * the user should always free the blocks manually, which is > @@ -1667,7 +1667,7 @@ int _odp_ishm_status(const char *title) > fragmnt; fragmnt = fragmnt->next) > nb_unused_frgments++; > > - ODP_DBG("ishm: %d fragment used. %d fragements unused. (total=%d)\n", > + ODP_DBG("ishm: %d fragment used. %d fragments unused. (total=%d)\n", > nb_used_frgments, nb_unused_frgments, > nb_used_frgments + nb_unused_frgments); > > -- > 2.7.4 >
On Wed, Dec 21, 2016 at 6:55 AM, Christophe Milard <christophe.milard@linaro.org> wrote: > Fixing a set of iritating typos. just in comments. > > Signed-off-by: Christophe Milard <christophe.milard@linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org> > --- > > Since V1: > another typo found by Bill > > platform/linux-generic/_ishm.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c > index 449e357..a49c8e4 100644 > --- a/platform/linux-generic/_ishm.c > +++ b/platform/linux-generic/_ishm.c > @@ -75,7 +75,7 @@ > /* > * Maximum number of internal shared memory blocks. > * > - * This the the number of separate ISHM areas that can be reserved concurrently > + * This is the number of separate ISHM areas that can be reserved concurrently > * (Note that freeing such blocks may take time, or possibly never happen > * if some of the block ownwers never procsync() after free). This number > * should take that into account) > @@ -236,7 +236,7 @@ static void procsync(void); > * Take a piece of the preallocated virtual space to fit "size" bytes. > * (best fit). Size must be rounded up to an integer number of pages size. > * Possibly split the fragment to keep track of remaining space. > - * Returns the allocated fragment (best_fragmnt) and the corresponding address. > + * Returns the allocated fragment (best_fragment) and the corresponding address. > * External caller must ensure mutex before the call! > */ > static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align, > @@ -282,11 +282,11 @@ static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align, > > /* > * if there is room between previous fragment and new one, (due to > - * alignement requirement) then fragment (split) the space between > + * alignment requirement) then fragment (split) the space between > * the end of the previous fragment and the beginning of the new one: > */ > if (border - (uintptr_t)(*best_fragmnt)->start > 0) { > - /* frangment space, i.e. take a new fragment descriptor... */ > + /* fragment space, i.e. take a new fragment descriptor... */ > rem_fragmnt = ishm_ftbl->unused_fragmnts; > if (!rem_fragmnt) { > ODP_ERR("unable to get shmem fragment descriptor!\n."); > @@ -316,7 +316,7 @@ static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align, > if (remainder == 0) > return (*best_fragmnt)->start; > > - /* otherwise, frangment space, i.e. take a new fragment descriptor... */ > + /* otherwise, fragment space, i.e. take a new fragment descriptor... */ > rem_fragmnt = ishm_ftbl->unused_fragmnts; > if (!rem_fragmnt) { > ODP_ERR("unable to get shmem fragment descriptor!\n."); > @@ -503,7 +503,7 @@ static void delete_file(ishm_block_t *block) > * performs the mapping, possibly allocating a fragment of the pre-reserved > * VA space if the _ODP_ISHM_SINGLE_VA flag was given. > * Sets fd, and returns the mapping address. > - * This funstion will also set the _ODP_ISHM_SINGLE_VA flag if the alignment > + * This function will also set the _ODP_ISHM_SINGLE_VA flag if the alignment > * requires it > * Mutex must be assured by the caller. > */ > @@ -724,7 +724,7 @@ static void procsync(void) > > last = ishm_proctable->nb_entries; > while (i < last) { > - /* if the procecess sequence number doesn't match the main > + /* if the process sequence number doesn't match the main > * table seq number, this entry is obsolete > */ > block = &ishm_tbl->block[ishm_proctable->entry[i].block_index]; > @@ -1033,7 +1033,7 @@ static int block_free(int block_index) > } > > /* > - * Free and unmap internal shared memory, intentified by its block number: > + * Free and unmap internal shared memory, identified by its block number: > * return -1 on error. 0 if OK. > */ > int _odp_ishm_free_by_index(int block_index) > @@ -1049,7 +1049,7 @@ int _odp_ishm_free_by_index(int block_index) > } > > /* > - * free and unmap internal shared memory, intentified by its block name: > + * free and unmap internal shared memory, identified by its block name: > * return -1 on error. 0 if OK. > */ > int _odp_ishm_free_by_name(const char *name) > @@ -1460,8 +1460,8 @@ static int do_odp_ishm_term_local(void) > * Go through the table of visible blocks for this process, > * decreasing the refcnt of each visible blocks, and issuing > * warning for those no longer referenced by any process. > - * Note that non-referenced blocks are nor freeed: this is > - * deliberate as this would imply that the sementic of the > + * Note that non-referenced blocks are not freed: this is > + * deliberate as this would imply that the semantic of the > * freeing function would differ depending on whether we run > * with odp_thread as processes or pthreads. With this approach, > * the user should always free the blocks manually, which is > @@ -1667,7 +1667,7 @@ int _odp_ishm_status(const char *title) > fragmnt; fragmnt = fragmnt->next) > nb_unused_frgments++; > > - ODP_DBG("ishm: %d fragment used. %d fragements unused. (total=%d)\n", > + ODP_DBG("ishm: %d fragment used. %d fragments unused. (total=%d)\n", > nb_used_frgments, nb_unused_frgments, > nb_used_frgments + nb_unused_frgments); > > -- > 2.7.4 >
Merged, Maxim. On 01/05/17 15:39, Bill Fischofer wrote: > On Wed, Dec 21, 2016 at 6:55 AM, Christophe Milard > <christophe.milard@linaro.org> wrote: >> Fixing a set of iritating typos. just in comments. >> >> Signed-off-by: Christophe Milard <christophe.milard@linaro.org> > > Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org> > >> --- >> >> Since V1: >> another typo found by Bill >> >> platform/linux-generic/_ishm.c | 24 ++++++++++++------------ >> 1 file changed, 12 insertions(+), 12 deletions(-) >> >> diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c >> index 449e357..a49c8e4 100644 >> --- a/platform/linux-generic/_ishm.c >> +++ b/platform/linux-generic/_ishm.c >> @@ -75,7 +75,7 @@ >> /* >> * Maximum number of internal shared memory blocks. >> * >> - * This the the number of separate ISHM areas that can be reserved concurrently >> + * This is the number of separate ISHM areas that can be reserved concurrently >> * (Note that freeing such blocks may take time, or possibly never happen >> * if some of the block ownwers never procsync() after free). This number >> * should take that into account) >> @@ -236,7 +236,7 @@ static void procsync(void); >> * Take a piece of the preallocated virtual space to fit "size" bytes. >> * (best fit). Size must be rounded up to an integer number of pages size. >> * Possibly split the fragment to keep track of remaining space. >> - * Returns the allocated fragment (best_fragmnt) and the corresponding address. >> + * Returns the allocated fragment (best_fragment) and the corresponding address. >> * External caller must ensure mutex before the call! >> */ >> static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align, >> @@ -282,11 +282,11 @@ static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align, >> >> /* >> * if there is room between previous fragment and new one, (due to >> - * alignement requirement) then fragment (split) the space between >> + * alignment requirement) then fragment (split) the space between >> * the end of the previous fragment and the beginning of the new one: >> */ >> if (border - (uintptr_t)(*best_fragmnt)->start > 0) { >> - /* frangment space, i.e. take a new fragment descriptor... */ >> + /* fragment space, i.e. take a new fragment descriptor... */ >> rem_fragmnt = ishm_ftbl->unused_fragmnts; >> if (!rem_fragmnt) { >> ODP_ERR("unable to get shmem fragment descriptor!\n."); >> @@ -316,7 +316,7 @@ static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align, >> if (remainder == 0) >> return (*best_fragmnt)->start; >> >> - /* otherwise, frangment space, i.e. take a new fragment descriptor... */ >> + /* otherwise, fragment space, i.e. take a new fragment descriptor... */ >> rem_fragmnt = ishm_ftbl->unused_fragmnts; >> if (!rem_fragmnt) { >> ODP_ERR("unable to get shmem fragment descriptor!\n."); >> @@ -503,7 +503,7 @@ static void delete_file(ishm_block_t *block) >> * performs the mapping, possibly allocating a fragment of the pre-reserved >> * VA space if the _ODP_ISHM_SINGLE_VA flag was given. >> * Sets fd, and returns the mapping address. >> - * This funstion will also set the _ODP_ISHM_SINGLE_VA flag if the alignment >> + * This function will also set the _ODP_ISHM_SINGLE_VA flag if the alignment >> * requires it >> * Mutex must be assured by the caller. >> */ >> @@ -724,7 +724,7 @@ static void procsync(void) >> >> last = ishm_proctable->nb_entries; >> while (i < last) { >> - /* if the procecess sequence number doesn't match the main >> + /* if the process sequence number doesn't match the main >> * table seq number, this entry is obsolete >> */ >> block = &ishm_tbl->block[ishm_proctable->entry[i].block_index]; >> @@ -1033,7 +1033,7 @@ static int block_free(int block_index) >> } >> >> /* >> - * Free and unmap internal shared memory, intentified by its block number: >> + * Free and unmap internal shared memory, identified by its block number: >> * return -1 on error. 0 if OK. >> */ >> int _odp_ishm_free_by_index(int block_index) >> @@ -1049,7 +1049,7 @@ int _odp_ishm_free_by_index(int block_index) >> } >> >> /* >> - * free and unmap internal shared memory, intentified by its block name: >> + * free and unmap internal shared memory, identified by its block name: >> * return -1 on error. 0 if OK. >> */ >> int _odp_ishm_free_by_name(const char *name) >> @@ -1460,8 +1460,8 @@ static int do_odp_ishm_term_local(void) >> * Go through the table of visible blocks for this process, >> * decreasing the refcnt of each visible blocks, and issuing >> * warning for those no longer referenced by any process. >> - * Note that non-referenced blocks are nor freeed: this is >> - * deliberate as this would imply that the sementic of the >> + * Note that non-referenced blocks are not freed: this is >> + * deliberate as this would imply that the semantic of the >> * freeing function would differ depending on whether we run >> * with odp_thread as processes or pthreads. With this approach, >> * the user should always free the blocks manually, which is >> @@ -1667,7 +1667,7 @@ int _odp_ishm_status(const char *title) >> fragmnt; fragmnt = fragmnt->next) >> nb_unused_frgments++; >> >> - ODP_DBG("ishm: %d fragment used. %d fragements unused. (total=%d)\n", >> + ODP_DBG("ishm: %d fragment used. %d fragments unused. (total=%d)\n", >> nb_used_frgments, nb_unused_frgments, >> nb_used_frgments + nb_unused_frgments); >> >> -- >> 2.7.4 >>
diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 449e357..a49c8e4 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -75,7 +75,7 @@ /* * Maximum number of internal shared memory blocks. * - * This the the number of separate ISHM areas that can be reserved concurrently + * This is the number of separate ISHM areas that can be reserved concurrently * (Note that freeing such blocks may take time, or possibly never happen * if some of the block ownwers never procsync() after free). This number * should take that into account) @@ -236,7 +236,7 @@ static void procsync(void); * Take a piece of the preallocated virtual space to fit "size" bytes. * (best fit). Size must be rounded up to an integer number of pages size. * Possibly split the fragment to keep track of remaining space. - * Returns the allocated fragment (best_fragmnt) and the corresponding address. + * Returns the allocated fragment (best_fragment) and the corresponding address. * External caller must ensure mutex before the call! */ static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align, @@ -282,11 +282,11 @@ static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align, /* * if there is room between previous fragment and new one, (due to - * alignement requirement) then fragment (split) the space between + * alignment requirement) then fragment (split) the space between * the end of the previous fragment and the beginning of the new one: */ if (border - (uintptr_t)(*best_fragmnt)->start > 0) { - /* frangment space, i.e. take a new fragment descriptor... */ + /* fragment space, i.e. take a new fragment descriptor... */ rem_fragmnt = ishm_ftbl->unused_fragmnts; if (!rem_fragmnt) { ODP_ERR("unable to get shmem fragment descriptor!\n."); @@ -316,7 +316,7 @@ static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align, if (remainder == 0) return (*best_fragmnt)->start; - /* otherwise, frangment space, i.e. take a new fragment descriptor... */ + /* otherwise, fragment space, i.e. take a new fragment descriptor... */ rem_fragmnt = ishm_ftbl->unused_fragmnts; if (!rem_fragmnt) { ODP_ERR("unable to get shmem fragment descriptor!\n."); @@ -503,7 +503,7 @@ static void delete_file(ishm_block_t *block) * performs the mapping, possibly allocating a fragment of the pre-reserved * VA space if the _ODP_ISHM_SINGLE_VA flag was given. * Sets fd, and returns the mapping address. - * This funstion will also set the _ODP_ISHM_SINGLE_VA flag if the alignment + * This function will also set the _ODP_ISHM_SINGLE_VA flag if the alignment * requires it * Mutex must be assured by the caller. */ @@ -724,7 +724,7 @@ static void procsync(void) last = ishm_proctable->nb_entries; while (i < last) { - /* if the procecess sequence number doesn't match the main + /* if the process sequence number doesn't match the main * table seq number, this entry is obsolete */ block = &ishm_tbl->block[ishm_proctable->entry[i].block_index]; @@ -1033,7 +1033,7 @@ static int block_free(int block_index) } /* - * Free and unmap internal shared memory, intentified by its block number: + * Free and unmap internal shared memory, identified by its block number: * return -1 on error. 0 if OK. */ int _odp_ishm_free_by_index(int block_index) @@ -1049,7 +1049,7 @@ int _odp_ishm_free_by_index(int block_index) } /* - * free and unmap internal shared memory, intentified by its block name: + * free and unmap internal shared memory, identified by its block name: * return -1 on error. 0 if OK. */ int _odp_ishm_free_by_name(const char *name) @@ -1460,8 +1460,8 @@ static int do_odp_ishm_term_local(void) * Go through the table of visible blocks for this process, * decreasing the refcnt of each visible blocks, and issuing * warning for those no longer referenced by any process. - * Note that non-referenced blocks are nor freeed: this is - * deliberate as this would imply that the sementic of the + * Note that non-referenced blocks are not freed: this is + * deliberate as this would imply that the semantic of the * freeing function would differ depending on whether we run * with odp_thread as processes or pthreads. With this approach, * the user should always free the blocks manually, which is @@ -1667,7 +1667,7 @@ int _odp_ishm_status(const char *title) fragmnt; fragmnt = fragmnt->next) nb_unused_frgments++; - ODP_DBG("ishm: %d fragment used. %d fragements unused. (total=%d)\n", + ODP_DBG("ishm: %d fragment used. %d fragments unused. (total=%d)\n", nb_used_frgments, nb_unused_frgments, nb_used_frgments + nb_unused_frgments);
Fixing a set of iritating typos. just in comments. Signed-off-by: Christophe Milard <christophe.milard@linaro.org> --- Since V1: another typo found by Bill platform/linux-generic/_ishm.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -- 2.7.4