X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_persistent_handle.c;h=d27663ccd932073906f2747cdce227db0b3e1a26;hp=55d53d0059e43f84cf8276ba3a62b70ebb754119;hb=7b028d0cbb030f9610084314f67b77907d8474a2;hpb=7dc5de0b79846bfe33ca36a9eeb894ef2ecfdee1 diff --git a/php_http_persistent_handle.c b/php_http_persistent_handle.c index 55d53d0..d27663c 100644 --- a/php_http_persistent_handle.c +++ b/php_http_persistent_handle.c @@ -6,13 +6,11 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2010, Michael Wallner | + | Copyright (c) 2004-2011, Michael Wallner | +--------------------------------------------------------------------+ */ -/* $Id: http_persistent_handle_api.c 292841 2009-12-31 08:48:57Z mike $ */ - -#include "php_http.h" +#include "php_http_api.h" #ifndef PHP_HTTP_DEBUG_PHANDLES # define PHP_HTTP_DEBUG_PHANDLES 0 @@ -62,21 +60,42 @@ static inline php_http_persistent_handle_list_t *php_http_persistent_handle_list return list; } -static inline void php_http_persistent_handle_list_dtor(php_http_persistent_handle_list_t *list, php_http_persistent_handle_provider_t *provider TSRMLS_DC) +static int php_http_persistent_handle_apply_cleanup_ex(void *pp, void *arg TSRMLS_DC) { - HashPosition pos; - void **handle; - + php_http_resource_factory_t *rf = arg; + void **handle = pp; + #if PHP_HTTP_DEBUG_PHANDLES - fprintf(stderr, "LSTDTOR: %p\n", list); + fprintf(stderr, "DESTROY: %p\n", *handle); #endif - FOREACH_HASH_VAL(pos, &list->free, handle) { + php_http_resource_factory_handle_dtor(rf, *handle TSRMLS_CC); + return ZEND_HASH_APPLY_REMOVE; +} + +static int php_http_persistent_handle_apply_cleanup(void *pp, void *arg TSRMLS_DC) +{ + php_http_resource_factory_t *rf = arg; + php_http_persistent_handle_list_t **listp = pp; + + zend_hash_apply_with_argument(&(*listp)->free, php_http_persistent_handle_apply_cleanup_ex, rf TSRMLS_CC); + if ((*listp)->used) { + return ZEND_HASH_APPLY_KEEP; + } + zend_hash_destroy(&(*listp)->free); #if PHP_HTTP_DEBUG_PHANDLES - fprintf(stderr, "DESTROY: %p\n", *handle); + fprintf(stderr, "LSTFREE: %p\n", *listp); #endif - - provider->rf.fops.dtor(provider->rf.data, *handle TSRMLS_CC); - } + pefree(*listp, 1); + *listp = NULL; + return ZEND_HASH_APPLY_REMOVE; +} + +static inline void php_http_persistent_handle_list_dtor(php_http_persistent_handle_list_t *list, php_http_persistent_handle_provider_t *provider TSRMLS_DC) +{ +#if PHP_HTTP_DEBUG_PHANDLES + fprintf(stderr, "LSTDTOR: %p\n", list); +#endif + zend_hash_apply_with_argument(&list->free, php_http_persistent_handle_apply_cleanup_ex, &provider->rf TSRMLS_CC); zend_hash_destroy(&list->free); } @@ -90,11 +109,17 @@ static inline void php_http_persistent_handle_list_free(php_http_persistent_hand *list = NULL; } +static int php_http_persistent_handle_list_apply_dtor(void *listp, void *provider TSRMLS_DC) +{ + php_http_persistent_handle_list_free(listp, provider TSRMLS_CC); + return ZEND_HASH_APPLY_REMOVE; +} + static inline php_http_persistent_handle_list_t *php_http_persistent_handle_list_find(php_http_persistent_handle_provider_t *provider, const char *ident_str, size_t ident_len TSRMLS_DC) { php_http_persistent_handle_list_t **list, *new_list; - if (SUCCESS == zend_hash_find(&provider->list.free, ident_str, ident_len + 1, (void *) &list)) { + if (SUCCESS == zend_symtable_find(&provider->list.free, ident_str, ident_len + 1, (void *) &list)) { #if PHP_HTTP_DEBUG_PHANDLES fprintf(stderr, "LSTFIND: %p\n", *list); #endif @@ -102,7 +127,7 @@ static inline php_http_persistent_handle_list_t *php_http_persistent_handle_list } if ((new_list = php_http_persistent_handle_list_init(NULL))) { - if (SUCCESS == zend_hash_add(&provider->list.free, ident_str, ident_len + 1, (void *) &new_list, sizeof(php_http_persistent_handle_list_t *), (void *) &list)) { + if (SUCCESS == zend_symtable_update(&provider->list.free, ident_str, ident_len + 1, (void *) &new_list, sizeof(php_http_persistent_handle_list_t *), (void *) &list)) { #if PHP_HTTP_DEBUG_PHANDLES fprintf(stderr, "LSTFIND: %p (new)\n", *list); #endif @@ -126,9 +151,11 @@ static inline STATUS php_http_persistent_handle_do_acquire(php_http_persistent_h *handle = *handle_ptr; zend_hash_index_del(&list->free, index); } else { - *handle = provider->rf.fops.ctor(provider->rf.data TSRMLS_CC); + *handle = php_http_resource_factory_handle_ctor(&provider->rf TSRMLS_CC); } - +#if PHP_HTTP_DEBUG_PHANDLES + fprintf(stderr, "CREATED: %p\n", *handle); +#endif if (*handle) { ++provider->list.used; ++list->used; @@ -147,7 +174,10 @@ static inline STATUS php_http_persistent_handle_do_release(php_http_persistent_h if ((list = php_http_persistent_handle_list_find(provider, ident_str, ident_len TSRMLS_CC))) { if (provider->list.used >= PHP_HTTP_G->persistent_handle.limit) { - provider->rf.fops.dtor(provider->rf.data, *handle TSRMLS_CC); +#if PHP_HTTP_DEBUG_PHANDLES + fprintf(stderr, "DESTROY: %p\n", *handle); +#endif + php_http_resource_factory_handle_dtor(&provider->rf, *handle TSRMLS_CC); } else { if (SUCCESS != zend_hash_next_index_insert(&list->free, (void *) handle, sizeof(void *), NULL)) { return FAILURE; @@ -167,7 +197,7 @@ static inline STATUS php_http_persistent_handle_do_accrete(php_http_persistent_h { php_http_persistent_handle_list_t *list; - if (provider->rf.fops.copy && (*new_handle = provider->rf.fops.copy(provider->rf.data, old_handle TSRMLS_CC))) { + if ((*new_handle = php_http_resource_factory_handle_copy(&provider->rf, old_handle TSRMLS_CC))) { if ((list = php_http_persistent_handle_list_find(provider, ident_str, ident_len TSRMLS_CC))) { ++list->used; } @@ -180,15 +210,9 @@ static inline STATUS php_http_persistent_handle_do_accrete(php_http_persistent_h static void php_http_persistent_handles_hash_dtor(void *p) { php_http_persistent_handle_provider_t *provider = (php_http_persistent_handle_provider_t *) p; - php_http_persistent_handle_list_t **list, *list_tmp; - HashPosition pos; - - FOREACH_HASH_VAL(pos, &provider->list.free, list) { - /* fix shutdown crash in PHP4 */ - list_tmp = *list; - php_http_persistent_handle_list_free(&list_tmp, provider TSRMLS_CC); - } + TSRMLS_FETCH(); + zend_hash_apply_with_argument(&provider->list.free, php_http_persistent_handle_list_apply_dtor, provider TSRMLS_CC); zend_hash_destroy(&provider->list.free); php_http_resource_factory_dtor(&provider->rf); } @@ -223,7 +247,7 @@ PHP_HTTP_API STATUS php_http_persistent_handle_provide(const char *name_str, siz fprintf(stderr, "PROVIDE: %s\n", name_str); #endif - if (SUCCESS == zend_hash_add(&php_http_persistent_handles_hash, name_str, name_len+1, (void *) &provider, sizeof(php_http_persistent_handle_provider_t), NULL)) { + if (SUCCESS == zend_symtable_update(&php_http_persistent_handles_hash, name_str, name_len+1, (void *) &provider, sizeof(php_http_persistent_handle_provider_t), NULL)) { status = SUCCESS; } else { php_http_resource_factory_dtor(&provider.rf); @@ -246,7 +270,7 @@ PHP_HTTP_API php_http_persistent_handle_factory_t *php_http_persistent_handle_co memset(a, 0, sizeof(*a)); LOCK(); - status = zend_hash_find(&php_http_persistent_handles_hash, name_str, name_len+1, (void *) &a->provider); + status = zend_symtable_find(&php_http_persistent_handles_hash, name_str, name_len+1, (void *) &a->provider); UNLOCK(); if (SUCCESS == status) { @@ -256,13 +280,13 @@ PHP_HTTP_API php_http_persistent_handle_factory_t *php_http_persistent_handle_co } } else { if (free_a) { - efree(a); + efree(free_a); } a = NULL; } #if PHP_HTTP_DEBUG_PHANDLES - fprintf(stderr, "CONCETE: %p (%s) (%s)\n", a ? a->provider : NULL, name_str, ident_str); + fprintf(stderr, "CONCEDE: %p (%s) (%s)\n", a ? a->provider : NULL, name_str, ident_str); #endif return a; @@ -272,6 +296,10 @@ PHP_HTTP_API void php_http_persistent_handle_abandon(php_http_persistent_handle_ { zend_bool f = a->free_on_abandon; +#if PHP_HTTP_DEBUG_PHANDLES + fprintf(stderr, "ABANDON: %p\n", a->provider); +#endif + STR_FREE(a->ident.str); memset(a, 0, sizeof(*a)); if (f) { @@ -292,7 +320,7 @@ PHP_HTTP_API void *php_http_persistent_handle_acquire(php_http_persistent_handle PHP_HTTP_API void *php_http_persistent_handle_accrete(php_http_persistent_handle_factory_t *a, void *handle TSRMLS_DC) { - void *new_handle; + void *new_handle = NULL; LOCK(); php_http_persistent_handle_do_accrete(a->provider, a->ident.str, a->ident.len, handle, &new_handle TSRMLS_CC); @@ -304,102 +332,36 @@ PHP_HTTP_API void *php_http_persistent_handle_accrete(php_http_persistent_handle PHP_HTTP_API void php_http_persistent_handle_release(php_http_persistent_handle_factory_t *a, void *handle TSRMLS_DC) { LOCK(); - php_http_persistent_handle_do_release(a->provider, a->ident.str, a->ident.len, &handle); - UNLOCK(); -} - -PHP_HTTP_API STATUS php_http_persistent_handle_acquire2(const char *name_str, size_t name_len, const char *ident_str, size_t ident_len, void **handle TSRMLS_DC) -{ - STATUS status = FAILURE; - php_http_persistent_handle_provider_t *provider; - - *handle = NULL; - LOCK(); - if (SUCCESS == zend_hash_find(&php_http_persistent_handles_hash, name_str, name_len+1, (void *) &provider)) { - status = php_http_persistent_handle_do_acquire(provider, ident_str, ident_len, handle TSRMLS_CC); - } - UNLOCK(); - -#if PHP_HTTP_DEBUG_PHANDLES - fprintf(stderr, "ACQUIRE: %p (%s)\n", *handle, name_str); -#endif - - return status; -} - -PHP_HTTP_API STATUS php_http_persistent_handle_release2(const char *name_str, size_t name_len, const char *ident_str, size_t ident_len, void **handle TSRMLS_DC) -{ - STATUS status = FAILURE; - php_http_persistent_handle_provider_t *provider; -#if PHP_HTTP_DEBUG_PHANDLES - void *handle_tmp = *handle; -#endif - - LOCK(); - if (SUCCESS == zend_hash_find(&php_http_persistent_handles_hash, name_str, name_len+1, (void *) &provider)) { - status = php_http_persistent_handle_do_release(provider, ident_str, ident_len, handle TSRMLS_CC); - } - UNLOCK(); - -#if PHP_HTTP_DEBUG_PHANDLES - fprintf(stderr, "RELEASE: %p (%s)\n", handle_tmp, name_str); -#endif - - return status; -} - -PHP_HTTP_API STATUS php_http_persistent_handle_accrete2(const char *name_str, size_t name_len, const char *ident_str, size_t ident_len, void *old_handle, void **new_handle TSRMLS_DC) -{ - STATUS status = FAILURE; - php_http_persistent_handle_provider_t *provider; - - *new_handle = NULL; - LOCK(); - if (SUCCESS == zend_hash_find(&php_http_persistent_handles_hash, name_str, name_len+1, (void *) &provider)) { - status = php_http_persistent_handle_do_accrete(provider, ident_str, ident_len, old_handle, new_handle TSRMLS_CC); - } + php_http_persistent_handle_do_release(a->provider, a->ident.str, a->ident.len, &handle TSRMLS_CC); UNLOCK(); - -#if PHP_HTTP_DEBUG_PHANDLES - fprintf(stderr, "ACCRETE: %p > %p (%s)\n", old_handle, *new_handle, name_str); -#endif - - return status; } PHP_HTTP_API void php_http_persistent_handle_cleanup(const char *name_str, size_t name_len, const char *ident_str, size_t ident_len TSRMLS_DC) { php_http_persistent_handle_provider_t *provider; - php_http_persistent_handle_list_t *list, **listp; - HashPosition pos1, pos2; + php_http_persistent_handle_list_t *list; LOCK(); if (name_str && name_len) { - if (SUCCESS == zend_hash_find(&php_http_persistent_handles_hash, name_str, name_len+1, (void *) &provider)) { + if (SUCCESS == zend_symtable_find(&php_http_persistent_handles_hash, name_str, name_len+1, (void *) &provider)) { if (ident_str && ident_len) { if ((list = php_http_persistent_handle_list_find(provider, ident_str, ident_len TSRMLS_CC))) { - php_http_persistent_handle_list_dtor(list, provider TSRMLS_CC); - php_http_persistent_handle_list_init(list); + zend_hash_apply_with_argument(&list->free, php_http_persistent_handle_apply_cleanup_ex, &provider->rf TSRMLS_CC); } } else { - FOREACH_HASH_VAL(pos1, &provider->list.free, listp) { - php_http_persistent_handle_list_dtor(*listp, provider TSRMLS_CC); - php_http_persistent_handle_list_init(*listp); - } + zend_hash_apply_with_argument(&provider->list.free, php_http_persistent_handle_apply_cleanup, &provider->rf TSRMLS_CC); } } } else { - FOREACH_HASH_VAL(pos1, &php_http_persistent_handles_hash, provider) { + HashPosition pos; + + FOREACH_HASH_VAL(pos, &php_http_persistent_handles_hash, provider) { if (ident_str && ident_len) { if ((list = php_http_persistent_handle_list_find(provider, ident_str, ident_len TSRMLS_CC))) { - php_http_persistent_handle_list_dtor(list, provider TSRMLS_CC); - php_http_persistent_handle_list_init(list); + zend_hash_apply_with_argument(&list->free, php_http_persistent_handle_apply_cleanup_ex, &provider->rf TSRMLS_CC); } } else { - FOREACH_HASH_VAL(pos2, &provider->list.free, listp) { - php_http_persistent_handle_list_dtor(*listp, provider TSRMLS_CC); - php_http_persistent_handle_list_init(*listp); - } + zend_hash_apply_with_argument(&provider->list.free, php_http_persistent_handle_apply_cleanup, &provider->rf TSRMLS_CC); } } } @@ -430,12 +392,10 @@ PHP_HTTP_API HashTable *php_http_persistent_handle_statall(HashTable *ht TSRMLS_ array_init(zentry[1]); add_assoc_long_ex(zentry[1], ZEND_STRS("used"), (*list)->used); add_assoc_long_ex(zentry[1], ZEND_STRS("free"), zend_hash_num_elements(&(*list)->free)); - - /* use zend_hash_* not add_assoc_* (which is zend_symtable_*) as we want a string even for numbers */ - zend_hash_add(Z_ARRVAL_P(zentry[0]), key2.str, key2.len, &zentry[1], sizeof(zval *), NULL); + add_assoc_zval_ex(zentry[0], key2.str, key2.len, zentry[1]); } - zend_hash_add(ht, key1.str, key1.len, &zentry[0], sizeof(zval *), NULL); + zend_symtable_update(ht, key1.str, key1.len, &zentry[0], sizeof(zval *), NULL); } } else if (ht) { ht = NULL; @@ -445,6 +405,16 @@ PHP_HTTP_API HashTable *php_http_persistent_handle_statall(HashTable *ht TSRMLS_ return ht; } +static php_http_resource_factory_ops_t php_http_persistent_handle_rf_ops = { + (php_http_resource_factory_handle_ctor_t) php_http_persistent_handle_acquire, + (php_http_resource_factory_handle_copy_t) php_http_persistent_handle_accrete, + (php_http_resource_factory_handle_dtor_t) php_http_persistent_handle_release +}; + +PHP_HTTP_API php_http_resource_factory_ops_t *php_http_persistent_handle_resource_factory_ops(void) +{ + return &php_http_persistent_handle_rf_ops; +} /* * Local variables: