Changeset 1132 for trunk/mod_cacher/xc_cacher.c

Timestamp:

08/09/2012 05:43:48 AM (10 months ago)

Author:

moo

Message:

cacher: hide more detail

Files:

• trunk/mod_cacher/xc_cacher.c (modified) (4 diffs)

trunk/mod_cacher/xc_cacher.c

@@ -94 +94 @@
 };
 /* }}} */
+typedef struct { /* {{{ xc_cache_t: only cache info, not in shm */
+    int cacheid;
+    xc_hash_t  *hcache; /* hash to cacheid */
+
+    struct _xc_lock_t  *lck;
+    struct _xc_shm_t   *shm; /* which shm contains us */
+    struct _xc_mem_t   *mem; /* which mem contains us */
+
+    xc_hash_t  *hentry; /* hash settings to entry */
+    xc_hash_t  *hphp;   /* hash settings to php */
+    xc_cached_t *cached;
+} xc_cache_t;
+/* }}} */
 
 /* {{{ globals */
@@ -150 +163 @@
     php->hits     = 0;
     php->refcount = 0;
-    stored_php = xc_processor_store_xc_entry_data_php_t(cache, php TSRMLS_CC);
+    stored_php = xc_processor_store_xc_entry_data_php_t(cache->shm, cache->mem, php TSRMLS_CC);
     if (stored_php) {
         xc_php_add_unlocked(cache->cached, stored_php);
@@ -297 +310 @@
     entry->atime = XG(request_time);
     stored_entry = type == XC_TYPE_PHP
-        ? (xc_entry_t *) xc_processor_store_xc_entry_php_t(cache, (xc_entry_php_t *) entry TSRMLS_CC)
-        : (xc_entry_t *) xc_processor_store_xc_entry_var_t(cache, (xc_entry_var_t *) entry TSRMLS_CC);
+        ? (xc_entry_t *) xc_processor_store_xc_entry_php_t(cache->shm, cache->mem, (xc_entry_php_t *) entry TSRMLS_CC)
+        : (xc_entry_t *) xc_processor_store_xc_entry_var_t(cache->shm, cache->mem, (xc_entry_var_t *) entry TSRMLS_CC);
     if (stored_entry) {
         xc_entry_add_unlocked(cache->cached, entryslotid, stored_entry);
@@ -3285 +3298 @@
 static PHP_MINIT_FUNCTION(xcache_cacher) /* {{{ */
 {
-    char *env;
     zend_extension *ext;
     zend_llist_position lpos;