git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mika Fischer <mika.fischer@zoopnet.de>
To: git@vger.kernel.org
Cc: gitster@pobox.com, daniel@haxx.se,
	Mika Fischer <mika.fischer@zoopnet.de>
Subject: [PATCH 1/2] http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping
Date: Wed,  2 Nov 2011 21:21:27 +0100	[thread overview]
Message-ID: <1320265288-12647-2-git-send-email-mika.fischer@zoopnet.de> (raw)
In-Reply-To: <1320265288-12647-1-git-send-email-mika.fischer@zoopnet.de>

Instead of sleeping unconditionally for a 50ms, when no data can be read
from the http connection(s), use curl_multi_fdset to obtain the actual
file descriptors of the open connections and use them in the select call.
This way, the 50ms sleep is interrupted when new data arrives.
---
 http.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/http.c b/http.c
index a4bc770..ae92318 100644
--- a/http.c
+++ b/http.c
@@ -664,14 +664,14 @@ void run_active_slot(struct active_request_slot *slot)
 		}
 
 		if (slot->in_use && !data_received) {
-			max_fd = 0;
+			max_fd = -1;
 			FD_ZERO(&readfds);
 			FD_ZERO(&writefds);
 			FD_ZERO(&excfds);
+			curl_multi_fdset(curlm, &readfds, &writefds, &excfds, &max_fd);
 			select_timeout.tv_sec = 0;
 			select_timeout.tv_usec = 50000;
-			select(max_fd, &readfds, &writefds,
-			       &excfds, &select_timeout);
+			select(max_fd+1, &readfds, &writefds, &excfds, &select_timeout);
 		}
 	}
 #else
-- 
1.7.8.rc0.33.g09c6f.dirty

  reply	other threads:[~2011-11-02 20:22 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-02 20:21 [PATCHv2] Improve use of select in http backend Mika Fischer
2011-11-02 20:21 ` Mika Fischer [this message]
2011-11-02 20:32   ` [PATCH 1/2] http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping Jeff King
2011-11-02 20:35     ` Jeff King
2011-11-02 21:26       ` Junio C Hamano
2011-11-02 22:22     ` Mika Fischer
2011-11-02 22:40       ` Daniel Stenberg
2011-11-02 20:21 ` [PATCH 2/2] http.c: Use timeout suggested by curl instead of fixed 50ms timeout Mika Fischer
2011-11-03 23:14 ` [PATCHv2] Improve use of select in http backend Junio C Hamano
2011-11-04 14:19 ` [PATCH v3 0/3] " Mika Fischer
2011-11-04 14:19   ` [PATCH v3 1/3] http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping Mika Fischer
2011-11-04 14:19   ` [PATCH v3 2/3] http.c: Use timeout suggested by curl instead of fixed 50ms timeout Mika Fischer
2011-11-04 17:13     ` Junio C Hamano
2011-11-04 17:47       ` Mika Fischer
2011-11-04 17:51         ` Jeff King
2011-11-04 17:55           ` Mika Fischer
2011-11-04 18:02         ` Junio C Hamano
2011-11-04 14:19   ` [PATCH v3 3/3] http.c: Rely on select instead of tracking whether data was received Mika Fischer
2011-11-04 17:53   ` [PATCH v3 0/3] Improve use of select in http backend Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1320265288-12647-2-git-send-email-mika.fischer@zoopnet.de \
    --to=mika.fischer@zoopnet.de \
    --cc=daniel@haxx.se \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).