From: Junio C Hamano <gitster@pobox.com>
To: Ben Peart <peartben@gmail.com>
Cc: git@vger.kernel.org, benpeart@microsoft.com,
christian.couder@gmail.com, larsxschneider@gmail.com
Subject: Re: [PATCH v6 3/8] convert: Split start_multi_file_filter into two separate functions
Date: Sun, 23 Apr 2017 21:31:23 -0700 [thread overview]
Message-ID: <xmqqshkyzask.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170421172611.12152-4-benpeart@microsoft.com> (Ben Peart's message of "Fri, 21 Apr 2017 13:26:06 -0400")
Ben Peart <peartben@gmail.com> writes:
> Subject: [PATCH v6 3/8] convert: Split start_multi_file_filter into two separate functions
Two minor nits, because the capital after "<area>:" looks ugly in shortlog
output, and having () there makes it easier to notice that a
function name is being discussed. I.e.
convert: split start_multi_file_filter() into two separate functions
> 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.
The above fails to describe a lot more important/significant change
this patch makes. Two mistaken check "errno == EPIPE" have been
removed as a preliminary bugfix. I think the bugfix deserves to be
split into a separate patch by itself and hoisted much earlier in
the series. It alone is a very good change, with or without the
remainder of the changes in this patch.
Thanks.
> Signed-off-by: Ben Peart <benpeart@microsoft.com>
> ---
> convert.c | 62 ++++++++++++++++++++++++++++++++++++--------------------------
> 1 file changed, 36 insertions(+), 26 deletions(-)
>
> diff --git a/convert.c b/convert.c
> index 793c29ebfd..36401fe087 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,38 @@ static struct cmd2process *start_multi_file_filter(struct hashmap *hashmap, cons
> done:
> sigchain_pop(SIGPIPE);
>
> - if (err || errno == EPIPE) {
> + 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;
> @@ -733,7 +743,7 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
> done:
> sigchain_pop(SIGPIPE);
>
> - if (err || errno == EPIPE) {
> + if (err) {
> if (!strcmp(filter_status.buf, "error")) {
> /* The filter signaled a problem with the file. */
> } else if (!strcmp(filter_status.buf, "abort")) {
next prev parent reply other threads:[~2017-04-24 4:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-21 17:26 [PATCH v6 0/8] refactor the filter process code into a reusable module Ben Peart
2017-04-21 17:26 ` [PATCH v6 1/8] pkt-line: add packet_read_line_gently() Ben Peart
2017-04-24 4:21 ` Junio C Hamano
2017-04-24 20:33 ` Ben Peart
2017-04-25 2:19 ` Junio C Hamano
2017-04-25 15:09 ` Ben Peart
2017-04-21 17:26 ` [PATCH v6 2/8] convert: move packet_write_list() into pkt-line as packet_writel() Ben Peart
2017-04-21 17:26 ` [PATCH v6 3/8] convert: Split start_multi_file_filter into two separate functions Ben Peart
2017-04-24 4:31 ` Junio C Hamano [this message]
2017-04-24 20:57 ` Ben Peart
2017-04-21 17:26 ` [PATCH v6 4/8] convert: Separate generic structures and variables from the filter specific ones Ben Peart
2017-04-21 17:26 ` [PATCH v6 5/8] convert: Update generic functions to only use generic data structures Ben Peart
2017-04-21 17:26 ` [PATCH v6 6/8] convert: rename reusable sub-process functions Ben Peart
2017-04-21 17:26 ` [PATCH v6 7/8] sub-process: move sub-process functions into separate files Ben Peart
2017-04-21 17:26 ` [PATCH v6 8/8] convert: Update subprocess_read_status to not die on EOF Ben Peart
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=xmqqshkyzask.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=benpeart@microsoft.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=larsxschneider@gmail.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).