- not used anymore

diff --git a/Zend/Zend.dsp b/Zend/Zend.dsp
index 2a05c131e4a57796c3be7b7fe39127ac810e7ad8..ebe01978c4e1ebf8c078c36ef1b6f6de4e5179e3 100644 (file)
--- a/Zend/Zend.dsp
+++ b/Zend/Zend.dsp
@@ -319,10 +319,6 @@ SOURCE=.\zend_extensions.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\zend_fast_cache.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\zend_globals.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/Zend/ZendTS.dsp b/Zend/ZendTS.dsp
index c08cc77faafce211b3782cfa31fbe7a1d0d03aab..3494cd4e17ff835593fd8a2dacde6a89ef6267ba 100644 (file)
--- a/Zend/ZendTS.dsp
+++ b/Zend/ZendTS.dsp
@@ -349,10 +349,6 @@ SOURCE=.\zend_extensions.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\zend_fast_cache.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\zend_globals.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/Zend/zend_fast_cache.h b/Zend/zend_fast_cache.h
deleted file mode 100644 (file)
index 1db5a73..0000000
--- a/Zend/zend_fast_cache.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.00 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available through the world-wide-web at the following url:           |
-   | http://www.zend.com/license/2_00.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   |          Zeev Suraski <zeev@zend.com>                                |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-#if 0
-#ifndef ZEND_FAST_CACHE_H
-#define ZEND_FAST_CACHE_H
-
-#ifndef ZEND_ENABLE_FAST_CACHE
-# if ZEND_DEBUG
-# define ZEND_ENABLE_FAST_CACHE 0
-# else
-# define ZEND_ENABLE_FAST_CACHE 0
-# endif
-#endif
-
-typedef struct _zend_fast_cache_list_entry {
-       struct _zend_fast_cache_list_entry *next;
-} zend_fast_cache_list_entry;
-
-#define MAX_FAST_CACHE_TYPES   4
-
-
-#define ZVAL_CACHE_LIST                        0
-#define HASHTABLE_CACHE_LIST   1
-
-#if ZEND_ENABLE_FAST_CACHE
-
-
-#include "zend_globals.h"
-#include "zend_globals_macros.h"
-#include "zend_alloc.h"
-
-
-#if ZEND_DEBUG
-# define RECORD_ZVAL_CACHE_HIT(fc_type)                AG(fast_cache_stats)[fc_type][1]++;
-# define RECORD_ZVAL_CACHE_MISS(fc_type)       AG(fast_cache_stats)[fc_type][0]++;
-#else
-# define RECORD_ZVAL_CACHE_HIT(fc_type)
-# define RECORD_ZVAL_CACHE_MISS(fc_type)
-#endif
-
-
-#define ZEND_FAST_ALLOC(p, type, fc_type)                                                              \
-       {                                                                                                                               \
-               TSRMLS_FETCH();                                                                                         \
-                                                                                                                                       \
-               if (((p) = (type *) AG(fast_cache_list_head)[fc_type])) {       \
-                       AG(fast_cache_list_head)[fc_type] = ((zend_fast_cache_list_entry *) AG(fast_cache_list_head)[fc_type])->next;   \
-                       RECORD_ZVAL_CACHE_HIT(fc_type);                                                 \
-               } else {                                                                                                        \
-                       (p) = (type *) emalloc(sizeof(type));                                   \
-                       RECORD_ZVAL_CACHE_MISS(fc_type);                                                \
-               }                                                                                                                       \
-       }
-
-
-#define ZEND_FAST_FREE(p, fc_type)                                                                             \
-       {                                                                                                                               \
-               TSRMLS_FETCH();                                                                                         \
-                                                                                                                                       \
-               ((zend_fast_cache_list_entry *) (p))->next = (zend_fast_cache_list_entry *) AG(fast_cache_list_head)[fc_type];  \
-               AG(fast_cache_list_head)[fc_type] = (zend_fast_cache_list_entry *) (p);                 \
-       }
-
-#define ZEND_FAST_ALLOC_REL(p, type, fc_type)  \
-       ZEND_FAST_ALLOC(p, type, fc_type)
-
-#define ZEND_FAST_FREE_REL(p, fc_type) \
-       ZEND_FAST_FREE(p, fc_type)
-
-
-#else /* !ZEND_ENABLE_FAST_CACHE */
-
-#define ZEND_FAST_ALLOC(p, type, fc_type)      \
-       (p) = (type *) emalloc(sizeof(type))
-
-#define ZEND_FAST_FREE(p, fc_type)     \
-       efree(p)
-
-#define ZEND_FAST_ALLOC_REL(p, type, fc_type)  \
-       (p) = (type *) emalloc_rel(sizeof(type))
-
-#define ZEND_FAST_FREE_REL(p, fc_type) \
-       efree_rel(p)
-
-#endif /* ZEND_ENABLE_FAST_CACHE */
-
-
-
-/* fast cache for zval's */
-#define ALLOC_ZVAL(z)  \
-       ZEND_FAST_ALLOC(z, zval, ZVAL_CACHE_LIST)
-
-#define FREE_ZVAL(z)   \
-       ZEND_FAST_FREE(z, ZVAL_CACHE_LIST)
-
-#define ALLOC_ZVAL_REL(z)      \
-       ZEND_FAST_ALLOC_REL(z, zval, ZVAL_CACHE_LIST)
-
-#define FREE_ZVAL_REL(z)       \
-       ZEND_FAST_FREE_REL(z, ZVAL_CACHE_LIST)
-
-/* fast cache for HashTables */
-#define ALLOC_HASHTABLE(ht)    \
-       ZEND_FAST_ALLOC(ht, HashTable, HASHTABLE_CACHE_LIST)
-
-#define FREE_HASHTABLE(ht)     \
-       ZEND_FAST_FREE(ht, HASHTABLE_CACHE_LIST)
-
-#define ALLOC_HASHTABLE_REL(ht)        \
-       ZEND_FAST_ALLOC_REL(ht, HashTable, HASHTABLE_CACHE_LIST)
-
-#define FREE_HASHTABLE_REL(ht) \
-       ZEND_FAST_FREE_REL(ht, HASHTABLE_CACHE_LIST)
-
-#endif /* ZEND_FAST_CACHE_H */
-#endif
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * indent-tabs-mode: t
- * End:
- */

diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c
index 42e75d4a4dc4788281109908991326776947cd6c..9ed3d21e72a7576230f531e3224962f62f100279 100644 (file)
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Aug  1 12:07:43 2010 */
+/* Generated by re2c 0.13.5 on Mon Aug 30 19:00:33 2010 */
 #line 1 "Zend/zend_ini_scanner.l"
 /*
    +----------------------------------------------------------------------+

diff --git a/Zend/zend_ini_scanner_defs.h b/Zend/zend_ini_scanner_defs.h
index 6dc3fd7cf91b2ffd3aa74ba74fee84f780e075a4..a3e7cbca70e9407fd99a25af0dad87a47c142546 100644 (file)
--- a/Zend/zend_ini_scanner_defs.h
+++ b/Zend/zend_ini_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Aug  1 12:07:43 2010 */
+/* Generated by re2c 0.13.5 on Mon Aug 30 19:00:34 2010 */
 #line 3 "Zend/zend_ini_scanner_defs.h"
 
 enum YYCONDTYPE {

diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 298feae4f907c968fcf04e2e46f2b1431834117f..6f0db2acee2c6732c494dc799babf5f875f3a78a 100644 (file)
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Sep 15 11:39:02 2010 */
+/* Generated by re2c 0.13.5 on Wed Sep 15 18:53:44 2010 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+

diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h
index 18528eec4e31125ec4596d8108c30279be04e2c7..e4aeb72fb563805c5190e7544c5e2b73849c21be 100644 (file)
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Sep 15 11:39:02 2010 */
+/* Generated by re2c 0.13.5 on Wed Sep 15 18:53:44 2010 */
 #line 3 "Zend/zend_language_scanner_defs.h"
 
 enum YYCONDTYPE {