zend_objects_store_del_ref_by_handle_ex(obj->zv.handle, obj->zv.handlers TSRMLS_CC);
}
+static int apply_unlisten(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
+{
+ php_pqconn_object_t *obj = va_arg(argv, php_pqconn_object_t *);
+ char *quoted_channel = PQescapeIdentifier(obj->intern->conn, key->arKey, key->nKeyLength - 1);
+
+ if (quoted_channel) {
+ PGresult *res;
+ char *cmd;
+
+ spprintf(&cmd, 0, "UNLISTEN %s", quoted_channel);
+ if ((res = PQexec(obj->intern->conn, cmd))) {
+ PHP_PQclear(res);
+ }
+
+ efree(cmd);
+ PQfreemem(quoted_channel);
+ }
+
+ return ZEND_HASH_APPLY_REMOVE;
+}
+
+static void php_pqconn_notice_ignore(void *p, const PGresult *res)
+{
+}
+
static void php_pqconn_object_free(void *o TSRMLS_DC)
{
php_pqconn_object_t *obj = o;
if (obj->intern) {
- php_pqconn_event_data_t *evdata = PQinstanceData(obj->intern->conn, php_pqconn_event);
+ php_pqconn_event_data_t *evdata;
+ PGresult *res;
- if (evdata) {
+ if ((evdata = PQinstanceData(obj->intern->conn, php_pqconn_event))) {
+ memset(evdata, 0, sizeof(*evdata));
efree(evdata);
PQsetInstanceData(obj->intern->conn, php_pqconn_event, NULL);
}
+ PQsetNoticeReceiver(obj->intern->conn, php_pqconn_notice_ignore, NULL);
+
+ /* clean up async results */
+ while ((res = PQgetResult(obj->intern->conn))) {
+ PHP_PQclear(res);
+ }
+
+ zend_hash_apply_with_arguments(&obj->intern->listeners TSRMLS_CC, apply_unlisten, 1, obj);
php_resource_factory_handle_dtor(&obj->intern->factory, obj->intern->conn TSRMLS_CC);
php_resource_factory_dtor(&obj->intern->factory);
if ((CONNECTION_BAD != PQstatus(obj->intern->conn))
&& (-1 < (socket = PQsocket(obj->intern->conn)))
&& (stream = php_stream_fopen_from_fd(socket, "r+b", NULL))) {
+ stream->flags |= PHP_STREAM_FLAG_NO_CLOSE;
php_stream_to_zval(stream, zsocket);
retval = SUCCESS;
} else {
return ZEND_HASH_APPLY_KEEP;
}
-static void php_pqconn_event_connreset(PGEventConnReset *event, php_pqconn_event_data_t *data)
+static void php_pqconn_event_connreset(PGEventConnReset *event)
{
- zval **evhs;
- TSRMLS_DF(data);
+ php_pqconn_event_data_t *data = PQinstanceData(event->conn, php_pqconn_event);
- if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("reset"), (void *) &evhs)) {
- zval *args, *connection = NULL;
+ if (data) {
+ zval **evhs;
+ TSRMLS_DF(data);
- MAKE_STD_ZVAL(args);
- array_init(args);
- php_pq_object_to_zval(data->obj, &connection TSRMLS_CC);
- add_next_index_zval(args, connection);
- zend_hash_apply_with_argument(Z_ARRVAL_PP(evhs), apply_event, args TSRMLS_CC);
- zval_ptr_dtor(&args);
+ if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("reset"), (void *) &evhs)) {
+ zval *args, *connection = NULL;
+
+ MAKE_STD_ZVAL(args);
+ array_init(args);
+ php_pq_object_to_zval(data->obj, &connection TSRMLS_CC);
+ add_next_index_zval(args, connection);
+ zend_hash_apply_with_argument(Z_ARRVAL_PP(evhs), apply_event, args TSRMLS_CC);
+ zval_ptr_dtor(&args);
+ }
}
}
return rid;
}
-static void php_pqconn_event_resultcreate(PGEventResultCreate *event, php_pqconn_event_data_t *data)
+static void php_pqconn_event_resultcreate(PGEventResultCreate *event)
{
- zval **evhs;
- TSRMLS_DF(data);
-
- /* event listener */
- if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("result"), (void *) &evhs)) {
- zval *args, *connection = NULL, *res = result_instance_zval(event->result TSRMLS_CC);
-
- MAKE_STD_ZVAL(args);
- array_init(args);
- php_pq_object_to_zval(data->obj, &connection TSRMLS_CC);
- add_next_index_zval(args, connection);
- add_next_index_zval(args, res);
- zend_hash_apply_with_argument(Z_ARRVAL_PP(evhs), apply_event, args TSRMLS_CC);
- zval_ptr_dtor(&args);
- }
+ php_pqconn_event_data_t *data = PQinstanceData(event->conn, php_pqconn_event);
+
+ if (data) {
+ zval **evhs;
+ TSRMLS_DF(data);
+
+ /* event listener */
+ if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("result"), (void *) &evhs)) {
+ zval *args, *connection = NULL, *res = result_instance_zval(event->result TSRMLS_CC);
+
+ MAKE_STD_ZVAL(args);
+ array_init(args);
+ php_pq_object_to_zval(data->obj, &connection TSRMLS_CC);
+ add_next_index_zval(args, connection);
+ add_next_index_zval(args, res);
+ zend_hash_apply_with_argument(Z_ARRVAL_PP(evhs), apply_event, args TSRMLS_CC);
+ zval_ptr_dtor(&args);
+ }
- /* async callback */
- if (data->obj->intern->onevent.fci.size > 0) {
- zval *res = result_instance_zval(event->result TSRMLS_CC);
+ /* async callback */
+ if (data->obj->intern->onevent.fci.size > 0) {
+ zval *res = result_instance_zval(event->result TSRMLS_CC);
- zend_fcall_info_argn(&data->obj->intern->onevent.fci TSRMLS_CC, 1, &res);
- zend_fcall_info_call(&data->obj->intern->onevent.fci, &data->obj->intern->onevent.fcc, NULL, NULL TSRMLS_CC);
- zval_ptr_dtor(&res);
+ zend_fcall_info_argn(&data->obj->intern->onevent.fci TSRMLS_CC, 1, &res);
+ zend_fcall_info_call(&data->obj->intern->onevent.fci, &data->obj->intern->onevent.fcc, NULL, NULL TSRMLS_CC);
+ zval_ptr_dtor(&res);
+ }
}
}
{
switch (id) {
case PGEVT_CONNRESET:
- php_pqconn_event_connreset(e, data);
+ php_pqconn_event_connreset(e);
break;
case PGEVT_RESULTCREATE:
- php_pqconn_event_resultcreate(e, data);
+ php_pqconn_event_resultcreate(e);
break;
default:
break;
php_pqconn_resource_factory_dtor
};
+static void php_pqconn_persistent_resource_factory_dtor(void *opaque, void *handle TSRMLS_DC)
+{
+ PGresult *res;
+
+
+ /* clean up */
+ if ((res = PQexec(handle, PQtransactionStatus(handle) == PQTRANS_IDLE ? "RESET ALL" : "ROLLBACK; RESET ALL"))) {
+ PHP_PQclear(res);
+ }
+
+ /* release to the pool, if the connection is alive */
+ if (CONNECTION_OK == PQstatus(handle)) {
+ php_persistent_handle_release(opaque, handle TSRMLS_CC);
+ } else {
+ PQfinish(handle);
+ }
+}
+
+static php_resource_factory_ops_t php_pqconn_persistent_resource_factory_ops = {
+ (php_resource_factory_handle_ctor_t) php_persistent_handle_acquire,
+ NULL,
+ php_pqconn_persistent_resource_factory_dtor
+};
+
ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_construct, 0, 0, 1)
ZEND_ARG_INFO(0, dsn)
ZEND_ARG_INFO(0, async)
if (flags & PHP_PQCONN_PERSISTENT) {
php_persistent_handle_factory_t *phf = php_persistent_handle_concede(NULL, ZEND_STRL("pq\\Connection"), dsn_str, dsn_len TSRMLS_CC);
- php_resource_factory_init(&obj->intern->factory, php_persistent_handle_get_resource_factory_ops(), phf, (void (*)(void*)) php_persistent_handle_abandon);
+ php_resource_factory_init(&obj->intern->factory, &php_pqconn_persistent_resource_factory_ops, phf, (void (*)(void*)) php_persistent_handle_abandon);
} else{
php_resource_factory_init(&obj->intern->factory, &php_pqconn_resource_factory_ops, NULL, NULL);
}
obj->intern->conn = php_resource_factory_handle_ctor(&obj->intern->factory, &rfdata TSRMLS_CC);
- PQregisterEventProc(obj->intern->conn, php_pqconn_event, "ext-pq", evdata);
+ PQregisterEventProc(obj->intern->conn, php_pqconn_event, "ext-pq", NULL);
/* the connection might be persistent, so reset event_proc instance data */
PQsetInstanceData(obj->intern->conn, php_pqconn_event, evdata);
PQsetNoticeReceiver(obj->intern->conn, php_pqconn_notice_recv, evdata);
PGresult *res;
char *cmd;
- spprintf(&cmd, 0, "LISTEN %s", channel_str);
+ spprintf(&cmd, 0, "LISTEN %s", quoted_channel);
res = PQexec(obj->intern->conn, cmd);
efree(cmd);
}
}
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_listen_async, 0, 0, 0)
+ ZEND_ARG_INFO(0, channel)
+ ZEND_ARG_INFO(0, callable)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, listenAsync) {
+ char *channel_str = NULL;
+ int channel_len = 0;
+ php_pq_callback_t listener;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sf", &channel_str, &channel_len, &listener.fci, &listener.fcc)) {
+ php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ obj->intern->poller = PQconsumeInput;
+
+ if (obj->intern) {
+ char *quoted_channel = PQescapeIdentifier(obj->intern->conn, channel_str, channel_len);
+
+ if (quoted_channel) {
+ char *cmd;
+
+ obj->intern->poller = PQconsumeInput;
+
+ spprintf(&cmd, 0, "LISTEN %s", channel_str);
+ if (PQsendQuery(obj->intern->conn, cmd)) {
+ php_pqconn_add_listener(obj, channel_str, channel_len, &listener TSRMLS_CC);
+ RETVAL_TRUE;
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not install listener (%s)", PHP_PQerrorMessage(obj->intern->conn));
+ RETVAL_FALSE;
+ }
+
+ efree(cmd);
+ PQfreemem(quoted_channel);
+
+ php_pqconn_notify_listeners(obj TSRMLS_CC);
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not escape channel identifier (%s)", PHP_PQerrorMessage(obj->intern->conn));
+ }
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+ RETVAL_FALSE;
+ }
+ }
+}
+
ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_notify, 0, 0, 2)
ZEND_ARG_INFO(0, channel)
ZEND_ARG_INFO(0, message)
}
}
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_notify_async, 0, 0, 2)
+ ZEND_ARG_INFO(0, channel)
+ ZEND_ARG_INFO(0, message)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, notifyAsync) {
+ char *channel_str, *message_str;
+ int channel_len, message_len;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &channel_str, &channel_len, &message_str, &message_len)) {
+ php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ if (obj->intern) {
+ char *params[2] = {channel_str, message_str};
+
+ obj->intern->poller = PQconsumeInput;
+
+ if (PQsendQueryParams(obj->intern->conn, "select pg_notify($1, $2)", 2, NULL, (const char *const*) params, NULL, NULL, 0)) {
+ RETVAL_TRUE;
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not notify listeners (%s)", PHP_PQerrorMessage(obj->intern->conn));
+ RETVAL_FALSE;
+ }
+
+ php_pqconn_notify_listeners(obj TSRMLS_CC);
+
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+ RETVAL_FALSE;
+ }
+ }
+}
+
ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_poll, 0, 0, 0)
ZEND_END_ARG_INFO();
static PHP_METHOD(pqconn, poll) {
PHP_ME(pqconn, prepare, ai_pqconn_prepare, ZEND_ACC_PUBLIC)
PHP_ME(pqconn, prepareAsync, ai_pqconn_prepare_async, ZEND_ACC_PUBLIC)
PHP_ME(pqconn, listen, ai_pqconn_listen, ZEND_ACC_PUBLIC)
+ PHP_ME(pqconn, listenAsync, ai_pqconn_listen_async, ZEND_ACC_PUBLIC)
PHP_ME(pqconn, notify, ai_pqconn_notify, ZEND_ACC_PUBLIC)
+ PHP_ME(pqconn, notifyAsync, ai_pqconn_notify_async, ZEND_ACC_PUBLIC)
PHP_ME(pqconn, getResult, ai_pqconn_get_result, ZEND_ACC_PUBLIC)
PHP_ME(pqconn, quote, ai_pqconn_quote, ZEND_ACC_PUBLIC)
PHP_ME(pqconn, quoteName, ai_pqconn_quote_name, ZEND_ACC_PUBLIC)
zend_restore_error_handling(&zeh TSRMLS_CC);
}
+ZEND_BEGIN_ARG_INFO_EX(ai_pqstm_desc_async, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqstm, descAsync) {
+ zend_error_handling zeh;
+
+ zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+ if (SUCCESS == zend_parse_parameters_none()) {
+ php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ if (obj->intern) {
+
+ obj->intern->conn->intern->poller = PQconsumeInput;
+
+ if (PQsendDescribePrepared(obj->intern->conn->intern->conn, obj->intern->name)) {
+ RETVAL_TRUE;
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not describe statement: %s", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+ RETVAL_FALSE;
+ }
+
+ php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
+
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Statement not initialized");
+ RETVAL_FALSE;
+ }
+ }
+ zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+
static zend_function_entry php_pqstm_methods[] = {
PHP_ME(pqstm, __construct, ai_pqstm_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
PHP_ME(pqstm, bind, ai_pqstm_bind, ZEND_ACC_PUBLIC)
PHP_ME(pqstm, exec, ai_pqstm_exec, ZEND_ACC_PUBLIC)
PHP_ME(pqstm, desc, ai_pqstm_desc, ZEND_ACC_PUBLIC)
PHP_ME(pqstm, execAsync, ai_pqstm_exec_async, ZEND_ACC_PUBLIC)
+ PHP_ME(pqstm, descAsync, ai_pqstm_desc_async, ZEND_ACC_PUBLIC)
{0}
};
projects / m6w6 / ext-pq / blobdiff