Changeset 18

Timestamp:

04/10/06 18:55:09 (7 years ago)

Author:

george

Message:

friendster changes. numerous stability fixes.

Files:

• trunk/fastxsl.c (modified) (51 diffs)
• trunk/fl_hash.c (modified) (3 diffs)
• trunk/fl_hash.h (modified) (1 diff)
• trunk/php_fastxsl.h (modified) (4 diffs)

trunk/fastxsl.c

@@ -41 +41 @@
-#endif
-#include <sys/types.h>
+#include <sys/file.h>
-#include <unistd.h>
-
@@ -51 +52 @@
-ZEND_DECLARE_MODULE_GLOBALS(fastxsl);
-
+static int inshm = 0;
+
-static int le_fastxsl_stylesheet;
-#define le_fastxsl_stylesheet_name "FastXSL Stylesheet"
@@ -60 +63 @@
-
-void fastxsl_errorfunc(void *ctx, const char *msg, ...);
+static void ShmCache_Stylesheet_Free(php_ss_wrapper *wrapper TSRMLS_DC);
+static void _SS_Wrapper_Dtor(php_ss_wrapper *wrapper);
+static void _XD_Wrapper_Dtor(php_xd_wrapper *wrapper);
+
+static unsigned int pool_hash(void *ptr)
+{
+  unsigned long i = (unsigned long) ptr;
+  i /= 8;
+  i *= 99961;
+  return i % 31907;
+}
+static void pool_init(zend_fastxsl_globals *globals)
+{
+  int i;
+
+  globals->pool = calloc(1, sizeof(void **) * 31907);
+  globals->pool_offset = calloc(1, sizeof(int) * 31907);
+  globals->pool_allocd = calloc(1, sizeof(int) * 31907);
+
+  for(i = 0; i < 31907; i++) {
+    globals->pool[i] = calloc(1, sizeof(void *) * 100);
+    globals->pool_allocd[i] = 100;
+  }
+}
+
+static void pool_add(void *ptr)
+{
+  unsigned int slot = pool_hash(ptr);
+  if(FASTXSL_G(pool_offset)[slot] == FASTXSL_G(pool_allocd)[slot] - 1) {
+    FASTXSL_G(pool_allocd)[slot] *= 2;
+    FASTXSL_G(pool)[slot] = realloc(FASTXSL_G(pool)[slot], sizeof(void *) * FASTXSL_G(pool_allocd)[slot]);
+  }
+  FASTXSL_G(pool)[slot][FASTXSL_G(pool_offset)[slot]++] = ptr;
+}
+
+static void pool_remove( void *ptr)
+{
+  int i;
+  unsigned int slot = pool_hash(ptr);
+  for(i = 0; i < FASTXSL_G(pool_offset)[slot]; i++) {
+    if(FASTXSL_G(pool)[slot][i] == ptr) {
+      FASTXSL_G(pool)[slot][i] = NULL;
+    }
+  }
+}
+
+static void pool_clear()
+{
+  int i;
+  for(i = 0; i < 31907; i++) {
+    FASTXSL_G(pool_offset)[i] = 0;
+  }
+}
+
+static void pool_destroy( FL_Free   free_func )
+{
+  int i, j;
+  for(i = 0; i < 31907; i++) {
+    for(j = 0; j < FASTXSL_G(pool_offset)[i]; j++) {
+      if(FASTXSL_G(pool)[i][j]) {
+        free_func(FASTXSL_G(pool)[i][j]);
+      }
+    }
+  }
+}
-
-static php_ss_wrapper *
@@ -73 +141 @@
-                        wrapper = (php_ss_wrapper *) calloc(1, sizeof(php_ss_wrapper));
-                }
+                if(!wrapper) {
+                        mm_display_info(FASTXSL_G(cache)->mm);
+                }
-                wrapper->persistant = 1;
-#else
@@ -96 +167 @@
-static xmlFreeFunc    free_ptr;
-static xmlMallocFunc  malloc_ptr;
+static xmlMallocFunc  mallocatomic_ptr;
-static xmlReallocFunc realloc_ptr;
-static xmlStrdupFunc  strdup_ptr;
@@ -104 +176 @@
-{
-        TSRMLS_FETCH();
+        if(!inshm) assert(0);
-        FASTXSL_G(tmp_allocated_size) -= mm_sizeof(FASTXSL_G(cache)->mm, ptr);
-        
-        mm_free(FASTXSL_G(cache)->mm, ptr);
+        //pool_remove(ptr);
-}
-
@@ -114 +187 @@
-        void *ptr;
-        TSRMLS_FETCH();
-
+
-        ptr = mm_malloc(FASTXSL_G(cache)->mm, size);
-        if (!ptr) {
-                php_error(E_ERROR, "Ran out of Shared memory to allocate data for FastXSL cache, "
-d bytes (%d available, %
+ld bytes (%ld available, %l
-                                                   get_active_function_name(TSRMLS_C), size, mm_available(FASTXSL_G(cache)->mm), 
-                                                   mm_maxsize() - mm_available(FASTXSL_G(cache)->mm));
@@ -125 +198 @@
-
-        FASTXSL_G(tmp_allocated_size) += size;
-
+
-        return ptr;
-}
@@ -134 +207 @@
-        void *ptr;
-
+        if(!inshm) assert(0);
-        ptr = ShmCache_Malloc(nmemb * size);
-        memset(ptr, 0, nmemb * size);
-
+
-        return ptr;
-}
@@ -147 +221 @@
-        TSRMLS_FETCH();
-
+        if(!inshm) assert(0);
-        oldsize = mm_sizeof(FASTXSL_G(cache)->mm, ptr);
-        newptr = mm_realloc(FASTXSL_G(cache)->mm, ptr, size);
@@ -158 +233 @@
-        }
-        FASTXSL_G(tmp_allocated_size) += (size - oldsize);
-
+
+
-        return newptr;
-}
@@ -168 +244 @@
-        int   string_length;
-
+        if(!inshm) assert(0);
-        string_length = strlen(string);
-
+ + 1
-        memcpy(newstring, string, string_length);
-        newstring[string_length] = 0;
@@ -205 +282 @@
-ShmCache_UseAllocationFunctions(void)
-{
+        //xmlGcMemSetup(ShmCache_Free, ShmCache_Malloc, ShmCache_Malloc, ShmCache_Realloc, ShmCache_Strdup);
-        xmlMemSetup(ShmCache_Free, ShmCache_Malloc, ShmCache_Realloc, ShmCache_Strdup);
-}
@@ -212 +290 @@
-Php_UseAllocationFunctions(void)
-{
+        //xmlGcMemSetup(Php_Free, Php_Malloc, Php_Malloc, Php_Realloc, Php_Strdup);
-        xmlMemSetup(Php_Free, Php_Malloc, Php_Realloc, Php_Strdup);
-}
@@ -218 +297 @@
-Xml_UseAllocationFunctions(void)
-{
-
+
+
-}
-
@@ -226 +306 @@
-{
-        php_ss_wrapper *wrapper;
-
+int rv;
-        wrapper = SS_Wrapper_Alloc(FASTXSL_SHARED_ALLOC TSRMLS_CC);
-
+        //xmlCleanupParserr();
-        ShmCache_UseAllocationFunctions();
+        wrapper->alloc_type = FASTXSL_SHMALLOC;
-        FASTXSL_G(tmp_allocated_size) = 0;
+inshm = 1;
+        zend_set_timeout(0);
+        //pool_clear();
-        wrapper->ss = xsltParseStylesheetFile(filename);
+inshm = 0;
+        Xml_UseAllocationFunctions();
-        if (!wrapper->ss) {
-
+
+
-                return NULL;
-        }
-        Xml_UseAllocationFunctions();
-        wrapper->mtime = mtime;
-        wrapper->allocsize = FASTXSL_G(tmp_allocated_size);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return wrapper;
@@ -249 +350 @@
-{
-        if (wrapper->ss) {
+                //xmlCleanupParserr();
-                ShmCache_UseAllocationFunctions();
+inshm = 1;
-                xsltFreeStylesheet(wrapper->ss);
+inshm = 0;
+                //xmlCleanupParserr();
-                Xml_UseAllocationFunctions();
-        }
@@ -261 +366 @@
-        php_ss_wrapper *wrapper;
-
+        mm_lock(FASTXSL_G(cache)->mm, MM_LOCK_RD);
-        wrapper = fl_hash_find(FASTXSL_G(cache)->table, filename, filename_len);
+        mm_unlock(FASTXSL_G(cache)->mm);
-        if (wrapper) {
+                mm_lock(FASTXSL_G(cache)->mm, MM_LOCK_RD);
-                fl_hash_delete(FASTXSL_G(cache)->table, filename, filename_len);
+                mm_unlock(FASTXSL_G(cache)->mm);
-                ShmCache_Stylesheet_Free(wrapper);
-        }
@@ -275 +384 @@
-
-        wrapper = (php_ss_wrapper *) SS_Wrapper_Alloc(FASTXSL_PRM_ALLOC TSRMLS_CC);
+        wrapper->alloc_type = FASTXSL_PRMALLOC;
-
-        wrapper->ss = xsltParseStylesheetFile(filename);
+        ////xmlCleanupParserr();
-        if (!wrapper->ss) {
-                return NULL;
@@ -282 +393 @@
-        wrapper->mtime = mtime;
-        
-
+
+
+
+
+
+
+
+
+
+
+
-
-        return wrapper;
@@ -352 +473 @@
-
-                        add_assoc_long(info_array, "allocated", ss_wrapper->allocsize);
+                        add_assoc_long(info_array, "hits", ss_wrapper->hits);
-                        add_assoc_long(info_array, "mtime", ss_wrapper->mtime);
-
@@ -361 +483 @@
-        add_assoc_zval(return_value, "files", files_array);
-
-
+
+
-        add_assoc_long(return_value, "shm_maxsize", (long) mm_maxsize());
-
-        mm_unlock(FASTXSL_G(cache)->mm);
+}
+
+PHP_FUNCTION(fastxsl_xmlMemoryDump)
+{
+  chdir("/tmp");
+  xmlMemDisplay(stderr);
-}
-#endif
@@ -383 +511 @@
-
-        wrapper = (php_ss_wrapper *) SS_Wrapper_Alloc(0 TSRMLS_CC);
+        wrapper->alloc_type = FASTXSL_PRMALLOC;
+        Xml_UseAllocationFunctions();
-        wrapper->ss = xsltParseStylesheetFile(filename);
-        if (!wrapper->ss) {
@@ -405 +535 @@
-
-        wrapper = XD_Wrapper_Alloc();
+        wrapper->alloc_type = FASTXSL_PRMALLOC;
+        Xml_UseAllocationFunctions();
-        wrapper->xd = xmlParseDoc(text);
-        if (!wrapper->xd) {
+                _XD_Wrapper_Dtor(wrapper);
-                RETURN_FALSE;
-        }
@@ -428 +561 @@
-
-        wrapper = XD_Wrapper_Alloc();
+        wrapper->alloc_type = FASTXSL_PRMALLOC;
-        wrapper->xd = xmlParseFile((const xmlChar *) filename);
-        if (!wrapper->xd) {
+                _XD_Wrapper_Dtor(wrapper);
-                RETURN_FALSE;
-        }
@@ -499 +634 @@
-        zval             *z_parameters;
-        struct stat       sb;
+        int lockfd;
-        
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|z", &ss_filename, &ss_filename_len,
@@ -515 +651 @@
-
-        result_wrapper = XD_Wrapper_Alloc();
-
-
+
+
+
+
+
+
-        if (!FASTXSL_G(nostat)) {
-
+
+
+
-                        ShmCache_Stylesheet_Delete(ss_filename, ss_filename_len TSRMLS_CC);
-
+
+
+
-                        free(parameters);
+                        close(lockfd);
-                        RETURN_FALSE;
-                }
@@ -527 +672 @@
-                sb.st_mtime = 0;
-        }
-
+
+
-        ss_wrapper = fl_hash_find(FASTXSL_G(cache)->table, ss_filename, ss_filename_len);
+        mm_unlock(FASTXSL_G(cache)->mm);
-        if (!ss_wrapper) {
+                ShmCache_UseAllocationFunctions();
+inshm = 1;
-                ss_wrapper = ShmCache_Stylesheet_ParseAndStore(ss_filename, ss_filename_len, sb.st_mtime);
+inshm = 0;
-                if (!ss_wrapper) {
-
+
+
+
+
+
-                        free(parameters);
-                        RETURN_FALSE;
@@ -539 +693 @@
-                if (!FASTXSL_G(nostat)) {
-                        if (ss_wrapper->mtime != sb.st_mtime) {
+                                //xmlCleanupParserr();
+                                ShmCache_UseAllocationFunctions();
+inshm = 1;
-                                ShmCache_Stylesheet_Delete(ss_filename, ss_filename_len TSRMLS_CC);
-                                ss_wrapper = ShmCache_Stylesheet_ParseAndStore(ss_filename, ss_filename_len, sb.st_mtime TSRMLS_CC);
+inshm = 0;
+                                //xmlCleanupParserr();
+                                Xml_UseAllocationFunctions();
-                                if (!ss_wrapper) {
-
+
+
+
-                                        free(parameters);
-                                        RETURN_FALSE;
@@ -549 +711 @@
-                }
-        }
-
+
+
+
+
+
-        result_wrapper->xd = xsltApplyStylesheet(ss_wrapper->ss, xd_wrapper->xd, 
-                        (const char **) parameters);
-
-        mm_unlock(FASTXSL_G(cache)->mm);
-        
-        if (parameters) 
@@ -595 +760 @@
-
-        result_wrapper = XD_Wrapper_Alloc();
+        result_wrapper->alloc_type = FASTXSL_PRMALLOC;
-
-        if (!FASTXSL_G(nostat)) {
-                if (stat(ss_filename, &sb) == -1) {
-                        PrmCache_Stylesheet_Delete(ss_filename, ss_filename_len TSRMLS_CC);
+                        _XD_Wrapper_Dtor(result_wrapper);
-                        free(parameters);
-                        RETURN_FALSE;
@@ -610 +777 @@
-                ss_wrapper = PrmCache_Stylesheet_ParseAndStore(ss_filename, ss_filename_len, sb.st_mtime TSRMLS_CC);
-                if (!ss_wrapper) {
+                        _XD_Wrapper_Dtor(result_wrapper);
-                        free(parameters);
-                        RETURN_FALSE;
@@ -619 +787 @@
-                                ss_wrapper = PrmCache_Stylesheet_ParseAndStore(ss_filename, ss_filename_len, sb.st_mtime TSRMLS_CC);
-                                if (!ss_wrapper) {
+                                        _XD_Wrapper_Dtor(result_wrapper);
-                                        free(parameters);
-                                        RETURN_FALSE;
@@ -625 +794 @@
-                }
-        }
-
+
-        result_wrapper->xd = xsltApplyStylesheet(ss_wrapper->ss, xd_wrapper->xd, 
-                        (const char **) parameters);
+        ////xmlCleanupParserr();
-
-        if (parameters) 
@@ -633 +803 @@
-        
-        if (!result_wrapper->xd) {
+                _XD_Wrapper_Dtor(result_wrapper);
-                RETURN_FALSE;
-        }       
@@ -667 +838 @@
-
-        result_wrapper = XD_Wrapper_Alloc();
-
+result_wrapper->alloc_type = FASTXSL_PRMALLOC;
-        result_wrapper->xd = xsltApplyStylesheet(ss_wrapper->ss, xd_wrapper->xd, 
-                        (const char **) parameters);
@@ -674 +845 @@
-
-        if (!result_wrapper->xd) {
+                _XD_Wrapper_Dtor(result_wrapper);
-                RETURN_FALSE;
-        }       
@@ -721 +893 @@
-
-        result_wrapper = XD_Wrapper_Alloc();
+        result_wrapper->alloc_type = FASTXSL_PRMALLOC;
-
-        result_wrapper->xd = xsltProfileStylesheet(ss_wrapper->ss, xd_wrapper->xd, 
-                        (const char **) parameters, dbgprof);
-        
-        if (parameters) 
-                free(parameters);
@@ -731 +903 @@
-        
-        if (!result_wrapper->xd) {
+                _XD_Wrapper_Dtor(result_wrapper);
-                RETURN_FALSE;
-        }       
@@ -788 +961 @@
-        ZEND_FETCH_RESOURCE(xd_wrapper, php_xd_wrapper *, &z_xd_wrapper, -1, "FastXSL XML Document", 
-                        le_fastxsl_document);
-
+
-        mm_lock(FASTXSL_G(cache)->mm, MM_LOCK_RD);
-        ss_wrapper = fl_hash_find(FASTXSL_G(cache)->table, ss_filename, ss_filename_len);
+        mm_unlock(FASTXSL_G(cache)->mm);
-        if (!ss_wrapper) {
-                mm_unlock(FASTXSL_G(cache)->mm);
-                RETURN_FALSE;
-        }
+        ss_wrapper->hits++;
-        xsltSaveResultToString(&result, &length, xd_wrapper->xd, ss_wrapper->ss);
-        mm_unlock(FASTXSL_G(cache)->mm);
-        if (result) {
-                RETVAL_STRINGL((char *) result, length, 1);
-                xmlFree(result);
-        } else {
-
-
+
+
+
-}
-#endif
@@ -830 +1004 @@
-                RETURN_FALSE;
-        }
+        ss_wrapper->hits++;
-        xsltSaveResultToString(&result, &length, xd_wrapper->xd, ss_wrapper->ss);
-        
@@ -849 +1024 @@
-        PHP_FE(fastxsl_shmcache_tostring,            NULL)
-        PHP_FE(fastxsl_shmcache_getstatistics,       NULL)
+        PHP_FE(fastxsl_xmlMemoryDump,                NULL)
-#endif
-        PHP_FE(fastxsl_prmcache_transform,           NULL)
@@ -867 +1043 @@
-        fastxsl_functions,
-        PHP_MINIT(fastxsl),
-NULL
-NULL,  
-NULL
+PHP_MSHUTDOWN(fastxsl)
+PHP_RINIT(fastxsl),
+PHP_RSHUTDOWN(fastxsl)
-        PHP_MINFO(fastxsl),
-#if ZEND_MODULE_API_NO >= 20010901
@@ -883 +1059 @@
-
-static void
+_SS_Wrapper_Dtor(php_ss_wrapper *wrapper)
+{
+        if(wrapper->ss) {
+                if(wrapper->alloc_type == FASTXSL_SHMALLOC) {
+                        //xmlCleanupParserr();
+                        ShmCache_UseAllocationFunctions();
+                } else {
+                        Xml_UseAllocationFunctions();
+                }
+                inshm = 1;
+                xsltFreeStylesheet(wrapper->ss);
+                inshm = 0;
+                if(wrapper->alloc_type == FASTXSL_SHMALLOC) {
+                        //xmlCleanupParserr();
+                        Xml_UseAllocationFunctions();
+                }
+        }
+        if(wrapper->persistant) {
+                mm_free(FASTXSL_G(cache)->mm, wrapper);
+        } else {
+                free(wrapper);
+        }
+}
+
+static void
-SS_Wrapper_Dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-{
-        php_ss_wrapper *wrapper = (php_ss_wrapper *) rsrc->ptr;
-        
-        if (wrapper->persistant) {
-                return;
-        }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        free(wrapper);
-}
@@ -901 +1112 @@
-{
-        php_xd_wrapper *wrapper = (php_xd_wrapper *) rsrc->ptr;
-
-
-
-
+
-}
-
@@ -982 +1190 @@
-        
-        globals->cache = calloc(1, sizeof(fl_cache));
+        //pool_init(globals);
-}
-
@@ -995 +1204 @@
-                        return;
-                }
-#ifdef FASTXSL_MM
-                mm_lock(cache->mm, MM_LOCK_RW);
-                fl_hash_free(cache->table);
-                mm_unlock(cache->mm);
-
-                mm_destroy(cache->mm);
-#endif
-                fl_hash_free(cache->prmtable);
-        }
+        if(globals->pool) { free(globals->pool); }
-}
-
@@ -1022 +1225 @@
-        
-        tctxt = (xsltTransformContextPtr) xsltXPathGetTransformContext(ctxt);
+        ////xmlCleanupParserr();
-        if (tctxt == NULL) {
-                xsltGenericError(xsltGenericErrorContext,
@@ -1137 +1341 @@
-        le_fastxsl_document   = zend_register_list_destructors_ex(XD_Wrapper_Dtor, NULL, 
-                        le_fastxsl_document_name,   module_number);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        xsltRegisterAllExtras();
-#if HAVE_DOMEXSLT
@@ -1145 +1376 @@
-        xmlLoadExtDtdDefaultValue = 1;
-
-        xmlMemGet(&free_ptr, &malloc_ptr, &realloc_ptr, &strdup_ptr);
-        xmlRegisterOutputCallbacks(Stream_MatchWrapper, Stream_XmlWrite_OpenWrapper, 
-                                           Stream_XmlWrite_WriteWrapper, Stream_CloseWrapper);
-        xsltSetGenericErrorFunc(NULL, fastxsl_errorfunc);
-        xmlSetGenericErrorFunc(NULL, fastxsl_errorfunc);
-#ifdef FASTXSL_MM
-        if (!sprintf(euid, "%d", geteuid())) {
-                return FAILURE;
-        }
-
-        shmpath_len = strlen(FASTXSL_G(shmpath)) + strlen(euid);
-        shmpath = do_alloca(shmpath_len + 1);
-
-        strcpy(shmpath, FASTXSL_G(shmpath));
-        strcat(shmpath, euid);
-        
-        FASTXSL_G(cache)->owner = getpid();
-        FASTXSL_G(cache)->mm = mm_create(0, shmpath);
-
-        free_alloca(shmpath);
-        if (!FASTXSL_G(cache)->mm) {
-                return FAILURE;
-        }
-
-        mm_lock(FASTXSL_G(cache)->mm, MM_LOCK_RW);
-        FASTXSL_G(cache)->table = fl_hash_new(&mm_allocators, NULL);
-        mm_unlock(FASTXSL_G(cache)->mm);
-#endif
-        FASTXSL_G(cache)->prmtable = fl_hash_new(&normal_allocators, NULL);
-        
-        if(FASTXSL_G(register_functions)) {
@@ -1180 +1386 @@
-                                           fastxsl_ext_function);
-        }
+        //xmlCleanupParserr();
+inshm = 0;
+        Xml_UseAllocationFunctions();
-        return SUCCESS;
+}
+
+PHP_MSHUTDOWN_FUNCTION(fastxsl)
+{
+  UNREGISTER_INI_ENTRIES();
+}
+PHP_RINIT_FUNCTION(fastxsl)
+{
+#ifdef FASTXSL_MM
+  /* just in case, set back the allocators */
+  Xml_UseAllocationFunctions();
+#endif
+}
+PHP_RSHUTDOWN_FUNCTION(fastxsl)
+{
+#ifdef FASTXSL_MM
+  /* just in case, set back the allocators */
+  Xml_UseAllocationFunctions();
+#endif
-}
-

trunk/fl_hash.c

@@ -74 +74 @@
-        FL_Bucket       *b;
-        unsigned int  hash = hash_hash(key, length) % FL_HASH_SIZE;
-
-        for (b = table->buckets[ hash ]; b; b = b->next) {
-                if (hash != b->hash) continue;
-                if (length != b->length) continue;
-                if (memcmp(key, b->key, length)) continue;
-
-                return b->data;
-        }
@@ -86 +84 @@
-}
-
-void
+int
-{
-
+, *ptr
-        unsigned int  hash;
-        
-        hash = hash_hash(key, length) % FL_HASH_SIZE;
+        /* check hash for dupes */
+        ptr = table->buckets[ hash ];
+        while(ptr) {
+                if(!strcmp(ptr->key, key)) {
+                        return 0;
+                }
+                ptr = ptr->next;
+        }
-
-        b = table->mems->malloc_func(sizeof(FL_Bucket));
@@ -100 +106 @@
-        b->hash = hash;
-        b->data = data;
-
-        b->next = table->buckets[ hash ];
-
-        table->buckets[ hash ] = b;
-        table->nElements++;
+        return 1;
-}
-

trunk/fl_hash.h

@@ -53 +53 @@
-void fl_hash_free(FL_Hash *table);
-void *fl_hash_find(FL_Hash *table, const void *key, int length);
-void
+int
-void fl_hash_delete(FL_Hash *table, char *key, int length);
-#endif

trunk/php_fastxsl.h

@@ -65 +65 @@
-PHP_MINIT_FUNCTION(fastxsl);
-PHP_MSHUTDOWN_FUNCTION(fastxsl);
+PHP_RINIT_FUNCTION(fastxsl);
+PHP_RSHUTDOWN_FUNCTION(fastxsl);
-PHP_MINFO_FUNCTION(fastxsl);
+
+#define FASTXSL_PRMALLOC 0
+#define FASTXSL_SHMALLOC 1
-
-typedef struct {
@@ -78 +83 @@
-typedef struct {
-        xmlDocPtr xd;
+        int alloc_type;
-} php_xd_wrapper;
-
@@ -84 +90 @@
-        int allocsize;
-        time_t mtime;
+        int hits;
-        int persistant;
+        int alloc_type;
-} php_ss_wrapper;
-
@@ -94 +102 @@
-        long      register_functions;
-        long      tmp_allocated_size;
+        void     ***pool;
+        int      *pool_offset;
+        int      *pool_allocd;
-} zend_fastxsl_globals;
-