Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
4e723e67
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4e723e67
编写于
8月 27, 2002
作者:
B
Bruce Momjian
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cleanup of libpq connection timeout code.
上级
78a693c4
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
47 addition
and
47 deletion
+47
-47
src/interfaces/libpq/fe-connect.c
src/interfaces/libpq/fe-connect.c
+47
-47
未找到文件。
src/interfaces/libpq/fe-connect.c
浏览文件 @
4e723e67
...
...
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.19
4 2002/08/18 01:35:39
momjian Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.19
5 2002/08/27 14:49:52
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -1063,34 +1063,33 @@ connectDBComplete(PGconn *conn)
if
(
conn
==
NULL
||
conn
->
status
==
CONNECTION_BAD
)
return
0
;
/*
* Prepare to time calculations, if connect_timeout isn't zero.
*/
if
(
conn
->
connect_timeout
!=
NULL
)
/*
* Prepare to time calculations, if connect_timeout isn't zero.
*/
if
(
conn
->
connect_timeout
!=
NULL
)
{
remains
.
tv_sec
=
atoi
(
conn
->
connect_timeout
);
if
(
!
remains
.
tv_sec
)
{
conn
->
status
=
CONNECTION_BAD
;
return
0
;
}
remains
.
tv_usec
=
0
;
rp
=
&
remains
;
}
remains
.
tv_sec
=
atoi
(
conn
->
connect_timeout
);
if
(
!
remains
.
tv_sec
)
{
conn
->
status
=
CONNECTION_BAD
;
return
0
;
}
remains
.
tv_usec
=
0
;
rp
=
&
remains
;
}
while
(
rp
==
NULL
||
remains
.
tv_sec
>
0
||
(
remains
.
tv_sec
==
0
&&
remains
.
tv_usec
>
0
))
{
/*
* If connecting timeout is set, get current time.
*/
if
(
rp
!=
NULL
&&
gettimeofday
(
&
start_time
,
NULL
)
==
-
1
)
{
conn
->
status
=
CONNECTION_BAD
;
return
0
;
}
while
(
rp
==
NULL
||
remains
.
tv_sec
>
0
||
(
remains
.
tv_sec
==
0
&&
remains
.
tv_usec
>
0
))
{
/*
* If connecting timeout is set, get current time.
*/
if
(
rp
!=
NULL
&&
gettimeofday
(
&
start_time
,
NULL
)
==
-
1
)
{
conn
->
status
=
CONNECTION_BAD
;
return
0
;
}
/*
* Wait, if necessary. Note that the initial state (just after
* PQconnectStart) is to wait for the socket to select for
* writing.
...
...
@@ -1104,7 +1103,7 @@ connectDBComplete(PGconn *conn)
return
1
;
/* success! */
case
PGRES_POLLING_READING
:
if
(
pqWaitTimed
(
1
,
0
,
conn
,
rp
))
if
(
pqWaitTimed
(
1
,
0
,
conn
,
rp
))
{
conn
->
status
=
CONNECTION_BAD
;
return
0
;
...
...
@@ -1130,27 +1129,28 @@ connectDBComplete(PGconn *conn)
*/
flag
=
PQconnectPoll
(
conn
);
/*
* If connecting timeout is set, calculate remain time.
*/
if
(
NULL
!=
rp
)
{
if
(
-
1
==
gettimeofday
(
&
finish_time
,
NULL
))
{
conn
->
status
=
CONNECTION_BAD
;
return
0
;
}
if
(
0
>
(
finish_time
.
tv_usec
-=
start_time
.
tv_usec
))
{
remains
.
tv_sec
++
;
finish_time
.
tv_usec
+=
1000000
;
}
if
(
0
>
(
remains
.
tv_usec
-=
finish_time
.
tv_usec
))
{
remains
.
tv_sec
--
;
remains
.
tv_usec
+=
1000000
;
}
remains
.
tv_sec
-=
finish_time
.
tv_sec
-
start_time
.
tv_sec
;
}
/*
* If connecting timeout is set, calculate remain time.
*/
if
(
NULL
!=
rp
)
{
if
(
gettimeofday
(
&
finish_time
,
NULL
)
==
-
1
)
{
conn
->
status
=
CONNECTION_BAD
;
return
0
;
}
if
((
finish_time
.
tv_usec
-=
start_time
.
tv_usec
)
<
0
)
{
remains
.
tv_sec
++
;
finish_time
.
tv_usec
+=
1000000
;
}
if
((
remains
.
tv_usec
-=
finish_time
.
tv_usec
)
<
0
)
{
remains
.
tv_sec
--
;
remains
.
tv_usec
+=
1000000
;
}
remains
.
tv_sec
-=
finish_time
.
tv_sec
-
start_time
.
tv_sec
;
}
}
conn
->
status
=
CONNECTION_BAD
;
return
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录