Changeset 131

Timestamp:

09/03/2006 07:37:05 AM (2 years ago)

Author:

moo

Message:

move open_files out of sandbox, it's not needed

Location:

trunk

Files:

• utils.c (modified) (5 diffs)
• utils.h (modified) (1 diff)
• xcache.c (modified) (3 diffs)

trunk/utils.c

@@ -371 +371 @@
 
     memcpy(&OG(included_files), &EG(included_files), sizeof(EG(included_files)));
-    memcpy(&OG(open_files), &CG(open_files), sizeof(CG(open_files)));
 
 #ifdef HAVE_XCACHE_CONSTANT
@@ -388 +387 @@
 
     TG(included_files) = &EG(included_files);
-    TG(open_files)     = &CG(open_files);
-
-    zend_llist_init(TG(open_files), sizeof(zend_file_handle), (void (*)(void *)) zend_file_handle_dtor, 0);
+
     zend_hash_init_ex(TG(included_files), 5, NULL, NULL, 0, 1);
 #ifdef HAVE_XCACHE_CONSTANT
@@ -440 +437 @@
     i = 1;
     zend_hash_add(&OG(included_files), sandbox->filename, strlen(sandbox->filename) + 1, (void *)&i, sizeof(int), NULL);
-    for (handle = zend_llist_get_first_ex(TG(open_files), &lpos);
-            handle;
-            handle = zend_llist_get_next_ex(TG(open_files), &lpos)) {
-        zend_llist_add_element(&OG(open_files), handle);
-    }
 }
 /* }}} */
@@ -466 +458 @@
         TG(function_table).pDestructor = NULL;
         TG(class_table).pDestructor = NULL;
-        TG(open_files)->dtor = NULL;
     }
 
@@ -476 +467 @@
     zend_hash_destroy(&TG(class_table));
     zend_hash_destroy(TG(included_files));
-    zend_llist_destroy(TG(open_files));
 
     /* restore orig here, as EG/CG holded tmp before */
     memcpy(&EG(included_files), &OG(included_files), sizeof(EG(included_files)));
-    memcpy(&CG(open_files),     &OG(open_files),     sizeof(CG(open_files)));
 
     if (sandbox->alloc) {

trunk/utils.h

@@ -38 +38 @@
 
     HashTable orig_included_files;
-    zend_llist orig_open_files;
     HashTable *tmp_included_files;
-    zend_llist *tmp_open_files;
 
 #ifdef HAVE_XCACHE_CONSTANT

trunk/xcache.c

@@ -559 +559 @@
     i = 1;
     zend_hash_add(&EG(included_files), xce->name.str.val, xce->name.str.len+1, (void *)&i, sizeof(int), NULL);
-    zend_llist_add_element(&CG(open_files), h);
+    if (h) {
+        zend_llist_add_element(&CG(open_files), h);
+    }
 
 #ifndef ZEND_ENGINE_2
@@ -939 +941 @@
 
     if (xc_test && stored_xce) {
-        /* no install, keep open_files too for h */
+        /* free it, no install. restore now */
         xc_sandbox_free(&sandbox, 0 TSRMLS_CC);
-        sandbox.tmp_open_files->dtor = NULL;
     }
     else {
@@ -956 +957 @@
         destroy_op_array(op_array TSRMLS_CC);
         efree(op_array);
+        h = NULL;
         goto restore;
     }