Changeset 178

Timestamp:

03/06/06 10:08:40 (2 years ago)

Author:

bart

Message:

Removed the old webui and made a new controlpanel en disassembler

more information in the README file

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/Makefile.in (modified) (1 diff)
• eaccelerator/trunk/README (modified) (2 diffs)
• eaccelerator/trunk/cache.c (modified) (6 diffs)
• eaccelerator/trunk/cache.h (modified) (1 diff)
• eaccelerator/trunk/config.m4 (modified) (4 diffs)
• eaccelerator/trunk/control.php (added)
• eaccelerator/trunk/dasm.php (added)
• eaccelerator/trunk/ea_dasm.c (added)
• eaccelerator/trunk/ea_dasm.h (added)
• eaccelerator/trunk/ea_info.c (added)
• eaccelerator/trunk/ea_info.h (added)
• eaccelerator/trunk/eaccelerator.c (modified) (12 diffs)
• eaccelerator/trunk/eaccelerator.h (modified) (2 diffs)
• eaccelerator/trunk/eaccelerator.ini (modified) (1 diff)
• eaccelerator/trunk/eaccelerator.php (deleted)
• eaccelerator/trunk/eaccelerator_password.php (deleted)
• eaccelerator/trunk/shm.c (modified) (6 diffs)
• eaccelerator/trunk/shm.h (modified) (1 diff)
• eaccelerator/trunk/webui.c (deleted)
• eaccelerator/trunk/webui.h (deleted)
• eaccelerator/trunk/x86_spinlocks.h (modified) (1 diff)

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2006-03-06  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
+
+        * Removed the old webui and made a new controlpanel en disassembler.
+
-2006-03-02  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-

eaccelerator/trunk/Makefile.in

@@ -1 +1 @@
-LTLIBRARY_NAME        = libeaccelerator.la
-webui.c session.c shm.c debug.c cache.c ea_restore.c ea_store
+session.c shm.c debug.c cache.c ea_restore.c ea_store.c ea_info.c ea_dasm
-LTLIBRARY_SHARED_NAME = eaccelerator.la
-

eaccelerator/trunk/README

@@ -225 +225 @@
-    "none"         - don't cache data
-
+eaccelerator.allowed_admin_path
+    The script paths that are allowed to get admin information and do admin 
+    controls
+
+Control panel and disassembler
+------------------------------
+
+If you want to use the control-panel you need to compile eAccelerator with 
+    --with-eaccelerator-info which is the default value.
+You need to copy the control.php file to your webroot and set the path to it 
+in the php.ini or eaccelerator.ini in the eaccelerator.allowed_admin_path 
+directive. If you don't do this you wont be able to see much information and 
+can't control eAccelerator.
+You can set the username and password needed to access the control-panel in 
+the control.php file.
+
+When you compile eAccelerator with --with-eaccelerator-disassembler you need 
+to place the dasm.php file also in the same directory as the control.php file.
-
-eAccelerator API
@@ -290 +308 @@
-  loads script which was encoded by eaccelerator_encode()
-
-WEB interface
--------------
-eAccelerator can be managed through web interface script  eaccelerator.php. So
-you need to put this file on  your  web  site.  For  security  reasons  it  is
-recommended to restrict the usage of this script by your local IP.
-
-Since version 2.3.18 admin interface may be protected by password. To generate
-password run the eaccelerator_password.php from command line  and  follow  the 
-instruction.
-
-  $ php -q eaccelerator_password.php
-  Changing password for eAccelerator Web Interface (eaccelerator.php)
-
-  Enter admin name: admin
-  New admin password: eaccelerator
-  Retype new admin password: eaccelerator
-
-  Add the following lines into your php.ini and restart HTTPD
-
-  eaccelerator.admin.name="admin"
-  eaccelerator.admin.password="$1$0ScD9gkb$nOEmFerNMvQ576hELeLrG0"
-
-If you use eaccelerator.php in directory that is password-protected  by  HTTPD
-then eaccelerator's admin name and password must be the same.
-
-
-Contact us
-----------

eaccelerator/trunk/cache.c

