#include <php.h>
+#include <Zend/zend_smart_str.h>
+
#include <libpq-events.h>
#include "php_pq.h"
#include "php_pq_misc.h"
#include "php_pq_object.h"
#include "php_pqconn_event.h"
+#include "php_pqstm.h"
#include "php_pqres.h"
-static int apply_event(void *p, void *a TSRMLS_DC)
+static int apply_event(zval *p, void *a)
{
- php_pq_callback_t *cb = p;
+ php_pq_callback_t *cb = Z_PTR_P(p);
zval *args = a;
- zval *retval = NULL;
+ zval rv;
+
+ ZVAL_NULL(&rv);
+ zend_fcall_info_args(&cb->fci, args);
+ zend_fcall_info_call(&cb->fci, &cb->fcc, &rv, NULL);
+ zend_fcall_info_args_clear(&cb->fci, 0);
+ zval_ptr_dtor(&rv);
+
+ return ZEND_HASH_APPLY_KEEP;
+}
+
+
+static inline PGresult *relisten(PGconn *conn, const char *channel_str, size_t channel_len)
+{
+ char *quoted_channel = PQescapeIdentifier(conn, channel_str, channel_len);
+ PGresult *res = NULL;
+
+ if (quoted_channel) {
+ smart_str cmd = {0};
+
+ smart_str_appends(&cmd, "LISTEN ");
+ smart_str_appends(&cmd, quoted_channel);
+ smart_str_0(&cmd);
+
+ res = PQexec(conn, smart_str_v(&cmd));
+
+ smart_str_free(&cmd);
+ PQfreemem(quoted_channel);
+ }
+
+ return res;
+}
+
+static int apply_relisten(zval *p, int argc, va_list argv, zend_hash_key *key)
+{
+ php_pqconn_object_t *obj = va_arg(argv, php_pqconn_object_t *);
+ PGresult *res = relisten(obj->intern->conn, key->key->val, key->key->len);
- zend_fcall_info_args(&cb->fci, args TSRMLS_CC);
- zend_fcall_info_call(&cb->fci, &cb->fcc, &retval, NULL TSRMLS_CC);
- if (retval) {
- zval_ptr_dtor(&retval);
+ if (res) {
+ php_pqres_clear(res);
}
return ZEND_HASH_APPLY_KEEP;
}
+static int apply_reprepare(zval *p, int argc, va_list argv, zend_hash_key *key)
+{
+ php_pqconn_object_t *obj = va_arg(argv, php_pqconn_object_t *);
+ php_pqstm_t *stm = Z_PTR_P(p);
+
+ php_pqconn_prepare(NULL, obj, stm->name, stm->query, stm->params);
+
+ return ZEND_HASH_APPLY_KEEP;
+}
+
static void php_pqconn_event_connreset(PGEventConnReset *event)
{
php_pqconn_event_data_t *data = PQinstanceData(event->conn, php_pqconn_event);
if (data) {
- HashTable *evhs;
- TSRMLS_DF(data);
+ zval *zevhs;
+
+ /* restore listeners */
+ zend_hash_apply_with_arguments(&data->obj->intern->listeners, apply_relisten, 1, data->obj);
+
+ /* restore statements */
+ zend_hash_apply_with_arguments(&data->obj->intern->statements, apply_reprepare, 1, data->obj);
- if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("reset"), (void *) &evhs)) {
- zval *args, *connection = NULL;
+ /* eventhandler */
+ if ((zevhs = zend_hash_str_find(&data->obj->intern->eventhandlers, ZEND_STRL("reset")))) {
+ zval args, connection;
- 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(evhs, apply_event, args TSRMLS_CC);
+ array_init(&args);
+ php_pq_object_to_zval(data->obj, &connection);
+ add_next_index_zval(&args, &connection);
+ zend_hash_apply_with_argument(Z_ARRVAL_P(zevhs), apply_event, &args);
zval_ptr_dtor(&args);
}
}
php_pqconn_event_data_t *data = PQinstanceData(event->conn, php_pqconn_event);
if (data) {
- php_pqres_object_t *obj;
- HashTable *evhs;
- TSRMLS_DF(data);
-
- php_pqres_init_instance_data(event->result, &obj TSRMLS_CC);
+ php_pqres_object_t *obj = php_pqres_init_instance_data(event->result, data->obj);
+ zval *zevhs;
/* event listener */
- if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("result"), (void *) &evhs)) {
- zval *args, *connection = NULL, *res = NULL;
-
- MAKE_STD_ZVAL(args);
- array_init(args);
- php_pq_object_to_zval(data->obj, &connection TSRMLS_CC);
- add_next_index_zval(args, connection);
- php_pq_object_to_zval(obj, &res TSRMLS_CC);
- add_next_index_zval(args, res);
- zend_hash_apply_with_argument(evhs, apply_event, args TSRMLS_CC);
+ if ((zevhs = zend_hash_str_find(&data->obj->intern->eventhandlers, ZEND_STRL("result")))) {
+ zval args, connection, res;
+
+ array_init(&args);
+ php_pq_object_to_zval(data->obj, &connection);
+ add_next_index_zval(&args, &connection);
+ php_pq_object_to_zval(obj, &res);
+ add_next_index_zval(&args, &res);
+ zend_hash_apply_with_argument(Z_ARRVAL_P(zevhs), apply_event, &args);
zval_ptr_dtor(&args);
}
/* async callback */
- if (data->obj->intern->onevent.fci.size > 0) {
- zval *res = NULL;
+ if (php_pq_callback_is_enabled(&data->obj->intern->onevent)) {
+ zval res;
- php_pq_object_to_zval(obj, &res 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);
+ php_pq_object_to_zval(obj, &res);
+ zend_fcall_info_argn(&data->obj->intern->onevent.fci, 1, &res);
+ zend_fcall_info_call(&data->obj->intern->onevent.fci, &data->obj->intern->onevent.fcc, NULL, NULL);
zval_ptr_dtor(&res);
}
if (obj) {
obj->intern->res = NULL;
+ assert(GC_REFCOUNT(&obj->zo));
+ php_pq_object_delref(obj);
}
}
return 1;
}
-php_pqconn_event_data_t *php_pqconn_event_data_init(php_pqconn_object_t *obj TSRMLS_DC)
+php_pqconn_event_data_t *php_pqconn_event_data_init(php_pqconn_object_t *obj)
{
php_pqconn_event_data_t *data = emalloc(sizeof(*data));
data->obj = obj;
- TSRMLS_CF(data);
+ data->res = NULL;
return data;
}
php_pqconn_event_data_t *data = p;
if (data) {
- HashTable *evhs;
- TSRMLS_DF(data);
-
- if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("notice"), (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);
- add_next_index_string(args, PHP_PQresultErrorMessage(res), 1);
- zend_hash_apply_with_argument(evhs, apply_event, args TSRMLS_CC);
+ zval *zevhs;
+
+ if ((zevhs = zend_hash_str_find(&data->obj->intern->eventhandlers, ZEND_STRL("notice")))) {
+ zval args, connection;
+
+ array_init(&args);
+ php_pq_object_to_zval(data->obj, &connection);
+ add_next_index_zval(&args, &connection);
+ add_next_index_string(&args, PHP_PQresultErrorMessage(res));
+ zend_hash_apply_with_argument(Z_ARRVAL_P(zevhs), apply_event, &args);
zval_ptr_dtor(&args);
}
}
projects / m6w6 / ext-pq / blobdiff