You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jf...@apache.org on 2009/05/04 12:20:42 UTC
svn commit: r771262 - in /httpd/httpd/trunk: include/ap_slotmem.h
modules/mem/mod_sharedmem.c server/slotmem.c
Author: jfclere
Date: Mon May 4 10:20:42 2009
New Revision: 771262
URL: http://svn.apache.org/viewvc?rev=771262&view=rev
Log:
Remove ap_slotmem_lock / ap_slotmem_unlock from the slotmem API.
Modified:
httpd/httpd/trunk/include/ap_slotmem.h
httpd/httpd/trunk/modules/mem/mod_sharedmem.c
httpd/httpd/trunk/server/slotmem.c
Modified: httpd/httpd/trunk/include/ap_slotmem.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_slotmem.h?rev=771262&r1=771261&r2=771262&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_slotmem.h (original)
+++ httpd/httpd/trunk/include/ap_slotmem.h Mon May 4 10:20:42 2009
@@ -104,20 +104,6 @@
*/
apr_status_t (* slotmem_mem)(ap_slotmem_t *s, unsigned int item_id, void**mem);
/**
- * lock the memory segment
- * NOTE: All slots share the same mutex
- * @param s ap_slotmem_t to use
- * @return APR_SUCCESS if all went well
- */
- apr_status_t (* slotmem_lock)(ap_slotmem_t *s);
- /**
- * unlock the memory segment
- * NOTE: All slots share the same mutex
- * @param s ap_slotmem_t to use.
- * @return APR_SUCCESS if all went well
- */
- apr_status_t (* slotmem_unlock)(ap_slotmem_t *s);
- /**
* retrieve the memory associated with this worker slot.
* @param s ap_slotmem_t to use.
* @param item_id item to return for 0 to item_num
@@ -203,22 +189,6 @@
*/
AP_DECLARE(apr_status_t) ap_slotmem_mem(ap_slotmem_storage_method *sm, ap_slotmem_t *s, unsigned int item_id, void**mem);
/**
- * lock the memory segment
- * NOTE: All slots share the same mutex
- * @param sm ap_slotmem_storage_method provider obtained
- * @param s ap_slotmem_t to use
- * @return APR_SUCCESS if all went well
- */
-AP_DECLARE(apr_status_t) ap_slotmem_lock(ap_slotmem_storage_method *sm, ap_slotmem_t *s);
-/**
- * unlock the memory segment
- * NOTE: All slots share the same mutex
- * @param sm ap_slotmem_storage_method provider obtained
- * @param s ap_slotmem_t to use.
- * @return APR_SUCCESS if all went well
- */
-AP_DECLARE(apr_status_t) ap_slotmem_unlock(ap_slotmem_storage_method *sm, ap_slotmem_t *s);
-/**
* retrieve the memory associated with this worker slot.
* @param sm ap_slotmem_storage_method provider obtained
* @param s ap_slotmem_t to use.
Modified: httpd/httpd/trunk/modules/mem/mod_sharedmem.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mem/mod_sharedmem.c?rev=771262&r1=771261&r2=771262&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mem/mod_sharedmem.c (original)
+++ httpd/httpd/trunk/modules/mem/mod_sharedmem.c Mon May 4 10:20:42 2009
@@ -351,6 +351,7 @@
return APR_SUCCESS;
}
+/* XXX: Those 2 should be removed */
static apr_status_t slotmem_lock(ap_slotmem_t *slot)
{
return (apr_global_mutex_lock(slot->smutex));
@@ -395,8 +396,6 @@
&slotmem_create,
&slotmem_attach,
&slotmem_mem,
- &slotmem_lock,
- &slotmem_unlock,
&slotmem_get,
&slotmem_put
};
Modified: httpd/httpd/trunk/server/slotmem.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/slotmem.c?rev=771262&r1=771261&r2=771262&view=diff
==============================================================================
--- httpd/httpd/trunk/server/slotmem.c (original)
+++ httpd/httpd/trunk/server/slotmem.c Mon May 4 10:20:42 2009
@@ -61,18 +61,6 @@
return (sm->slotmem_mem(s, item_id, mem));
}
-AP_DECLARE(apr_status_t) ap_slotmem_lock(ap_slotmem_storage_method *sm,
- ap_slotmem_t *s)
-{
- return (sm->slotmem_lock(s));
-}
-
-AP_DECLARE(apr_status_t) ap_slotmem_unlock(ap_slotmem_storage_method *sm,
- ap_slotmem_t *s)
-{
- return (sm->slotmem_unlock(s));
-}
-
AP_DECLARE(apr_status_t) ap_slotmem_get(ap_slotmem_storage_method *sm,
ap_slotmem_t *s, unsigned int item_id,
unsigned char *dest, apr_size_t dest_len)