cvs: pecl /apc apc_main.c apc_main.h apcgui-classic.css apcgui-pecl.css apcgui.php php_apc.c

rasmus          Fri Jul 22 12:13:28 2005 EDT

  Added files:                 
    /pecl/apc   apcgui-classic.css apcgui-pecl.css apcgui.php 

  Modified files:              
    /pecl/apc   apc_main.c apc_main.h php_apc.c 
  Log:
  Add hook for other extensions that need to overload compile_file
  Add Ralf's APC GUI
  
  
http://cvs.php.net/diff.php/pecl/apc/apc_main.c?r1=3.48&r2=3.49&ty=u
Index: pecl/apc/apc_main.c
diff -u pecl/apc/apc_main.c:3.48 pecl/apc/apc_main.c:3.49
--- pecl/apc/apc_main.c:3.48    Thu Jul 21 04:11:14 2005
+++ pecl/apc/apc_main.c Fri Jul 22 12:13:26 2005
@@ -28,7 +28,7 @@
 
  */
 
-/* $Id: apc_main.c,v 3.48 2005/07/21 08:11:14 rasmus Exp $ */
+/* $Id: apc_main.c,v 3.49 2005/07/22 16:13:26 rasmus Exp $ */
 
 #include "apc_php.h"
 #include "apc_main.h"
@@ -52,11 +52,21 @@
 /* {{{ module variables */
 
 /* pointer to the original Zend engine compile_file function */
-static zend_op_array* (*old_compile_file)
-    (zend_file_handle*, int TSRMLS_DC);
+typedef zend_op_array* (zend_compile_t)(zend_file_handle*, int TSRMLS_DC);
+static zend_compile_t *old_compile_file;
 
 /* }}} */
 
+/* {{{ get/set old_compile_file (to interact with other extensions that need 
the compile hook) */
+static zend_compile_t* set_compile_hook(zend_compile_t *ptr)
+{
+    zend_compile_t *retval = old_compile_file;
+
+    if (ptr != NULL) old_compile_file = ptr;
+    return retval;
+}
+/* }}} */
+
 /* {{{ install_function */
 static int install_function(apc_function_t fn TSRMLS_DC)
 {
@@ -332,7 +342,7 @@
 
 /* {{{ module init and shutdown */
 
-int apc_module_init()
+int apc_module_init(int module_number)
 {
     TSRMLS_FETCH();
     /* apc initialization */
@@ -350,7 +360,8 @@
     /* override compilation */
     old_compile_file = zend_compile_file;
     zend_compile_file = my_compile_file;
-    
+       REGISTER_LONG_CONSTANT("\000apc_magic", (long)&set_compile_hook, 
CONST_PERSISTENT | CONST_CS);
+
     APCG(initialized) = 1;
     return 0;
 }
http://cvs.php.net/diff.php/pecl/apc/apc_main.h?r1=3.5&r2=3.6&ty=u
Index: pecl/apc/apc_main.h
diff -u pecl/apc/apc_main.h:3.5 pecl/apc/apc_main.h:3.6
--- pecl/apc/apc_main.h:3.5     Mon Jun 27 04:06:57 2005
+++ pecl/apc/apc_main.h Fri Jul 22 12:13:26 2005
@@ -29,7 +29,7 @@
 
  */
 
-/* $Id: apc_main.h,v 3.5 2005/06/27 08:06:57 rasmus Exp $ */
+/* $Id: apc_main.h,v 3.6 2005/07/22 16:13:26 rasmus Exp $ */
 
 #ifndef APC_MAIN_H
 #define APC_MAIN_H
@@ -38,7 +38,7 @@
  * This module provides the primary interface between PHP and APC.
  */
 
-extern int apc_module_init();
+extern int apc_module_init(int module_number);
 extern int apc_module_shutdown();
 extern int apc_request_init(TSRMLS_D);
 extern int apc_request_shutdown();
http://cvs.php.net/diff.php/pecl/apc/php_apc.c?r1=3.54&r2=3.55&ty=u
Index: pecl/apc/php_apc.c
diff -u pecl/apc/php_apc.c:3.54 pecl/apc/php_apc.c:3.55
--- pecl/apc/php_apc.c:3.54     Thu Jul 21 20:56:52 2005
+++ pecl/apc/php_apc.c  Fri Jul 22 12:13:26 2005
@@ -26,7 +26,7 @@
 
  */
 
-/* $Id: php_apc.c,v 3.54 2005/07/22 00:56:52 rasmus Exp $ */
+/* $Id: php_apc.c,v 3.55 2005/07/22 16:13:26 rasmus Exp $ */
 
 #include "php_apc.h"
 #include "apc_cache.h"
@@ -132,7 +132,7 @@
 #else
        php_info_print_table_row(2, "MMAP Support", "Disabled");
 #endif
-       php_info_print_table_row(2, "Revision", "$Revision: 3.54 $");
+       php_info_print_table_row(2, "Revision", "$Revision: 3.55 $");
        php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__);
        php_info_print_table_end();
     DISPLAY_INI_ENTRIES();
@@ -152,7 +152,7 @@
     }
 
     if (APCG(enabled)) {
-        apc_module_init();
+        apc_module_init(module_number);
     }
 
        return SUCCESS;

http://cvs.php.net/co.php/pecl/apc/apcgui-classic.css?r=1.1&p=1
Index: pecl/apc/apcgui-classic.css
+++ pecl/apc/apcgui-classic.css

http://cvs.php.net/co.php/pecl/apc/apcgui-pecl.css?r=1.1&p=1
Index: pecl/apc/apcgui-pecl.css
+++ pecl/apc/apcgui-pecl.css

http://cvs.php.net/co.php/pecl/apc/apcgui.php?r=1.1&p=1
Index: pecl/apc/apcgui.php
+++ pecl/apc/apcgui.php