To enable future reuse of the filter.<driver>.process infrastructure,
split the cmd2process structure into two separate parts.
subprocess_entry will now contain the generic data required to manage
the creation and tracking of the child process in a hashmap. Also move
all knowledge of the hashmap into the generic functions.
cmd2process is a filter protocol specific structure that is used to
track the negotiated capabilities of the filter.
Signed-off-by: Ben Peart <benpeart@xxxxxxxxxxxxx>
---
convert.c | 57 +++++++++++++++++++++++++++++++--------------------------
1 file changed, 31 insertions(+), 26 deletions(-)
diff --git a/convert.c b/convert.c
index 404757eac9..f569026511 100644
--- a/convert.c
+++ b/convert.c
@@ -496,29 +496,40 @@ static int apply_single_file_filter(const char *path, const char *src, size_t le
#define CAP_CLEAN (1u<<0)
#define CAP_SMUDGE (1u<<1)
-struct cmd2process {
+struct subprocess_entry {
struct hashmap_entry ent; /* must be the first member! */
- unsigned int supported_capabilities;
const char *cmd;
struct child_process process;
};
+struct cmd2process {
+ struct subprocess_entry subprocess; /* must be the first member! */
+ unsigned int supported_capabilities;
+};
+
static int cmd_process_map_initialized;
static struct hashmap cmd_process_map;
-static int cmd2process_cmp(const struct cmd2process *e1,
- const struct cmd2process *e2,
+static int cmd2process_cmp(const struct subprocess_entry *e1,
+ const struct subprocess_entry *e2,
const void *unused)
{
return strcmp(e1->cmd, e2->cmd);
}
-static struct cmd2process *find_multi_file_filter_entry(struct hashmap *hashmap, const char *cmd)
+static struct subprocess_entry *find_multi_file_filter_entry(const char *cmd)
{
- struct cmd2process key;
+ struct subprocess_entry key;
+
+ if (!cmd_process_map_initialized) {
+ cmd_process_map_initialized = 1;
+ hashmap_init(&cmd_process_map, (hashmap_cmp_fn)cmd2process_cmp, 0);
+ return NULL;
+ }
+
hashmap_entry_init(&key, strhash(cmd));
key.cmd = cmd;
- return hashmap_get(hashmap, &key, NULL);
+ return hashmap_get(&cmd_process_map, &key, NULL);
}
static void read_multi_file_filter_status(int fd, struct strbuf *status)
@@ -541,7 +552,7 @@ static void read_multi_file_filter_status(int fd, struct strbuf *status)
}
}
-static void kill_multi_file_filter(struct hashmap *hashmap, struct cmd2process *entry)
+static void kill_multi_file_filter(struct subprocess_entry *entry)
{
if (!entry)
return;
@@ -550,7 +561,7 @@ static void kill_multi_file_filter(struct hashmap *hashmap, struct cmd2process *
kill(entry->process.pid, SIGTERM);
finish_command(&entry->process);
- hashmap_remove(hashmap, entry, NULL);
+ hashmap_remove(&cmd_process_map, entry, NULL);
free(entry);
}
@@ -571,8 +582,8 @@ static int start_multi_file_filter_fn(struct cmd2process *entry)
struct string_list cap_list = STRING_LIST_INIT_NODUP;
char *cap_buf;
const char *cap_name;
- struct child_process *process = &entry->process;
- const char *cmd = entry->cmd;
+ struct child_process *process = &entry->subprocess.process;
+ const char *cmd = entry->subprocess.cmd;
sigchain_push(SIGPIPE, SIG_IGN);
@@ -627,7 +638,7 @@ static int start_multi_file_filter_fn(struct cmd2process *entry)
return err;
}
-static struct cmd2process *start_multi_file_filter(struct hashmap *hashmap, const char *cmd)
+static struct cmd2process *start_multi_file_filter(const char *cmd)
{
int err;
struct cmd2process *entry;
@@ -635,9 +646,9 @@ static struct cmd2process *start_multi_file_filter(struct hashmap *hashmap, cons
const char *argv[] = { cmd, NULL };
entry = xmalloc(sizeof(*entry));
- entry->cmd = cmd;
+ entry->subprocess.cmd = cmd;
entry->supported_capabilities = 0;
- process = &entry->process;
+ process = &entry->subprocess.process;
child_process_init(process);
process->argv = argv;
@@ -657,11 +668,11 @@ static struct cmd2process *start_multi_file_filter(struct hashmap *hashmap, cons
err = start_multi_file_filter_fn(entry);
if (err) {
error("initialization for external filter '%s' failed", cmd);
- kill_multi_file_filter(hashmap, entry);
+ kill_multi_file_filter(&entry->subprocess);
return NULL;
}
- hashmap_add(hashmap, entry);
+ hashmap_add(&cmd_process_map, entry);
return entry;
}
@@ -676,22 +687,16 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
struct strbuf filter_status = STRBUF_INIT;
const char *filter_type;
- if (!cmd_process_map_initialized) {
- cmd_process_map_initialized = 1;
- hashmap_init(&cmd_process_map, (hashmap_cmp_fn) cmd2process_cmp, 0);
- entry = NULL;
- } else {
- entry = find_multi_file_filter_entry(&cmd_process_map, cmd);
- }
+ entry = (struct cmd2process *)find_multi_file_filter_entry(cmd);
fflush(NULL);
if (!entry) {
- entry = start_multi_file_filter(&cmd_process_map, cmd);
+ entry = start_multi_file_filter(cmd);
if (!entry)
return 0;
}
- process = &entry->process;
+ process = &entry->subprocess.process;
if (!(wanted_capability & entry->supported_capabilities))
return 0;
@@ -762,7 +767,7 @@ 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(&cmd_process_map, entry);
+ kill_multi_file_filter(&entry->subprocess);
}
} else {
strbuf_swap(dst, &nbuf);
--
2.12.0.windows.1.31.g1548525701.dirty