[PATCH 31/40] odb-helper: add 'script_mode' to 'struct odb_helper'
- From
Christian Couder <christian.couder@gmail.com>
- Date
- Jan 3, 2018, 16:33 UTC
- Message-ID
- <20180103163403.11303-32-chriscool@tuxfamily.org>
- In-Reply-To
- <20180103163403.11303-1-chriscool@tuxfamily.org>
to prepare for having a long running odb helper sub-process handling the communication between Git and an external odb.
We introduce "odb.<name>.subprocesscommand" to make it possible to define such a sub-process, and we mark such odb helpers with the new 'script_mode' field set to 0.
Helpers defined using the existing "odb.<name>.scriptcommand" are marked with the 'script_mode' field set to 1.
Implementation of the different capabilities/instructions in the new (sub-)process mode is left for following commits.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- external-odb.c | 4 ++++ odb-helper.c | 19 ++++++++++++++----- odb-helper.h | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/external-odb.c b/external-odb.c index 3ce3d111f3..f38c2c2fe3 100644 --- a/external-odb.c +++ b/external-odb.c @@ -43,6 +43,10 @@ static int external_odb_config(const char *var, const char *value, void *data) o->type = ODB_HELPER_SCRIPT_CMD; return git_config_string(&o->dealer, var, value); } + if (!strcmp(subkey, "subprocesscommand")) { + o->type = ODB_HELPER_SUBPROCESS_CMD; + return git_config_string(&o->dealer, var, value); + } return 0; } diff --git a/odb-helper.c b/odb-helper.c index 0fa7af0348..91b4de1a05 100644 --- a/odb-helper.c +++ b/odb-helper.c @@ -124,6 +124,9 @@ int odb_helper_init(struct odb_helper *o) FILE *fh; struct strbuf line = STRBUF_INIT; + if (o->type != ODB_HELPER_SCRIPT_CMD) + return 0; + if (odb_helper_start(o, &cmd, 0, "init") < 0) return -1; @@ -174,16 +177,12 @@ static int odb_helper_object_cmp(const void *va, const void *vb) return hashcmp(a->sha1, b->sha1); } -static void odb_helper_load_have(struct odb_helper *o) +static void have_object_script(struct odb_helper *o) { struct odb_helper_cmd cmd; FILE *fh; struct strbuf line = STRBUF_INIT; - if (o->have_valid) - return; - o->have_valid = 1; - if (odb_helper_start(o, &cmd, 0, "have") < 0) return; @@ -195,6 +194,16 @@ static void odb_helper_load_have(struct odb_helper *o) strbuf_release(&line); fclose(fh); odb_helper_finish(o, &cmd); +} + +static void odb_helper_load_have(struct odb_helper *o) +{ + if (o->have_valid) + return; + o->have_valid = 1; + + if (o->type == ODB_HELPER_SCRIPT_CMD) + have_object_script(o); qsort(o->have, o->have_nr, sizeof(*o->have), odb_helper_object_cmp); } diff --git a/odb-helper.h b/odb-helper.h index 4a9cc7f07b..9a33adbf0b 100644 --- a/odb-helper.h +++ b/odb-helper.h @@ -7,7 +7,7 @@ enum odb_helper_type { ODB_HELPER_NONE = 0, ODB_HELPER_GIT_REMOTE, ODB_HELPER_SCRIPT_CMD, - ODB_HELPER_PROCESS_CMD, + ODB_HELPER_SUBPROCESS_CMD, OBJ_HELPER_MAX };
-- 2.16.0.rc0.16.g82191dbc6c.dirty