Changeset 982 for trunk/xcache.c

Timestamp:

2012-07-17T10:35:45+02:00 (10 months ago)

Author:

moo

Message:

move files to subdirs

File:

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

trunk/xcache.c

@@ -27 +27 @@
 #include "ext/date/php_date.h"
 #endif
-#include "optimizer.h"
-#include "coverager.h"
-#include "disassembler.h"
-#include "align.h"
-#include "stack.h"
+#include "submodules/xc_optimizer.h"
+#include "submodules/xc_coverager.h"
+#include "submodules/xc_disassembler.h"
 #include "xcache_globals.h"
-#include "processor.h"
-#include "const_string.h"
-#include "opcode_spec.h"
-#include "utils.h"
+#include "xc_processor.h"
+#include "xc_const_string.h"
+#include "xc_opcode_spec.h"
+#include "xc_utils.h"
+#include "util/xc_align.h"
+#include "util/xc_stack.h"
+#include "util/xc_vector.h"
+#include "util/xc_trace.h"
 
 #define VAR_ENTRY_EXPIRED(pentry) ((pentry)->ttl && XG(request_time) > (pentry)->ctime + (time_t) (pentry)->ttl)
@@ -72 +74 @@
 static zend_bool xc_disable_on_crash = 0;
 
-static xc_hash_t xc_php_hcache = { 0 };
-static xc_hash_t xc_php_hentry = { 0 };
-static xc_hash_t xc_var_hcache = { 0 };
-static xc_hash_t xc_var_hentry = { 0 };
+static xc_hash_t xc_php_hcache = { 0, 0, 0 };
+static xc_hash_t xc_php_hentry = { 0, 0, 0 };
+static xc_hash_t xc_var_hcache = { 0, 0, 0 };
+static xc_hash_t xc_var_hentry = { 0, 0, 0 };
 
 static zend_ulong xc_php_ttl    = 0;
@@ -114 +116 @@
 #endif
 ZEND_DLEXPORT zend_extension zend_extension_entry;
-ZEND_DECLARE_MODULE_GLOBALS(xcache);
+ZEND_DECLARE_MODULE_GLOBALS(xcache)
 
 typedef enum { XC_TYPE_PHP, XC_TYPE_VAR } xc_entry_type_t;
@@ -3271 +3273 @@
 }
 /* }}} */
-#ifdef HAVE_XCACHE_OPCODE_SPEC_DEF
 /* {{{ proto string xcache_get_opcode_spec(int opcode) */
 PHP_FUNCTION(xcache_get_opcode_spec)
@@ -3295 +3296 @@
 }
 /* }}} */
-#endif
 /* {{{ proto mixed xcache_get_special_value(zval value)
    XCache internal use only: For decompiler to get static value with type fixed */
@@ -3398 +3398 @@
     PHP_FE(xcache_get_data_type,     NULL)
     PHP_FE(xcache_get_opcode,        NULL)
-#ifdef HAVE_XCACHE_OPCODE_SPEC_DEF
     PHP_FE(xcache_get_opcode_spec,   NULL)
-#endif
     PHP_FE(xcache_is_autoglobal,     NULL)
     PHP_FE(xcache_inc,               NULL)
@@ -3520 +3518 @@
 typedef void (*xc_sighandler_t)(int);
 #define FOREACH_SIG(sig) static xc_sighandler_t old_##sig##_handler = NULL
-#include "foreachcoresig.h"
+#include "util/xc_foreachcoresig.h"
 #undef FOREACH_SIG
 /* }}} */
@@ -3534 +3532 @@
     } \
 } while (0)
-#include "foreachcoresig.h"
+#include "util/xc_foreachcoresig.h"
 #undef FOREACH_SIG
 }
@@ -3542 +3540 @@
 #define FOREACH_SIG(sig) \
     old_##sig##_handler = signal(sig, xcache_signal_handler)
-#include "foreachcoresig.h"
+#include "util/xc_foreachcoresig.h"
 #undef FOREACH_SIG
 }