Skip to content

Timeout feature added #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: v4.4.x-fix
Choose a base branch
from
Open

Timeout feature added #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b9f14e
Timeout feature added
codercms May 7, 2020
d2cefa6
Fix segmentation fault
codercms May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 46 additions & 24 deletions swoole_postgresql_coro.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,16 +145,19 @@ ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_query, 0, 0, 0)
ZEND_ARG_INFO(0, query)
ZEND_ARG_INFO(0, timeout)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_send_prepare, 0, 0, 2)
ZEND_ARG_INFO(0, stmtname)
ZEND_ARG_INFO(0, query)
ZEND_ARG_INFO(0, timeout)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_send_execute, 0, 0, 2)
ZEND_ARG_INFO(0, stmtname)
ZEND_ARG_INFO(0, pv_param_arr)
ZEND_ARG_INFO(0, timeout)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_all, 0, 0, 0)
Expand Down Expand Up @@ -314,6 +317,7 @@ static PHP_METHOD(swoole_postgresql_coro, connect)

object->fd = fd;
object->conn = pgsql;
// TODO: Use timeout specified by user
object->timeout = SW_PGSQL_CONNECT_TIMEOUT;
object->status = CONNECTION_STARTED;
object->connected = false;
Expand Down Expand Up @@ -372,15 +376,22 @@ static void swoole_pgsql_coro_onTimeout(swTimer *timer, swTimer_node *tnode)
feedback = "Connected to server..";
break;

// cancel outgoing command
case CONNECTION_OK:
PQrequestCancel(pgsql);
swoole_event_del(object->fd);
feedback = " query time out..";
break;

default:
feedback = " time out..";
break;
}

err_msg = PQerrorMessage(object->conn);

if (pgsql==NULL || PQstatus(pgsql) == CONNECTION_STARTED)
{
err_msg = PQerrorMessage(object->conn);

swWarn(" [%s, %s] ", feedback, err_msg);
}
else if (PQstatus(pgsql) == CONNECTION_MADE)
Expand Down Expand Up @@ -681,11 +692,15 @@ static int prepare_result_parse(pg_object *object)
static PHP_METHOD(swoole_postgresql_coro, query)
{
zval *query;
double timeout = 0;

PGconn *pgsql;
PGresult *pgsql_result;

ZEND_PARSE_PARAMETERS_START(1,1)
ZEND_PARSE_PARAMETERS_START(1,2)
Z_PARAM_ZVAL(query)
Z_PARAM_OPTIONAL
Z_PARAM_DOUBLE(timeout)
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);

pg_object *object = php_swoole_postgresql_coro_get_object(ZEND_THIS);
Expand All @@ -702,33 +717,39 @@ static PHP_METHOD(swoole_postgresql_coro, query)
if (ret == 0)
{
char * err_msg = PQerrorMessage(pgsql);
swWarn("error:[%s]", err_msg);
swWarn("PQsendQuery error:[%s]", err_msg);
}

php_coro_context *context = php_swoole_postgresql_coro_get_context(ZEND_THIS);
context->coro_params = *ZEND_THIS;

swoole_event_add(object->fd, SW_EVENT_READ, PHP_SWOOLE_FD_POSTGRESQL);
if (ret == 1)
{
swoole_event_add(object->fd, SW_EVENT_READ, PHP_SWOOLE_FD_POSTGRESQL);

//TODO: add the timeout
/*
if (pg_object->timeout > 0)
if (timeout > 0)
{
pg_object->timer = swTimer_add(&SwooleG.timer, (int) (pg_object->timeout * 1000), 0, sw_current_context, swoole_pgsql_coro_onTimeout);
}*/
object->timer = swoole_timer_add((long) (timeout * 1000), 0, swoole_pgsql_coro_onTimeout, context);
}
}

PHPCoroutine::yield_m(return_value, context);
}

static PHP_METHOD(swoole_postgresql_coro, prepare)
{
zval *query, *stmtname;
double timeout = 0;

PGconn *pgsql;
int is_non_blocking;
PGresult *pgsql_result;

ZEND_PARSE_PARAMETERS_START(2,2)
ZEND_PARSE_PARAMETERS_START(2,3)
Z_PARAM_ZVAL(stmtname)
Z_PARAM_ZVAL(query)
Z_PARAM_OPTIONAL
Z_PARAM_DOUBLE(timeout)
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);

pg_object *object = php_swoole_postgresql_coro_get_object(ZEND_THIS);
Expand Down Expand Up @@ -766,12 +787,11 @@ static PHP_METHOD(swoole_postgresql_coro, prepare)
php_coro_context *context = php_swoole_postgresql_coro_get_context(ZEND_THIS);
context->coro_params = *ZEND_THIS;

//TODO: add the timeout
/*
if (pg_object->timeout > 0)
{
pg_object->timer = swTimer_add(&SwooleG.timer, (int) (pg_object->timeout * 1000), 0, sw_current_context, swoole_pgsql_coro_onTimeout);
}*/
if (timeout > 0)
{
object->timer = swoole_timer_add((long)(timeout * 1000), 0, swoole_pgsql_coro_onTimeout, context);
}

swoole_event_add(object->fd, SW_EVENT_READ, PHP_SWOOLE_FD_POSTGRESQL);
PHPCoroutine::yield_m(return_value, context);
}
Expand All @@ -783,14 +803,17 @@ static PHP_METHOD(swoole_postgresql_coro, execute)
int num_params = 0;
char **params = NULL;
zval *stmtname;
double timeout = 0;
PGconn *pgsql;
int is_non_blocking;
PGresult *pgsql_result;


ZEND_PARSE_PARAMETERS_START(2,2)
ZEND_PARSE_PARAMETERS_START(2,3)
Z_PARAM_ZVAL(stmtname)
Z_PARAM_ZVAL(pv_param_arr)
Z_PARAM_OPTIONAL
Z_PARAM_DOUBLE(timeout)
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);

pg_object *object = php_swoole_postgresql_coro_get_object(ZEND_THIS);
Expand Down Expand Up @@ -868,12 +891,11 @@ static PHP_METHOD(swoole_postgresql_coro, execute)
php_coro_context *context = php_swoole_postgresql_coro_get_context(ZEND_THIS);
context->coro_params = *ZEND_THIS;

//TODO: add the timeout
/*
if (pg_object->timeout > 0)
{
pg_object->timer = swTimer_add(&SwooleG.timer, (int) (pg_object->timeout * 1000), 0, sw_current_context, swoole_pgsql_coro_onTimeout);
}*/
if (timeout > 0)
{
object->timer = swoole_timer_add((long)(timeout * 1000), 0, swoole_pgsql_coro_onTimeout, context);
}

swoole_event_add(object->fd, SW_EVENT_READ, PHP_SWOOLE_FD_POSTGRESQL);
PHPCoroutine::yield_m(return_value, context);
}
Expand Down