Changeset 11 for trunk/xcache.c

Timestamp:

05/24/2006 09:52:48 AM (7 years ago)

Author:

moo

Message:

make it build on windows vc compiler

Files:

• trunk/xcache.c (modified) (25 diffs)

trunk/xcache.c

@@ -27 +27 @@
 #include "opcode_spec.h"
 
+#undef NDEBUG
 #ifdef DEBUG
-#   undef NDEBUG
 #   undef inline
 #   define inline
@@ -340 +340 @@
     for (i = 0, c = cache->hentry->size; i < c; i ++) {
         for (e = cache->entries[i]; e; e = e->next) {
-            xc_fillentry_dmz(e, 0, list);
+            xc_fillentry_dmz(e, 0, list TSRMLS_CC);
         }
     }
@@ -348 +348 @@
     array_init(list);
     for (e = cache->deletes; e; e = e->next) {
-        xc_fillentry_dmz(e, 1, list);
+        xc_fillentry_dmz(e, 1, list TSRMLS_CC);
     }
     add_assoc_zval(return_value, "deleted_list", list);
@@ -402 +402 @@
     int i;
     xc_cache_t *cache;
-    typeof(cache->deletes) p, *last;
+    typedef xc_entry_t *xc_delete_t;
+    xc_delete_t p, *last;
 
     for (i = 0; i < size; i ++) {
@@ -408 +409 @@
         ENTER_LOCK(cache) {
             if (cache->deletes) {
-                last = (typeof(last)) &cache->deletes;
+                last = (xc_delete_t *) &cache->deletes;
                 for (p = *last; p; p = p->next) {
                     if (t - p->dtime > 3600) {
@@ -433 +434 @@
 }
 /* }}} */
-static inline void xc_entry_unholds_real(xc_stack_t *holds, xc_cache_t **caches, int cachecount) /* {{{ */
+static inline void xc_entry_unholds_real(xc_stack_t *holds, xc_cache_t **caches, int cachecount TSRMLS_DC) /* {{{ */
 {
     int i;
@@ -457 +458 @@
 static void xc_entry_unholds(TSRMLS_D) /* {{{ */
 {
-    xc_entry_unholds_real(XG(php_holds), xc_php_caches, xc_php_hcache.size);
-    xc_entry_unholds_real(XG(var_holds), xc_var_caches, xc_var_hcache.size);
-}
-/* }}} */
-static int xc_stat(const char *filename, const char *include_path, struct stat *pbuf) /* {{{ */
+    xc_entry_unholds_real(XG(php_holds), xc_php_caches, xc_php_hcache.size TSRMLS_CC);
+    xc_entry_unholds_real(XG(var_holds), xc_var_caches, xc_var_hcache.size TSRMLS_CC);
+}
+/* }}} */
+static int xc_stat(const char *filename, const char *include_path, struct stat *pbuf TSRMLS_DC) /* {{{ */
 {
     char filepath[1024];
@@ -472 +473 @@
     memcpy(paths, include_path, size);
 
-    for (path = strtok_r(paths, tokens, &tokbuf); path; path = strtok_r(NULL, tokens, &tokbuf)) {
+    for (path = php_strtok_r(paths, tokens, &tokbuf); path; path = php_strtok_r(NULL, tokens, &tokbuf)) {
         if (strlen(path) + strlen(filename) + 1 > 1024) {
             continue;
@@ -536 +537 @@
         }
         else {
-            if (xc_stat(filename, PG(include_path), pbuf) != 0) {   
+            if (xc_stat(filename, PG(include_path), pbuf TSRMLS_CC) != 0) {   
                 return 0;
             }
@@ -825 +826 @@
 static int xc_init_constant(int module_number TSRMLS_DC) /* {{{ */
 {
-    struct {
+    typedef struct {
         const char *prefix;
         int (*getsize)();
         const char *(*get)(zend_uchar i);
-    } nameinfos[] = {
+    } xc_meminfo_t;
+    xc_meminfo_t nameinfos[] = {
         { "",        xc_get_op_type_count,   xc_get_op_type   },
         { "",        xc_get_data_type_count, xc_get_data_type },
@@ -836 +838 @@
         { NULL, NULL, NULL }
     };
-    typeof(nameinfos[0])* p;
+    xc_meminfo_t* p;
     int i;
     char const_name[96];
@@ -861 +863 @@
 }
 /* }}} */
-static xc_shm_t *xc_cache_destroy(xc_cache_t **caches, xc_hash_t *hcache TSRMLS_DC) /* {{{ */
+static xc_shm_t *xc_cache_destroy(xc_cache_t **caches, xc_hash_t *hcache) /* {{{ */
 {
     int i;
@@ -891 +893 @@
 }
 /* }}} */
-static xc_cache_t **xc_cache_init(xc_shm_t *shm, char *ptr, xc_hash_t *hcache, xc_hash_t *hentry, xc_shmsize_t shmsize TSRMLS_DC) /* {{{ */
+static xc_cache_t **xc_cache_init(xc_shm_t *shm, char *ptr, xc_hash_t *hcache, xc_hash_t *hentry, xc_shmsize_t shmsize) /* {{{ */
 {
     xc_cache_t **caches = NULL, *cache;
     xc_mem_t *mem;
     int i;
+
     xc_memsize_t memsize = shmsize / hcache->size;
 
@@ -948 +951 @@
 static int xc_init(int module_number TSRMLS_DC) /* {{{ */
 {
-    xc_php_caches = xc_var_caches = NULL;
     xc_shm_t *shm;
     char *ptr;
+
+    xc_php_caches = xc_var_caches = NULL;
 
     if (xc_php_size || xc_var_size) {
@@ -1057 +1061 @@
 /* }}} */
 
-#define NEED_INITIZED() do { \
-    if (!xc_initized) { \
-        php_error_docref(NULL TSRMLS_CC, E_WARNING, "XCache is not initized"); \
-        RETURN_FALSE; \
-    } \
-} while (0)
-
 /* user functions */
 /* {{{ xcache_op */
@@ -1069 +1066 @@
 static void xcache_op(xcache_op_type optype, INTERNAL_FUNCTION_PARAMETERS)
 {
-    NEED_INITIZED();
     long type;
     int size;
     xc_cache_t **caches, *cache;
     long id = 0;
+
+    if (!xc_initized) {
+        php_error_docref(NULL TSRMLS_CC, E_WARNING, "XCache is not initized");
+        RETURN_FALSE;
+    }
 
     if (optype == XC_OP_COUNT) {
@@ -1239 +1240 @@
             }
             else {
-                xc_entry_remove_dmz(stored_xce);
+                xc_entry_remove_dmz(stored_xce TSRMLS_CC);
             }
         }
@@ -1266 +1267 @@
         stored_xce = xc_entry_find_dmz(&xce TSRMLS_CC);
         if (stored_xce) {
-            xc_entry_remove_dmz(stored_xce);
+            xc_entry_remove_dmz(stored_xce TSRMLS_CC);
         }
         var.value = value;
         var.etime = ttl ? XG(request_time) + ttl : TIME_MAX;
-        RETVAL_BOOL(xc_entry_store_dmz(&xce) != NULL ? 1 : 0);
+        RETVAL_BOOL(xc_entry_store_dmz(&xce TSRMLS_CC) != NULL ? 1 : 0);
     } LEAVE_LOCK(xce.cache);
 }
@@ -1297 +1298 @@
             }
             else {
-                xc_entry_remove_dmz(stored_xce);
+                xc_entry_remove_dmz(stored_xce TSRMLS_CC);
             }
         }
@@ -1322 +1323 @@
         stored_xce = xc_entry_find_dmz(&xce TSRMLS_CC);
         if (stored_xce) {
-            xc_entry_remove_dmz(stored_xce);
+            xc_entry_remove_dmz(stored_xce TSRMLS_CC);
             RETVAL_TRUE;
         }
@@ -1359 +1360 @@
                 fprintf(stderr, "incdec: expired\n");
 #endif
-                xc_entry_remove_dmz(stored_xce);
+                xc_entry_remove_dmz(stored_xce TSRMLS_CC);
                 stored_xce = NULL;
             }
@@ -1399 +1400 @@
             xce.ctime = stored_xce->ctime;
             xce.hits  = stored_xce->hits;
-            xc_entry_remove_dmz(stored_xce);
-        }
-        xc_entry_store_dmz(&xce);
+            xc_entry_remove_dmz(stored_xce TSRMLS_CC);
+        }
+        xc_entry_store_dmz(&xce TSRMLS_CC);
 
     } LEAVE_LOCK(xce.cache);
@@ -1492 +1493 @@
     }
     if (spec >= 0 && spec < count) {
-        name = getter(spec);
+        name = getter((zend_uchar) spec);
         if (name) {
             /* RETURN_STRING */
@@ -1540 +1541 @@
     }
     if (spec <= xc_get_opcode_spec_count()) {
-        opspec = xc_get_opcode_spec(spec);
+        opspec = xc_get_opcode_spec((zend_uchar) spec);
         if (opspec) {
             array_init(return_value);
@@ -1886 +1887 @@
 #endif
 {
+    TSRMLS_FETCH();
+
     xc_request_shutdown(TSRMLS_C);
     return SUCCESS;