Changeset 394

Timestamp:

02/04/10 11:31:26 (6 months ago)

Author:

bart

Message:

Remove some leftovers from the lock api

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/eaccelerator.c (modified) (3 diffs)
• eaccelerator/trunk/eaccelerator.h (modified) (3 diffs)

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2010-02-04      Bart Vanbrabant <bart at vanbrabant.eu>
+
+                * Remove some leftovers from the lock api
+
-2010-02-03      Bart Vanbrabant <bart at vanbrabant.eu>
-

eaccelerator/trunk/eaccelerator.c

@@ -259 +259 @@
-  ea_mm_instance->check_mtime_enabled = 1;
-  ea_mm_instance->removed = NULL;
-  ea_mm_instance->locks = NULL;
-  ea_mm_instance->last_prune = time(NULL);      /* this time() call is harmless since this is init phase */
-  EACCELERATOR_PROTECT();
@@ -1501 +1500 @@
-  if (ea_mm_instance != NULL) {
-    EACCELERATOR_UNPROTECT();
- || ea_mm_instance->locks != NULL
+
-      EACCELERATOR_LOCK_RW();
-      while (p != NULL) {
@@ -1525 +1524 @@
-        }
-        p = p->next;
-      }
-      if (ea_mm_instance->locks != NULL) {
-        pid_t    pid    = getpid();
-#ifdef ZTS
-        THREAD_T thread = tsrm_thread_id();
-#endif
-        ea_lock_entry** p = &ea_mm_instance->locks;
-        while ((*p) != NULL) {
-#ifdef ZTS
-          if ((*p)->pid == pid && (*p)->thread == thread) {
-#else
-          if ((*p)->pid == pid) {
-#endif
-            ea_lock_entry* x = *p;
-            *p = (*p)->next;
-            eaccelerator_free_nolock(x);
-          } else {
-            p = &(*p)->next;
-          }
-        }
-      }
-      EACCELERATOR_UNLOCK_RW();

eaccelerator/trunk/eaccelerator.h

@@ -308 +308 @@
-} ea_used_entry;
-
-/*
- * Linked list of locks
- */
-typedef struct _ea_lock_entry {
-        struct _ea_lock_entry *next;
-        pid_t pid;
-#ifdef ZTS
-        THREAD_T thread;
-#endif
-        char key[1];
-} ea_lock_entry;
-
-typedef struct _ea_file_header {
-        char magic[8];                          /* "EACCELERATOR" */
@@ -345 +333 @@
-        time_t last_prune;
-        ea_cache_entry *removed;
-        ea_lock_entry *locks;
-
-        ea_cache_entry *hash[EA_HASH_SIZE];
@@ -394 +381 @@
-void format_size (char *s, unsigned int size, int legend);
-void eaccelerator_prune (time_t t);
-
-int eaccelerator_lock (const char *key, int key_len TSRMLS_DC);
-int eaccelerator_unlock (const char *key, int key_len TSRMLS_DC);
-
-void *eaccelerator_malloc2 (size_t size TSRMLS_DC);