Changeset 993

Timestamp:

07/18/2012 10:27:29 AM (10 months ago)

Author:

moo

Message:

refactor: move functions to module

Location:

trunk

Files:

• submodules/xc_coverager.h (modified) (1 diff)
• submodules/xc_disassembler.c (modified) (2 diffs)
• submodules/xc_disassembler.h (modified) (1 diff)
• submodules/xc_optimizer.h (modified) (1 diff)
• xcache.c (modified) (4 diffs)

trunk/submodules/xc_coverager.h

@@ -11 +11 @@
 PHP_FUNCTION(xcache_coverager_stop);
 PHP_FUNCTION(xcache_coverager_get);
+#define XCACHE_COVERAGER_FUNCTIONS() \
+    PHP_FE(xcache_coverager_decode,  NULL) \
+    PHP_FE(xcache_coverager_start,   NULL) \
+    PHP_FE(xcache_coverager_stop,    NULL) \
+    PHP_FE(xcache_coverager_get,     NULL)

trunk/submodules/xc_disassembler.c

@@ -119 +119 @@
 
     zval *output;
-} xc_dasm_sandboxed_t; /* {{{ */
-
-zend_op_array *xc_dasm_sandboxed(void *data TSRMLS_DC)
+} xc_dasm_sandboxed_t; /* }}} */
+zend_op_array *xc_dasm_sandboxed(void *data TSRMLS_DC) /* {{{ */
 {
     zend_bool catched = 0;
@@ -189 +188 @@
 }
 /* }}} */
+
+/* {{{ proto array xcache_dasm_file(string filename)
+   Disassemble file into opcode array by filename */
+PHP_FUNCTION(xcache_dasm_file)
+{
+    char *filename;
+    int filename_len;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &filename, &filename_len) == FAILURE) {
+        return;
+    }
+    if (!filename_len) RETURN_FALSE;
+
+    xc_dasm_file(return_value, filename TSRMLS_CC);
+}
+/* }}} */
+/* {{{ proto array xcache_dasm_string(string code)
+   Disassemble php code into opcode array */
+PHP_FUNCTION(xcache_dasm_string)
+{
+    zval *code;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &code) == FAILURE) {
+        return;
+    }
+    xc_dasm_string(return_value, code TSRMLS_CC);
+}
+/* }}} */

trunk/submodules/xc_disassembler.h

@@ -1 +1 @@
 #include "php.h"
 
-void xc_dasm_string(zval *return_value, zval *code TSRMLS_DC);
-void xc_dasm_file(zval *return_value, const char *filename TSRMLS_DC);
+PHP_FUNCTION(xcache_dasm_file);
+PHP_FUNCTION(xcache_dasm_string);
+#define XCACHE_DISASSEMBLER_FUNCTIONS() \
+    PHP_FE(xcache_dasm_file,         NULL) \
+    PHP_FE(xcache_dasm_string,       NULL)

trunk/submodules/xc_optimizer.h

@@ -3 +3 @@
 
 void xc_optimizer_op_array_handler(zend_op_array *op_array);
+#define XCACHE_OPTIMIZER_FUNCTIONS()

trunk/xcache.c

@@ -27 +27 @@
 #include "ext/date/php_date.h"
 #endif
-#include "submodules/xc_optimizer.h"
-#include "submodules/xc_coverager.h"
-#include "submodules/xc_disassembler.h"
+
+#ifdef HAVE_XCACHE_OPTIMIZER
+#   include "submodules/xc_optimizer.h"
+#else
+#   define XCACHE_OPTIMIZER_FUNCTIONS()
+#endif
+#ifdef HAVE_XCACHE_COVERAGER
+#   include "submodules/xc_coverager.h"
+#else
+#   define XCACHE_COVERAGER_FUNCTIONS()
+#endif
+#ifdef HAVE_XCACHE_DISASSEMBLER
+#   include "submodules/xc_disassembler.h"
+#else
+#   define XCACHE_DISASSEMBLER_FUNCTIONS()
+#endif
+
 #include "xcache_globals.h"
 #include "xc_processor.h"
@@ -3173 +3187 @@
 #endif
 /* }}} */
-#ifdef HAVE_XCACHE_DISASSEMBLER
-/* {{{ proto array  xcache_dasm_file(string filename)
-   Disassemble file into opcode array by filename */
-PHP_FUNCTION(xcache_dasm_file)
-{
-    char *filename;
-    int filename_len;
-
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &filename, &filename_len) == FAILURE) {
-        return;
-    }
-    if (!filename_len) RETURN_FALSE;
-
-    xc_dasm_file(return_value, filename TSRMLS_CC);
-}
-/* }}} */
-/* {{{ proto array  xcache_dasm_string(string code)
-   Disassemble php code into opcode array */
-PHP_FUNCTION(xcache_dasm_string)
-{
-    zval *code;
-
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &code) == FAILURE) {
-        return;
-    }
-    xc_dasm_string(return_value, code TSRMLS_CC);
-}
-/* }}} */
-#endif
 /* {{{ proto string xcache_encode(string filename)
    Encode php file into XCache opcode encoded format */
@@ -3374 +3359 @@
     PHP_FE(xcache_clear_cache,       NULL)
     PHP_FE(xcache_coredump,          NULL)
+    XCACHE_OPTIMIZER_FUNCTIONS()
 #ifdef HAVE_XCACHE_ASSEMBLER
     PHP_FE(xcache_asm,               NULL)
 #endif
-#ifdef HAVE_XCACHE_DISASSEMBLER
-    PHP_FE(xcache_dasm_file,         NULL)
-    PHP_FE(xcache_dasm_string,       NULL)
-#endif
+    XCACHE_DISASSEMBLER_FUNCTIONS()
 #ifdef HAVE_XCACHE_ENCODER
     PHP_FE(xcache_encode,            NULL)
@@ -3388 +3371 @@
     PHP_FE(xcache_decode_string,     NULL)
 #endif
-#ifdef HAVE_XCACHE_COVERAGER
-    PHP_FE(xcache_coverager_decode,  NULL)
-    PHP_FE(xcache_coverager_start,   NULL)
-    PHP_FE(xcache_coverager_stop,    NULL)
-    PHP_FE(xcache_coverager_get,     NULL)
-#endif
+    XCACHE_COVERAGER_FUNCTIONS()
     PHP_FE(xcache_get_special_value, NULL)
     PHP_FE(xcache_get_type,          NULL)