Changeset 163 for trunk

Timestamp:

2006-09-13T14:11:36+02:00 (7 years ago)

Author:

moo

Message:

show available shm scheme in moduleinfo

Location:

trunk

Files:

• xc_shm.c (modified) (2 diffs)
• xc_shm.h (modified) (1 diff)
• xcache.c (modified) (4 diffs)

trunk/xc_shm.c

@@ -11 +11 @@
 #include "xc_shm.h"
 
-typedef struct {
+struct _xc_shm_scheme_t {
     const char              *name;
     const xc_shm_handlers_t *handlers;
-} xc_shm_scheme_t;
+};
 static xc_shm_scheme_t xc_shm_schemes[10];
 
@@ -53 +53 @@
 }
 /* }}} */
+xc_shm_scheme_t *xc_shm_scheme_first() /* {{{ */
+{
+    return xc_shm_schemes;
+}
+/* }}} */
+xc_shm_scheme_t *xc_shm_scheme_next(xc_shm_scheme_t *scheme) /* {{{ */
+{
+    scheme ++;
+    return scheme->name ? scheme : NULL;
+}
+/* }}} */
+const char *xc_shm_scheme_name(xc_shm_scheme_t *scheme) /* {{{ */
+{
+    assert(scheme);
+    return scheme->name;
+}
+/* }}} */
 xc_shm_t *xc_shm_init(const char *type, xc_shmsize_t size, int readonly_protection, const void *arg1, const void *arg2) /* {{{ */
 {

trunk/xc_shm.h

@@ -52 +52 @@
 };
 #endif
+typedef struct _xc_shm_scheme_t xc_shm_scheme_t;
 
 void xc_shm_init_modules();
 int xc_shm_scheme_register(const char *name, const xc_shm_handlers_t *handlers);
 const xc_shm_handlers_t *xc_shm_scheme_find(const char *name);
+xc_shm_scheme_t *xc_shm_scheme_first();
+xc_shm_scheme_t *xc_shm_scheme_next(xc_shm_scheme_t *scheme);
+const char *xc_shm_scheme_name(xc_shm_scheme_t *scheme);
 
 xc_shm_t *xc_shm_init(const char *type, xc_shmsize_t size, int readonly_protection, const void *arg1, const void *arg2);

trunk/xcache.c

@@ -2123 +2123 @@
     char buf[100];
     char *ptr;
+    int left, len;
+    xc_shm_scheme_t *scheme;
 
     php_info_print_table_start();
@@ -2132 +2134 @@
     if (xc_php_size) {
         ptr = _php_math_number_format(xc_php_size, 0, '.', ',');
-        sprintf(buf, "enabled, %s bytes, %d split(s), with %d slots each", ptr, xc_php_hcache.size, xc_php_hentry.size);
+        snprintf(buf, sizeof(buf), "enabled, %s bytes, %d split(s), with %d slots each", ptr, xc_php_hcache.size, xc_php_hentry.size);
         php_info_print_table_row(2, "Opcode Cache", buf);
         efree(ptr);
@@ -2141 +2143 @@
     if (xc_var_size) {
         ptr = _php_math_number_format(xc_var_size, 0, '.', ',');
-        sprintf(buf, "enabled, %s bytes, %d split(s), with %d slots each", ptr, xc_var_hcache.size, xc_var_hentry.size);
+        snprintf(buf, sizeof(buf), "enabled, %s bytes, %d split(s), with %d slots each", ptr, xc_var_hcache.size, xc_var_hentry.size);
         php_info_print_table_row(2, "Variable Cache", buf);
         efree(ptr);
@@ -2148 +2150 @@
         php_info_print_table_row(2, "Variable Cache", "disabled");
     }
+
+    left = sizeof(buf);
+    ptr = buf;
+    buf[0] = '\0';
+    for (scheme = xc_shm_scheme_first(); scheme; scheme = xc_shm_scheme_next(scheme)) {
+        len = snprintf(ptr, left, ptr == buf ? "%s" : ", %s", xc_shm_scheme_name(scheme));
+        left -= len;
+        ptr += len;
+    }
+    php_info_print_table_row(2, "Shared Memory Schemes", buf);
+
 #ifdef HAVE_XCACHE_COVERAGER
     php_info_print_table_row(2, "Coverage Dumper", XG(coveragedumper) && xc_coveragedump_dir && xc_coveragedump_dir[0] ? "enabled" : "disabled");