Do a mechanical rename of the functions that will become the reusable
sub-process module.
Signed-off-by: Ben Peart <benpeart@xxxxxxxxxxxxx>
---
convert.c | 53 +++++++++++++++++++++++++++--------------------------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/convert.c b/convert.c
index 747c0c363b..235a6a5279 100644
--- a/convert.c
+++ b/convert.c
@@ -507,8 +507,8 @@ struct cmd2process {
unsigned int supported_capabilities;
};
-static int cmd_process_map_initialized;
-static struct hashmap cmd_process_map;
+static int subprocess_map_initialized;
+static struct hashmap subprocess_map;
static int cmd2process_cmp(const struct subprocess_entry *e1,
const struct subprocess_entry *e2,
@@ -517,22 +517,22 @@ static int cmd2process_cmp(const struct subprocess_entry *e1,
return strcmp(e1->cmd, e2->cmd);
}
-static struct subprocess_entry *find_multi_file_filter_entry(const char *cmd)
+static struct subprocess_entry *subprocess_find_entry(const char *cmd)
{
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);
+ if (!subprocess_map_initialized) {
+ subprocess_map_initialized = 1;
+ hashmap_init(&subprocess_map, (hashmap_cmp_fn)cmd2process_cmp, 0);
return NULL;
}
hashmap_entry_init(&key, strhash(cmd));
key.cmd = cmd;
- return hashmap_get(&cmd_process_map, &key, NULL);
+ return hashmap_get(&subprocess_map, &key, NULL);
}
-static void read_multi_file_filter_status(int fd, struct strbuf *status)
+static void subprocess_read_status(int fd, struct strbuf *status)
{
struct strbuf **pair;
char *line;
@@ -552,7 +552,7 @@ static void read_multi_file_filter_status(int fd, struct strbuf *status)
}
}
-static void kill_multi_file_filter(struct subprocess_entry *entry)
+static void subprocess_stop(struct subprocess_entry *entry)
{
if (!entry)
return;
@@ -561,14 +561,14 @@ static void kill_multi_file_filter(struct subprocess_entry *entry)
kill(entry->process.pid, SIGTERM);
finish_command(&entry->process);
- hashmap_remove(&cmd_process_map, entry, NULL);
+ hashmap_remove(&subprocess_map, entry, NULL);
free(entry);
}
-static void stop_multi_file_filter(struct child_process *process)
+static void subprocess_exit_handler(struct child_process *process)
{
sigchain_push(SIGPIPE, SIG_IGN);
- /* Closing the pipe signals the filter to initiate a shutdown. */
+ /* Closing the pipe signals the subprocess to initiate a shutdown. */
close(process->in);
close(process->out);
sigchain_pop(SIGPIPE);
@@ -640,16 +640,16 @@ static int start_multi_file_filter_fn(struct subprocess_entry *subprocess)
}
typedef int(*subprocess_start_fn)(struct subprocess_entry *entry);
-int start_multi_file_filter(struct subprocess_entry *entry, const char *cmd,
+int subprocess_start(struct subprocess_entry *entry, const char *cmd,
subprocess_start_fn startfn)
{
int err;
struct child_process *process;
const char *argv[] = { cmd, NULL };
- if (!cmd_process_map_initialized) {
- cmd_process_map_initialized = 1;
- hashmap_init(&cmd_process_map, (hashmap_cmp_fn)cmd2process_cmp, 0);
+ if (!subprocess_map_initialized) {
+ subprocess_map_initialized = 1;
+ hashmap_init(&subprocess_map, (hashmap_cmp_fn)cmd2process_cmp, 0);
}
entry->cmd = cmd;
@@ -661,11 +661,11 @@ int start_multi_file_filter(struct subprocess_entry *entry, const char *cmd,
process->in = -1;
process->out = -1;
process->clean_on_exit = 1;
- process->clean_on_exit_handler = stop_multi_file_filter;
+ process->clean_on_exit_handler = subprocess_exit_handler;
err = start_command(process);
if (err) {
- error("cannot fork to run external filter '%s'", cmd);
+ error("cannot fork to run subprocess '%s'", cmd);
return err;
}
@@ -673,12 +673,12 @@ int start_multi_file_filter(struct subprocess_entry *entry, const char *cmd,
err = startfn(entry);
if (err) {
- error("initialization for external filter '%s' failed", cmd);
- kill_multi_file_filter(entry);
+ error("initialization for subprocess '%s' failed", cmd);
+ subprocess_stop(entry);
return err;
}
- hashmap_add(&cmd_process_map, entry);
+ hashmap_add(&subprocess_map, entry);
return 0;
}
@@ -693,7 +693,7 @@ 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;
- entry = (struct cmd2process *)find_multi_file_filter_entry(cmd);
+ entry = (struct cmd2process *)subprocess_find_entry(cmd);
fflush(NULL);
@@ -701,7 +701,7 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
entry = xmalloc(sizeof(*entry));
entry->supported_capabilities = 0;
- if (start_multi_file_filter(&entry->subprocess, cmd, start_multi_file_filter_fn)) {
+ if (subprocess_start(&entry->subprocess, cmd, start_multi_file_filter_fn)) {
free(entry);
return 0;
}
@@ -746,7 +746,7 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
if (err)
goto done;
- read_multi_file_filter_status(process->out, &filter_status);
+ subprocess_read_status(process->out, &filter_status);
err = strcmp(filter_status.buf, "success");
if (err)
goto done;
@@ -755,7 +755,7 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
if (err)
goto done;
- read_multi_file_filter_status(process->out, &filter_status);
+ subprocess_read_status(process->out, &filter_status);
err = strcmp(filter_status.buf, "success");
done:
@@ -777,7 +777,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((struct subprocess_entry *)entry);
+ subprocess_stop((struct subprocess_entry *)entry);
+ free(entry);
}
} else {
strbuf_swap(dst, &nbuf);
--
2.12.0.windows.1.31.g1548525701.dirty