Changeset 990

Timestamp:

2012-07-18T09:01:59+02:00 (10 months ago)

Author:

moo

Message:

split trace

Location:

trunk

Files:

• config.m4 (modified) (1 diff)
• config.w32 (modified) (1 diff)
• util/xc_stack.c (modified) (1 diff)
• util/xc_trace.c (added)
• xcache/xc_sandbox.c (modified) (1 diff)
• xcache/xc_utils.c (modified) (1 diff)
• xcache/xc_utils.h (modified) (1 diff)

trunk/config.m4

@@ -26 +26 @@
   xcache_sources="
                   util/xc_stack.c \
+                  util/xc_trace.c \
                   xcache.c \
                   xcache/xc_const_string.c \

trunk/config.w32

@@ -14 +14 @@
     var xcache_sources = "
                           util/xc_stack.c \
+                          util/xc_trace.c \
                           xcache.c \
                           xcache/xc_const_string.c \

trunk/util/xc_stack.c

@@ -1 +1 @@
 #include <stdlib.h>
-#include <assert.h>
+#include "xc_trace.h"
 #include "xc_stack.h"
+
 typedef xc_stack_t* S;
 

trunk/xcache/xc_sandbox.c

@@ -433 +433 @@
 /* }}} */
 #endif
-
-int xc_vtrace(const char *fmt, va_list args) /* {{{ */
-{
-    return vfprintf(stderr, fmt, args);
-}
-/* }}} */
-int xc_trace(const char *fmt, ...) /* {{{ */
-{
-    va_list args;
-    int ret;
-
-    va_start(args, fmt);
-    ret = xc_vtrace(fmt, args);
-    va_end(args);
-    return ret;
-}
-/* }}} */
 
 #ifndef ZEND_ENGINE_2_3

trunk/xcache/xc_utils.c

@@ -7 +7 @@
 #endif
 #include "xc_opcode_spec.h"
-#undef NDEBUG
-#include "assert.h"
+#include "../util/xc_trace.h"
 
 #ifndef max

trunk/xcache/xc_utils.h

@@ -41 +41 @@
 #endif
 
-void xc_zend_class_add_ref(zend_class_entry ZESW(*ce, **ce));
-
 typedef zend_bool (*xc_if_func_t)(void *data);