database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

libpq connection_timeout doesn't do subsecond timing, so make the code

Browse Source 
clear on that point.
This commit is contained in:
Bruce Momjian
2002-10-14 17:15:11 +00:00
parent 8f2a289d78
commit 9eada51012
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/interfaces/libpq/fe-connect.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.208 2002/10/11 04:41:59 momjian Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.209 2002/10/14 17:15:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -1071,15 +1071,14 @@ connectDBComplete(PGconn *conn)
conn->status = CONNECTION_BAD;
return 0;
}
remains.tv_usec = 0;
remains.tv_usec = 0; /* We don't use subsecond timing */
rp = &remains;
/* calculate the finish time based on start + timeout */
finish_time = time((time_t *) NULL) + remains.tv_sec;
}
while (rp == NULL || remains.tv_sec > 0 ||
(remains.tv_sec == 0 && remains.tv_usec > 0))
while (rp == NULL || remains.tv_sec > 0)
{
/*
* Wait, if necessary. Note that the initial state (just after
@ -1133,7 +1132,6 @@ connectDBComplete(PGconn *conn)
}
remains.tv_sec = finish_time - current_time;
remains.tv_usec = 0;
}
}
conn->status = CONNECTION_BAD;