mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02: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.
139 lines
4.8 KiB
C
139 lines
4.8 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$ */
|
|
|
|
#ifndef MODULES_H
|
|
#define MODULES_H
|
|
|
|
#include "zend.h"
|
|
#include "zend_compile.h"
|
|
#include "zend_build.h"
|
|
|
|
#define INIT_FUNC_ARGS int type, int module_number TSRMLS_DC
|
|
#define INIT_FUNC_ARGS_PASSTHRU type, module_number TSRMLS_CC
|
|
#define SHUTDOWN_FUNC_ARGS int type, int module_number TSRMLS_DC
|
|
#define SHUTDOWN_FUNC_ARGS_PASSTHRU type, module_number TSRMLS_CC
|
|
#define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module TSRMLS_DC
|
|
#define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module TSRMLS_CC
|
|
|
|
#define ZEND_MODULE_API_NO 20140815
|
|
#ifdef ZTS
|
|
#define USING_ZTS 1
|
|
#else
|
|
#define USING_ZTS 0
|
|
#endif
|
|
|
|
#define STANDARD_MODULE_HEADER_EX sizeof(zend_module_entry), ZEND_MODULE_API_NO, ZEND_DEBUG, USING_ZTS
|
|
#define STANDARD_MODULE_HEADER \
|
|
STANDARD_MODULE_HEADER_EX, NULL, NULL
|
|
#define ZE2_STANDARD_MODULE_HEADER \
|
|
STANDARD_MODULE_HEADER_EX, ini_entries, NULL
|
|
|
|
#define ZEND_MODULE_BUILD_ID "API" ZEND_TOSTR(ZEND_MODULE_API_NO) ZEND_BUILD_TS ZEND_BUILD_DEBUG ZEND_BUILD_SYSTEM ZEND_BUILD_EXTRA
|
|
|
|
#define STANDARD_MODULE_PROPERTIES_EX 0, 0, NULL, 0, ZEND_MODULE_BUILD_ID
|
|
|
|
#define NO_MODULE_GLOBALS 0, NULL, NULL, NULL
|
|
|
|
#ifdef ZTS
|
|
# define ZEND_MODULE_GLOBALS(module_name) sizeof(zend_##module_name##_globals), &module_name##_globals_id
|
|
#else
|
|
# define ZEND_MODULE_GLOBALS(module_name) sizeof(zend_##module_name##_globals), &module_name##_globals
|
|
#endif
|
|
|
|
#define STANDARD_MODULE_PROPERTIES \
|
|
NO_MODULE_GLOBALS, NULL, STANDARD_MODULE_PROPERTIES_EX
|
|
|
|
#define NO_VERSION_YET NULL
|
|
|
|
#define MODULE_PERSISTENT 1
|
|
#define MODULE_TEMPORARY 2
|
|
|
|
struct _zend_ini_entry;
|
|
typedef struct _zend_module_entry zend_module_entry;
|
|
typedef struct _zend_module_dep zend_module_dep;
|
|
|
|
struct _zend_module_entry {
|
|
unsigned short size;
|
|
unsigned int zend_api;
|
|
unsigned char zend_debug;
|
|
unsigned char zts;
|
|
const struct _zend_ini_entry *ini_entry;
|
|
const struct _zend_module_dep *deps;
|
|
const char *name;
|
|
const struct _zend_function_entry *functions;
|
|
int (*module_startup_func)(INIT_FUNC_ARGS);
|
|
int (*module_shutdown_func)(SHUTDOWN_FUNC_ARGS);
|
|
int (*request_startup_func)(INIT_FUNC_ARGS);
|
|
int (*request_shutdown_func)(SHUTDOWN_FUNC_ARGS);
|
|
void (*info_func)(ZEND_MODULE_INFO_FUNC_ARGS);
|
|
const char *version;
|
|
size_t globals_size;
|
|
#ifdef ZTS
|
|
ts_rsrc_id* globals_id_ptr;
|
|
#else
|
|
void* globals_ptr;
|
|
#endif
|
|
void (*globals_ctor)(void *global TSRMLS_DC);
|
|
void (*globals_dtor)(void *global TSRMLS_DC);
|
|
int (*post_deactivate_func)(void);
|
|
int module_started;
|
|
unsigned char type;
|
|
void *handle;
|
|
int module_number;
|
|
const char *build_id;
|
|
};
|
|
|
|
#define MODULE_DEP_REQUIRED 1
|
|
#define MODULE_DEP_CONFLICTS 2
|
|
#define MODULE_DEP_OPTIONAL 3
|
|
|
|
#define ZEND_MOD_REQUIRED_EX(name, rel, ver) { name, rel, ver, MODULE_DEP_REQUIRED },
|
|
#define ZEND_MOD_CONFLICTS_EX(name, rel, ver) { name, rel, ver, MODULE_DEP_CONFLICTS },
|
|
#define ZEND_MOD_OPTIONAL_EX(name, rel, ver) { name, rel, ver, MODULE_DEP_OPTIONAL },
|
|
|
|
#define ZEND_MOD_REQUIRED(name) ZEND_MOD_REQUIRED_EX(name, NULL, NULL)
|
|
#define ZEND_MOD_CONFLICTS(name) ZEND_MOD_CONFLICTS_EX(name, NULL, NULL)
|
|
#define ZEND_MOD_OPTIONAL(name) ZEND_MOD_OPTIONAL_EX(name, NULL, NULL)
|
|
|
|
#define ZEND_MOD_END { NULL, NULL, NULL, 0 }
|
|
|
|
struct _zend_module_dep {
|
|
const char *name; /* module name */
|
|
const char *rel; /* version relationship: NULL (exists), lt|le|eq|ge|gt (to given version) */
|
|
const char *version; /* version */
|
|
unsigned char type; /* dependency type */
|
|
};
|
|
|
|
extern ZEND_API HashTable module_registry;
|
|
|
|
void module_destructor(zend_module_entry *module);
|
|
int module_registry_request_startup(zend_module_entry *module TSRMLS_DC);
|
|
int module_registry_unload_temp(const zend_module_entry *module TSRMLS_DC);
|
|
|
|
#endif
|
|
|
|
/*
|
|
* Local variables:
|
|
* tab-width: 4
|
|
* c-basic-offset: 4
|
|
* indent-tabs-mode: t
|
|
* End:
|
|
*/
|