mirror of
https://github.com/php/php-src.git
synced 2024-09-24 19:37:26 +00: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.
175 lines
4.0 KiB
C
175 lines
4.0 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: Andi Gutmans <andi@zend.com> |
|
|
| Zeev Suraski <zeev@zend.com> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
/* $Id$ */
|
|
|
|
#include "zend.h"
|
|
#include "zend_stack.h"
|
|
|
|
#define ZEND_STACK_ELEMENT(stack, n) ((void *)((char *) (stack)->elements + (stack)->size * (n)))
|
|
|
|
ZEND_API int zend_stack_init(zend_stack *stack, int size)
|
|
{
|
|
stack->size = size;
|
|
stack->top = 0;
|
|
stack->max = 0;
|
|
stack->elements = NULL;
|
|
return SUCCESS;
|
|
}
|
|
|
|
ZEND_API int zend_stack_push(zend_stack *stack, const void *element)
|
|
{
|
|
/* We need to allocate more memory */
|
|
if (stack->top >= stack->max) {
|
|
stack->max += STACK_BLOCK_SIZE;
|
|
stack->elements = safe_erealloc(stack->elements, stack->size, stack->max, 0);
|
|
}
|
|
memcpy(ZEND_STACK_ELEMENT(stack, stack->top), element, stack->size);
|
|
return stack->top++;
|
|
}
|
|
|
|
|
|
ZEND_API void *zend_stack_top(const zend_stack *stack)
|
|
{
|
|
if (stack->top > 0) {
|
|
return ZEND_STACK_ELEMENT(stack, stack->top - 1);
|
|
} else {
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
|
|
ZEND_API int zend_stack_del_top(zend_stack *stack)
|
|
{
|
|
--stack->top;
|
|
return SUCCESS;
|
|
}
|
|
|
|
|
|
ZEND_API int zend_stack_int_top(const zend_stack *stack)
|
|
{
|
|
int *e = zend_stack_top(stack);
|
|
if (e) {
|
|
return *e;
|
|
} else {
|
|
return FAILURE;
|
|
}
|
|
}
|
|
|
|
|
|
ZEND_API int zend_stack_is_empty(const zend_stack *stack)
|
|
{
|
|
return stack->top == 0;
|
|
}
|
|
|
|
|
|
ZEND_API int zend_stack_destroy(zend_stack *stack)
|
|
{
|
|
if (stack->elements) {
|
|
efree(stack->elements);
|
|
stack->elements = NULL;
|
|
}
|
|
|
|
return SUCCESS;
|
|
}
|
|
|
|
|
|
ZEND_API void *zend_stack_base(const zend_stack *stack)
|
|
{
|
|
return stack->elements;
|
|
}
|
|
|
|
|
|
ZEND_API int zend_stack_count(const zend_stack *stack)
|
|
{
|
|
return stack->top;
|
|
}
|
|
|
|
|
|
ZEND_API void zend_stack_apply(zend_stack *stack, int type, int (*apply_function)(void *element))
|
|
{
|
|
int i;
|
|
|
|
switch (type) {
|
|
case ZEND_STACK_APPLY_TOPDOWN:
|
|
for (i=stack->top-1; i>=0; i--) {
|
|
if (apply_function(ZEND_STACK_ELEMENT(stack, i))) {
|
|
break;
|
|
}
|
|
}
|
|
break;
|
|
case ZEND_STACK_APPLY_BOTTOMUP:
|
|
for (i=0; i<stack->top; i++) {
|
|
if (apply_function(ZEND_STACK_ELEMENT(stack, i))) {
|
|
break;
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
ZEND_API void zend_stack_apply_with_argument(zend_stack *stack, int type, int (*apply_function)(void *element, void *arg), void *arg)
|
|
{
|
|
int i;
|
|
|
|
switch (type) {
|
|
case ZEND_STACK_APPLY_TOPDOWN:
|
|
for (i=stack->top-1; i>=0; i--) {
|
|
if (apply_function(ZEND_STACK_ELEMENT(stack, i), arg)) {
|
|
break;
|
|
}
|
|
}
|
|
break;
|
|
case ZEND_STACK_APPLY_BOTTOMUP:
|
|
for (i=0; i<stack->top; i++) {
|
|
if (apply_function(ZEND_STACK_ELEMENT(stack, i), arg)) {
|
|
break;
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
ZEND_API void zend_stack_clean(zend_stack *stack, void (*func)(void *), zend_bool free_elements)
|
|
{
|
|
int i;
|
|
|
|
if (func) {
|
|
for (i = 0; i < stack->top; i++) {
|
|
func(ZEND_STACK_ELEMENT(stack, i));
|
|
}
|
|
}
|
|
if (free_elements) {
|
|
if (stack->elements) {
|
|
efree(stack->elements);
|
|
stack->elements = NULL;
|
|
}
|
|
stack->top = stack->max = 0;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Local variables:
|
|
* tab-width: 4
|
|
* c-basic-offset: 4
|
|
* indent-tabs-mode: t
|
|
* End:
|
|
*/
|