generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid doing getsockopt() on Windows to verify connects. It seems that this

Browse Source 
hogs Windows machines when libcurl is being used multi-threaded (with > ~50
threads). Andrew Fuller helped us verify and test this.

According to a MSDN web page on connect(), it returns 0 when the connect
is done and thus we don't need the getsockopt() call anyway on Windows.
This commit is contained in:
Daniel Stenberg 2003-10-15 11:42:57 +00:00
parent 171229e122
commit a9af971c59
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/connect.c
View File

@ -353,18 +353,27 @@ static CURLcode bindlocal(struct connectdata *conn,
return CURLE_HTTP_PORT_FAILED; return CURLE_HTTP_PORT_FAILED;
} }
/*
static * verifyconnect() returns TRUE if the connect really has happened.
int socketerror(int sockfd) */
static bool verifyconnect(int sockfd)
{ {
#if defined(SO_ERROR) && !defined(WIN32)
int err = 0; int err = 0;
socklen_t errSize = sizeof(err); socklen_t errSize = sizeof(err);
#ifdef SO_ERROR
if( -1 == getsockopt(sockfd, SOL_SOCKET, SO_ERROR, if( -1 == getsockopt(sockfd, SOL_SOCKET, SO_ERROR,
(void *)&err, &errSize)) (void *)&err, &errSize))
err = Curl_ourerrno(); err = Curl_ourerrno();
if ((0 == err) || (EISCONN == err))
/* we are connected, awesome! */
return TRUE;
/* This wasn't a successful connect */
return FALSE;
#else
return TRUE;
#endif #endif
return err;
} }
/* /*
@ -415,14 +424,13 @@ CURLcode Curl_is_connected(struct connectdata *conn,
rc = waitconnect(sockfd, 0); rc = waitconnect(sockfd, 0);
if(0 == rc) { if(0 == rc) {
int err = socketerror(sockfd); if (verifyconnect(sockfd)) {
if ((0 == err) || (EISCONN == err)) {
/* we are connected, awesome! */ /* we are connected, awesome! */
*connected = TRUE; *connected = TRUE;
return CURLE_OK; return CURLE_OK;
} }
/* nope, not connected for real */ /* nope, not connected for real */
failf(data, "Connection failed, socket error: %d", err); failf(data, "Connection failed");
return CURLE_COULDNT_CONNECT; return CURLE_COULDNT_CONNECT;
} }
else if(1 != rc) { else if(1 != rc) {
@ -568,10 +576,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */
if(0 == rc) { if(0 == rc) {
/* we might be connected, if the socket says it is OK! Ask it! */ /* we might be connected, if the socket says it is OK! Ask it! */
int err; if(verifyconnect(sockfd)) {
err = socketerror(sockfd);
if ((0 == err) || (EISCONN == err)) {
/* we are connected, awesome! */ /* we are connected, awesome! */
*connected = TRUE; /* this is truly a connect */ *connected = TRUE; /* this is truly a connect */
break; break;
@ -695,8 +700,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */
} }
if(0 == rc) { if(0 == rc) {
int err = socketerror(sockfd); if (verifyconnect(sockfd)) {
if ((0 == err) || (EISCONN == err)) {
/* we are connected, awesome! */ /* we are connected, awesome! */
*connected = TRUE; /* this is a true connect */ *connected = TRUE; /* this is a true connect */
break; break;