From patchwork Tue Sep 25 11:53:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Couder X-Patchwork-Id: 10613871 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 133A86CB for ; Tue, 25 Sep 2018 11:54:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 059D229A16 for ; Tue, 25 Sep 2018 11:54:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED87929B6E; Tue, 25 Sep 2018 11:54:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9D0A29A1A for ; Tue, 25 Sep 2018 11:54:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728676AbeIYSBS (ORCPT ); Tue, 25 Sep 2018 14:01:18 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:45351 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728585AbeIYSBS (ORCPT ); Tue, 25 Sep 2018 14:01:18 -0400 Received: by mail-wr1-f67.google.com with SMTP id m16so6558477wrx.12 for ; Tue, 25 Sep 2018 04:54:06 -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 :mime-version:content-transfer-encoding; bh=BFA9rS8p4c61LWvQAensQ0gE4ApKPIjwa/4qy1dhlns=; b=BJD8A/hlcOSu0hTjaAV8RPNvqJyY0pRyg9gBr9eZVnpdP9lHibqY1lQcXgoN0QWNkc fxtX2oe3TlYsBWFxMecdw5evsG6CJfW/sJjQKvMOxbBaed7zvm3E/Tq4TYsE0k+l9Fd+ UiBE3uQKJRNh+5LGYZnCbCQJ8DYld8vhgTgCcueuRrN9UQefjD1YLml3qRsmHfUGwuYi bwR42tJhq0toBV4E7kMjdi0tCJTYIW4yJkhP0vGiVudh+yHK145lyhBVj4VgRDWtYEgU mvffYZDE4E3lqD+G+YbzLAyx2fYO8BAMfhliBxHtfvY+ONLoD3t4C3iT/Oh1UBHgB3RE IBCQ== 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:mime-version:content-transfer-encoding; bh=BFA9rS8p4c61LWvQAensQ0gE4ApKPIjwa/4qy1dhlns=; b=TtTfbEKFyEwGt+gfWawFuBERX2V51jdL58Ar/qgRdzW17fSapHHx19RgNJJTUiKUhn Qhry4N+w2ucyV9T5cMWwNf42NF7AVgkQHzm6OY2PF5Z5232SdSGFHJPcIzhC7E79XU71 GzNP0HKu/wxPLR6xTw18clxZvNzgZQBJMU1xzZy8MKhh/E9OdqIDLumM8pU/Rsc9lRmd 0k4jFHaDygRjE0vw5tGziLwLMqtZVT659MKLjAjNu8mAtucbGVObN3WVugchn2nLkf7G UNnWKJOdMJ2NRmU8fyTF2l2Z2ZwheZ2ok1NZLwgvGzxbcbmKVhJi+5oazIqwQHzJVFKU kgYg== X-Gm-Message-State: ABuFfogu/VNPUNdCHhneYBt7LRmv4DHnTEhCI6Qm3u7Tyi5v/8E9Qtv0 beHzUkX9WSX0UoM4U/nQBSKrWEy4 X-Google-Smtp-Source: ACcGV60gaK+9Iql9O+eSQzvfx5Z1xVZsLA1e7s/vkpdQc44Y46FeustbhkuxkK5KG89h1wPVoKgytQ== X-Received: by 2002:adf:ecc4:: with SMTP id s4-v6mr728765wro.142.1537876445227; Tue, 25 Sep 2018 04:54:05 -0700 (PDT) Received: from localhost.localdomain (89-95-107-230.abo.bbox.fr. [89.95.107.230]) by smtp.gmail.com with ESMTPSA id z14-v6sm1998628wrr.91.2018.09.25.04.54.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 04:54:04 -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 , Jeff Hostetler , Eric Sunshine , Beat Bolli , Christian Couder Subject: [PATCH v5 3/8] remote-odb: implement remote_odb_get_direct() Date: Tue, 25 Sep 2018 13:53:36 +0200 Message-Id: <20180925115341.19248-4-chriscool@tuxfamily.org> X-Mailer: git-send-email 2.19.0.278.gca5b891cac In-Reply-To: <20180925115341.19248-1-chriscool@tuxfamily.org> References: <20180925115341.19248-1-chriscool@tuxfamily.org> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Christian Couder This is implemented only in the promisor remote mode for now by calling fetch_objects(). Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- odb-helper.c | 15 +++++++++++++++ odb-helper.h | 3 +++ remote-odb.c | 17 +++++++++++++++++ remote-odb.h | 1 + 4 files changed, 36 insertions(+) diff --git a/odb-helper.c b/odb-helper.c index b4d403ffa9..6458fe2e32 100644 --- a/odb-helper.c +++ b/odb-helper.c @@ -4,6 +4,7 @@ #include "odb-helper.h" #include "run-command.h" #include "sha1-lookup.h" +#include "fetch-object.h" struct odb_helper *odb_helper_new(const char *name, int namelen) { @@ -14,3 +15,17 @@ struct odb_helper *odb_helper_new(const char *name, int namelen) return o; } + +int odb_helper_get_direct(struct odb_helper *o, + const struct object_id *oids, + int oid_nr) +{ + int res; + uint64_t start = getnanotime(); + + res = fetch_objects(o->remote, oids, oid_nr); + + trace_performance_since(start, "odb_helper_get_direct"); + + return res; +} diff --git a/odb-helper.h b/odb-helper.h index 4b792a3896..950f9f9cd1 100644 --- a/odb-helper.h +++ b/odb-helper.h @@ -15,5 +15,8 @@ struct odb_helper { }; extern struct odb_helper *odb_helper_new(const char *name, int namelen); +extern int odb_helper_get_direct(struct odb_helper *o, + const struct object_id *oids, + int oid_nr); #endif /* ODB_HELPER_H */ diff --git a/remote-odb.c b/remote-odb.c index 03be54ba2e..53900203ae 100644 --- a/remote-odb.c +++ b/remote-odb.c @@ -89,3 +89,20 @@ int has_remote_odb(void) { return !!find_odb_helper(NULL); } + +int remote_odb_get_direct(const struct object_id *oids, int oid_nr) +{ + struct odb_helper *o; + + trace_printf("trace: remote_odb_get_direct: nr: %d", oid_nr); + + remote_odb_init(); + + for (o = helpers; o; o = o->next) { + if (odb_helper_get_direct(o, oids, oid_nr) < 0) + continue; + return 0; + } + + return -1; +} diff --git a/remote-odb.h b/remote-odb.h index 4c7b13695f..221305d1b6 100644 --- a/remote-odb.h +++ b/remote-odb.h @@ -3,5 +3,6 @@ extern struct odb_helper *find_odb_helper(const char *remote); extern int has_remote_odb(void); +extern int remote_odb_get_direct(const struct object_id *oids, int oid_nr); #endif /* REMOTE_ODB_H */