Changeset 249

Timestamp:

07/27/06 16:45:55 (2 years ago)

Author:

bart

Message:

* Wrong ifdef in compile fix for php 5.2
* Update config.w32, VC6 and VC2005 project files
* Fix debug build for win32, this fixes ticket #149
* Removed a debug statement and added return value in optimizer.

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/config.w32 (modified) (4 diffs)
• eaccelerator/trunk/debug.c (modified) (1 diff)
• eaccelerator/trunk/eaccelerator.h (modified) (3 diffs)
• eaccelerator/trunk/optimize.c (modified) (1 diff)
• eaccelerator/trunk/shm.c (modified) (1 diff)
• eaccelerator/trunk/win32/eAccelerator.dsp (modified) (5 diffs)
• eaccelerator/trunk/win32/eAccelerator.dsw (modified) (1 diff)
• eaccelerator/trunk/win32/eAccelerator.sln (modified) (2 diffs)
• eaccelerator/trunk/win32/eAccelerator.vcproj (modified) (5 diffs)

eaccelerator/trunk/ChangeLog

@@ -9 +9 @@
-        * Fix bug #145, objects are serialized when they are stored in shared memory.
-          Users don't have to do this in their code anymore.
+        * Wrong ifdef in compile fix for php 5.2
+        * Update config.w32, VC6 and VC2005 project files
+        * Fix debug build for win32, this fixes ticket #149
+        * Removed a debug statement and added return value in optimizer.c
-
-2006-07-25  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>

eaccelerator/trunk/config.w32

@@ -3 +3 @@
-
-ARG_ENABLE("eaccelerator", "Enable eaccelerator support", "no");
-ARG_ENABLE("eloader", "Enable eloader support", "no");
-
-ARG_WITH("eaccelerator-crash-detection", "Include eaccelerator crash detection", "yes");
-ARG_WITH("eaccelerator-optimizer", "Include eaccelerator optimizer", "yes");
-ARG_WITH("eaccelerator-encoder", "Include eaccelerator encoder", "yes");
-ARG_WITH("eaccelerator-loader", "Include eaccelerator loader", "yes");
-ARG_WITH("eaccelerator-shared-memory", "Include eaccelerator shared memory functions", "no");
-ARG_WITH("eaccelerator-sessions", "Include eaccelerator sessions", "no");
@@ -16 +13 @@
-ARG_WITH("eaccelerator-debug", "Enable the debug code so eaccelerator logs verbosely", "no");
-
-if (PHP_EACCELERATOR != "no" && PHP_ELOADER != "no") {
-        ERROR("You can't enable eaccelerator and eloader support at the same time.");
-}
-
-if (PHP_EACCELERATOR != "no") {
-encoder.c loader.c 
+
-        AC_DEFINE("HAVE_EACCELERATOR", 1, "Define if you like to use eAccelerator");
-
@@ -29 +22 @@
-        if (PHP_EACCELERATOR_OPTIMIZER != "no") {
-                AC_DEFINE("WITH_EACCELERATOR_OPTIMIZER", 1, "Define if you like to use peephole opcode optimization");
-        }
-        if (PHP_EACCELERATOR_ENCODER != "no") {
-                AC_DEFINE("WITH_EACCELERATOR_ENCODER", 1, "Define if you like to use eAccelerator enoder");
-        }
-        if (PHP_EACCELERATOR_LOADER != "no" && PHP_ELOADER == "no") {
-                AC_DEFINE("WITH_EACCELERATOR_LOADER", 1, "Define if you like to load files encoded by eAccelerator encoder");
-        }
-        if (PHP_EACCELERATOR_SHARED_MEMORY != "no" || PHP_EACCELERATOR_CONTENT_CACHING != "no") {
@@ -57 +44 @@
-        AC_DEFINE("HAVE_EXT_SESSION_PHP_SESSION_H", 1, "Define if you have the <ext/session/php_session.h> header file.");
-}
-
-if (PHP_ELOADER != "no") {
-        EXTENSION("eloader", "loader.c opcodes.c ea_restore.c", PHP_ELOADER_SHARED, "/D HAVE_EACCELERATOR_STANDALONE_LOADER");
-        AC_DEFINE("HAVE_EACCELERATOR", 1, "Define if you like to use eAccelerator");
-
-        AC_DEFINE("WITH_EACCELERATOR_LOADER", 1, "Define if you like to load files encoded by eAccelerator encoder");
-}

eaccelerator/trunk/debug.c

@@ -207 +207 @@
-#ifdef DEBUG /* This ifdef is still req'd because xpad is N/A in a non-debug compile */
-    if (eaccelerator_debug & debug_level) {
-
-
-
-
+
+
+
+
+
-        while (i-- > 0) {
-            fputc ('\t', F_fp);

eaccelerator/trunk/eaccelerator.h

@@ -360 +360 @@
-} eaccelerator_cache_place;
-
-#ifndef align_union
-typedef union align_union {
-  double d;
@@ -367 +366 @@
-  long l;
-} align_union;
-
-
+
+
-typedef union _align_test {
-  void *ptr;
@@ -374 +373 @@
-  long lng;
-} align_test;
+#endif
-
-/******************************************************************************/

eaccelerator/trunk/optimize.c

@@ -1568 +1568 @@
-    p = p->pListNext;
-  }
+  return 0;
-}
-

