From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id BFAD0208D0 for ; Thu, 3 Aug 2017 09:19:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751985AbdHCJT4 (ORCPT ); Thu, 3 Aug 2017 05:19:56 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34065 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751948AbdHCJTx (ORCPT ); Thu, 3 Aug 2017 05:19:53 -0400 Received: by mail-wm0-f67.google.com with SMTP id x64so1443992wmg.1 for ; Thu, 03 Aug 2017 02:19:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7oBzSksrexLfCctNRiuDfpvV39FZyY51YnQSkH+P6GE=; b=bwr0Uv2KpxbuFsHfDR+Gotg3MW+WlILbfqqm7Pc06bOBlYs3/z44dK5qzoUwfpeAWw tn3pCGKifBD2mGYOmVJj7q1uwdWiqxJAy9Yi0SDUPeIqSKFwfM1UIuAIdHc/xaFIhltL rzRY2TrJ491F6sv+FLUIBwzqG5dFbYsT7NfPfrTr0k5QVowFIepZn/iaFoJE+O1XljUj 9YdUGvFK4Pt28DCNhFErIuKCTXjsGTvWOUzZW7RxTTgr7bI91FRiaPx36LA4ui82hdaG MV9Dmi4J2J7VqSOkIRJc4LLbxvTf4opJ5wOpMX79xjufPu75ErqJB17D0XVQ3m2FS28y 72eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7oBzSksrexLfCctNRiuDfpvV39FZyY51YnQSkH+P6GE=; b=EIgrOQ6IZGL/h9EMGdIWX3yHTf64X2+NkDnzUH7UsK8iaTLMR7rZsz7E/i4wbfCiEu 6vN6RFUohLrshgvNeFBbKQAxeuLyIAXVTT3/JEU8tP124UcP6o4aR33RUw0dIF/PkQaR zhGKXuoN0w2bfpXYkPeAQoJbtEs7f6F4g5LNvV9X+Ue7Ru3LwOppHXhh3/YMai7nElxJ EDezdJzErZ4Uwf0eXElKDBDSNnAyeKL1tUXmm882V42H27BQqxLxDMR3nt2cqGMzgWgY 7h4epnlbbUzpY9Zbol22EsD1nKaV5yakwFICAtt2Ob5ha4x+fxDFlXZmGIUSZrs47ukf TsGA== X-Gm-Message-State: AIVw110QuJJDNwzDO7HCr1W9sO6cQOu9fDV6B81+v4eczkz41GFOdnaV eyxOqh2s2bXSE0uc X-Received: by 10.28.109.27 with SMTP id i27mr646242wmc.173.1501751991510; Thu, 03 Aug 2017 02:19:51 -0700 (PDT) Received: from localhost.localdomain (sud35-h04-89-95-107-230.dsl.sta.abo.bbox.fr. [89.95.107.230]) by smtp.gmail.com with ESMTPSA id n184sm1308051wme.33.2017.08.03.02.19.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Aug 2017 02:19:51 -0700 (PDT) From: Christian Couder X-Google-Original-From: Christian Couder To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Ben Peart , Jonathan Tan , Nguyen Thai Ngoc Duy , Mike Hommey , Lars Schneider , Eric Wong , Christian Couder Subject: [PATCH v5 11/40] odb-helper: add odb_helper_init() to send 'init' instruction Date: Thu, 3 Aug 2017 11:18:57 +0200 Message-Id: <20170803091926.1755-12-chriscool@tuxfamily.org> X-Mailer: git-send-email 2.14.0.rc1.52.gf02fb0ddac.dirty In-Reply-To: <20170803091926.1755-1-chriscool@tuxfamily.org> References: <20170803091926.1755-1-chriscool@tuxfamily.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Let's add an odb_helper_init() function to send an 'init' instruction to the helpers. This 'init' instruction is especially useful to get the capabilities that are supported by the helpers. So while at it, let's also add a parse_capabilities() function to parse them and a supported_capabilities variable in struct odb_helper to store them. Signed-off-by: Christian Couder --- external-odb.c | 9 ++++++++- odb-helper.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ odb-helper.h | 12 +++++++++++ t/t0400-external-odb.sh | 4 ++++ 4 files changed, 78 insertions(+), 1 deletion(-) diff --git a/external-odb.c b/external-odb.c index e9c3f11666..0f0de170b8 100644 --- a/external-odb.c +++ b/external-odb.c @@ -41,12 +41,16 @@ static int external_odb_config(const char *var, const char *value, void *data) static void external_odb_init(void) { static int initialized; + struct odb_helper *o; if (initialized) return; initialized = 1; git_config(external_odb_config, NULL); + + for (o = helpers; o; o = o->next) + odb_helper_init(o); } const char *external_odb_root(void) @@ -63,9 +67,12 @@ int external_odb_has_object(const unsigned char *sha1) external_odb_init(); - for (o = helpers; o; o = o->next) + for (o = helpers; o; o = o->next) { + if (!(o->supported_capabilities & ODB_HELPER_CAP_HAVE)) + return 1; if (odb_helper_has_object(o, sha1)) return 1; + } return 0; } diff --git a/odb-helper.c b/odb-helper.c index 0e6f824e4a..c6e16b938c 100644 --- a/odb-helper.c +++ b/odb-helper.c @@ -5,6 +5,40 @@ #include "run-command.h" #include "sha1-lookup.h" +static void parse_capabilities(char *cap_buf, + unsigned int *supported_capabilities, + const char *process_name) +{ + struct string_list cap_list = STRING_LIST_INIT_NODUP; + + string_list_split_in_place(&cap_list, cap_buf, '=', 1); + + if (cap_list.nr == 2 && !strcmp(cap_list.items[0].string, "capability")) { + const char *cap_name = cap_list.items[1].string; + + if (!strcmp(cap_name, "get_git_obj")) { + *supported_capabilities |= ODB_HELPER_CAP_GET_GIT_OBJ; + } else if (!strcmp(cap_name, "get_raw_obj")) { + *supported_capabilities |= ODB_HELPER_CAP_GET_RAW_OBJ; + } else if (!strcmp(cap_name, "get_direct")) { + *supported_capabilities |= ODB_HELPER_CAP_GET_DIRECT; + } else if (!strcmp(cap_name, "put_git_obj")) { + *supported_capabilities |= ODB_HELPER_CAP_PUT_GIT_OBJ; + } else if (!strcmp(cap_name, "put_raw_obj")) { + *supported_capabilities |= ODB_HELPER_CAP_PUT_RAW_OBJ; + } else if (!strcmp(cap_name, "put_direct")) { + *supported_capabilities |= ODB_HELPER_CAP_PUT_DIRECT; + } else if (!strcmp(cap_name, "have")) { + *supported_capabilities |= ODB_HELPER_CAP_HAVE; + } else { + warning("external process '%s' requested unsupported read-object capability '%s'", + process_name, cap_name); + } + } + + string_list_clear(&cap_list, 0); +} + struct odb_helper *odb_helper_new(const char *name, int namelen) { struct odb_helper *o; @@ -79,6 +113,26 @@ static int odb_helper_finish(struct odb_helper *o, return 0; } +int odb_helper_init(struct odb_helper *o) +{ + struct odb_helper_cmd cmd; + FILE *fh; + struct strbuf line = STRBUF_INIT; + + if (odb_helper_start(o, &cmd, "init") < 0) + return -1; + + fh = xfdopen(cmd.child.out, "r"); + while (strbuf_getline(&line, fh) != EOF) + parse_capabilities(line.buf, &o->supported_capabilities, o->name); + + strbuf_release(&line); + fclose(fh); + odb_helper_finish(o, &cmd); + + return 0; +} + static int parse_object_line(struct odb_helper_object *o, const char *line) { char *end; diff --git a/odb-helper.h b/odb-helper.h index 5800661704..8e0b9dd9cb 100644 --- a/odb-helper.h +++ b/odb-helper.h @@ -1,9 +1,20 @@ #ifndef ODB_HELPER_H #define ODB_HELPER_H +#include "external-odb.h" + +#define ODB_HELPER_CAP_GET_GIT_OBJ (1u<<0) +#define ODB_HELPER_CAP_GET_RAW_OBJ (1u<<1) +#define ODB_HELPER_CAP_GET_DIRECT (1u<<2) +#define ODB_HELPER_CAP_PUT_GIT_OBJ (1u<<3) +#define ODB_HELPER_CAP_PUT_RAW_OBJ (1u<<4) +#define ODB_HELPER_CAP_PUT_DIRECT (1u<<5) +#define ODB_HELPER_CAP_HAVE (1u<<6) + struct odb_helper { const char *name; const char *cmd; + unsigned int supported_capabilities; struct odb_helper_object { unsigned char sha1[20]; @@ -18,6 +29,7 @@ struct odb_helper { }; struct odb_helper *odb_helper_new(const char *name, int namelen); +int odb_helper_init(struct odb_helper *o); int odb_helper_has_object(struct odb_helper *o, const unsigned char *sha1); int odb_helper_get_object(struct odb_helper *o, const unsigned char *sha1, int fd); diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh index 2f4749fab1..ed89f3ab40 100755 --- a/t/t0400-external-odb.sh +++ b/t/t0400-external-odb.sh @@ -9,6 +9,10 @@ export ALT_SOURCE write_script odb-helper <<\EOF GIT_DIR=$ALT_SOURCE; export GIT_DIR case "$1" in +init) + echo "capability=get_git_obj" + echo "capability=have" + ;; have) git cat-file --batch-check --batch-all-objects | awk '{print $1 " " $3 " " $2}' -- 2.14.0.rc1.52.gf02fb0ddac.dirty