Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Received-SPF: neutral (nike.apache.org: local policy)
Message-ID: <5058F244.10202@apache.org>
Date: Wed, 19 Sep 2012 00:14:28 +0200
From: Guenter Knauf <fuankg@apache.org>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; de;
 rv:1.9.2.28) Gecko/20120306 Lightning/1.0b2 Thunderbird/3.1.20
MIME-Version: 1.0
To: dev@httpd.apache.org
Subject: Re: svn commit: r1386880 - in /httpd/httpd/trunk:
 docs/log-message-tags/next-number
 docs/manual/mod/mod_slotmem_plain.xml docs/manual/mod/mod_slotmem_shm.xml
 include/ap_slotmem.h modules/slotmem/mod_slotmem_plain.c
 modules/slotmem/mod_slotmem_shm.c
References: <20120917222629.950BC2388A3F@eris.apache.org>
In-Reply-To: <20120917222629.950BC2388A3F@eris.apache.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: quoted-printable

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

G=C3=BCn.

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=3D1386880&view=3Drev
> 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=3D1386880&r1=3D1386879&r2=3D1386880&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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
=2E..
> @@ -251,13 +257,31 @@ static apr_status_t slotmem_grab(ap_slot
>           }
>       }
>       if (i>=3D slot->num) {
> -        return APR_ENOSHMAVAIL;
> +        return APR_EINVAL;
>       }
>       *inuse =3D 1;
>       *id =3D i;
>       return APR_SUCCESS;
>   }
>
> +*/
    ^

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