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

Re: [PATCH v2] send-pack: avoid deadlock when pack-object dies early

From
Jeff King <peff@peff.net>
Date
Apr 26, 2011, 08:23 UTC
Message-ID
<20110426082302.GC26874@sigill.intra.peff.net>
In-Reply-To
<4DB5E1CA.8000105@kdbg.org>
On Mon, Apr 25, 2011 at 11:04:10PM +0200, Johannes Sixt wrote:
Show 8 quoted lines
> > In the comments for 1/2, you said this goes directly on 38a81b4e. But in
> > that commit, we use #ifndef WIN32 to decide whether or not to fork for
> > async code. So shouldn't this use the same test (I don't even see
> > ASYNC_AS_THREAD defined anywhere else)?
> 
> Here's the fixed patch. I squashed both earlier patches into a single patch
> because they are about the same topic, as you showed with your tests of
> git-push via smart http.
Thanks, this one looks good to me, and I think the squash is sensible.
> Again, this should go on top of 38a81b4e. When it is merged to f6b60983 or
> later, the '#ifndef WIN32' must be changed to '#ifdef NO_PTHREADS'.
I see Junio has an evil merge in pu that takes care of this.

I wonder if it might have been nicer to "cherry-pick -n" the old fix on top of master, fixing up the tree to use NO_PTHREADS, and then resolving the ensuing merge conflict in favor of the cherry-picked version. . I guess it is just a matter of style (the fact that a few of our archaeology tools do not find content in evil merges very well is a downside, but that just means we should fix the tools :) ).

-Peff
Previous: Johannes SixtNext: Jeff King
Message 24 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.