svn: /pecl/apc/trunk/ apc_globals.h config.w32 package.xml

kalle Tue, 22 Sep 2009 12:07:48 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=288563 Log: Refactor the whole config.w32 file, this is now more like the config.m4 and have two new options: --enable-apc-filehits --enable-apc-spinlocks This means that filehits now is available on Windows Changed paths: U pecl/apc/trunk/apc_globals.h U pecl/apc/trunk/config.w32 U pecl/apc/trunk/package.xml Modified: pecl/apc/trunk/apc_globals.h =================================================================== --- pecl/apc/trunk/apc_globals.h 2009-09-22 11:58:46 UTC (rev 288562) +++ pecl/apc/trunk/apc_globals.h 2009-09-22 12:07:48 UTC (rev 288563) @@ -101,7 +101,7 @@ HashTable copied_zvals; /* my_copy recursion detection list */ zend_bool force_file_update; /* force files to be updated during apc_compile_file */ char canon_path[MAXPATHLEN]; /* canonical path for key data */ -#if APC_FILEHITS +#ifdef APC_FILEHITS zval *filehits; /* Files that came from the cache for this request */ #endif zend_bool coredump_unmap; /* Trap signals that coredump and unmap shared memory */ Modified: pecl/apc/trunk/config.w32 =================================================================== --- pecl/apc/trunk/config.w32 2009-09-22 11:58:46 UTC (rev 288562) +++ pecl/apc/trunk/config.w32 2009-09-22 12:07:48 UTC (rev 288563) @@ -1,27 +1,39 @@ // $Id$ // vim:ft=javascript -ARG_ENABLE("apc", "Alternative PHP Cache", "no"); -if (PHP_APC != "no") { - apc_sources="apc.c php_apc.c \ - apc_cache.c \ - apc_compile.c \ - apc_debug.c \ - apc_fcntl_win32.c \ - apc_iterator.c \ - apc_main.c \ - apc_shm.c \ - apc_sma.c \ - apc_stack.c \ - apc_rfc1867.c \ - apc_zend.c \ - apc_pool.c \ - apc_bin.c \ - apc_spin.c \ - pgsql_s_lock.c"; - - EXTENSION('apc', apc_sources); - AC_DEFINE('HAVE_APC', 1); - ADD_FLAG('CFLAGS_APC', "/DAPC_SPIN_LOCKS=1 /DWIN32_ONLY_COMPILER=1"); -} +ARG_ENABLE('apc', 'Whether to enable APC support', 'no'); +ARG_ENABLE('apc-filehits', 'Whether to enable cache request file info', 'no'); +ARG_ENABLE('apc-spinlocks', 'Whether to use spin locks', 'no'); + +// Not implemented +// ARG_ENABLE('apc-mmap', 'Whether to use mmap support', 'yes'); +// ARG_ENABLE('apc-sem', 'Whether to use semaphore locking instead of fcntl', 'no'); +// ARG_ENABLE('memory-protection', 'Whether to enable memory protection', 'no'); + +if(PHP_APC != 'no') +{ + if(PHP_APC_FILEHITS != 'no') + { + AC_DEFINE('APC_FILEHITS', '1'); + } + + if(PHP_APC_SPINLOCKS != 'no') + { + AC_DEFINE('APC_SPIN_LOCKS', '1'); + ADD_FLAG('CFLAGS_APC', '/DWIN32_ONLY_COMPILER=1'); + } + else + { + AC_DEFINE('APC_FCNTL_LOCKS', '1'); + } + + AC_DEFINE('HAVE_APC', '1'); + + EXTENSION('apc', + 'apc.c php_apc.c apc_cache.c apc_compile.c apc_debug.c ' + + 'apc_fcntl_win32.c apc_iterator.c apc_main.c apc_shm.c ' + + 'apc_sma.c apc_stack.c apc_rfc1867.c apc_zend.c apc_pool.c ' + + 'apc_bin.c apc_spin.c pgsql_s_lock.c' + ); +} \ No newline at end of file Modified: pecl/apc/trunk/package.xml =================================================================== --- pecl/apc/trunk/package.xml 2009-09-22 11:58:46 UTC (rev 288562) +++ pecl/apc/trunk/package.xml 2009-09-22 12:07:48 UTC (rev 288563) @@ -64,6 +64,7 @@ <stability><release>beta</release><api>beta</api></stability> <license uri="http://www.php.net/license">PHP License</license> <notes> +- Windows builds may now have filehits if enabled (Kalle) - Fixed pecl bug #16717 (apc_fetch dies after 1 hour, regardless of ttl settings) (Kalle) </notes> @@ -76,7 +77,6 @@ <file role="doc" name="TODO" /> <file role="doc" name="TECHNOTES.txt" /> <file role="src" name="apc.c" /> - <file role="src" name="apc.dsp" /> <file role="src" name="apc.h" /> <file role="src" name="apc_bin.c" /> <file role="src" name="apc_bin.h" />