mirror of
https://github.com/php/php-src.git
synced 2024-11-24 10:24:11 +08:00
d11734b4b0
TLS is already used in TSRM, the way exporting the tsrm cache through a thread local variable is not portable. Additionally, the current patch suffers from bugs which are hard to find, but prevent it to be worky with apache. What is done here is mainly uses the idea from the RFC patch, but - __thread variable is removed - offset math and declarations are removed - extra macros and definitions are removed What is done merely is - use an inline function to access the tsrm cache. The function uses the portable tsrm_tls_get macro which is cheap - all the TSRM_* macros are set to placebo. Thus this opens the way remove them later Except that, the logic is old. TSRMLS_FETCH will have to be done once per thread, then tsrm_get_ls_cache() can be used. Things seeming to be worky are cli, cli server and apache. I also tried to enable bz2 shared and it has worked out of the box. The change is yet minimal diffing to the current master bus is a worky start, IMHO. Though will have to recheck the other previously done SAPIs - embed and cgi. The offsets can be added to the tsrm_resource_type struct, then it'll not be needed to declare them in the userspace. Even the "done" member type can be changed to int16 or smaller, then adding the offset as int16 will not change the struct size. As well on the todo might be removing the hashed storage, thread_id != thread_id and linked list logic in favour of the explicit TLS operations.
158 lines
4.7 KiB
C
158 lines
4.7 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| Zend Engine |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 1998-2014 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: David Wang <planetbeing@gmail.com> |
|
|
| Dmitry Stogov <dmitry@zend.com> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
/* $Id$ */
|
|
|
|
#ifndef ZEND_GC_H
|
|
#define ZEND_GC_H
|
|
|
|
#ifndef GC_BENCH
|
|
# define GC_BENCH 0
|
|
#endif
|
|
|
|
#if GC_BENCH
|
|
# define GC_BENCH_INC(counter) GC_G(counter)++
|
|
# define GC_BENCH_DEC(counter) GC_G(counter)--
|
|
# define GC_BENCH_PEAK(peak, counter) do { \
|
|
if (GC_G(counter) > GC_G(peak)) { \
|
|
GC_G(peak) = GC_G(counter); \
|
|
} \
|
|
} while (0)
|
|
#else
|
|
# define GC_BENCH_INC(counter)
|
|
# define GC_BENCH_DEC(counter)
|
|
# define GC_BENCH_PEAK(peak, counter)
|
|
#endif
|
|
|
|
#define GC_COLOR 0xc000
|
|
|
|
#define GC_BLACK 0x0000
|
|
#define GC_WHITE 0x8000
|
|
#define GC_GREY 0x4000
|
|
#define GC_PURPLE 0xc000
|
|
|
|
#define GC_ADDRESS(v) \
|
|
((v) & ~GC_COLOR)
|
|
#define GC_SET_ADDRESS(v, a) \
|
|
do {(v) = ((v) & GC_COLOR) | (a);} while (0)
|
|
#define GC_GET_COLOR(v) \
|
|
(((zend_uintptr_t)(v)) & GC_COLOR)
|
|
#define GC_SET_COLOR(v, c) \
|
|
do {(v) = ((v) & ~GC_COLOR) | (c);} while (0)
|
|
#define GC_SET_BLACK(v) \
|
|
do {(v) = (v) & ~GC_COLOR;} while (0)
|
|
#define GC_SET_PURPLE(v) \
|
|
do {(v) = (v) | GC_COLOR;} while (0)
|
|
|
|
#define GC_ZVAL_ADDRESS(v) \
|
|
GC_ADDRESS(Z_GC_INFO_P(v))
|
|
#define GC_ZVAL_SET_ADDRESS(v, a) \
|
|
GC_SET_ADDRESS(Z_GC_INFO_P(v), (a))
|
|
#define GC_ZVAL_GET_COLOR(v) \
|
|
GC_GET_COLOR(Z_GC_INFO_P(v))
|
|
#define GC_ZVAL_SET_COLOR(v, c) \
|
|
GC_SET_COLOR(Z_GC_INFO_P(v), (c))
|
|
#define GC_ZVAL_SET_BLACK(v) \
|
|
GC_SET_BLACK(Z_GC_INFO_P(v))
|
|
#define GC_ZVAL_SET_PURPLE(v) \
|
|
GC_SET_PURPLE(Z_GC_INFO_P(v))
|
|
|
|
typedef struct _gc_root_buffer {
|
|
zend_refcounted *ref;
|
|
struct _gc_root_buffer *next; /* double-linked list */
|
|
struct _gc_root_buffer *prev;
|
|
uint32_t refcount;
|
|
} gc_root_buffer;
|
|
|
|
typedef struct _zend_gc_globals {
|
|
zend_bool gc_enabled;
|
|
zend_bool gc_active;
|
|
zend_bool gc_full;
|
|
|
|
gc_root_buffer *buf; /* preallocated arrays of buffers */
|
|
gc_root_buffer roots; /* list of possible roots of cycles */
|
|
gc_root_buffer *unused; /* list of unused buffers */
|
|
gc_root_buffer *first_unused; /* pointer to first unused buffer */
|
|
gc_root_buffer *last_unused; /* pointer to last unused buffer */
|
|
|
|
gc_root_buffer to_free; /* list to free */
|
|
gc_root_buffer *next_to_free;
|
|
|
|
uint32_t gc_runs;
|
|
uint32_t collected;
|
|
|
|
#if GC_BENCH
|
|
uint32_t root_buf_length;
|
|
uint32_t root_buf_peak;
|
|
uint32_t zval_possible_root;
|
|
uint32_t zval_buffered;
|
|
uint32_t zval_remove_from_buffer;
|
|
uint32_t zval_marked_grey;
|
|
#endif
|
|
|
|
} zend_gc_globals;
|
|
|
|
#ifdef ZTS
|
|
BEGIN_EXTERN_C()
|
|
ZEND_API extern int gc_globals_id;
|
|
END_EXTERN_C()
|
|
#define GC_G(v) TSRMG(gc_globals_id, zend_gc_globals *, v)
|
|
#else
|
|
#define GC_G(v) (gc_globals.v)
|
|
extern ZEND_API zend_gc_globals gc_globals;
|
|
#endif
|
|
|
|
BEGIN_EXTERN_C()
|
|
ZEND_API int gc_collect_cycles(TSRMLS_D);
|
|
ZEND_API void gc_possible_root(zend_refcounted *ref TSRMLS_DC);
|
|
ZEND_API void gc_remove_from_buffer(zend_refcounted *ref TSRMLS_DC);
|
|
ZEND_API void gc_globals_ctor(TSRMLS_D);
|
|
ZEND_API void gc_globals_dtor(TSRMLS_D);
|
|
ZEND_API void gc_init(TSRMLS_D);
|
|
ZEND_API void gc_reset(TSRMLS_D);
|
|
END_EXTERN_C()
|
|
|
|
#define GC_ZVAL_CHECK_POSSIBLE_ROOT(z) \
|
|
gc_check_possible_root((z) TSRMLS_CC)
|
|
|
|
#define GC_REMOVE_FROM_BUFFER(p) do { \
|
|
zend_refcounted *_p = (zend_refcounted*)(p); \
|
|
if (GC_ADDRESS(GC_INFO(_p))) { \
|
|
gc_remove_from_buffer(_p TSRMLS_CC); \
|
|
} \
|
|
} while (0)
|
|
|
|
static zend_always_inline void gc_check_possible_root(zval *z TSRMLS_DC)
|
|
{
|
|
ZVAL_DEREF(z);
|
|
if (Z_COLLECTABLE_P(z) && UNEXPECTED(!Z_GC_INFO_P(z))) {
|
|
gc_possible_root(Z_COUNTED_P(z) TSRMLS_CC);
|
|
}
|
|
}
|
|
|
|
#endif /* ZEND_GC_H */
|
|
|
|
/*
|
|
* Local variables:
|
|
* tab-width: 4
|
|
* c-basic-offset: 4
|
|
* indent-tabs-mode: t
|
|
* End:
|
|
*/
|