Changeset 120

Timestamp:

07/09/05 13:10:52 (3 years ago)

Author:

zoeloelip

Message:

Code clean up and compile fixes for VC.net + VC.net project files update

(Based on patch #1234919)

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/debug.c (modified) (1 diff)
• eaccelerator/trunk/debug.h (modified) (1 diff)
• eaccelerator/trunk/ea_restore.c (modified) (14 diffs)
• eaccelerator/trunk/ea_store.c (modified) (4 diffs)
• eaccelerator/trunk/eaccelerator.c (modified) (6 diffs)
• eaccelerator/trunk/win32/eAccelerator.sln (modified) (1 diff)
• eaccelerator/trunk/win32/eAccelerator.vcproj (modified) (4 diffs)
• eaccelerator/trunk/win32/eLoader.vcproj (modified) (2 diffs)

eaccelerator/trunk/ChangeLog

@@ -4 +4 @@
-        * Removed atexit code that only produced segfaults and didn't work
-          (Patch from Rob Foehl <rwf at loonybin.net>)
+        * Code clean up and compile fixes for VC.net + VC.net project files update
+          (Based on patch #1234919)
-
-2005-07-07 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>

eaccelerator/trunk/debug.c

@@ -109 +109 @@
-
-#ifdef ZEND_WIN32
-buffer
+output_buf
-#else
-    fputs (output_buf, stderr);

eaccelerator/trunk/debug.h

@@ -58 +58 @@
-void ea_debug_init (TSRMLS_D);
-void ea_debug_shutdown ();
+void ea_debug_printf (long debug_level, char *format, ...);
-void ea_debug_error (char *format, ...);
-void ea_debug_pad (long debug_level TSRMLS_DC);

eaccelerator/trunk/ea_restore.c

@@ -256 +256 @@
-    fixup_hash (&from->function_table,
-            (fixup_bucket_t) fixup_op_array TSRMLS_CC);
-}
-
-void eaccelerator_fixup (mm_cache_entry * p TSRMLS_DC)
-{
-    mm_fc_entry *q;
-
-    MMCG (mem) = (char *) ((long) p - (long) p->next);
-    MMCG (compress) = 1;
-    p->next = NULL;
-    FIXUP (p->op_array);
-    FIXUP (p->f_head);
-    FIXUP (p->c_head);
-    fixup_op_array (p->op_array TSRMLS_CC);
-    q = p->f_head;
-    while (q != NULL) {
-        FIXUP (q->fc);
-        fixup_op_array ((eaccelerator_op_array *) q->fc TSRMLS_CC);
-        FIXUP (q->next);
-        q = q->next;
-    }
-    q = p->c_head;
-    while (q != NULL) {
-        FIXUP (q->fc);
-        fixup_class_entry ((eaccelerator_class_entry *) q->fc TSRMLS_CC);
-        FIXUP (q->next);
-        q = q->next;
-    }
-}
-
@@ -469 +442 @@
-#endif
-
-
+C
-    ea_debug_printf (EA_DEBUG, "[%d] restore_op_array: %s\n", getpid (),
-            from->function_name ? from->function_name : "(top)");
@@ -565 +538 @@
-                (CG (class_table), (void *) from_scope_lc, from->scope_name_len + 1,
-                 (void **) &to->scope) != SUCCESS) {
-
+C
-            ea_debug_printf (EA_DEBUG,
-                    "[%d]                   can't find '%s' in hash. use MMCG(class_entry).\n",
@@ -571 +544 @@
-            to->scope = MMCG (class_entry);
-        } else {
-
+C
-            ea_debug_printf (EA_DEBUG,
-                    "[%d]                   found '%s' in hash\n",
@@ -579 +552 @@
-        efree (from_scope_lc);
-    } else {
-
+C
-        ea_debug_printf (EA_DEBUG, "[%d]                   from is NULL\n",
-                getpid ());
@@ -586 +559 @@
-
-            for (p = MMCG (class_entry)->parent; p; p = p->parent) {
-
+C
-                ea_debug_printf (EA_DEBUG,
-                        "[%d]                   checking parent '%s' have '%s'\n",
@@ -593 +566 @@
-                        (&p->function_table, fname_lc, fname_len + 1,
-                         (void **) &function) == SUCCESS) {
-
+C
-                    ea_debug_printf (EA_DEBUG,
-                            "[%d]                                   '%s' has '%s' of scope '%s'\n",
@@ -606 +579 @@
-    }
-
-
+C
-    ea_debug_printf (EA_DEBUG, "[%d]                   %s's scope is '%s'\n",
-            getpid (),
@@ -614 +587 @@
-    if (from->type == ZEND_INTERNAL_FUNCTION) {
-        zend_class_entry *ce = MMCG (class_entry);
-
+C
-        ea_debug_printf (EA_DEBUG,
-                "[%d]                   [internal function from=%08x,to=%08x] ce='%s' [%08x]\n",
-                getpid (), from, to, ce->name, ce);
-        if (ce) {
-
+C
-            ea_debug_printf (EA_DEBUG,
-                    "[%d]                                       ce->parent='%s' [%08x]\n",
@@ -635 +608 @@
-                    (void **) &function) ==
-                SUCCESS && function->type == ZEND_INTERNAL_FUNCTION) {
-
+C
-            ea_debug_printf (EA_DEBUG,
-                    "[%d]                                       found in function table\n",
@@ -647 +620 @@
-             * damaged structure...
-             */
-
+C
-            ea_debug_printf (EA_DEBUG,
-                    "[%d]                                       can't find\n",
@@ -731 +704 @@
-{
-    zend_class_entry *old;
-
-
-
+ = NULL
+ = 0
+ = NULL
-#ifdef ZEND_ENGINE_2
-    int cname_len;
@@ -741 +714 @@
-#endif
-
-
+C
-    ea_debug_printf (EA_DEBUG, "[%d] retore_class_entry: %s\n", getpid (),
-            from->name ? from->name : "(top)");
@@ -839 +812 @@
-#endif
-    } else {
-
+C
-        ea_debug_printf (EA_DEBUG, "[%d] parent = NULL\n", getpid ());
-        to->parent = NULL;

eaccelerator/trunk/ea_store.c

@@ -549 +549 @@
-    zend_op *end;
-
-
+C
-    ea_debug_printf (EA_DEBUG, "[%d] store_op_array: %s [scope=%s]\n",
-                     getpid (),
@@ -637 +637 @@
-                to->scope_name_len = q->nKeyLength - 1;
-
-
+C
-                ea_debug_printf (EA_DEBUG,
-                                 "[%d]                 find scope '%s' in CG(class_table) save hashkey '%s' [%08x] as to->scope_name\n",
@@ -648 +648 @@
-        }
-        if (to->scope_name == NULL) {
-
+C
-            ea_debug_printf (EA_DEBUG,
-                             "[%d]                 could not find scope '%s' in CG(class_table), saving it to NULL\n",
@@ -798 +798 @@
-#endif
-
-
+C
-    ea_debug_printf (EA_DEBUG, "[%d] store_class_entry: %s parent was '%s'\n",
-                     getpid (), from->name ? from->name : "(top)",

eaccelerator/trunk/eaccelerator.c

@@ -560 +560 @@
-}
-
+void eaccelerator_fixup (mm_cache_entry * p TSRMLS_DC)
+{
+  mm_fc_entry *q;
+
+  MMCG (mem) = (char *) ((long) p - (long) p->next);
+  MMCG (compress) = 1;
+  p->next = NULL;
+  FIXUP (p->op_array);
+  FIXUP (p->f_head);
+  FIXUP (p->c_head);
+  fixup_op_array (p->op_array TSRMLS_CC);
+  q = p->f_head;
+  while (q != NULL) {
+    FIXUP (q->fc);
+    fixup_op_array ((eaccelerator_op_array *) q->fc TSRMLS_CC);
+    FIXUP (q->next);
+    q = q->next;
+  }
+  q = p->c_head;
+  while (q != NULL) {
+    FIXUP (q->fc);
+    fixup_class_entry ((eaccelerator_class_entry *) q->fc TSRMLS_CC);
+    FIXUP (q->next);
+    q = q->next;
+  }
+}
+
-/******************************************************************************/
-/* Cache file functions.                                                                                                          */
@@ -717 +744 @@
-  char *x;
-
-
+C
-  ea_debug_printf (EA_DEBUG, "[%d] eaccelerator_store_int: key='%s'\n", 
-          getpid (), key);
@@ -737 +764 @@
-  q = NULL;
-  while (c != NULL) {
-
+C
-    ea_debug_printf (EA_DEBUG, 
-            "[%d] eaccelerator_store_int:     class hashkey=", getpid ());
@@ -767 +794 @@
-  q = NULL;
-  while (f != NULL) {
-
+C
-      ea_debug_printf (EA_DEBUG, 
-              "[%d] eaccelerator_store_int:     function hashkey='%s'\n", getpid (), f->arKey);
@@ -1272 +1299 @@
-    HashTable* orig_function_table;
-    HashTable* orig_class_table;
-
+ = NULL
-    HashTable tmp_function_table;
-    HashTable tmp_class_table;
@@ -1976 +2003 @@
-#if defined(WITH_EACCELERATOR_SESSIONS) && defined(HAVE_PHP_SESSIONS_SUPPORT)
-  if (!eaccelerator_session_registered()) {
-  
+
-  }
-#endif

eaccelerator/trunk/win32/eAccelerator.sln

@@ -10 +10 @@
-Global
-        GlobalSection(SolutionConfiguration) = preSolution
-= Debug
+PHP4 = Debug PHP4
-                Debug PHP5 = Debug PHP5
-= Release
+PHP4 = Release PHP4
-                Release PHP5 = Release PHP5
-        EndGlobalSection
-        GlobalSection(ProjectConfiguration) = postSolution
-
-
+ PHP4
+ PHP4
-                {9CB8051E-B608-430D-B6AA-D763031A94B7}.Debug PHP5.ActiveCfg = Debug PHP5|Win32
-                {9CB8051E-B608-430D-B6AA-D763031A94B7}.Debug PHP5.Build.0 = Debug PHP5|Win32
-
-
+ PHP4
+ PHP4
-                {9CB8051E-B608-430D-B6AA-D763031A94B7}.Release PHP5.ActiveCfg = Release PHP5|Win32
-                {9CB8051E-B608-430D-B6AA-D763031A94B7}.Release PHP5.Build.0 = Release PHP5|Win32
-
-
+ PHP4
+ PHP4
-                {5FCBC0AF-2EBB-461F-9971-9272472602E7}.Debug PHP5.ActiveCfg = Debug PHP5|Win32
-                {5FCBC0AF-2EBB-461F-9971-9272472602E7}.Debug PHP5.Build.0 = Debug PHP5|Win32
-
-
+ PHP4
+ PHP4
-                {5FCBC0AF-2EBB-461F-9971-9272472602E7}.Release PHP5.ActiveCfg = Release PHP5|Win32
-                {5FCBC0AF-2EBB-461F-9971-9272472602E7}.Release PHP5.Build.0 = Release PHP5|Win32

eaccelerator/trunk/win32/eAccelerator.vcproj

@@ -79 +79 @@
-                </Configuration>
-                <Configuration
-
+ PHP4
-                        OutputDirectory=".\Release"
-                        IntermediateDirectory=".\Release"
@@ -145 +145 @@
-                </Configuration>
-                <Configuration
-
+ PHP4
-                        OutputDirectory=".\Debug"
-                        IntermediateDirectory=".\Debug"
@@ -292 +292 @@
-                                RelativePath="..\debug.c">
-                        </File>
+            <File
+                RelativePath="..\ea_restore.c">
+            </File>
+            <File
+                RelativePath="..\ea_store.c">
+            </File>
-                        <File
-                                RelativePath="..\eaccelerator.c">
@@ -335 +341 @@
-                                RelativePath="..\debug.h">
-                        </File>
+            <File
+                RelativePath="..\ea_restore.h">
+            </File>
+            <File
+                RelativePath="..\ea_store.h">
+            </File>
-                        <File
-                                RelativePath="..\eaccelerator.h">

eaccelerator/trunk/win32/eLoader.vcproj

@@ -79 +79 @@
-                </Configuration>
-                <Configuration
-
+ PHP4
-                        OutputDirectory=".\Release"
-                        IntermediateDirectory=".\Release"
@@ -211 +211 @@
-                </Configuration>
-                <Configuration
-
+ PHP4
-                        OutputDirectory=".\Debug"
-                        IntermediateDirectory=".\Debug"