summaryrefslogtreecommitdiffstats
path: root/docs/manual
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2012-09-18 00:26:28 +0200
committerJim Jagielski <jim@apache.org>2012-09-18 00:26:28 +0200
commit6e77cfce5144e61d1e9b62cad049bd9cec1ceb50 (patch)
tree8723d8310e9c68872bd4eabe27e7b58cf15ea649 /docs/manual
parentMore consistent return errors... (diff)
downloadapache2-6e77cfce5144e61d1e9b62cad049bd9cec1ceb50.tar.xz
apache2-6e77cfce5144e61d1e9b62cad049bd9cec1ceb50.zip
Allow for a forced grab of a slotmem slot.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1386880 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual')
-rw-r--r--docs/manual/mod/mod_slotmem_plain.xml7
-rw-r--r--docs/manual/mod/mod_slotmem_shm.xml5
2 files changed, 9 insertions, 3 deletions
diff --git a/docs/manual/mod/mod_slotmem_plain.xml b/docs/manual/mod/mod_slotmem_plain.xml
index d5f9d232c4..61603f189f 100644
--- a/docs/manual/mod/mod_slotmem_plain.xml
+++ b/docs/manual/mod/mod_slotmem_plain.xml
@@ -67,10 +67,13 @@
<dt>apr_size_t slot_size(ap_slotmem_instance_t *s)</dt>
<dd>return the total data size, in bytes, of a slot in the segment</dd>
- <dt>apr_status_t grab(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
+ <dt>apr_status_t grab(ap_slotmem_instance_t *s, unsigned int *item_id);</dt>
<dd>grab or allocate a slot and mark as in-use (does not do any data copying)</dd>
- <dt>apr_status_t release(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
+ <dt>apr_status_t fgrab(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
+ <dd>forced grab or allocate a slot and mark as in-use (does not do any data copying)</dd>
+
+ <dt>apr_status_t release(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
<dd>release or free a slot and mark as not in-use (does not do any data copying)</dd>
</dl>
diff --git a/docs/manual/mod/mod_slotmem_shm.xml b/docs/manual/mod/mod_slotmem_shm.xml
index cee9a8e4eb..e129970f16 100644
--- a/docs/manual/mod/mod_slotmem_shm.xml
+++ b/docs/manual/mod/mod_slotmem_shm.xml
@@ -80,9 +80,12 @@
<dt>apr_size_t slot_size(ap_slotmem_instance_t *s)</dt>
<dd>return the total data size, in bytes, of a slot in the segment</dd>
- <dt>apr_status_t grab(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
+ <dt>apr_status_t grab(ap_slotmem_instance_t *s, unsigned int *item_id);</dt>
<dd>grab or allocate a slot and mark as in-use (does not do any data copying)</dd>
+ <dt>apr_status_t grab(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
+ <dd>forced grab or allocate a slot and mark as in-use (does not do any data copying)</dd>
+
<dt>apr_status_t release(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
<dd>release or free a slot and mark as not in-use (does not do any data copying)</dd>
</dl>