From: Ben Peart <peartben@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, benpeart@microsoft.com,
christian.couder@gmail.com, larsxschneider@gmail.com
Subject: [PATCH v3 5/8] convert: Update generic functions to only use generic data structures
Date: Wed, 29 Mar 2017 11:53:27 -0400 [thread overview]
Message-ID: <20170329155330.12860-6-benpeart@microsoft.com> (raw)
In-Reply-To: <20170329155330.12860-1-benpeart@microsoft.com>
Update all functions that are going to be moved into a reusable module
so that they only work with the reusable data structures. Move code
that is specific to the filter out into the filter functions.
Signed-off-by: Ben Peart <benpeart@microsoft.com>
---
convert.c | 48 +++++++++++++++++++++++++++++-------------------
1 file changed, 29 insertions(+), 19 deletions(-)
diff --git a/convert.c b/convert.c
index f569026511..77966e246b 100644
--- a/convert.c
+++ b/convert.c
@@ -562,7 +562,6 @@ static void kill_multi_file_filter(struct subprocess_entry *entry)
finish_command(&entry->process);
hashmap_remove(&cmd_process_map, entry, NULL);
- free(entry);
}
static void stop_multi_file_filter(struct child_process *process)
@@ -576,14 +575,15 @@ static void stop_multi_file_filter(struct child_process *process)
finish_command(process);
}
-static int start_multi_file_filter_fn(struct cmd2process *entry)
+static int start_multi_file_filter_fn(struct subprocess_entry *subprocess)
{
int err;
+ struct cmd2process *entry = (struct cmd2process *)subprocess;
struct string_list cap_list = STRING_LIST_INIT_NODUP;
char *cap_buf;
const char *cap_name;
- struct child_process *process = &entry->subprocess.process;
- const char *cmd = entry->subprocess.cmd;
+ struct child_process *process = &subprocess->process;
+ const char *cmd = subprocess->cmd;
sigchain_push(SIGPIPE, SIG_IGN);
@@ -638,17 +638,21 @@ static int start_multi_file_filter_fn(struct cmd2process *entry)
return err;
}
-static struct cmd2process *start_multi_file_filter(const char *cmd)
+typedef int(*subprocess_start_fn)(struct subprocess_entry *entry);
+int start_multi_file_filter(struct subprocess_entry *entry, const char *cmd,
+ subprocess_start_fn startfn)
{
int err;
- struct cmd2process *entry;
struct child_process *process;
const char *argv[] = { cmd, NULL };
- entry = xmalloc(sizeof(*entry));
- entry->subprocess.cmd = cmd;
- entry->supported_capabilities = 0;
- process = &entry->subprocess.process;
+ if (!cmd_process_map_initialized) {
+ cmd_process_map_initialized = 1;
+ hashmap_init(&cmd_process_map, (hashmap_cmp_fn)cmd2process_cmp, 0);
+ }
+
+ entry->cmd = cmd;
+ process = &entry->process;
child_process_init(process);
process->argv = argv;
@@ -658,22 +662,23 @@ static struct cmd2process *start_multi_file_filter(const char *cmd)
process->clean_on_exit = 1;
process->clean_on_exit_handler = stop_multi_file_filter;
- if (start_command(process)) {
+ err = start_command(process);
+ if (err) {
error("cannot fork to run external filter '%s'", cmd);
- return NULL;
+ return err;
}
hashmap_entry_init(entry, strhash(cmd));
- err = start_multi_file_filter_fn(entry);
+ err = startfn(entry);
if (err) {
error("initialization for external filter '%s' failed", cmd);
- kill_multi_file_filter(&entry->subprocess);
- return NULL;
+ kill_multi_file_filter(entry);
+ return err;
}
hashmap_add(&cmd_process_map, entry);
- return entry;
+ return 0;
}
static int apply_multi_file_filter(const char *path, const char *src, size_t len,
@@ -692,9 +697,13 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
fflush(NULL);
if (!entry) {
- entry = start_multi_file_filter(cmd);
- if (!entry)
+ entry = xmalloc(sizeof(*entry));
+ entry->supported_capabilities = 0;
+
+ if (start_multi_file_filter(&entry->subprocess, cmd, start_multi_file_filter_fn)) {
+ free(entry);
return 0;
+ }
}
process = &entry->subprocess.process;
@@ -767,7 +776,8 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
* Force shutdown and restart if another blob requires filtering.
*/
error("external filter '%s' failed", cmd);
- kill_multi_file_filter(&entry->subprocess);
+ kill_multi_file_filter((struct subprocess_entry *)entry);
+ free(entry);
}
} else {
strbuf_swap(dst, &nbuf);
--
2.12.1.gvfs.1.18.ge47db72
next prev parent reply other threads:[~2017-03-29 15:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-29 15:53 [PATCH v3 0/8] refactor the filter process code into a reusable module Ben Peart
2017-03-29 15:53 ` [PATCH v3 1/8] pkt-line: add packet_writel() and packet_read_line_gently() Ben Peart
2017-03-29 15:53 ` [PATCH v3 2/8] convert: Update convert to use new packet_writel() function Ben Peart
2017-03-29 15:53 ` [PATCH v3 3/8] convert: Split start_multi_file_filter into two separate functions Ben Peart
2017-03-29 15:53 ` [PATCH v3 4/8] convert: Separate generic structures and variables from the filter specific ones Ben Peart
2017-03-29 15:53 ` Ben Peart [this message]
2017-03-29 15:53 ` [PATCH v3 6/8] convert: rename reusable sub-process functions Ben Peart
2017-03-29 15:53 ` [PATCH v3 7/8] sub-process: move sub-process functions into separate files Ben Peart
2017-03-29 20:43 ` Junio C Hamano
2017-03-30 15:27 ` Ben Peart
2017-03-29 15:53 ` [PATCH v3 8/8] convert: Update subprocess_read_status to not die on EOF Ben Peart
2017-03-29 19:59 ` [PATCH v3 0/8] refactor the filter process code into a reusable module Junio C Hamano
2017-03-30 15:26 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170329155330.12860-6-benpeart@microsoft.com \
--to=peartben@gmail.com \
--cc=benpeart@microsoft.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=larsxschneider@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.