Changeset 21

Timestamp:

04/14/06 12:57:45 (7 years ago)

Author:

george

Message:

cleanup and configurables

Files:

• trunk/fastxsl.c (modified) (21 diffs)
• trunk/php_fastxsl.h (modified) (1 diff)

trunk/fastxsl.c

@@ -215 +215 @@
-ShmCache_UseAllocationFunctions(void)
-{
-        //xmlGcMemSetup(ShmCache_Free, ShmCache_Malloc, ShmCache_Malloc, ShmCache_Realloc, ShmCache_Strdup);
-        xmlMemSetup(ShmCache_Free, ShmCache_Malloc, ShmCache_Realloc, ShmCache_Strdup);
-}
@@ -223 +222 @@
-Php_UseAllocationFunctions(void)
-{
-        //xmlGcMemSetup(Php_Free, Php_Malloc, Php_Malloc, Php_Realloc, Php_Strdup);
-        xmlMemSetup(Php_Free, Php_Malloc, Php_Realloc, Php_Strdup);
-}
@@ -230 +228 @@
-Xml_UseAllocationFunctions(void)
-{
-        //xmlGcMemSetup(free_ptr, malloc_ptr, mallocatomic_ptr, realloc_ptr, strdup);
-        xmlMemSetup(free_ptr, malloc_ptr,  realloc_ptr, strdup);
-}
@@ -242 +239 @@
-        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);
-        wrapper->ss = xsltParseStylesheetFile(filename);
-inshm = 0;
-        Xml_UseAllocationFunctions();
-        if (!wrapper->ss) {
@@ -264 +258 @@
-                php_ss_wrapper *fallback;
-                mm_lock(FASTXSL_G(cache)->mm, MM_LOCK_RD);
-
+
+
-                mm_unlock(FASTXSL_G(cache)->mm);
-                if(fallback) {
@@ -317 +312 @@
-        wrapper->alloc_type = FASTXSL_PRMALLOC;
-
-
-
+
-        if (!wrapper->ss) {
-                return NULL;
@@ -325 +319 @@
-        
-        if(fl_hash_add(FASTXSL_G(cache)->prmtable, filename, filename_len, wrapper) == 0) {
-
-
-
-
-
-
-
-
-
+
-        }
-
@@ -415 +401 @@
-
-        add_assoc_long(return_value, "apparent_allocated", allocated_bytes);
-real_
-max
+
+
-        mm_unlock(FASTXSL_G(cache)->mm);
-}
-
-PHP_FUNCTION(fastxsl_xmlMemoryDump)
-{
-  chdir("/tmp");
-  xmlMemDisplay(stderr);
-}
-#endif
-/* }}} */
@@ -444 +425 @@
-        wrapper->alloc_type = FASTXSL_PRMALLOC;
-        Xml_UseAllocationFunctions();
-
+(xmlChar*)
-        if (!wrapper->ss) {
-                RETURN_FALSE;
@@ -468 +449 @@
-        wrapper->alloc_type = FASTXSL_PRMALLOC;
-        Xml_UseAllocationFunctions();
-
+(xmlChar *) 
-        if (!wrapper->xd) {
-                _XD_Wrapper_Dtor(wrapper);
@@ -493 +474 @@
-        wrapper = XD_Wrapper_Alloc();
-        wrapper->alloc_type = FASTXSL_PRMALLOC;
-xmlC
+c
-        if (!wrapper->xd) {
-                _XD_Wrapper_Dtor(wrapper);
@@ -510 +491 @@
-        HashPosition   pos;
-        char          *key;
-int 
+uint
-        unsigned long  ival;
-        int            index = 0;
@@ -955 +936 @@
-        PHP_FE(fastxsl_shmcache_tostring,            NULL)
-        PHP_FE(fastxsl_shmcache_getstatistics,       NULL)
-        PHP_FE(fastxsl_xmlMemoryDump,                NULL)
-#endif
-        PHP_FE(fastxsl_prmcache_transform,           NULL)
@@ -1008 +988 @@
-        }
-        if(wrapper->persistant) {
+#ifdef FASTXSL_MM
-                mm_free(FASTXSL_G(cache)->mm, wrapper);
+#endif
-        } else {
-                free(wrapper);
@@ -1136 +1118 @@
-                fl_hash_free(cache->prmtable);
-        }
-        if(globals->pool) { free(globals->pool); }
-}
-
@@ -1174 +1155 @@
-                        case XPATH_NODESET:
-                                tmp = xmlXPathCastToString(obj);
-
+(char *) 
-                                xmlFree(tmp);
-                                break;
@@ -1184 +1165 @@
-                                break;
-                        case XPATH_STRING:
-
+(char *)
-                                break;
-                        default:
-                                zend_error(E_WARNING, "inexact type conversion %d", obj->type);
-                                tmp = xmlXPathCastToString(obj);
-
+(char *)
-                                xmlFree(tmp);
-                                break;
@@ -1204 +1185 @@
-        }
-        MAKE_STD_ZVAL(function);
-
+(char *)
-        xmlFree(fname);
-        MAKE_STD_ZVAL(ret);
@@ -1226 +1207 @@
-                        break;
-                case IS_STRING:
-
+(xmlChar *) 
-                        break;
-                default:
-                        convert_to_string_ex(&ret);
-
+(xmlChar *) 
-                        break;
-        }
@@ -1254 +1235 @@
-        STD_PHP_INI_ENTRY("fastxsl.shmpath", "/tmp/fastxsl_mem", PHP_INI_SYSTEM, OnUpdateString, shmpath, zend_fastxsl_globals, fastxsl_globals)
-        STD_PHP_INI_BOOLEAN("fastxsl.nostat", "0", PHP_INI_ALL, OnUpdateLong, nostat, zend_fastxsl_globals, fastxsl_globals) 
+        STD_PHP_INI_BOOLEAN("fastxsl.memalloc", "0", PHP_INI_SYSTEM, OnUpdateLong, memalloc, zend_fastxsl_globals, fastxsl_globals) 
-        STD_PHP_INI_BOOLEAN("fastxsl.register_functions", "0", PHP_INI_ALL, OnUpdateLong, register_functions, zend_fastxsl_globals, fastxsl_globals) 
-PHP_INI_END()
@@ -1283 +1265 @@
-        
-        FASTXSL_G(cache)->owner = getpid();
-0
+FASTXSL_G(memalloc)
-        free_alloca(shmpath);
-        if (!FASTXSL_G(cache)->mm) {

trunk/php_fastxsl.h

@@ -100 +100 @@
-        char     *errbuf;
-        long      nostat;
+        long      memalloc;
-        long      register_functions;
-        long      tmp_allocated_size;
-        void     ***pool;
-        int      *pool_offset;
-        int      *pool_allocd;
-} zend_fastxsl_globals;
-