danog/ext-uv
1
0
Fork 0
mirror of https://github.com/danog/ext-uv.git synced 2024-11-30 04:29:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

use fci and fcc for getaddr cb

Browse Source
This commit is contained in:
Shuhei Tanuma 2012-07-12 00:47:24 +09:00
parent 98ff7e121b
commit 0c48f290a1
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
php_uv.c
View File

@ -60,7 +60,6 @@
}\ }\
uv->in_free = 0;\ uv->in_free = 0;\
uv->address = NULL; \ uv->address = NULL; \
uv->getaddr_cb = NULL; \
} }
#if PHP_UV_DEBUG>=1 #if PHP_UV_DEBUG>=1
@ -502,11 +501,6 @@ void static destruct_uv(zend_rsrc_list_entry *rsrc TSRMLS_DC)
zval_ptr_dtor(&obj->address); zval_ptr_dtor(&obj->address);
obj->address = NULL; obj->address = NULL;
} }
if (obj->getaddr_cb) {
PHP_UV_DEBUG_PRINT("zval_ptr_dtor: getaddr_cb\n");
zval_ptr_dtor(&obj->getaddr_cb);
obj->getaddr_cb = NULL;
}
if (obj->resource_id) { if (obj->resource_id) {
base_id = obj->resource_id; base_id = obj->resource_id;
@ -1395,7 +1389,7 @@ static void php_uv_getaddrinfo_cb(uv_getaddrinfo_t* handle, int status, struct a
params[1] = &tmp; params[1] = &tmp;
php_uv_do_callback(&retval_ptr, uv->getaddr_cb, params, 2 TSRMLS_CC); php_uv_do_callback2(&retval_ptr, uv, params, 2, PHP_UV_GETADDR_CB TSRMLS_CC);
if (retval_ptr != NULL) { if (retval_ptr != NULL) {
zval_ptr_dtor(&retval_ptr); zval_ptr_dtor(&retval_ptr);
@ -3098,21 +3092,23 @@ PHP_FUNCTION(uv_idle_start)
*/ */
PHP_FUNCTION(uv_getaddrinfo) PHP_FUNCTION(uv_getaddrinfo)
{ {
zval *z_loop, *hints, *callback = NULL; zval *z_loop, *hints = NULL;
uv_loop_t *loop; uv_loop_t *loop;
php_uv_t *uv = NULL; php_uv_t *uv = NULL;
struct addrinfo hint = {0}; struct addrinfo hint = {0};
char *node, *service; char *node, *service;
int node_len, service_len = 0; int node_len, service_len = 0;
zend_fcall_info fci = empty_fcall_info;
zend_fcall_info_cache fcc = empty_fcall_info_cache;
php_uv_cb_t *cb;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"zzss|a",&z_loop, &callback, &node, &node_len, &service, &service_len, &hints) == FAILURE) { "zfss|a",&z_loop, &fci, &fcc, &node, &node_len, &service, &service_len, &hints) == FAILURE) {
return; return;
} }
ZEND_FETCH_RESOURCE(loop, uv_loop_t *, &z_loop, -1, PHP_UV_LOOP_RESOURCE_NAME, uv_loop_handle); ZEND_FETCH_RESOURCE(loop, uv_loop_t *, &z_loop, -1, PHP_UV_LOOP_RESOURCE_NAME, uv_loop_handle);
Z_ADDREF_P(callback);
if (Z_TYPE_P(hints) == IS_ARRAY) { if (Z_TYPE_P(hints) == IS_ARRAY) {
HashTable *h; HashTable *h;
zval **data; zval **data;
@ -3135,10 +3131,10 @@ PHP_FUNCTION(uv_getaddrinfo)
uv = (php_uv_t *)emalloc(sizeof(php_uv_t)); uv = (php_uv_t *)emalloc(sizeof(php_uv_t));
PHP_UV_INIT_ZVALS(uv) PHP_UV_INIT_ZVALS(uv)
TSRMLS_SET_CTX(uv->thread_ctx); TSRMLS_SET_CTX(uv->thread_ctx);
uv->getaddr_cb = callback;
uv->uv.addrinfo.data = uv; uv->uv.addrinfo.data = uv;
uv->resource_id = PHP_UV_LIST_INSERT(uv, uv_resource_handle); uv->resource_id = PHP_UV_LIST_INSERT(uv, uv_resource_handle);
php_uv_cb_init(&cb, uv, &fci, &fcc, PHP_UV_GETADDR_CB);
uv_getaddrinfo(loop, &uv->uv.addrinfo, php_uv_getaddrinfo_cb, node, service, &hint); uv_getaddrinfo(loop, &uv->uv.addrinfo, php_uv_getaddrinfo_cb, node, service, &hint);
} }
/* }}} */ /* }}} */

1
php_uv.h
View File

@ -122,7 +122,6 @@ typedef struct {
} uv; } uv;
char *buffer; char *buffer;
zval *address; zval *address;
zval *getaddr_cb;
php_uv_cb_t *callback[PHP_UV_CB_MAX]; php_uv_cb_t *callback[PHP_UV_CB_MAX];
} php_uv_t; } php_uv_t;