From: Ramsay Jones <ramsay@ramsayjones.plus.com>
To: Stefan Beller <sbeller@google.com>,
gitster@pobox.com, git@vger.kernel.org
Cc: jacob.keller@gmail.com, peff@peff.net, jrnieder@gmail.com,
johannes.schindelin@gmail.com, Jens.Lehmann@web.de,
ericsunshine@gmail.com
Subject: Re: [PATCHv6 0/8] fetch submodules in parallel
Date: Thu, 1 Oct 2015 19:55:51 +0100 [thread overview]
Message-ID: <560D81B7.6090304@ramsayjones.plus.com> (raw)
In-Reply-To: <1443664456-1307-1-git-send-email-sbeller@google.com>
Hi Stefan,
On 01/10/15 02:54, Stefan Beller wrote:
[snip]
While skimming the interdiff for this series, ...
> diff --git a/run-command.c b/run-command.c
> index df84985..28048a7 100644
> --- a/run-command.c
> +++ b/run-command.c
> @@ -863,12 +863,13 @@ struct parallel_processes {
>
> get_next_task_fn get_next_task;
> start_failure_fn start_failure;
> - return_value_fn return_value;
> + task_finished_fn task_finished;
>
> struct {
> unsigned in_use : 1;
> struct child_process process;
> struct strbuf err;
> + void *data;
> } *children;
> /*
> * The struct pollfd is logically part of *children,
> @@ -882,9 +883,10 @@ struct parallel_processes {
> struct strbuf buffered_output; /* of finished children */
> } parallel_processes_struct;
>
> -static int default_start_failure(void *data,
> - struct child_process *cp,
> - struct strbuf *err)
> +static int default_start_failure(struct child_process *cp,
> + struct strbuf *err,
> + void *pp_cb,
> + void *pp_task_cb)
> {
> int i;
>
> @@ -895,10 +897,11 @@ static int default_start_failure(void *data,
> return 0;
> }
>
> -static int default_return_value(void *data,
> - struct child_process *cp,
> - struct strbuf *err,
> - int result)
> +static int default_task_finished(int result,
> + struct child_process *cp,
> + struct strbuf *err,
> + void *pp_cb,
> + void *pp_task_cb)
> {
> int i;
>
> @@ -930,10 +933,11 @@ static void handle_children_on_signal(int signo)
> raise(signo);
> }
>
> -static struct parallel_processes *pp_init(int n, void *data,
> +static struct parallel_processes *pp_init(int n,
> get_next_task_fn get_next_task,
> start_failure_fn start_failure,
> - return_value_fn return_value)
> + task_finished_fn task_finished,
> + void *data)
> {
> int i;
> struct parallel_processes *pp = ¶llel_processes_struct;
> @@ -948,7 +952,7 @@ static struct parallel_processes *pp_init(int n, void *data,
> pp->get_next_task = get_next_task;
>
> pp->start_failure = start_failure ? start_failure : default_start_failure;
> - pp->return_value = return_value ? return_value : default_return_value;
> + pp->task_finished = task_finished ? task_finished : default_task_finished;
>
> pp->nr_processes = 0;
> pp->output_owner = 0;
> @@ -1006,15 +1010,17 @@ static int pp_start_one(struct parallel_processes *pp)
> if (i == pp->max_processes)
> die("BUG: bookkeeping is hard");
>
> - if (!pp->get_next_task(pp->data,
> + if (!pp->get_next_task(&pp->children[i].data,
> &pp->children[i].process,
> - &pp->children[i].err))
> + &pp->children[i].err,
> + pp->data))
> return 1;
... the above hunk caught my eye. I don't know that it matters that
much, but since you have reordered parameters on some functions, should
pp->get_next_task() take the 'task_cb' as the last parameter, rather than
the first?
I have not looked at the final result yet (just the interdiff), so please
just ignore the above if I've missed something obvious. :-D
ATB,
Ramsay Jones
next prev parent reply other threads:[~2015-10-01 18:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-01 1:54 [PATCHv6 0/8] fetch submodules in parallel Stefan Beller
2015-10-01 1:54 ` [PATCHv6 1/8] submodule.c: write "Fetching submodule <foo>" to stderr Stefan Beller
2015-10-01 1:54 ` [PATCHv6 2/8] xread: poll on non blocking fds Stefan Beller
2015-10-01 1:54 ` [PATCHv6 3/8] xread_nonblock: add functionality to read from fds without blocking Stefan Beller
2015-10-01 1:54 ` [PATCHv6 4/8] strbuf: add strbuf_read_once to read " Stefan Beller
2015-10-01 1:54 ` [PATCHv6 5/8] sigchain: add command to pop all common signals Stefan Beller
2015-10-01 1:54 ` [PATCHv6 6/8] run-command: add an asynchronous parallel child processor Stefan Beller
2015-10-01 1:54 ` [PATCHv6 7/8] fetch_populated_submodules: use new parallel job processing Stefan Beller
2015-10-01 1:54 ` [PATCHv6 8/8] submodules: allow parallel fetching, add tests and documentation Stefan Beller
2015-10-01 18:55 ` Ramsay Jones [this message]
2015-10-01 19:03 ` [PATCHv6 0/8] fetch submodules in parallel Stefan Beller
2015-10-02 18:48 ` Junio C Hamano
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=560D81B7.6090304@ramsayjones.plus.com \
--to=ramsay@ramsayjones.plus.com \
--cc=Jens.Lehmann@web.de \
--cc=ericsunshine@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=johannes.schindelin@gmail.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
/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).