From: Jim Jagielski <jim@apache.org>
Date: Mon, 17 Sep 2012 17:19:44 +0000 (+0000)
Subject: Add debug output when slotmem is persisting shm
X-Git-Tag: 2.5.0-alpha~6327
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f217b5997a1575b1553d18bd7df9a2a1ba7eece8;p=apache

Add debug output when slotmem is persisting shm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1386726 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number
index f5052a2a28..d61563f929 100644
--- a/docs/log-message-tags/next-number
+++ b/docs/log-message-tags/next-number
@@ -1 +1 @@
-2334
+2336
diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index ccc67a0ad3..780bdaed06 100644
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -144,6 +144,11 @@ static const char *slotmem_filename(apr_pool_t *pool, const char *slotmemname)
     return fname;
 }
 
+static const char *storemem_filename(apr_pool_t *pool, const char *name)
+{
+    return apr_pstrcat(pool, name, ".persist", NULL);
+}
+
 static void store_slotmem(ap_slotmem_instance_t *slotmem)
 {
     apr_file_t *fp;
@@ -151,7 +156,10 @@ static void store_slotmem(ap_slotmem_instance_t *slotmem)
     apr_size_t nbytes;
     const char *storename;
 
-    storename = slotmem_filename(slotmem->gpool, slotmem->name);
+    storename = storemem_filename(slotmem->gpool, slotmem->name);
+
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02334)
+                 "storing %s", storename);
 
     if (storename) {
         rv = apr_file_open(&fp, storename, APR_CREATE | APR_READ | APR_WRITE,
@@ -166,7 +174,7 @@ static void store_slotmem(ap_slotmem_instance_t *slotmem)
         }
         nbytes = (slotmem->desc.size * slotmem->desc.num) +
                  (slotmem->desc.num * sizeof(char)) + AP_UNSIGNEDINT_OFFSET;
-	/* XXX: Error handling */
+        /* XXX: Error handling */
         apr_file_write_full(fp, slotmem->persist, nbytes, NULL);
         apr_file_close(fp);
     }
@@ -181,7 +189,10 @@ static void restore_slotmem(void *ptr, const char *name, apr_size_t size,
     apr_size_t nbytes = size;
     apr_status_t rv;
 
-    storename = slotmem_filename(pool, name);
+    storename = storemem_filename(pool, name);
+
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02335)
+                 "restoring %s", storename);
 
     if (storename) {
         rv = apr_file_open(&fp, storename, APR_READ | APR_WRITE, APR_OS_DEFAULT,
@@ -683,4 +694,3 @@ AP_DECLARE_MODULE(slotmem_shm) = {
     NULL,                       /* command apr_table_t */
     ap_slotmem_shm_register_hook  /* register hooks */
 };
-