kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Switch to Poll instead of Select.

This commit is contained in:
Eliot Gable 2012-10-08 22:22:34 +00:00
parent dc1477e575
commit 7d7eaee942
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/switch_pgsql.c
View File

@ -35,6 +35,7 @@
#ifdef SWITCH_HAVE_PGSQL #ifdef SWITCH_HAVE_PGSQL
#include <libpq-fe.h> #include <libpq-fe.h>
#include <poll.h>
struct switch_pgsql_handle { struct switch_pgsql_handle {
@ -168,8 +169,8 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_next_result_timed(switch_pgsq
switch_time_t ctime; switch_time_t ctime;
unsigned int usec = msec * 1000; unsigned int usec = msec * 1000;
char *err_str; char *err_str;
fd_set pgset; struct pollfd fds[2] = { {0} };
struct timeval timeout; int poll_res = 0;
if(!handle) { if(!handle) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "**BUG** Null handle passed to switch_pgsql_next_result.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "**BUG** Null handle passed to switch_pgsql_next_result.\n");
@ -183,30 +184,37 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_next_result_timed(switch_pgsq
/* Wait for a result to become available, up to msec milliseconds */ /* Wait for a result to become available, up to msec milliseconds */
start = switch_time_now(); start = switch_time_now();
while((ctime = switch_time_now()) - start <= usec) { while((ctime = switch_micro_time_now()) - start <= usec) {
FD_ZERO(&pgset); int wait_time = (usec - (ctime - start)) / 1000;
FD_SET(handle->sock, &pgset); fds[0].fd = handle->sock;
fds[0].events |= POLLIN;
fds[0].events |= POLLERR;
timeout.tv_sec = 0;
timeout.tv_usec = 500;
/* Wait for the PostgreSQL socket to be ready for data reads. */ /* Wait for the PostgreSQL socket to be ready for data reads. */
if (select(FD_SETSIZE, &pgset, NULL, NULL, &timeout) > 0) { if ((poll_res = poll(&fds[0], 1, wait_time)) > -1 ) {
/* Then try to consume any input waiting. */ if (fds[0].revents & POLLIN) {
if (PQconsumeInput(handle->con)) { /* Then try to consume any input waiting. */
/* And check to see if we have a full result ready for reading */ if (PQconsumeInput(handle->con)) {
if (!PQisBusy(handle->con)) { /* And check to see if we have a full result ready for reading */
/* If we can pull a full result without blocking, then break this loop */ if (!PQisBusy(handle->con)) {
break; /* If we can pull a full result without blocking, then break this loop */
break;
}
} else {
/* If we had an error trying to consume input, report it and cancel the query. */
err_str = switch_pgsql_handle_get_error(handle);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "An error occurred trying to consume input for query (%s): %s\n", handle->sql, err_str);
switch_safe_free(err_str);
switch_pgsql_cancel(handle);
goto error;
} }
} else { } else if (fds[0].revents & POLLERR) {
/* If we had an error trying to consume input, report it and cancel the query. */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Poll error trying to read PGSQL socket for query (%s)\n", handle->sql);
err_str = switch_pgsql_handle_get_error(handle);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "An error occurred trying to consume input for query (%s): %s\n", handle->sql, err_str);
switch_safe_free(err_str);
switch_pgsql_cancel(handle);
goto error; goto error;
} }
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Poll failed trying to read PGSQL socket for query (%s)\n", handle->sql);
goto error;
} }
} }
@ -318,7 +326,7 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_finish_results_real(const cha
#endif #endif
} }
#ifdef SWITCH_HAVE_PG #ifdef SWITCH_HAVE_PGSQL
static int db_is_up(switch_pgsql_handle_t *handle) static int db_is_up(switch_pgsql_handle_t *handle)
{ {
int ret = 0; int ret = 0;