svn commit: r1665451 - in /tomcat/jk/trunk/native/common: jk_shm.c jk_shm.h

[rj...@apache.org]

Author: rjung
Date: Tue Mar 10 10:32:33 2015
New Revision: 1665451

URL: http://svn.apache.org/r1665451
Log:
Remove unused code.

Modified:
    tomcat/jk/trunk/native/common/jk_shm.c
    tomcat/jk/trunk/native/common/jk_shm.h

Modified: tomcat/jk/trunk/native/common/jk_shm.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.c?rev=1665451&r1=1665450&r2=1665451&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.c (original)
+++ tomcat/jk/trunk/native/common/jk_shm.c Tue Mar 10 10:32:33 2015
@@ -42,7 +42,6 @@ struct jk_shm_header_data
     unsigned int pos;
     unsigned int childs;
     unsigned int workers;
-    time_t       modified;
 };
 
 typedef struct jk_shm_header_data jk_shm_header_data_t;
@@ -81,8 +80,6 @@ typedef struct jk_shm jk_shm_t;
 
 static const char shm_signature[] = { JK_SHM_MAGIC };
 static jk_shm_t jk_shmem = { 0, 0, 0, 0, NULL, NULL, -1, -1, 0, NULL};
-static time_t jk_workers_modified_time = 0;
-static time_t jk_workers_access_time = 0;
 #if defined (WIN32)
 static HANDLE jk_shm_map = NULL;
 static HANDLE jk_shm_hlock = NULL;
@@ -866,40 +863,6 @@ const char *jk_shm_name()
     return jk_shmem.filename;
 }
 
-
-time_t jk_shm_get_workers_time()
-{
-    if (jk_shmem.hdr)
-        return jk_shmem.hdr->h.data.modified;
-    else
-        return jk_workers_modified_time;
-}
-
-void jk_shm_set_workers_time(time_t t)
-{
-    jk_shm_lock();
-    if (jk_shmem.hdr)
-        jk_shmem.hdr->h.data.modified = t;
-    else
-        jk_workers_modified_time = t;
-    jk_workers_access_time = t;
-    jk_shm_unlock();
-}
-
-int jk_shm_is_modified()
-{
-    time_t m = jk_shm_get_workers_time();
-    if (m != jk_workers_access_time)
-        return 1;
-    else
-        return 0;
-}
-
-void jk_shm_sync_access_time()
-{
-    jk_workers_access_time = jk_shm_get_workers_time();
-}
-
 int jk_shm_lock()
 {
     int rc = JK_TRUE;

Modified: tomcat/jk/trunk/native/common/jk_shm.h
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.h?rev=1665451&r1=1665450&r2=1665451&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.h (original)
+++ tomcat/jk/trunk/native/common/jk_shm.h Tue Mar 10 10:32:33 2015
@@ -223,27 +223,6 @@ jk_shm_lb_sub_worker_t *jk_shm_alloc_lb_
 jk_shm_lb_worker_t *jk_shm_alloc_lb_worker(jk_pool_t *p, const char *name,
                                            jk_logger_t *l);
 
-/* Return workers.properties last modified time
- */
-time_t jk_shm_get_workers_time(void);
-
-/* Set workers.properties last modified time
- */
-void jk_shm_set_workers_time(time_t t);
-
-/* Check if the shared memory has been modified
- * by some other process.
- */
-int jk_shm_is_modified(void);
-
-/* Synchronize access and modification time.
- * This function should be called when the shared memory
- * is modified and after we update the config acording
- * to the current shared memory data.
- */
-void jk_shm_sync_access_time(void);
-
-
 /* Lock shared memory for thread safe access */
 int jk_shm_lock(void);
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org