Browse Source

split trace

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@990 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
tags/3.0.0-beta1
Xuefer 8 years ago
parent
commit
0af13b375c
7 changed files with 26 additions and 22 deletions
  1. +1
    -0
      config.m4
  2. +1
    -0
      config.w32
  3. +2
    -1
      util/xc_stack.c
  4. +21
    -0
      util/xc_trace.c
  5. +0
    -17
      xcache/xc_sandbox.c
  6. +1
    -2
      xcache/xc_utils.c
  7. +0
    -2
      xcache/xc_utils.h

+ 1
- 0
config.m4 View File

@@ -25,6 +25,7 @@ if test "$PHP_XCACHE" != "no"; then

xcache_sources="
util/xc_stack.c \
util/xc_trace.c \
xcache.c \
xcache/xc_const_string.c \
xcache/xc_lock.c \


+ 1
- 0
config.w32 View File

@@ -13,6 +13,7 @@ if (PHP_XCACHE != "no") {

var xcache_sources = "
util/xc_stack.c \
util/xc_trace.c \
xcache.c \
xcache/xc_const_string.c \
xcache/xc_lock.c \


+ 2
- 1
util/xc_stack.c View File

@@ -1,6 +1,7 @@
#include <stdlib.h>
#include <assert.h>
#include "xc_trace.h"
#include "xc_stack.h"

typedef xc_stack_t* S;

void xc_stack_init_ex(S stack, int initsize)


+ 21
- 0
util/xc_trace.c View File

@@ -0,0 +1,21 @@
#include "xc_trace.h"
#include <stdio.h>
#include <stdarg.h>

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;
}
/* }}} */


+ 0
- 17
xcache/xc_sandbox.c View File

@@ -433,23 +433,6 @@ zend_uint xc_sandbox_compilererror_cnt(TSRMLS_D) /* {{{ */
/* }}} */
#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
#include "ext/standard/php_string.h"
size_t xc_dirname(char *path, size_t len) /* {{{ */


+ 1
- 2
xcache/xc_utils.c View File

@@ -6,8 +6,7 @@
#include "zend_vm.h"
#endif
#include "xc_opcode_spec.h"
#undef NDEBUG
#include "assert.h"
#include "../util/xc_trace.h"

#ifndef max
#define max(a, b) ((a) < (b) ? (b) : (a))


+ 0
- 2
xcache/xc_utils.h View File

@@ -40,8 +40,6 @@ ZESW(xc_cest_t *, void) xc_install_class(ZEND_24(NOTHING, const) char *filename,
#define XCACHE_ERROR_CACHING
#endif

void xc_zend_class_add_ref(zend_class_entry ZESW(*ce, **ce));

typedef zend_bool (*xc_if_func_t)(void *data);

void xc_hash_copy_if(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size, xc_if_func_t checker);


Loading…
Cancel
Save