From: Mika Fischer <mika.fischer@zoopnet.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, daniel@haxx.se, peff@peff.net
Subject: Re: [PATCH v3 2/3] http.c: Use timeout suggested by curl instead of fixed 50ms timeout
Date: Fri, 4 Nov 2011 18:47:44 +0100 [thread overview]
Message-ID: <CAOs=hRKxc9SdE_HTnfs+WdnxZEY6yF9MBV_K1FX2=7B7xtj7-w@mail.gmail.com> (raw)
In-Reply-To: <7vehxndd4q.fsf@alter.siamese.dyndns.org>
On Fri, Nov 4, 2011 at 18:13, Junio C Hamano <gitster@pobox.com> wrote:
> I'm inclined to squash in the following to narrow the scope of
> curl_timeout, though.
>
> diff --git a/http.c b/http.c
> index 5cb0fb6..924be52 100644
> --- a/http.c
> +++ b/http.c
> @@ -636,9 +636,6 @@ void run_active_slot(struct active_request_slot *slot)
> fd_set excfds;
> int max_fd;
> struct timeval select_timeout;
> -#if LIBCURL_VERSION_NUM >= 0x070f04
> - long curl_timeout;
> -#endif
> int finished = 0;
>
> slot->finished = &finished;
> @@ -655,6 +652,7 @@ void run_active_slot(struct active_request_slot *slot)
>
> if (slot->in_use && !data_received) {
> #if LIBCURL_VERSION_NUM >= 0x070f04
> + long curl_timeout;
> curl_multi_timeout(curlm, &curl_timeout);
> if (curl_timeout == 0) {
> continue;
Ah yes, that's good. I would have done it this way in C++, but I
wasn't sure whether C99 is OK for git.
next prev parent reply other threads:[~2011-11-04 17:48 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 ` [PATCH 1/2] http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping Mika Fischer
2011-11-02 20:32 ` 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 [this message]
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='CAOs=hRKxc9SdE_HTnfs+WdnxZEY6yF9MBV_K1FX2=7B7xtj7-w@mail.gmail.com' \
--to=mika.fischer@zoopnet.de \
--cc=daniel@haxx.se \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).