From: Lars Schneider <larsxschneider@gmail.com>
To: Ben Peart <peartben@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com, benpeart@microsoft.com,
christian.couder@gmail.com
Subject: Re: [PATCH v5 3/8] convert: Split start_multi_file_filter into two separate functions
Date: Sun, 9 Apr 2017 21:56:04 +0200 [thread overview]
Message-ID: <C977E0BA-8386-4B87-9569-A1C3B9E97B31@gmail.com> (raw)
In-Reply-To: <20170407120354.17736-4-benpeart@microsoft.com>
> On 07 Apr 2017, at 14:03, Ben Peart <peartben@gmail.com> wrote:
>
> To enable future reuse of the filter.<driver>.process infrastructure,
> split start_multi_file_filter into two separate parts.
>
> start_multi_file_filter will now only contain the generic logic to
> manage the creation and tracking of the child process in a hashmap.
>
> start_multi_file_filter_fn is a protocol specific initialization
> function that will negotiate the multi-file-filter interface version
> and capabilities.
>
> Signed-off-by: Ben Peart <benpeart@microsoft.com>
> ---
> convert.c | 63 ++++++++++++++++++++++++++++++++++++++-------------------------
> 1 file changed, 38 insertions(+), 25 deletions(-)
>
> diff --git a/convert.c b/convert.c
> index 793c29ebfd..404757eac9 100644
> --- a/convert.c
> +++ b/convert.c
> @@ -565,35 +565,14 @@ static void stop_multi_file_filter(struct child_process *process)
> finish_command(process);
> }
>
> -static struct cmd2process *start_multi_file_filter(struct hashmap *hashmap, const char *cmd)
> +static int start_multi_file_filter_fn(struct cmd2process *entry)
> {
> int err;
> - struct cmd2process *entry;
> - struct child_process *process;
> - const char *argv[] = { cmd, NULL };
> struct string_list cap_list = STRING_LIST_INIT_NODUP;
> char *cap_buf;
> const char *cap_name;
> -
> - entry = xmalloc(sizeof(*entry));
> - entry->cmd = cmd;
> - entry->supported_capabilities = 0;
> - process = &entry->process;
> -
> - child_process_init(process);
> - process->argv = argv;
> - process->use_shell = 1;
> - process->in = -1;
> - process->out = -1;
> - process->clean_on_exit = 1;
> - process->clean_on_exit_handler = stop_multi_file_filter;
> -
> - if (start_command(process)) {
> - error("cannot fork to run external filter '%s'", cmd);
> - return NULL;
> - }
> -
> - hashmap_entry_init(entry, strhash(cmd));
> + struct child_process *process = &entry->process;
> + const char *cmd = entry->cmd;
>
> sigchain_push(SIGPIPE, SIG_IGN);
>
> @@ -642,7 +621,41 @@ static struct cmd2process *start_multi_file_filter(struct hashmap *hashmap, cons
> done:
> sigchain_pop(SIGPIPE);
>
> - if (err || errno == EPIPE) {
> + if (err || errno == EPIPE)
> + err = err ? err : errno;
Nice! I should have done this here, too:
https://github.com/git/git/blob/b14f27f91770e0f99f64135348977a0ce1c7993a/convert.c#L755
This is clearly a bug in my code. I'll send a patch shortly.
> +
> + return err;
> +}
> +
> +static struct cmd2process *start_multi_file_filter(struct hashmap *hashmap, const char *cmd)
> +{
> + int err;
> + struct cmd2process *entry;
> + struct child_process *process;
> + const char *argv[] = { cmd, NULL };
> +
> + entry = xmalloc(sizeof(*entry));
> + entry->cmd = cmd;
> + entry->supported_capabilities = 0;
> + process = &entry->process;
> +
> + child_process_init(process);
> + process->argv = argv;
> + process->use_shell = 1;
> + process->in = -1;
> + process->out = -1;
> + process->clean_on_exit = 1;
> + process->clean_on_exit_handler = stop_multi_file_filter;
> +
> + if (start_command(process)) {
> + error("cannot fork to run external filter '%s'", cmd);
> + return NULL;
> + }
> +
> + hashmap_entry_init(entry, strhash(cmd));
> +
> + err = start_multi_file_filter_fn(entry);
> + if (err) {
> error("initialization for external filter '%s' failed", cmd);
> kill_multi_file_filter(hashmap, entry);
> return NULL;
> --
> 2.12.0.windows.1.31.g1548525701.dirty
Looks good to me.
Thanks,
Lars
next prev parent reply other threads:[~2017-04-09 19:56 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-07 12:03 [PATCH v5 0/8] refactor the filter process code into a reusable module Ben Peart
2017-04-07 12:03 ` [PATCH v5 1/8] pkt-line: add packet_read_line_gently() Ben Peart
2017-04-09 19:34 ` Lars Schneider
2017-04-07 12:03 ` [PATCH v5 2/8] convert: move packet_write_list() into pkt-line as packet_writel() Ben Peart
2017-04-09 19:43 ` Lars Schneider
2017-04-07 12:03 ` [PATCH v5 3/8] convert: Split start_multi_file_filter into two separate functions Ben Peart
2017-04-09 19:56 ` Lars Schneider [this message]
2017-04-11 16:16 ` Jeff King
2017-04-11 19:29 ` Lars Schneider
2017-04-11 19:37 ` Jeff King
2017-04-11 20:01 ` Lars Schneider
2017-04-11 20:05 ` Jeff King
2017-04-20 17:27 ` Ben Peart
2017-04-07 12:03 ` [PATCH v5 4/8] convert: Separate generic structures and variables from the filter specific ones Ben Peart
2017-04-10 10:18 ` Lars Schneider
2017-04-17 3:31 ` Junio C Hamano
2017-04-18 16:38 ` Ben Peart
2017-04-19 1:23 ` Junio C Hamano
2017-04-20 17:24 ` Ben Peart
2017-04-07 12:03 ` [PATCH v5 5/8] convert: Update generic functions to only use generic data structures Ben Peart
2017-04-10 12:05 ` Lars Schneider
2017-04-07 12:03 ` [PATCH v5 6/8] convert: rename reusable sub-process functions Ben Peart
2017-04-10 12:11 ` Lars Schneider
2017-04-07 12:03 ` [PATCH v5 7/8] sub-process: move sub-process functions into separate files Ben Peart
2017-04-10 12:41 ` Lars Schneider
2017-04-07 12:03 ` [PATCH v5 8/8] convert: Update subprocess_read_status to not die on EOF Ben Peart
2017-04-10 12:48 ` Lars Schneider
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=C977E0BA-8386-4B87-9569-A1C3B9E97B31@gmail.com \
--to=larsxschneider@gmail.com \
--cc=benpeart@microsoft.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peartben@gmail.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).