git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 4/4] send-pack: abort sideband demuxer on pack-objects error

From
Johannes Sixt <j6t@kdbg.org>
Date
Apr 14, 2011, 20:43 UTC
Message-ID
<201104142243.33522.j6t@kdbg.org>
In-Reply-To
<20110414202110.GA6525@sigill.intra.peff.net>
On Donnerstag, 14. April 2011, Jeff King wrote:
Show 45 quoted lines
> On Thu, Apr 14, 2011 at 09:36:25PM +0200, Johannes Sixt wrote:
> > On Donnerstag, 14. April 2011, Jeff King wrote:
> > > Obviously it totally breaks the start_async abstraction if the called
> > > code needs to care whether it forked or not. But we can use that to our
> > > advantage, since it means start_async callers must assume the interface
> > > is very limited.  So I think we can do something like:
> > >
> > >   1. Async code declares which file descriptors it cares about. This
> > >      would automatically include the pipe we give to it, of course.
> > >      So the declared ones for a sideband demuxer would be stderr, and
> > >      some network fd for reading.
> > >
> > >   2. In the pthreads case, we do nothing. In the forked case, the child
> > >      closes every descriptor except the "interesting" ones.
> > >
> > > And that solves this problem, and the general case that async-callers
> > > have no idea if they have just leaked pipe descriptors in the forked
> > > case.
> >
> > Sounds like a plan. How do you close all file descriptors? Just iterate
> > up to getrlimit(RLIMIT_NOFILE)?
>
> Sadly, yes, I think that is what we would have to do. It does feel like
> an awful hack. And it will interact badly with things like valgrind,
> which open descriptors behind the scenes (but can properly handle
> the forking).
>
> I just don't see another way around it for the general case.  The
> "usual" fix for this sort of thing is that the descriptors should have
> close-on-exec set, but that doesn't work for us here, because we are
> only forking.
>
> It's sufficiently ugly (and still possible to break in the pthreads
> case!) that it may be worth not worrying about the general case at all,
> and just fixing this one with the explicit close.
>
> > > I'm still slightly confused, though, because I never see that
> > > descriptor get closed in the threaded case. So I still don't understand
> > > why it _doesn't_ deadlock with pthreads.
> >
> > In the threaded case, this fd is closed by start_command(), where it is
> > passed as po.out in pack_objects(). In the fork case this is too late
> > because a duplicate was already inherited to the sideband demuxer.
>
> Hrm, I see the code now. That seems like an odd thing to do to me.

Why so? It's a matter of resource ownership: If you pass a positive value, you give away ownership; if you pass -1, you gain ownership; if you pass 0, ownership remains unchanged.

Show 13 quoted lines
> Doesn't it disallow:
>
>   /* set up a command */
>   const char **argv = { "some", "command" };
>   struct child_process c;
>   c.argv = argv;
>   c.out = fd;
>
>   /* run it */
>   run_command(&c);
>
>   /* now tack our own output to the end */
>   write(fd, "foo", 3);
You would have to dup() the fd before run_command().
> And even weirder, we only do the close for high file descriptors. So you
> _can_ do that above if "fd" is stdout, but not with an arbitrary fd.

Ah, right, that's a bit dubious. The reason is that if you want to tell the child process to use the parent's stdout for its own stdout, you specify 0 aka "no special treatement", i.e. just inherit from the parent, not 1. IOW, 1 is never a sane candidate to be assigned to c.out.

-- Hannes
Previous: Jeff KingNext: Jeff King
Message 14 of 48 in “fix hang in git push when pack-objects fails”
  1. 0/4 fix hang in git push when pack-objects failsJeff King, Mar 31, 2011
  2. 1/4 teach wait_or_whine a "quiet" modeJeff King, Mar 31, 2011
  3. Johannes SixtMar 31, 2011
  4. Jeff KingApr 1, 2011
  5. 2/4 finish_async: be quiet when waiting for async processJeff King, Mar 31, 2011
  6. 3/4 run-command: allow aborting async code prematurelyJeff King, Mar 31, 2011
  7. Erik Faye-LundApr 1, 2011
  8. Jeff KingApr 1, 2011
  9. 4/4 send-pack: abort sideband demuxer on pack-objects errorJeff King, Mar 31, 2011
  10. Johannes SixtApr 13, 2011
  11. Jeff KingApr 14, 2011
  12. Johannes SixtApr 14, 2011
  13. Jeff KingApr 14, 2011
  14. Johannes SixtApr 14, 2011
  15. Jeff KingApr 14, 2011
  16. Johannes SixtApr 14, 2011
  17. Junio C HamanoApr 14, 2011
  18. 1/2 send-pack --stateless-rpc: properly close the outgoing channelJohannes Sixt, Apr 24, 2011
  19. 2/2 send-pack: avoid deadlock when pack-object dies earlyJohannes Sixt, Apr 24, 2011
  20. Jeff KingApr 25, 2011
  21. Johannes SixtApr 25, 2011
  22. Junio C HamanoApr 25, 2011
  23. send-pack: avoid deadlock when pack-object dies earlyJohannes Sixt, Apr 25, 2011
  24. Jeff KingApr 26, 2011
  25. Jeff KingApr 25, 2011
  26. 5/4 run-command: implement abort_async for pthreadsJeff King, Mar 31, 2011
  27. Erik Faye-LundApr 1, 2011
  28. Erik Faye-LundApr 1, 2011
  29. Johannes SixtApr 1, 2011
  30. Jeff KingApr 1, 2011
  31. Erik Faye-LundApr 1, 2011
  32. Erik Faye-LundApr 1, 2011
  33. Johannes SixtApr 1, 2011
  34. Erik Faye-LundApr 1, 2011
  35. Jeff KingApr 1, 2011
  36. Erik Faye-LundApr 1, 2011
  37. Jeff KingApr 1, 2011
  38. Jeff KingApr 1, 2011
  39. Erik Faye-LundApr 1, 2011
  40. Johannes SixtApr 1, 2011
  41. Erik Faye-LundApr 1, 2011
  42. Johannes SixtApr 1, 2011
  43. Erik Faye-LundApr 1, 2011
  44. Jeff KingApr 1, 2011
  45. Erik Faye-LundApr 2, 2011
  46. Jeff KingApr 1, 2011
  47. Johannes SixtMar 31, 2011
  48. Jeff KingApr 1, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.