@@ -48 +48 @@
-extern int binary_zend_version;
-
- 
+
-{
-        int len;
@@ -55 +55 @@
-         * namespace 
-         */
- (EAG 
+(EAG
-        if (len > 0) {
-                char *xkey;
-                *xlen = len + key_len + 1;
- 
- (xkey, EAG 
+
+(xkey, EAG
-                xkey[len] = ':';
- 
+
-                return xkey;
-        }
@@ -69 +69 @@
-         * hostname 
-         */
- 
+
-        if (len > 0) {
-                char *xkey;
-                *xlen = len + key_len + 1;
- 
- (xkey, EAG 
+
+(xkey, EAG
-                xkey[len] = ':';
- 
+
-                return xkey;
-        } else {
@@ -139 +139 @@
-#ifdef ZEND_WIN32
-                        Sleep (100);
-/*???
-#elif defined(HAVE_SCHED_YIELD)
-      sched_yield();
-*/
-#else
-                        struct timeval t;
@@ -258 +254 @@
-                memcpy (&q->value, val, sizeof (zval));
-                q->ttl = ttl ? time (0) + ttl : 0;
+                q->create = time (0);
-                store_zval (&q->value TSRMLS_CC);
-                zend_hash_destroy (&EAG (strings));
@@ -605 +602 @@
-        return size;
-}
+
+/* get list of all keys stored in memory that matches hostname or namespace */
+int eaccelerator_list_keys(zval *return_value TSRMLS_DC) 
+{
+        unsigned int i, xlen;
+        zval *list;
+        char *xkey;
+        mm_user_cache_entry *p;
+        time_t t = time (0);
+
+        // create key prefix for current host / namespace
+        xlen = strlen(EAG(name_space));
+        if (xlen > 0) {
+                xkey = emalloc(xlen + 1);
+                memcpy(xkey, EAG(name_space), xlen);
+        } else {
+        xlen = strlen(EAG(hostname));
+            if (xlen > 0) {
+                xkey = emalloc(xlen + 1);
+                memcpy(xkey, EAG(hostname), xlen);
+            }
+    }
+
+        // initialize return value as an array
+        array_init(return_value);
+
+        for (i = 0; i < MM_USER_HASH_SIZE; ++i) {
+        p = eaccelerator_mm_instance->user_hash[i];
+                while(p != NULL) {
+                        if (!xlen || strncmp(p->key, xkey, xlen) == 0) {
+                                list = NULL;
+                                ALLOC_INIT_ZVAL(list);
+                                array_init(list);
+                                
+                                if (strlen(p->key) > xlen) {
+                                        add_assoc_string(list, "name", (p->key) + xlen, 1);
+                                } else {
+                                        add_assoc_string(list, "name", p->key, 1);
+                                }
+                
+                if (p->ttl) {
+                                if (p->ttl < t) {
+                                        add_assoc_long(list, "ttl", (p->ttl -t)); // ttl
+                                } else {
+                                        add_assoc_long(list, "ttl", -1); // expired
+                                }
+                } else {
+                                        add_assoc_long(list, "ttl", 0); // no ttl
+                                }
+                                
+                                add_assoc_long(list, "created", p->create);
+                                add_assoc_long(list, "size", p->size);
+                                add_next_index_zval(return_value, list);
+                        }
+            p = p->next;
+                }
+        }
+
+    if (xlen > 0) 
+        efree(xkey);
+        return 1;
+}
+
-#endif /* HAVE_EACCELERATOR */
+

eaccelerator/trunk/cache.h

@@ -43 +43 @@
-size_t eaccelerator_gc (TSRMLS_D);
-
+int eaccelerator_list_keys(zval *return_value TSRMLS_DC);
+
-#endif                                                  /* INCLUDED_CACHE_H */

eaccelerator/trunk/config.m4

@@ -51 +51 @@
-])
-
-AC_ARG_WITH(eaccelerator-webui,
-[  --without-eaccelerator-webui             Do not include the eaccelerator WebUI],[
-  eaccelerator_webui=$withval
-],[
-  eaccelerator_webui=yes
-])
-
-AC_ARG_WITH(eaccelerator-sessions,
-[  --with-eaccelerator-sessions             Include eaccelerator sessions],[
@@ -70 +63 @@
-],[
-  eaccelerator_content_caching=no
+])
+
+AC_ARG_WITH(eaccelerator-info,
+[  --without-eaccelerator-info                Do not compile the eAccelerator information functions],[
+  eaccelerator_info=$withval
+],[
+  eaccelerator_info=yes
-])
-
@@ -105 +105 @@
-  AC_DEFINE(HAVE_EACCELERATOR, 1, [Define if you like to use eAccelerator])
-
+  AC_DEFINE(WITH_EACCELERATOR_INFO, 1, [Define to be able to get information about eAccelerator])
+
-  AC_DEFINE_UNQUOTED(EA_USERID, $ea_userid, [The userid eAccelerator will be running under.]) 
-    
@@ -122 +124 @@
-    AC_DEFINE(WITH_EACCELERATOR_SHM, 1, [Define if you like to use the eAccelerator functions to store keys in shared memory])
-  fi
-webui
-WEBUI, 1, [Define if you like to use the eAccelerator WebUI
+info
+INFO, 1, [Define if you want the information functions
-  fi
-  if test "$eaccelerator_sessions" = "yes"; then

eaccelerator/trunk/eaccelerator.c

@@ -37 +37 @@
-#include "zend_extensions.h"
-
-#include "webui.h"
-#include "debug.h"
-#include "shm.h"
@@ -45 +44 @@
-#include "ea_store.h"
-#include "ea_restore.h"
+#include "ea_info.h"
+#include "ea_dasm.h"
-
-#include <sys/types.h>
@@ -904 +905 @@
-  *nreloads = 1;
-  EACCELERATOR_UNPROTECT();
-
-
+
-  if (p == NULL && !eaccelerator_scripts_shm_only) {
-    p = hash_find_file(realname, buf TSRMLS_CC);
@@ -1387 +1387 @@
-*/
-    EAG(compiler) = 0;
-
-
+
-#ifdef EACCELERATOR_USE_INODE
-        eaccelerator_ok_to_cache(file_handle->opened_path TSRMLS_CC)) {
@@ -1622 +1621 @@
-  php_info_print_table_header(2, "eAccelerator support", "enabled");
-  php_info_print_table_row(2, "Version", EACCELERATOR_VERSION);
-
-
+
+
+
+
-  if (eaccelerator_mm_instance != NULL) {
-    size_t available;
@@ -1742 +1743 @@
-#ifdef WITH_EACCELERATOR_CONTENT_CACHING
-ZEND_INI_ENTRY("eaccelerator.content",          "shm_and_disk", PHP_INI_SYSTEM, eaccelerator_OnUpdateContentCachePlace)
+#endif
+#ifdef WITH_EACCELERATOR_INFO
+STD_PHP_INI_ENTRY("eaccelerator.allowed_admin_path",       "", PHP_INI_SYSTEM, OnUpdateString, allowed_admin_path, zend_eaccelerator_globals, eaccelerator_globals)
-#endif
-STD_PHP_INI_ENTRY("eaccelerator.cache_dir",      "/tmp/eaccelerator", PHP_INI_SYSTEM, OnUpdateString, cache_dir, zend_eaccelerator_globals, eaccelerator_globals)
@@ -1918 +1922 @@
-  eaccelerator_globals->hostname[0]       = '\000';
-  eaccelerator_globals->in_request        = 0;
+  eaccelerator_globals->allowed_admin_path= NULL;
-}
-
@@ -2071 +2076 @@
-                zend_function tmp_func;
-                zend_class_entry tmp_class;
-
-                // Don't need this, as the context given by function argument.
-                // TSRMLS_FETCH();
-
-                zend_hash_init_ex(&eaccelerator_global_function_table, 100, NULL, NULL, 1, 0);
@@ -2140 +2142 @@
-PHP_RSHUTDOWN_FUNCTION(eaccelerator)
-{
-
-
+
-                return SUCCESS;
-        }
-#ifdef WITH_EACCELERATOR_CRASH_DETECTION
-#ifdef SIGSEGV
-
-
+
-                signal(SIGSEGV, EAG(original_sigsegv_handler));
-
-
-
+
-                signal(SIGSEGV, SIG_DFL);
-        }
-#endif
-#ifdef SIGFPE
-
-
+
-                signal(SIGFPE, EAG(original_sigfpe_handler));
-
-
-
+
-                signal(SIGFPE, SIG_DFL);
-        }
-#endif
-#ifdef SIGBUS
-
-
+
-                signal(SIGBUS, EAG(original_sigbus_handler));
-
-
-
+
-                signal(SIGBUS, SIG_DFL);
-        }
-#endif
-#ifdef SIGILL
-
-
+
-                signal(SIGILL, EAG(original_sigill_handler));
-
-
-
+
-                signal(SIGILL, SIG_DFL);
-        }
-#endif
-#ifdef SIGABRT
-
-
+
-                signal(SIGABRT, EAG(original_sigabrt_handler));
-
-
-
+
-                signal(SIGABRT, SIG_DFL);
-        }
@@ -2212 +2198 @@
-
-function_entry eaccelerator_functions[] = {
-#ifdef WITH_EACCELERATOR_WEBUI
-  PHP_FE(eaccelerator, NULL)
-#endif
-#ifdef WITH_EACCELERATOR_SHM
-  PHP_FE(eaccelerator_put, NULL)
@@ -2222 +2205 @@
-  PHP_FE(eaccelerator_lock, NULL)
-  PHP_FE(eaccelerator_unlock, NULL)
+#endif
+#ifdef WITH_EACCELERATOR_INFO
+  PHP_FE(eaccelerator_caching, NULL)
+  #ifdef WITH_EACCELERATOR_OPTIMIZER
+  PHP_FE(eaccelerator_optimizer, NULL)
+  #endif
+  PHP_FE(eaccelerator_clear, NULL)
+  PHP_FE(eaccelerator_clean, NULL)
+  PHP_FE(eaccelerator_info, NULL)
+  PHP_FE(eaccelerator_purge, NULL)
+  PHP_FE(eaccelerator_cached_scripts, NULL)
+  PHP_FE(eaccelerator_removed_scripts, NULL)
+  PHP_FE(eaccelerator_list_keys, NULL)
-#endif
-#ifdef WITH_EACCELERATOR_ENCODER
@@ -2248 +2244 @@
-  PHP_FE(eaccelerator_cache_output, NULL)
-  PHP_FE(eaccelerator_cache_result, NULL)
+#endif
+#ifdef WITH_EACCELERATOR_DISASSEMBLER
+  PHP_FE(eaccelerator_dasm_file, NULL)
-#endif
-#ifdef ZEND_ENGINE_2

eaccelerator/trunk/eaccelerator.h

@@ -304 +304 @@
-        unsigned int hv;                        /* hash value                  */
-        long ttl;                                       /* expiration time             */
+        long create;
-        int size;
-        zval value;                                     /* value                       */
@@ -460 +461 @@
-char *name_space;
-char *mem;
+char *allowed_admin_path;
-HashTable strings;
-zend_class_entry *class_entry;

eaccelerator/trunk/eaccelerator.ini

@@ -107 +107 @@
-eaccelerator.content  = "shm_and_disk"
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-eaccelerator.admin.name="yourusername"
-eaccelerator.admin.password="yourpassword"

eaccelerator/trunk/shm.c

@@ -68 +68 @@
-/******************************************************************************/
-
- 
+
-{
-        char *key;
-        int key_len;
-
-
-
+
-                return;
-
- 
+
-                RETURN_TRUE;
-        } else {
@@ -89 +88 @@
-        int key_len;
-
-
-
+
-                return;
-
@@ -108 +106 @@
-        long where = eaccelerator_keys_cache_place;
-
-
-
+
-                return;
-
@@ -125 +122 @@
-        long where = eaccelerator_keys_cache_place;
-
-
-
+
-                return;
-
@@ -142 +138 @@
-        long where = eaccelerator_keys_cache_place;
-
-
-
+
-                return;
-
@@ -161 +156 @@
-        RETURN_TRUE;
-}
+
+
+
-#endif                                                  /* WITH_EACCELERATOR_SHM */
-#endif                                                  /* HAVE_EACCELERATOR */

eaccelerator/trunk/shm.h

@@ -42 +42 @@
-
-#endif /* WITH_EACCELERATOR_SHM */
-
-#endif /* INCLUDED_SHM_H */

eaccelerator/trunk/x86_spinlocks.h

@@ -66 +66 @@
-  }
-}
+