#ifdef ZTS
# define PHP_RAPHF_G ((zend_raphf_globals *) \
- (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(raphf_globals_id)])
+ (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(raphf_globals_id)])
#else
# define PHP_RAPHF_G (&raphf_globals)
#endif
}
}
-void *php_resource_factory_handle_ctor(php_resource_factory_t *f,
- void *init_arg TSRMLS_DC)
+void *php_resource_factory_handle_ctor(php_resource_factory_t *f, void *init_arg)
{
if (f->fops.ctor) {
- return f->fops.ctor(f->data, init_arg TSRMLS_CC);
+ return f->fops.ctor(f->data, init_arg);
}
return NULL;
}
-void *php_resource_factory_handle_copy(php_resource_factory_t *f,
- void *handle TSRMLS_DC)
+void *php_resource_factory_handle_copy(php_resource_factory_t *f, void *handle)
{
if (f->fops.copy) {
- return f->fops.copy(f->data, handle TSRMLS_CC);
+ return f->fops.copy(f->data, handle);
}
return NULL;
}
-void php_resource_factory_handle_dtor(php_resource_factory_t *f,
- void *handle TSRMLS_DC)
+void php_resource_factory_handle_dtor(php_resource_factory_t *f, void *handle)
{
if (f->fops.dtor) {
- f->fops.dtor(f->data, handle TSRMLS_CC);
+ f->fops.dtor(f->data, handle);
}
}
return list;
}
-static int php_persistent_handle_apply_stat(zval *p TSRMLS_DC, int argc,
- va_list argv, zend_hash_key *key)
+static int php_persistent_handle_apply_stat(zval *p, int argc, va_list argv,
+ zend_hash_key *key)
{
php_persistent_handle_list_t *list = Z_PTR_P(p);
zval zsubentry, *zentry = va_arg(argv, zval *);
return ZEND_HASH_APPLY_KEEP;
}
-static int php_persistent_handle_apply_statall(zval *p TSRMLS_DC, int argc,
- va_list argv, zend_hash_key *key)
+static int php_persistent_handle_apply_statall(zval *p, int argc, va_list argv,
+ zend_hash_key *key)
{
php_persistent_handle_provider_t *provider = Z_PTR_P(p);
HashTable *ht = va_arg(argv, HashTable *);
array_init(&zentry);
- zend_hash_apply_with_arguments(&provider->list.free TSRMLS_CC,
+ zend_hash_apply_with_arguments(&provider->list.free,
php_persistent_handle_apply_stat, 1, &zentry);
if (key->key) {
return ZEND_HASH_APPLY_KEEP;
}
-static int php_persistent_handle_apply_cleanup_ex(zval *p, void *arg TSRMLS_DC)
+static int php_persistent_handle_apply_cleanup_ex(zval *p, void *arg)
{
php_resource_factory_t *rf = arg;
void *handle = Z_PTR_P(p);
#if PHP_RAPHF_DEBUG_PHANDLES
fprintf(stderr, "DESTROY: %p\n", handle);
#endif
- php_resource_factory_handle_dtor(rf, handle TSRMLS_CC);
+ php_resource_factory_handle_dtor(rf, handle);
return ZEND_HASH_APPLY_REMOVE;
}
-static int php_persistent_handle_apply_cleanup(zval *p, void *arg TSRMLS_DC)
+static int php_persistent_handle_apply_cleanup(zval *p, void *arg)
{
php_resource_factory_t *rf = arg;
php_persistent_handle_list_t *list = Z_PTR_P(p);
zend_hash_apply_with_argument(&list->free,
- php_persistent_handle_apply_cleanup_ex, rf TSRMLS_CC);
+ php_persistent_handle_apply_cleanup_ex, rf);
if (list->used) {
return ZEND_HASH_APPLY_KEEP;
}
static inline void php_persistent_handle_list_dtor(
php_persistent_handle_list_t *list,
- php_persistent_handle_provider_t *provider TSRMLS_DC)
+ php_persistent_handle_provider_t *provider)
{
#if PHP_RAPHF_DEBUG_PHANDLES
fprintf(stderr, "LSTDTOR: %p\n", list);
#endif
zend_hash_apply_with_argument(&list->free,
- php_persistent_handle_apply_cleanup_ex, &provider->rf TSRMLS_CC);
+ php_persistent_handle_apply_cleanup_ex, &provider->rf);
zend_hash_destroy(&list->free);
}
static inline void php_persistent_handle_list_free(
php_persistent_handle_list_t **list,
- php_persistent_handle_provider_t *provider TSRMLS_DC)
+ php_persistent_handle_provider_t *provider)
{
- php_persistent_handle_list_dtor(*list, provider TSRMLS_CC);
+ php_persistent_handle_list_dtor(*list, provider);
#if PHP_RAPHF_DEBUG_PHANDLES
fprintf(stderr, "LSTFREE: %p\n", *list);
#endif
*list = NULL;
}
-static int php_persistent_handle_list_apply_dtor(zval *p,
- void *provider TSRMLS_DC)
+static int php_persistent_handle_list_apply_dtor(zval *p, void *provider)
{
php_persistent_handle_list_t *list = Z_PTR_P(p);
- php_persistent_handle_list_free(&list, provider TSRMLS_CC);
+
+ php_persistent_handle_list_free(&list, provider );
ZVAL_PTR(p, NULL);
return ZEND_HASH_APPLY_REMOVE;
}
static inline php_persistent_handle_list_t *php_persistent_handle_list_find(
php_persistent_handle_provider_t *provider, const char *ident_str,
- size_t ident_len TSRMLS_DC)
+ size_t ident_len)
{
php_persistent_handle_list_t *list;
#endif
return list;
}
- php_persistent_handle_list_free(&list, provider TSRMLS_CC);
+ php_persistent_handle_list_free(&list, provider);
}
return NULL;
}
-static int php_persistent_handle_apply_cleanup_all(zval *p TSRMLS_DC, int argc,
+static int php_persistent_handle_apply_cleanup_all(zval *p, int argc,
va_list argv, zend_hash_key *key)
{
php_persistent_handle_provider_t *provider = Z_PTR_P(p);
if (ident_str && ident_len) {
if ((list = php_persistent_handle_list_find(provider, ident_str,
- ident_len TSRMLS_CC))) {
+ ident_len))) {
zend_hash_apply_with_argument(&list->free,
php_persistent_handle_apply_cleanup_ex,
- &provider->rf TSRMLS_CC);
+ &provider->rf);
}
} else {
zend_hash_apply_with_argument(&provider->list.free,
- php_persistent_handle_apply_cleanup, &provider->rf TSRMLS_CC);
+ php_persistent_handle_apply_cleanup, &provider->rf);
}
return ZEND_HASH_APPLY_KEEP;
static void php_persistent_handle_hash_dtor(zval *p)
{
php_persistent_handle_provider_t *provider = Z_PTR_P(p);
- TSRMLS_FETCH();
zend_hash_apply_with_argument(&provider->list.free,
- php_persistent_handle_list_apply_dtor, provider TSRMLS_CC);
+ php_persistent_handle_list_apply_dtor, provider);
zend_hash_destroy(&provider->list.free);
php_resource_factory_dtor(&provider->rf);
pefree(provider, 1);
ZEND_RESULT_CODE php_persistent_handle_provide(const char *name_str,
size_t name_len, php_resource_factory_ops_t *fops, void *data,
- void (*dtor)(void *) TSRMLS_DC)
+ void (*dtor)(void *))
{
php_persistent_handle_provider_t *provider = pemalloc(sizeof(*provider), 1);
php_persistent_handle_factory_t *a, const char *name_str,
size_t name_len, const char *ident_str, size_t ident_len,
php_persistent_handle_wakeup_t wakeup,
- php_persistent_handle_retire_t retire TSRMLS_DC)
+ php_persistent_handle_retire_t retire)
{
php_persistent_handle_factory_t *free_a = NULL;
}
}
-void *php_persistent_handle_acquire(php_persistent_handle_factory_t *a,
- void *init_arg TSRMLS_DC)
+void *php_persistent_handle_acquire(php_persistent_handle_factory_t *a, void *init_arg)
{
int key;
zval *p;
void *handle = NULL;
php_persistent_handle_list_t *list;
- list = php_persistent_handle_list_find(a->provider, a->ident.str,
- a->ident.len TSRMLS_CC);
+ list = php_persistent_handle_list_find(a->provider, a->ident.str, a->ident.len);
if (list) {
zend_hash_internal_pointer_end(&list->free);
key = zend_hash_get_current_key(&list->free, NULL, &index, 0);
if (p && HASH_KEY_NON_EXISTENT != key) {
handle = Z_PTR_P(p);
if (a->wakeup) {
- a->wakeup(a, &handle TSRMLS_CC);
+ a->wakeup(a, &handle);
}
zend_hash_index_del(&list->free, index);
} else {
- handle = php_resource_factory_handle_ctor(&a->provider->rf,
- init_arg TSRMLS_CC);
+ handle = php_resource_factory_handle_ctor(&a->provider->rf, init_arg);
}
#if PHP_RAPHF_DEBUG_PHANDLES
fprintf(stderr, "CREATED: %p\n", handle);
return handle;
}
-void *php_persistent_handle_accrete(php_persistent_handle_factory_t *a,
- void *handle TSRMLS_DC)
+void *php_persistent_handle_accrete(php_persistent_handle_factory_t *a, void *handle)
{
void *new_handle = NULL;
php_persistent_handle_list_t *list;
- new_handle = php_resource_factory_handle_copy(&a->provider->rf,
- handle TSRMLS_CC);
+ new_handle = php_resource_factory_handle_copy(&a->provider->rf, handle);
if (handle) {
- list = php_persistent_handle_list_find(a->provider, a->ident.str,
- a->ident.len TSRMLS_CC);
+ list = php_persistent_handle_list_find(a->provider, a->ident.str, a->ident.len);
if (list) {
++list->used;
}
return new_handle;
}
-void php_persistent_handle_release(php_persistent_handle_factory_t *a,
- void *handle TSRMLS_DC)
+void php_persistent_handle_release(php_persistent_handle_factory_t *a, void *handle)
{
php_persistent_handle_list_t *list;
- list = php_persistent_handle_list_find(a->provider, a->ident.str,
- a->ident.len TSRMLS_CC);
+ list = php_persistent_handle_list_find(a->provider, a->ident.str, a->ident.len);
if (list) {
if (a->provider->list.used >= PHP_RAPHF_G->persistent_handle.limit) {
#if PHP_RAPHF_DEBUG_PHANDLES
fprintf(stderr, "DESTROY: %p\n", handle);
#endif
- php_resource_factory_handle_dtor(&a->provider->rf, handle TSRMLS_CC);
+ php_resource_factory_handle_dtor(&a->provider->rf, handle);
} else {
if (a->retire) {
- a->retire(a, &handle TSRMLS_CC);
+ a->retire(a, &handle);
}
zend_hash_next_index_insert_ptr(&list->free, handle);
}
}
void php_persistent_handle_cleanup(const char *name_str, size_t name_len,
- const char *ident_str, size_t ident_len TSRMLS_DC)
+ const char *ident_str, size_t ident_len)
{
php_persistent_handle_provider_t *provider;
php_persistent_handle_list_t *list;
if (provider) {
if (ident_str && ident_len) {
list = php_persistent_handle_list_find(provider, ident_str,
- ident_len TSRMLS_CC);
+ ident_len);
if (list) {
zend_hash_apply_with_argument(&list->free,
php_persistent_handle_apply_cleanup_ex,
- &provider->rf TSRMLS_CC);
+ &provider->rf);
}
} else {
zend_hash_apply_with_argument(&provider->list.free,
php_persistent_handle_apply_cleanup,
- &provider->rf TSRMLS_CC);
+ &provider->rf);
}
}
} else {
zend_hash_apply_with_arguments(
- &PHP_RAPHF_G->persistent_handle.hash TSRMLS_CC,
+ &PHP_RAPHF_G->persistent_handle.hash,
php_persistent_handle_apply_cleanup_all, 2, ident_str,
ident_len);
}
}
-HashTable *php_persistent_handle_statall(HashTable *ht TSRMLS_DC)
+HashTable *php_persistent_handle_statall(HashTable *ht)
{
if (zend_hash_num_elements(&PHP_RAPHF_G->persistent_handle.hash)) {
if (!ht) {
zend_hash_init(ht, 0, NULL, ZVAL_PTR_DTOR, 0);
}
zend_hash_apply_with_arguments(
- &PHP_RAPHF_G->persistent_handle.hash TSRMLS_CC,
+ &PHP_RAPHF_G->persistent_handle.hash,
php_persistent_handle_apply_statall, 1, ht);
} else if (ht) {
ht = NULL;
{
if (SUCCESS == zend_parse_parameters_none()) {
object_init(return_value);
- if (php_persistent_handle_statall(HASH_OF(return_value) TSRMLS_CC)) {
+ if (php_persistent_handle_statall(HASH_OF(return_value))) {
return;
}
zval_dtor(return_value);
char *name_str = NULL, *ident_str = NULL;
int name_len = 0, ident_len = 0;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!",
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|s!s!",
&name_str, &name_len, &ident_str, &ident_len)) {
- php_persistent_handle_cleanup(name_str, name_len, ident_str,
- ident_len TSRMLS_CC);
+ php_persistent_handle_cleanup(name_str, name_len, ident_str, ident_len);
}
}
return SUCCESS;
}
-static int php_persistent_handle_apply_info_ex(zval *p TSRMLS_DC, int argc,
+static int php_persistent_handle_apply_info_ex(zval *p, int argc,
va_list argv, zend_hash_key *key)
{
php_persistent_handle_list_t *list = Z_PTR_P(p);
return ZEND_HASH_APPLY_KEEP;
}
-static int php_persistent_handle_apply_info(zval *p TSRMLS_DC, int argc,
+static int php_persistent_handle_apply_info(zval *p, int argc,
va_list argv, zend_hash_key *key)
{
php_persistent_handle_provider_t *provider = Z_PTR_P(p);
- zend_hash_apply_with_arguments(&provider->list.free TSRMLS_CC,
+ zend_hash_apply_with_arguments(&provider->list.free,
php_persistent_handle_apply_info_ex, 1, key);
return ZEND_HASH_APPLY_KEEP;
);
php_info_print_table_header(4, "Provider", "Ident", "Used", "Free");
zend_hash_apply_with_arguments(
- &PHP_RAPHF_G->persistent_handle.hash TSRMLS_CC,
+ &PHP_RAPHF_G->persistent_handle.hash,
php_persistent_handle_apply_info, 0);
php_info_print_table_end();
* @param init_arg is the \a init_arg from php_resource_factory_init()
* @return the created (persistent) handle
*/
-typedef void *(*php_resource_factory_handle_ctor_t)(void *opaque,
- void *init_arg TSRMLS_DC);
+typedef void *(*php_resource_factory_handle_ctor_t)(void *opaque, void *init_arg);
/**
* The copy constructor of a resource.
* @param opaque the factory's data
* @param handle the (persistent) handle to copy
*/
-typedef void *(*php_resource_factory_handle_copy_t)(void *opaque,
- void *handle TSRMLS_DC);
+typedef void *(*php_resource_factory_handle_copy_t)(void *opaque, void *handle);
/**
* The destructor of a resource.
* @param opaque the factory's data
* @param handle the handle to destroy
*/
-typedef void (*php_resource_factory_handle_dtor_t)(void *opaque,
- void *handle TSRMLS_DC);
+typedef void (*php_resource_factory_handle_dtor_t)(void *opaque, void *handle);
/**
* The resource ops consisting of a ctor, a copy ctor and a dtor.
* @return the new resource
*/
PHP_RAPHF_API void *php_resource_factory_handle_ctor(php_resource_factory_t *f,
- void *init_arg TSRMLS_DC);
+ void *init_arg);
/**
* Create a copy of the resource \a handle
* @return the copy
*/
PHP_RAPHF_API void *php_resource_factory_handle_copy(php_resource_factory_t *f,
- void *handle TSRMLS_DC);
+ void *handle);
/**
* Destroy (and free) the resource
* @param handle the resource to destroy
*/
PHP_RAPHF_API void php_resource_factory_handle_dtor(php_resource_factory_t *f,
- void *handle TSRMLS_DC);
+ void *handle);
/**
* Persistent handles storage
* Wakeup the persistent handle on re-acquisition.
*/
typedef void (*php_persistent_handle_wakeup_t)(
- php_persistent_handle_factory_t *f, void **handle TSRMLS_DC);
+ php_persistent_handle_factory_t *f, void **handle);
/**
* Retire the persistent handle on release.
*/
typedef void (*php_persistent_handle_retire_t)(
- php_persistent_handle_factory_t *f, void **handle TSRMLS_DC);
+ php_persistent_handle_factory_t *f, void **handle);
/**
* Definition of a persistent handle factory.
*/
PHP_RAPHF_API ZEND_RESULT_CODE php_persistent_handle_provide(
const char *name_str, size_t name_len, php_resource_factory_ops_t *fops,
- void *data, void (*dtor)(void *) TSRMLS_DC);
+ void *data, void (*dtor)(void *));
/**
* Retrieve a persistent handle factory at runtime.
php_persistent_handle_factory_t *a, const char *name_str,
size_t name_len, const char *ident_str, size_t ident_len,
php_persistent_handle_wakeup_t wakeup,
- php_persistent_handle_retire_t retire TSRMLS_DC);
+ php_persistent_handle_retire_t retire);
/**
* Abandon the persistent handle factory.
* @return the acquired resource
*/
PHP_RAPHF_API void *php_persistent_handle_acquire(
- php_persistent_handle_factory_t *a, void *init_arg TSRMLS_DC);
+ php_persistent_handle_factory_t *a, void *init_arg);
/**
* Release a persistent handle.
* @param handle the handle to release
*/
PHP_RAPHF_API void php_persistent_handle_release(
- php_persistent_handle_factory_t *a, void *handle TSRMLS_DC);
+ php_persistent_handle_factory_t *a, void *handle);
/**
* Copy a persistent handle.
* @param handle the resource to accrete
*/
PHP_RAPHF_API void *php_persistent_handle_accrete(
- php_persistent_handle_factory_t *a, void *handle TSRMLS_DC);
+ php_persistent_handle_factory_t *a, void *handle);
/**
* Retrieve persistent handle resource factory ops.
* @param ident_len the subsidiary namespace name length
*/
PHP_RAPHF_API void php_persistent_handle_cleanup(const char *name_str,
- size_t name_len, const char *ident_str, size_t ident_len TSRMLS_DC);
+ size_t name_len, const char *ident_str, size_t ident_len);
/**
* Retrieve statistics about the current process/thread's persistent handles.
* ]
* ~~~~~~~~~~~~~~~
*/
-PHP_RAPHF_API HashTable *php_persistent_handle_statall(HashTable *ht TSRMLS_DC);
+PHP_RAPHF_API HashTable *php_persistent_handle_statall(HashTable *ht);
#endif /* PHP_RAPHF_H */
projects / m6w6 / ext-raphf / commitdiff
