Changeset 26

Timestamp:

2006-05-26T04:28:17+02:00 (7 years ago)

Author:

moo

Message:

list modules compiled in XCache

Location:

trunk

Files:

• config.m4 (modified) (3 diffs)
• config.w32 (modified) (2 diffs)
• xcache.c (modified) (1 diff)

trunk/config.m4

@@ -6 +6 @@
   if test "$PHP_$3" != "no"; then
     xcache_sources="$xcache_sources $1.c"
+    XCACHE_MODULES="$XCACHE_MODULES $1"
     HAVE_$3=1
     AC_DEFINE([HAVE_$3], 1, [Define for XCache: $4])
@@ -27 +28 @@
                   lock.c \
                   "
+  XCACHE_MODULES="cacher"
   XCACHE_OPTION([optimizer],    [optimizer   ], [XCACHE_OPTIMIZER],    [(N/A)])
   XCACHE_OPTION([coverage],     [coverage    ], [XCACHE_COVERAGE],     [Enable code coverage dumper, NOT for production server])
@@ -33 +35 @@
   XCACHE_OPTION([encoder],      [encoder     ], [XCACHE_ENCODER],      [(N/A)])
   XCACHE_OPTION([decoder],      [decoder     ], [XCACHE_DECODER],      [(N/A)])
+  AC_DEFINE_UNQUOTED([XCACHE_MODULES], "$XCACHE_MODULES", [Define what modules is built with XCache])
 
   PHP_NEW_EXTENSION(xcache, $xcache_sources, $ext_shared)

trunk/config.w32

@@ -23 +23 @@
     ARG_ENABLE("xcache-decoder",      "(N/A)", "no");
 
+    var XCACHE_MODULES = "cacher";
     var options = ["optimizer",
                    "coverage",
@@ -33 +34 @@
         if (withval != "no") {
             xcache_sources += " " + name + ".c";
+            XCACHE_MODULES += " " + name;
             STDOUT.WriteLine("Enabling XCache Module: " + name);
             AC_DEFINE("HAVE_XCACHE_" + uname, 1, "Define for XCache: " + name)
         }
     }
+    AC_DEFINE("XCACHE_MODULES", XCACHE_MODULES);
     // }}}
     // {{{ check for programs needed

trunk/xcache.c

@@ -1747 +1747 @@
     php_info_print_table_header(2, "XCache Support", (xc_php_size || xc_var_size) ? "enabled" : "disabled");
     php_info_print_table_row(2, "Version", XCACHE_VERSION);
+    php_info_print_table_row(2, "Modules Built", XCACHE_MODULES);
     php_info_print_table_row(2, "Readonly Protection", xc_readonly_protection ? "enabled" : "N/A");
     php_info_print_table_row(2, "Opcode Cache", xc_php_size ? "enabled" : "disabled");
     php_info_print_table_row(2, "Variable Cache", xc_var_size ? "enabled" : "disabled");
+#ifdef HAVE_XCACHE_COVERAGER
+    php_info_print_table_row(2, "Coverage Dumper", XG(coveragedumper) && xc_coveragedump_dir && xc_coveragedump_dir[0] ? "enabled" : "disabled");
+#endif
     php_info_print_table_end();
     DISPLAY_INI_ENTRIES();