firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-25 01:23:03 +01:00
Code Issues

Slightly improve the retry loops in inet.cpp. Let's give up as soon as the call fails with any unexpected error.

Browse Source
This commit is contained in:
dimitr 2009-06-08 12:34:47 +00:00
parent 3ca8242b21
commit 6bbff07368
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/remote/inet.cpp
View File

@ -673,11 +673,10 @@ rem_port* INET_connect(const TEXT* name,
// NOTE: This still does not guarantee success, but helps. // NOTE: This still does not guarantee success, but helps.
if (!service) if (!service)
{ {
if (H_ERRNO == INET_RETRY_ERRNO) { for (int retry = 0; H_ERRNO == INET_RETRY_ERRNO && retry < INET_RETRY_CALL; retry++)
for (int retry = 0; retry < INET_RETRY_CALL; retry++) { {
if ( (service = getservbyname(protocol.c_str(), "tcp")) ) if ( (service = getservbyname(protocol.c_str(), "tcp")) )
break; break;
}
} }
} }
#endif // WIN_NT #endif // WIN_NT
@ -828,14 +827,12 @@ rem_port* INET_connect(const TEXT* name,
// On Linux platform, when the server dies the system holds a port // On Linux platform, when the server dies the system holds a port
// for some time. // for some time.
if (INET_ERRNO == INET_ADDR_IN_USE) for (int retry = 0; INET_ERRNO == INET_ADDR_IN_USE && retry < INET_RETRY_CALL; retry++)
{ {
for (int retry = 0; retry < INET_RETRY_CALL; retry++) { sleep(10);
sleep(10); n = bind((SOCKET) port->port_handle, (struct sockaddr *) &address, sizeof(address));
n = bind((SOCKET) port->port_handle, (struct sockaddr *) &address, sizeof(address)); if (n == 0)
if (n == 0 || INET_ERRNO != INET_ADDR_IN_USE) break;
break;
}
} }
} }
@ -1848,9 +1845,10 @@ static int get_host_address(const char* name,
// retry the operation a few times. // retry the operation a few times.
// NOTE: This still does not guarantee success, but helps. // NOTE: This still does not guarantee success, but helps.
if ((!host) && (H_ERRNO == INET_RETRY_ERRNO)) if (!host)
{ {
for (int retry = 0; retry < INET_RETRY_CALL; retry++) { for (int retry = 0; H_ERRNO == INET_RETRY_ERRNO && retry < INET_RETRY_CALL; retry++)
{
if ( (host = gethostbyname(name)) ) if ( (host = gethostbyname(name)) )
break; break;
} }