danog/ext-uv
1
0
Fork 0
mirror of https://github.com/danog/ext-uv.git synced 2025-01-23 05:41:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

don't re-register resources

Browse Source
This commit is contained in:
Shuhei Tanuma 2012-05-26 22:25:15 +09:00
parent 404b8df7e4
commit 6e61335453
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
php_uv.c
View File

@ -150,7 +150,10 @@ static void php_uv_write_cb(uv_write_t* req, int status)
MAKE_STD_ZVAL(stat);
ZVAL_LONG(stat, status);
MAKE_STD_ZVAL(client);
ZEND_REGISTER_RESOURCE(client, uv, uv_resource_handle);
client->value.lval = uv->resource_id;
client->type = IS_RESOURCE;
params[0] = &stat;
params[1] = &client;
@ -226,7 +229,9 @@ static void php_uv_listen_cb(uv_stream_t* server, int status)
fci.retval_ptr_ptr = &retval_ptr;
MAKE_STD_ZVAL(svr);
ZEND_REGISTER_RESOURCE(svr, uv, uv_resource_handle);
svr->value.lval = uv->resource_id;
svr->type = IS_RESOURCE;
params[0] = &svr;
fci.params = params;
@ -261,7 +266,8 @@ static void php_uv_read_cb(uv_stream_t* handle, ssize_t nread, uv_buf_t buf)
zval *rsc;
MAKE_STD_ZVAL(rsc);
ZEND_REGISTER_RESOURCE(rsc, uv, uv_resource_handle);
rsc->value.lval = uv->resource_id;
rsc->type = IS_RESOURCE;
params[0] = &buffer;
params[1] = &rsc;
@ -363,6 +369,7 @@ PHP_FUNCTION(uv_tcp_init)
uv->socket = tcp;
ZEND_REGISTER_RESOURCE(return_value, uv, uv_resource_handle);
uv->resource_id = Z_LVAL_P(return_value);
}
static zend_function_entry uv_functions[] = {

8
php_uv.h
View File

@ -28,13 +28,15 @@ typedef struct {
struct sockaddr_in addr;
uv_connect_t connect;
uv_tcp_t *socket;
int resource_id;
zval *listen_cb;
zval *read_cb;
zval *write_cb;
/* TODO: remove lator */
zend_fcall_info fci_connect;
zend_fcall_info_cache fcc_connect;
zend_fcall_info fci_listen;
zend_fcall_info_cache fcc_listen;
zval *listen_cb;
zval *read_cb;
zval *write_cb;
} php_uv_t;
#define PHP_UV_RESOURCE_NAME "uv"