eaccelerator/trunk/shm.c

@@ -159 +159 @@
-                php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Error at offset %ld of %d bytes", 
-                        (long)((char*)p - Z_STRVAL_P(value)), Z_STRLEN_P(value));
-                ea_debug_error("Error unserializing (%s) with length %d\n", Z_STRVAL_P(value), Z_STRLEN_P(value));
-            }
-            PHP_VAR_UNSERIALIZE_DESTROY(var_hash);

eaccelerator/trunk/win32/eAccelerator.dsp

@@ -46 +46 @@
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-D "NDEBUG" /D ZEND_DEBUG=0 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_ENCODER" /D "WITH_EACCELERATOR_LOAD
+I "../../" /D "NDEBUG" /D ZEND_DEBUG=0 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZ
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -72 +72 @@
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
-D "_DEBUG" /D ZEND_DEBUG=1 /D "DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_ENCODER" /D "WITH_EACCELERATOR_LOAD
+I "../../" /D "_DEBUG" /D ZEND_DEBUG=1 /D "DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZ
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -99 +99 @@
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../.." /I "../../../zend" /I "../../../TSRM" /I "../../../main" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D ZEND_DEBUG=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_ENCODER" /D "WITH_EACCELERATOR_LOADER" /D "WITH_EACCELERATOR_SESSIONS" /D "WITH_EACCELERATOR_CONTENT_CACHING" /YX /FD /GZ /c
-D "_DEBUG" /D ZEND_DEBUG=1 /D "DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_ENCODER" /D "WITH_EACCELERATOR_LOAD
+I "../../" /D "_DEBUG" /D ZEND_DEBUG=1 /D "DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZ
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -126 +126 @@
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../../.." /I "../../../zend" /I "../../../TSRM" /I "../../../main" /D "NDEBUG" /D ZEND_DEBUG=0 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_ENCODER" /D "WITH_EACCELERATOR_LOADER" /D "WITH_EACCELERATOR_SESSIONS" /D "WITH_EACCELERATOR_CONTENT_CACHING" /YX /FD /c
-D "NDEBUG" /D ZEND_DEBUG=0 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_ENCODER" /D "WITH_EACCELERATOR_LOAD
+I "../../" /D "NDEBUG" /D ZEND_DEBUG=0 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZ
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -183 +183 @@
-# Begin Source File
-
-SOURCE=..\encoder.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\loader.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\mm.c
-# End Source File

eaccelerator/trunk/win32/eAccelerator.dsw

@@ -5 +5 @@
-
-Project: "eAccelerator"=".\eAccelerator.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "eLoader"=".\eLoader.dsp" - Package Owner=<4>
-
-Package=<5>

eaccelerator/trunk/win32/eAccelerator.sln

