Changeset 662 for trunk/xcache.h

Timestamp:

08/03/2009 10:15:53 AM (4 years ago)

Author:

moo

Message:

back patch __FILE and __DIR on cache restore

Files:

• trunk/xcache.h (modified) (6 diffs)

trunk/xcache.h

@@ -62 +62 @@
 #ifndef IS_CONSTANT_TYPE_MASK
 #   define IS_CONSTANT_TYPE_MASK (~IS_CONSTANT_INDEX)
+#endif
+
+#ifndef ZEND_ENGINE_2_3
+#define zend_dirname(path, len) xc_dirname(path, len)
 #endif
 
@@ -238 +242 @@
 } xc_cache_t;
 /* }}} */
+/* {{{ xc_op_array_info_t */
+typedef struct {
+    zend_uint oplineinfo_cnt;
+    int *oplineinfos;
+} xc_op_array_info_t;
+/* }}} */
 /* {{{ xc_classinfo_t */
 typedef struct {
@@ -246 +256 @@
     zend_uint key_size;
     ulong     h;
+    zend_uint methodinfo_cnt;
+    xc_op_array_info_t *methodinfos;
     xc_cest_t cest;
 #ifndef ZEND_COMPILE_DELAYED_BINDING
@@ -273 +285 @@
     zend_uint key_size;
     ulong     h;
+    xc_op_array_info_t op_array_info;
     zend_function func;
 } xc_funcinfo_t;
@@ -311 +324 @@
     size_t     size;
 
+    int    filepath_len;
+    char  *filepath;
+    int    dirpath_len;
+    char  *dirpath;
+#ifdef IS_UNICODE
+    UChar *ufilepath;
+    int    ufilepath_len;
+    UChar *udirpath;
+    int    udirpath_len;
+#endif
+
+    xc_op_array_info_t op_array_info;
     zend_op_array *op_array;
 
@@ -387 +412 @@
 int xc_is_ro(const void *p);
 int xc_is_shm(const void *p);
-void xc_gc_add_op_array(zend_op_array *op_array TSRMLS_DC);
+/* {{{ xc_gc_op_array_t */
+typedef struct {
+#ifdef ZEND_ENGINE_2
+    zend_uint num_args;
+    zend_arg_info *arg_info;
+#endif
+    zend_uint last;
+    zend_op *opcodes;
+} xc_gc_op_array_t;
+/* }}} */
+void xc_gc_add_op_array(xc_gc_op_array_t *gc_op_array TSRMLS_DC);
+void xc_fix_op_array_info(const xc_entry_data_php_t *php, zend_op_array *op_array, int shallow_copied, const xc_op_array_info_t *op_array_info TSRMLS_DC);
 
 #endif /* __XCACHE_H */