From: Eric Wong <normalperson@yhbt.net>
To: Jeff King <peff@peff.net>
Cc: Daniel Stenberg <daniel@haxx.se>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [PATCH] http: use curl's tcp keepalive if available
Date: Tue, 15 Oct 2013 04:58:14 +0000 [thread overview]
Message-ID: <20131015045814.GA12312@dcvr.yhbt.net> (raw)
In-Reply-To: <20131015000614.GA10905@sigill.intra.peff.net>
Jeff King <peff@peff.net> wrote:
> On Mon, Oct 14, 2013 at 11:38:39PM +0000, Eric Wong wrote:
>
> > I wanted it to work as older curl first (since I noticed this
> > on an old server). But your patch on top of mine looks reasonable,
> > thanks.
>
> Makes sense. Here it is with a real commit message (on top of the
> ew/keepalive topic).
>
> -- >8 --
> Subject: http: use curl's tcp keepalive if available
>
> Commit a15d069 taught git to use curl's SOCKOPTFUNCTION hook
> to turn on TCP keepalives. However, modern versions of curl
> have a TCP_KEEPALIVE option, which can do this for us. As an
> added bonus, the curl code knows how to turn on keepalive
> for a much wider variety of platforms. The only downside to
> using this option is that not everybody has a new enough curl.
> Let's split our keepalive options into three conditionals:
>
> 1. With curl 7.25.0 and newer, we rely on curl to do it
> right.
>
> 2. With older curl that still knows SOCKOPTFUNCTION, we
> use the code from a15d069.
>
> 3. Otherwise, we are out of luck, and the call is a no-op.
>
> Signed-off-by: Jeff King <peff@peff.net>
Thanks.
Tested-by: Eric Wong <normalperson@yhbt.net>
on curl 7.21.0 and 7.26.0, confirmed via strace:
setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, [1], 4) = 0
I can also confirm 7.26.0 adds:
setsockopt(fd, SOL_TCP, TCP_KEEPIDLE, [60], 4) = 0
setsockopt(fd, SOL_TCP, TCP_KEEPINTVL, [60], 4) = 0
to the strace on Linux.
> ---
> Given the #ifdefs in curl's keepalive code, I suspect we may see build
> problems for people in case 2 on some systems, with or without my patch.
> I think this patch is a strict improvement, though; if they have a new
> enough curl, they will not even look at the case 2 code. And if they do
> not, our previous options were:
>
> a. Add platform-specific code for them.
>
> b. Tell them they are out of luck, and add an #ifdef to push them into
> case 3.
Case 2 works fine on my Debian Squeeze system.
> Now we have an extra option:
>
> c. Tell them to upgrade curl. :)
Yes, I keep forgetting I still have a Debian Squeeze machine :x
next prev parent reply other threads:[~2013-10-15 4:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-12 22:29 [PATCH] http: enable keepalive on TCP sockets Eric Wong
2013-10-13 9:44 ` Daniel Stenberg
2013-10-14 5:27 ` Eric Wong
2013-10-14 21:40 ` Jeff King
2013-10-14 23:38 ` Eric Wong
2013-10-15 0:06 ` [PATCH] http: use curl's tcp keepalive if available Jeff King
2013-10-15 4:58 ` Eric Wong [this message]
2013-10-15 5:00 ` Jeff King
2013-10-15 6:03 ` Eric Wong
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131015045814.GA12312@dcvr.yhbt.net \
--to=normalperson@yhbt.net \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).