Re: svn commit: r1702473 - /httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
On Sep 14, 2015 10:21 AM, "Jim Jagielski" wrote: > > :) > > No worries, it's just that it creates an artificial delat > between trunk and 2.4. Simple solution is to @bug the doxygen that a change is needed, or to begin a list of renames in STATUS to be executed prior to 2.6.0/3.0.0. The awkward name persists while we are still largely maintaining 2.4, but it reminds us to clean up before trunk is tagged for GA. We did something very similar between APR 0.9 and 1.0 and it worked rather well to keep patches simple, plus it documented for developers just what we had changed.
Re: svn commit: r1702473 - /httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
:) No worries, it's just that it creates an artificial delat between trunk and 2.4. > On Sep 11, 2015, at 3:35 PM, Yann Ylavic wrote: > > Well, granted, it made sense to me to change the field name with the > comment... > I also thought about having both 'name' and 'fname' (the former for > logging only), so it's not like I overengineered either :) > But I can certainly revert (but the comment as suggested by Rüdiger), > or enough frivolity for today maybe? > > > On Fri, Sep 11, 2015 at 8:19 PM, Jim Jagielski wrote: >> I find this kinda frivolous. >> >>> On Sep 11, 2015, at 9:58 AM, [email protected] wrote: >>> >>> Author: ylavic >>> Date: Fri Sep 11 13:58:44 2015 >>> New Revision: 1702473 >>> >>> URL: http://svn.apache.org/r1702473 >>> Log: >>> mod_slotmem_shm: follow up to r1702450. >>> Rename ap_slotmem_instance_t's field 'name' to 'fname' since it really >>> stores >>> the file path/name of the file-based SHM. >>> >>> Modified: >>> httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c >>> >>> Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c >>> URL: >>> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c?rev=1702473&r1=1702472&r2=1702473&view=diff >>> == >>> --- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original) >>> +++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Fri Sep 11 13:58:44 >>> 2015 >>> @@ -41,8 +41,8 @@ typedef struct { >>> #define AP_UNSIGNEDINT_OFFSET (APR_ALIGN_DEFAULT(sizeof(unsigned int))) >>> >>> struct ap_slotmem_instance_t { >>> -char *name; /* per segment name */ >>> -char *pname; /* persisted file name */ >>> +char *fname; /* file based SHM path/name */ >>> +char *pname; /* persisted file path/name */ >>>int fbased; /* filebased? */ >>>void *shm;/* ptr to memory segment (apr_shm_t *) >>> */ >>>void *base; /* data set start */ >>> @@ -271,8 +271,8 @@ static apr_status_t cleanup_slotmem(void >>>store_slotmem(next); >>>} >>>if (next->fbased) { >>> -apr_shm_remove(next->name, next->gpool); >>> -apr_file_remove(next->name, next->gpool); >>> +apr_shm_remove(next->fname, next->gpool); >>> +apr_file_remove(next->fname, next->gpool); >>>} >>>apr_shm_destroy((apr_shm_t *)next->shm); >>>next = next->next; >>> @@ -336,7 +336,7 @@ static apr_status_t slotmem_create(ap_sl >>>/* first try to attach to existing slotmem */ >>>if (next) { >>>for (;;) { >>> -if (strcmp(next->name, fname) == 0) { >>> +if (strcmp(next->fname, fname) == 0) { >>>/* we already have it */ >>>*new = next; >>>ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, >>> APLOGNO(02603) >>> @@ -435,7 +435,7 @@ static apr_status_t slotmem_create(ap_sl >>>/* For the chained slotmem stuff */ >>>res = (ap_slotmem_instance_t *) apr_pcalloc(gpool, >>> >>> sizeof(ap_slotmem_instance_t)); >>> -res->name = apr_pstrdup(gpool, fname); >>> +res->fname = apr_pstrdup(gpool, fname); >>>res->pname = apr_pstrdup(gpool, pname); >>>res->fbased = fbased; >>>res->shm = shm; >>> @@ -487,7 +487,7 @@ static apr_status_t slotmem_attach(ap_sl >>>/* first try to attach to existing slotmem */ >>>if (next) { >>>for (;;) { >>> -if (strcmp(next->name, fname) == 0) { >>> +if (strcmp(next->fname, fname) == 0) { >>>/* we already have it */ >>>*new = next; >>>*item_size = next->desc.size; >>> @@ -519,7 +519,7 @@ static apr_status_t slotmem_attach(ap_sl >>>/* For the chained slotmem stuff */ >>>res = (ap_slotmem_instance_t *) apr_pcalloc(gpool, >>> >>> sizeof(ap_slotmem_instance_t)); >>> -res->name = apr_pstrdup(gpool, fname); >>> +res->fname = apr_pstrdup(gpool, fname); >>>res->fbased = 1; >>>res->shm = shm; >>>res->num_free = (unsigned int *)ptr; >>> @@ -665,7 +665,7 @@ static apr_status_t slotmem_grab(ap_slot >>>if (i >= slot->desc.num) { >>>ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, >>> APLOGNO(02293) >>> "slotmem(%s) grab failed. Num %u/num_free %u", >>> - slot->name, slotmem_num_slots(slot), >>> + slot->fname, slotmem_num_slots(slot), >>> slotmem_num_free_slots(slot)); >>>return APR_EINVAL; >>>} >>> @@ -686,7 +686,7 @@ static apr_status_t slotmem_fgrab(ap_slo >>>if (id >= slot->desc.num) { >>>ap_log_error(AP
Re: svn commit: r1702473 - /httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
Well, granted, it made sense to me to change the field name with the comment... I also thought about having both 'name' and 'fname' (the former for logging only), so it's not like I overengineered either :) But I can certainly revert (but the comment as suggested by Rüdiger), or enough frivolity for today maybe? On Fri, Sep 11, 2015 at 8:19 PM, Jim Jagielski wrote: > I find this kinda frivolous. > >> On Sep 11, 2015, at 9:58 AM, [email protected] wrote: >> >> Author: ylavic >> Date: Fri Sep 11 13:58:44 2015 >> New Revision: 1702473 >> >> URL: http://svn.apache.org/r1702473 >> Log: >> mod_slotmem_shm: follow up to r1702450. >> Rename ap_slotmem_instance_t's field 'name' to 'fname' since it really stores >> the file path/name of the file-based SHM. >> >> Modified: >>httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c >> >> Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c >> URL: >> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c?rev=1702473&r1=1702472&r2=1702473&view=diff >> == >> --- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original) >> +++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Fri Sep 11 13:58:44 >> 2015 >> @@ -41,8 +41,8 @@ typedef struct { >> #define AP_UNSIGNEDINT_OFFSET (APR_ALIGN_DEFAULT(sizeof(unsigned int))) >> >> struct ap_slotmem_instance_t { >> -char *name; /* per segment name */ >> -char *pname; /* persisted file name */ >> +char *fname; /* file based SHM path/name */ >> +char *pname; /* persisted file path/name */ >> int fbased; /* filebased? */ >> void *shm;/* ptr to memory segment (apr_shm_t *) >> */ >> void *base; /* data set start */ >> @@ -271,8 +271,8 @@ static apr_status_t cleanup_slotmem(void >> store_slotmem(next); >> } >> if (next->fbased) { >> -apr_shm_remove(next->name, next->gpool); >> -apr_file_remove(next->name, next->gpool); >> +apr_shm_remove(next->fname, next->gpool); >> +apr_file_remove(next->fname, next->gpool); >> } >> apr_shm_destroy((apr_shm_t *)next->shm); >> next = next->next; >> @@ -336,7 +336,7 @@ static apr_status_t slotmem_create(ap_sl >> /* first try to attach to existing slotmem */ >> if (next) { >> for (;;) { >> -if (strcmp(next->name, fname) == 0) { >> +if (strcmp(next->fname, fname) == 0) { >> /* we already have it */ >> *new = next; >> ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, >> APLOGNO(02603) >> @@ -435,7 +435,7 @@ static apr_status_t slotmem_create(ap_sl >> /* For the chained slotmem stuff */ >> res = (ap_slotmem_instance_t *) apr_pcalloc(gpool, >> >> sizeof(ap_slotmem_instance_t)); >> -res->name = apr_pstrdup(gpool, fname); >> +res->fname = apr_pstrdup(gpool, fname); >> res->pname = apr_pstrdup(gpool, pname); >> res->fbased = fbased; >> res->shm = shm; >> @@ -487,7 +487,7 @@ static apr_status_t slotmem_attach(ap_sl >> /* first try to attach to existing slotmem */ >> if (next) { >> for (;;) { >> -if (strcmp(next->name, fname) == 0) { >> +if (strcmp(next->fname, fname) == 0) { >> /* we already have it */ >> *new = next; >> *item_size = next->desc.size; >> @@ -519,7 +519,7 @@ static apr_status_t slotmem_attach(ap_sl >> /* For the chained slotmem stuff */ >> res = (ap_slotmem_instance_t *) apr_pcalloc(gpool, >> >> sizeof(ap_slotmem_instance_t)); >> -res->name = apr_pstrdup(gpool, fname); >> +res->fname = apr_pstrdup(gpool, fname); >> res->fbased = 1; >> res->shm = shm; >> res->num_free = (unsigned int *)ptr; >> @@ -665,7 +665,7 @@ static apr_status_t slotmem_grab(ap_slot >> if (i >= slot->desc.num) { >> ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, >> APLOGNO(02293) >> "slotmem(%s) grab failed. Num %u/num_free %u", >> - slot->name, slotmem_num_slots(slot), >> + slot->fname, slotmem_num_slots(slot), >> slotmem_num_free_slots(slot)); >> return APR_EINVAL; >> } >> @@ -686,7 +686,7 @@ static apr_status_t slotmem_fgrab(ap_slo >> if (id >= slot->desc.num) { >> ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, >> APLOGNO(02397) >> "slotmem(%s) fgrab failed. Num %u/num_free %u", >> - slot->name, slotmem_num_slots(slot), >> + slot->f
Re: svn commit: r1702473 - /httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
I find this kinda frivolous. > On Sep 11, 2015, at 9:58 AM, [email protected] wrote: > > Author: ylavic > Date: Fri Sep 11 13:58:44 2015 > New Revision: 1702473 > > URL: http://svn.apache.org/r1702473 > Log: > mod_slotmem_shm: follow up to r1702450. > Rename ap_slotmem_instance_t's field 'name' to 'fname' since it really stores > the file path/name of the file-based SHM. > > Modified: >httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c > > Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c > URL: > http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c?rev=1702473&r1=1702472&r2=1702473&view=diff > == > --- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original) > +++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Fri Sep 11 13:58:44 > 2015 > @@ -41,8 +41,8 @@ typedef struct { > #define AP_UNSIGNEDINT_OFFSET (APR_ALIGN_DEFAULT(sizeof(unsigned int))) > > struct ap_slotmem_instance_t { > -char *name; /* per segment name */ > -char *pname; /* persisted file name */ > +char *fname; /* file based SHM path/name */ > +char *pname; /* persisted file path/name */ > int fbased; /* filebased? */ > void *shm;/* ptr to memory segment (apr_shm_t *) > */ > void *base; /* data set start */ > @@ -271,8 +271,8 @@ static apr_status_t cleanup_slotmem(void > store_slotmem(next); > } > if (next->fbased) { > -apr_shm_remove(next->name, next->gpool); > -apr_file_remove(next->name, next->gpool); > +apr_shm_remove(next->fname, next->gpool); > +apr_file_remove(next->fname, next->gpool); > } > apr_shm_destroy((apr_shm_t *)next->shm); > next = next->next; > @@ -336,7 +336,7 @@ static apr_status_t slotmem_create(ap_sl > /* first try to attach to existing slotmem */ > if (next) { > for (;;) { > -if (strcmp(next->name, fname) == 0) { > +if (strcmp(next->fname, fname) == 0) { > /* we already have it */ > *new = next; > ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, > APLOGNO(02603) > @@ -435,7 +435,7 @@ static apr_status_t slotmem_create(ap_sl > /* For the chained slotmem stuff */ > res = (ap_slotmem_instance_t *) apr_pcalloc(gpool, > > sizeof(ap_slotmem_instance_t)); > -res->name = apr_pstrdup(gpool, fname); > +res->fname = apr_pstrdup(gpool, fname); > res->pname = apr_pstrdup(gpool, pname); > res->fbased = fbased; > res->shm = shm; > @@ -487,7 +487,7 @@ static apr_status_t slotmem_attach(ap_sl > /* first try to attach to existing slotmem */ > if (next) { > for (;;) { > -if (strcmp(next->name, fname) == 0) { > +if (strcmp(next->fname, fname) == 0) { > /* we already have it */ > *new = next; > *item_size = next->desc.size; > @@ -519,7 +519,7 @@ static apr_status_t slotmem_attach(ap_sl > /* For the chained slotmem stuff */ > res = (ap_slotmem_instance_t *) apr_pcalloc(gpool, > > sizeof(ap_slotmem_instance_t)); > -res->name = apr_pstrdup(gpool, fname); > +res->fname = apr_pstrdup(gpool, fname); > res->fbased = 1; > res->shm = shm; > res->num_free = (unsigned int *)ptr; > @@ -665,7 +665,7 @@ static apr_status_t slotmem_grab(ap_slot > if (i >= slot->desc.num) { > ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, > APLOGNO(02293) > "slotmem(%s) grab failed. Num %u/num_free %u", > - slot->name, slotmem_num_slots(slot), > + slot->fname, slotmem_num_slots(slot), > slotmem_num_free_slots(slot)); > return APR_EINVAL; > } > @@ -686,7 +686,7 @@ static apr_status_t slotmem_fgrab(ap_slo > if (id >= slot->desc.num) { > ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, > APLOGNO(02397) > "slotmem(%s) fgrab failed. Num %u/num_free %u", > - slot->name, slotmem_num_slots(slot), > + slot->fname, slotmem_num_slots(slot), > slotmem_num_free_slots(slot)); > return APR_EINVAL; > } > @@ -713,7 +713,7 @@ static apr_status_t slotmem_release(ap_s > if (id >= slot->desc.num || !inuse[id] ) { > ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, > APLOGNO(02294) > "slotmem(%s) release failed. Num %u/inuse[%u] %d", > - slot->name, slotmem_num_slots(slot), > +
