psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-01-31 09:24:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Functions conn_poll_* renamed to conn_poll_connect_*.

Browse Source 
These functions are used only during async connections, not for polling
afterwards.
This commit is contained in:
Daniele Varrazzo 2010-04-20 13:11:43 +01:00
parent d2d1160260
commit 9f5d835de6
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
psycopg/connection.h
View File

@ -132,8 +132,8 @@ HIDDEN int conn_commit(connectionObject *self);
HIDDEN int conn_rollback(connectionObject *self);
HIDDEN int conn_switch_isolation_level(connectionObject *self, int level);
HIDDEN int conn_set_client_encoding(connectionObject *self, const char *enc);
HIDDEN PyObject *conn_poll_send(connectionObject *self);
HIDDEN PyObject *conn_poll_fetch(connectionObject *self);
HIDDEN PyObject *conn_poll_connect_send(connectionObject *self);
HIDDEN PyObject *conn_poll_connect_fetch(connectionObject *self);
HIDDEN PyObject *conn_poll_ready(connectionObject *self);
HIDDEN PyObject *conn_poll_green(connectionObject *self);

30
psycopg/connection_int.c
View File

@ -444,16 +444,17 @@ conn_connect(connectionObject *self, long int async)
}
}
/* conn_poll_send - handle connection polling when flushing output */
/* conn_poll_connect_send - handle connection polling when flushing output
during asynchronous connection attempt. */
PyObject *
conn_poll_send(connectionObject *self)
conn_poll_connect_send(connectionObject *self)
{
const char *query = NULL;
int next_status;
int ret;
Dprintf("conn_poll_send: status %d", self->status);
Dprintf("conn_poll_connect_send: status %d", self->status);
switch (self->status) {
case CONN_STATUS_SEND_DATESTYLE:
@ -479,7 +480,7 @@ conn_poll_send(connectionObject *self)
return NULL;
}
Dprintf("conn_poll_send: sending query %-.200s", query);
Dprintf("conn_poll_connect_send: sending query %-.200s", query);
Py_BEGIN_ALLOW_THREADS;
pthread_mutex_lock(&(self->lock));
@ -496,7 +497,7 @@ conn_poll_send(connectionObject *self)
if (PQflush(self->pgconn) == 0) {
/* the query got fully sent to the server */
Dprintf("conn_poll_send: query got flushed immediately");
Dprintf("conn_poll_connect_send: query got flushed immediately");
/* the return value will be POLL_READ */
ret = PSYCO_POLL_READ;
@ -518,7 +519,7 @@ conn_poll_send(connectionObject *self)
}
self->status = next_status;
Dprintf("conn_poll_send: next status is %d, returning %d",
Dprintf("conn_poll_connect_send: next status is %d, returning %d",
self->status, ret);
pthread_mutex_unlock(&(self->lock));
@ -527,17 +528,18 @@ conn_poll_send(connectionObject *self)
return PyInt_FromLong(ret);
}
/* curs_poll_fetch - handle connection polling when reading result */
/* conn_poll_connect_fetch - handle connection polling when reading result
during asynchronous connection attempt. */
PyObject *
conn_poll_fetch(connectionObject *self)
conn_poll_connect_fetch(connectionObject *self)
{
PGresult *pgres;
int is_busy;
int next_status;
int ret;
Dprintf("conn_poll_fetch: status %d", self->status);
Dprintf("conn_poll_connect_fetch: status %d", self->status);
/* consume the input */
is_busy = pq_is_busy(self);
@ -547,7 +549,7 @@ conn_poll_fetch(connectionObject *self)
}
else if (is_busy == 1) {
/* the connection is busy, tell the user to wait more */
Dprintf("conn_poll_fetch: connection busy, returning %d",
Dprintf("conn_poll_connect_fetch: connection busy, returning %d",
PSYCO_POLL_READ);
return PyInt_FromLong(PSYCO_POLL_READ);
}
@ -563,7 +565,7 @@ conn_poll_fetch(connectionObject *self)
pthread_mutex_unlock(&(self->lock));
Py_END_ALLOW_THREADS;
Dprintf("conn_poll_fetch: got result %p", pgres);
Dprintf("conn_poll_connect_fetch: got result %p", pgres);
/* we expect COMMAND_OK (from SET) or TUPLES_OK (from SHOW) */
if (pgres == NULL || (PQresultStatus(pgres) != PGRES_COMMAND_OK &&
@ -576,7 +578,7 @@ conn_poll_fetch(connectionObject *self)
if (self->status == CONN_STATUS_GET_DATESTYLE) {
/* got the result from SET DATESTYLE*/
Dprintf("conn_poll_fetch: datestyle set");
Dprintf("conn_poll_connect_fetch: datestyle set");
next_status = CONN_STATUS_SEND_CLIENT_ENCODING;
}
else if (self->status == CONN_STATUS_GET_CLIENT_ENCODING) {
@ -585,7 +587,7 @@ conn_poll_fetch(connectionObject *self)
if (self->encoding == NULL) {
return NULL;
}
Dprintf("conn_poll_fetch: got client_encoding %s", self->encoding);
Dprintf("conn_poll_connect_fetch: got client_encoding %s", self->encoding);
/* since this is the last step, set the other instance variables now */
self->equote = conn_get_standard_conforming_strings(self->pgconn);
@ -632,7 +634,7 @@ conn_poll_fetch(connectionObject *self)
last initialization query, so we return POLL_OK, otherwise we need to
send another query, so return POLL_WRITE */
ret = self->status == CONN_STATUS_READY ? PSYCO_POLL_OK : PSYCO_POLL_WRITE;
Dprintf("conn_poll_fetch: next status is %d, returning %d",
Dprintf("conn_poll_connect_fetch: next status is %d, returning %d",
self->status, ret);
return PyInt_FromLong(ret);
}

4
psycopg/connection_type.c
View File

@ -435,12 +435,12 @@ psyco_conn_poll_async(connectionObject *self)
case CONN_STATUS_SENT_CLIENT_ENCODING:
/* these mean that we need to wait for the socket to become writable
to send the rest of our query */
return conn_poll_send(self);
return conn_poll_connect_send(self);
case CONN_STATUS_GET_DATESTYLE:
case CONN_STATUS_GET_CLIENT_ENCODING:
/* these mean that we are waiting for the results of the queries */
return conn_poll_fetch(self);
return conn_poll_connect_fetch(self);
case CONN_STATUS_ASYNC:
/* this means we are in the middle of a PQconnectPoll loop */