@@ -3 +3 @@
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eAccelerator", "eAccelerator.vcproj", "{F236792D-8DF1-49FA-9F36-2338F47C9DEB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eLoader", "eLoader.vcproj", "{945FEBD1-AA09-445B-8C31-11270D6B2464}"
-EndProject
-Global
@@ -22 +20 @@
-                {F236792D-8DF1-49FA-9F36-2338F47C9DEB}.Release|Win32.ActiveCfg = Release|Win32
-                {F236792D-8DF1-49FA-9F36-2338F47C9DEB}.Release|Win32.Build.0 = Release|Win32
-                {945FEBD1-AA09-445B-8C31-11270D6B2464}.Debug PHP5|Win32.ActiveCfg = Debug PHP5|Win32
-                {945FEBD1-AA09-445B-8C31-11270D6B2464}.Debug PHP5|Win32.Build.0 = Debug PHP5|Win32
-                {945FEBD1-AA09-445B-8C31-11270D6B2464}.Debug|Win32.ActiveCfg = Debug|Win32
-                {945FEBD1-AA09-445B-8C31-11270D6B2464}.Debug|Win32.Build.0 = Debug|Win32
-                {945FEBD1-AA09-445B-8C31-11270D6B2464}.Release PHP5|Win32.ActiveCfg = Release PHP5|Win32
-                {945FEBD1-AA09-445B-8C31-11270D6B2464}.Release PHP5|Win32.Build.0 = Release PHP5|Win32
-                {945FEBD1-AA09-445B-8C31-11270D6B2464}.Release|Win32.ActiveCfg = Release|Win32
-                {945FEBD1-AA09-445B-8C31-11270D6B2464}.Release|Win32.Build.0 = Release|Win32
-        EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution

eaccelerator/trunk/win32/eAccelerator.vcproj

@@ -50 +50 @@
-                                Optimization="2"
-                                InlineFunctionExpansion="1"
-
-ENCODER;WITH_EACCELERATOR_LOADER;WITH_EACCELERATOR_
+,../../
+
-                                StringPooling="true"
-                                RuntimeLibrary="2"
@@ -144 +144 @@
-                        <Tool
-                                Name="VCCLCompilerTool"
-
+ /D &quot;_CRT_NONSTDC_NO_DEPRECATE&quot;&#x0D;&#x0A;
-                                Optimization="2"
-                                InlineFunctionExpansion="1"
-
+,../../
-                                PreprocessorDefinitions="NDEBUG;ZEND_DEBUG=0;WIN32;_WINDOWS;_USRDLL;HAVE_EACCELERATOR;COMPILE_DL_EACCELERATOR;ZEND_WIN32;PHP_WIN32;ZTS=1;HAVE_EXT_SESSION_PHP_SESSION_H=1;WITH_EACCELERATOR_CRASH_DETECTION;WITH_EACCELERATOR_OPTIMIZER;WITH_EACCELERATOR_ENCODER;WITH_EACCELERATOR_LOADER;WITH_EACCELERATOR_SESSIONS;WITH_EACCELERATOR_CONTENT_CACHING;WITH_EACCELERATOR_SHM;WITH_EACCELERATOR_INFO"
-                                StringPooling="true"
@@ -241 +241 @@
-                        <Tool
-                                Name="VCCLCompilerTool"
-
+ /D &quot;_CRT_NONSTDC_NO_DEPRECATE&quot;&#x0D;&#x0A;
-                                Optimization="0"
-
+,../../
-                                PreprocessorDefinitions="_DEBUG;ZEND_DEBUG=1;DEBUG;WIN32;_WINDOWS;_USRDLL;HAVE_EACCELERATOR;COMPILE_DL_EACCELERATOR;ZEND_WIN32;PHP_WIN32;ZTS=1;HAVE_EXT_SESSION_PHP_SESSION_H=1;WITH_EACCELERATOR_CRASH_DETECTION;WITH_EACCELERATOR_OPTIMIZER;WITH_EACCELERATOR_ENCODER;WITH_EACCELERATOR_LOADER;WITH_EACCELERATOR_SESSIONS;WITH_EACCELERATOR_CONTENT_CACHING;WITH_EACCELERATOR_SHM;WITH_EACCELERATOR_INFO"
-                                MinimalRebuild="true"
@@ -339 +339 @@
-                        <Tool
-                                Name="VCCLCompilerTool"
-
+ /D &quot;_CRT_NONSTDC_NO_DEPRECATE&quot;&#x0D;&#x0A;
-                                Optimization="0"
-
+,../../
-                                PreprocessorDefinitions="_DEBUG;ZEND_DEBUG=1;DEBUG;WIN32;_WINDOWS;_USRDLL;HAVE_EACCELERATOR;COMPILE_DL_EACCELERATOR;ZEND_WIN32;PHP_WIN32;ZTS=1;HAVE_EXT_SESSION_PHP_SESSION_H=1;WITH_EACCELERATOR_CRASH_DETECTION;WITH_EACCELERATOR_OPTIMIZER;WITH_EACCELERATOR_ENCODER;WITH_EACCELERATOR_LOADER;WITH_EACCELERATOR_SESSIONS;WITH_EACCELERATOR_CONTENT_CACHING;WITH_EACCELERATOR_SHM;WITH_EACCELERATOR_INFO"
-                                MinimalRebuild="true"
@@ -694 +694 @@
-                        <File
-                                RelativePath="..\eaccelerator.c"
-                                >
-                                <FileConfiguration
-                                        Name="Release PHP5|Win32"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug PHP5|Win32"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\encoder.c"
-                                >
-                                <FileConfiguration
-                                        Name="Release PHP5|Win32"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug PHP5|Win32"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\loader.c"
-                                >
-                                <FileConfiguration