[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-httpd-dev
Subject:    Re: svn commit: r1386880 - in /httpd/httpd/trunk: docs/log-message-tags/next-number docs/manual/mod/
From:       Guenter Knauf <fuankg () apache ! org>
Date:       2012-09-18 22:14:28
Message-ID: 5058F244.10202 () apache ! org
[Download RAW message or body]

Hi Jim,
your commit below introduced a comment close tag which seems misplaced ...
I did just remove this with r1387389 - if you intended to comment out 
something there then please review ...

Gün.

Am 18.09.2012 00:26, schrieb jim@apache.org:
> Author: jim
> Date: Mon Sep 17 22:26:28 2012
> New Revision: 1386880
> 
> URL: http://svn.apache.org/viewvc?rev=1386880&view=rev
> Log:
> Allow for a forced grab of a slotmem slot.
> 
> Modified:
> httpd/httpd/trunk/docs/log-message-tags/next-number
> httpd/httpd/trunk/docs/manual/mod/mod_slotmem_plain.xml
> httpd/httpd/trunk/docs/manual/mod/mod_slotmem_shm.xml
> httpd/httpd/trunk/include/ap_slotmem.h
> httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c
> httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
> 
> Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c?rev=1386880&r1=1386879&r2=1386880&view=diff
>  ==============================================================================
> --- httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c (original)
> +++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c Mon Sep 17 22:26:28 2012
...
> @@ -251,13 +257,31 @@ static apr_status_t slotmem_grab(ap_slot
> }
> }
> if (i>= slot->num) {
> -        return APR_ENOSHMAVAIL;
> +        return APR_EINVAL;
> }
> *inuse = 1;
> *id = i;
> return APR_SUCCESS;
> }
> 
> +*/
    ^

> +static apr_status_t slotmem_fgrab(ap_slotmem_instance_t *slot, unsigned int id)
> +{
> +    unsigned int i;
> +    char *inuse;
> +
> +    if (!slot) {
> +        return APR_ENOSHMAVAIL;
> +    }
> +
> +    if (id>= slot->num) {
> +        return APR_EINVAL;
> +    }
> +    inuse = slot->inuse + id;
> +    *inuse = 1;
> +    return APR_SUCCESS;
> +}
> +
> static apr_status_t slotmem_release(ap_slotmem_instance_t *slot, unsigned int id)
> {
> char *inuse;


[prev in list] [next in list] [prev in thread] [next in thread]