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

Re: [PATCH 2/2] upload-pack: use stdio in send_ref callbacks

From
Jeff King <peff@peff.net>
Date
Aug 26, 2021, 23:32 UTC
Message-ID
<YSgkgfCr6/kIGzWX@coredump.intra.peff.net>
In-Reply-To
<20210826100648.10333-2-jacob@gitlab.com>
On Thu, Aug 26, 2021 at 12:06:48PM +0200, Jacob Vosmaer wrote:
Show 13 quoted lines
> @@ -126,6 +127,7 @@ static void upload_pack_data_init(struct upload_pack_data *data)
>  	struct string_list uri_protocols = STRING_LIST_INIT_DUP;
>  	struct object_array extra_edge_obj = OBJECT_ARRAY_INIT;
>  	struct string_list allowed_filters = STRING_LIST_INIT_DUP;
> +	struct strbuf send_ref_buf = STRBUF_INIT;
>  
>  	memset(data, 0, sizeof(*data));
>  	data->symref = symref;
> @@ -141,6 +143,7 @@ static void upload_pack_data_init(struct upload_pack_data *data)
>  	data->allow_filter_fallback = 1;
>  	data->tree_filter_max_depth = ULONG_MAX;
>  	packet_writer_init(&data->writer, 1);
> +	data->send_ref_buf = send_ref_buf;

This does a struct copy of the strbuf, which is usually a bad thing (both copies think they own the pointer). It works here because the original immediately goes out of scope. The usual thing would be to do this instead:

  strbuf_init(&data->send_ref_buf, 0);

but I notice this whole function is somewhat odd that way (lots of static initializers followed by struct assignment, rather than using initialization functions).

I'm not sure if it's worth changing or not. Again, I don't think it's doing the wrong thing, but just sort of unusual for our code base. A few of the data structures in use here don't have _init() functions (object_array and oid_array), but that probably means we ought to add them.

-Peff
Previous: Jeff KingNext: Junio C Hamano
Message 26 of 27 in “upload-pack: buffer ref advertisement writes”
  1. 1/1 upload-pack: buffer ref advertisement writesJacob Vosmaer, Aug 24, 2021
  2. Taylor BlauAug 24, 2021
  3. Junio C HamanoAug 24, 2021
  4. Jeff KingAug 25, 2021
  5. Jacob VosmaerAug 26, 2021
  6. 1/2 pkt-line: add packet_fwriteJacob Vosmaer, Aug 26, 2021
  7. 2/2 upload-pack: use stdio in send_ref callbacksJacob Vosmaer, Aug 26, 2021
  8. Junio C HamanoAug 26, 2021
  9. Junio C HamanoAug 26, 2021
  10. Taylor BlauAug 26, 2021
  11. Jeff KingAug 26, 2021
  12. Junio C HamanoAug 27, 2021
  13. 0/2 send_ref bufferingJacob Vosmaer, Aug 31, 2021
  14. 1/2 pkt-line: add stdio packet write functionsJacob Vosmaer, Aug 31, 2021
  15. Jeff KingAug 31, 2021
  16. Junio C HamanoAug 31, 2021
  17. 0/2 send_ref bufferingJacob Vosmaer, Sep 1, 2021
  18. 2/2 upload-pack: use stdio in send_ref callbacksJacob Vosmaer, Sep 1, 2021
  19. 1/2 pkt-line: add stdio packet write functionsJacob Vosmaer, Sep 1, 2021
  20. Jeff KingSep 2, 2021
  21. 2/2 upload-pack: use stdio in send_ref callbacksJacob Vosmaer, Aug 31, 2021
  22. Jeff KingAug 31, 2021
  23. Jacob VosmaerAug 31, 2021
  24. Jacob VosmaerAug 31, 2021
  25. Jeff KingSep 1, 2021
  26. Jeff KingAug 26, 2021
  27. Junio C HamanoAug 26, 2021

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.