Changeset 1003

Timestamp:

2012-07-19T08:51:33+02:00 (10 months ago)

Author:

moo

Message:

refactor: fix build for optimizer, use mod_* directories

Location:

trunk

Files:

• README (modified) (1 diff)
• config.m4 (modified) (1 diff)
• config.w32 (modified) (1 diff)
• devel/run (modified) (2 diffs)
• mod_assembler (added)
• mod_assembler/xc_assembler.c (copied) (copied from trunk/submodules/xc_assembler.c)
• mod_cacher (added)
• mod_cacher/htdocs (moved) (moved from trunk/admin)
• mod_coverager (added)
• mod_coverager/htdocs (moved) (moved from trunk/coverager)
• mod_coverager/xc_coverager.c (copied) (copied from trunk/submodules/xc_coverager.c)
• mod_coverager/xc_coverager.h (copied) (copied from trunk/submodules/xc_coverager.h)
• mod_decoder (added)
• mod_decoder/xc_decoder.c (copied) (copied from trunk/submodules/xc_decoder.c)
• mod_disassembler (added)
• mod_disassembler/bin (moved) (moved from trunk/bin)
• mod_disassembler/lib (moved) (moved from trunk/lib)
• mod_disassembler/xc_disassembler.c (copied) (copied from trunk/submodules/xc_disassembler.c)
• mod_disassembler/xc_disassembler.h (copied) (copied from trunk/submodules/xc_disassembler.h)
• mod_encoder (added)
• mod_encoder/xc_encoder.c (copied) (copied from trunk/submodules/xc_encoder.c)
• mod_optimizer (added)
• mod_optimizer/xc_optimizer.c (copied) (copied from trunk/submodules/xc_optimizer.c) (1 diff)
• mod_optimizer/xc_optimizer.h (copied) (copied from trunk/submodules/xc_optimizer.h)
• submodules (deleted)
• xcache.c (modified) (1 diff)
• xcache/xc_processor.c (modified) (1 diff)
• xcache/xc_utils.c (modified) (1 diff)

trunk/README

@@ -1 @@
-Please check http://xcache.lighttpd.net/ and https://groups.google.com/forum/?fromgroups#!forum/xcache for help
+XCache is a fast, stable PHP opcode cacher that has been tested and is now running on production servers under high load.
+It is tested (on linux) and supported on all of the latest version of PHP popular release branches.
+ThreadSafe/Windows is also perfectly supported.
+
+Please check http://xcache.lighttpd.net/ and https://groups.google.com/group/xcache for help

trunk/config.m4

@@ -5 +5 @@
   [  --enable-xcache-$2    XCache: $4], no, no)
   if test "$PHP_$3" != "no"; then
-    xcache_sources="$xcache_sources submodules/xc_$1.c"
+    xcache_sources="$xcache_sources mod_$1/xc_$1.c"
     XCACHE_MODULES="$XCACHE_MODULES $1"
     HAVE_$3=1

trunk/config.w32

@@ -45 +45 @@
         var withval = eval("PHP_XCACHE_" + uname);
         if (withval != "no") {
-            xcache_sources += " submodules/xc_" + name + ".c";
+            xcache_sources += " mod_" + name + "/xc_" + name + ".c";
             XCACHE_MODULES += " " + name;
             STDOUT.WriteLine("Enabling XCache Module: " + name);

trunk/devel/run

@@ -81 +81 @@
     phpize --clean \
     && phpize \
-    && CFLAGS="-Wall -Wno-unused -W -Wshadow -std=gnu99" ./configure --enable-xcache-disassembler --enable-xcache-test --enable-xcache-constant \
+    && CFLAGS="-Wall -Wno-unused -W -Wshadow -std=gnu99" ./configure \
+        --enable-xcache-cacher \
+        --enable-xcache-optimizer \
+        --enable-xcache-encoder \
+        --enable-xcache-decoder \
+        --enable-xcache-disassembler \
+        --enable-xcache-test --enable-xcache-constant \
     && make clean all
     exit
@@ -135 +141 @@
     ;;
 dc)
-    exec ./php-cli -c devel.ini ./bin/phpdc.phpr "${args[@]}" | tee decompiled.php
+    exec ./php-cli -c devel.ini ./mod_disassembler/bin/phpdc.phpr "${args[@]}" | tee decompiled.php
     ;;
 dop)
-    exec ./php-cli -c devel.ini ./bin/phpdop.phpr "${args[@]}"
+    exec ./php-cli -c devel.ini ./mod_disassembler/bin/phpdop.phpr "${args[@]}"
     ;;
 retest)

trunk/mod_optimizer/xc_optimizer.c

@@ -3 +3 @@
 #endif
 
-#include "utils.h"
-#include "optimizer.h"
+#include "xcache/xc_utils.h"
+#include "xc_optimizer.h"
 /* the "vector" stack */
-#include "stack.h"
+#include "util/xc_stack.h"
+#include "util/xc_trace.h"
 #include "xcache_globals.h"
 
 #ifdef XCACHE_DEBUG
-#   include "processor.h"
-#   include "const_string.h"
+#error 1
+#   include "xc_processor.h"
+#   include "xcache/xc_const_string.h"
 #   include "ext/standard/php_var.h"
 #endif

trunk/xcache.c

@@ -29 +29 @@
 
 #ifdef HAVE_XCACHE_OPTIMIZER
-#   include "submodules/xc_optimizer.h"
+#   include "mod_optimizer/xc_optimizer.h"
 #else
 #   define XCACHE_OPTIMIZER_FUNCTIONS()
 #endif
 #ifdef HAVE_XCACHE_COVERAGER
-#   include "submodules/xc_coverager.h"
+#   include "mod_coverager/xc_coverager.h"
 #else
 #   define XCACHE_COVERAGER_FUNCTIONS()
 #endif
 #ifdef HAVE_XCACHE_DISASSEMBLER
-#   include "submodules/xc_disassembler.h"
+#   include "mod_disassembler/xc_disassembler.h"
 #else
 #   define XCACHE_DISASSEMBLER_FUNCTIONS()

trunk/xcache/xc_processor.c

@@ -1 @@
-#include "../xc_processor.c.h"
+#include "xc_processor.c.h"

trunk/xcache/xc_utils.c

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