From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Turner Subject: [PATCH v2 09/17] Add watchman support to reduce index refresh cost Date: Fri, 18 Mar 2016 21:04:42 -0400 Message-ID: <1458349490-1704-10-git-send-email-dturner@twopensource.com> References: <1458349490-1704-1-git-send-email-dturner@twopensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: David Turner To: git@vger.kernel.org, pclouds@gmail.com, Johannes Schindelin X-From: git-owner@vger.kernel.org Sat Mar 19 02:06:39 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ah5Li-0008QA-0e for gcvg-git-2@plane.gmane.org; Sat, 19 Mar 2016 02:06:38 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754204AbcCSBGe convert rfc822-to-quoted-printable (ORCPT ); Fri, 18 Mar 2016 21:06:34 -0400 Received: from mail-qk0-f173.google.com ([209.85.220.173]:35316 "EHLO mail-qk0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751538AbcCSBGS (ORCPT ); Fri, 18 Mar 2016 21:06:18 -0400 Received: by mail-qk0-f173.google.com with SMTP id o6so56422989qkc.2 for ; Fri, 18 Mar 2016 18:06:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=twopensource-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WIn67ZBSx+RGLSsvxq3BMQ4Lv2HLYgsTM32D6M9699s=; b=lxFsEoq1meSQPqjjrMG8nb4SmZ9tqwbsK4tMoTZz0AXhM6GfU/CpT22m4pQen4BEVF E/lUE9H6zncEnbzc9buMbzh78fS04juXgfSRbQStP2KTiMZBrjtZtaXW8RstX4BSl15f 7+MDFMJ2buPqCaYYVSntqkOOrRBXP0Atgw3eAu1Xu2PQDD7sV5V+F+q/Omz74972v7ZT jDFr93pHq1LjG06DRJ0a6tCwjqsy6sjgztkX5Pdot1LnQJ5DuGyTaOsdL+xCFcrNZe/x iDU9eVy/s8sJV1BOvS9UjcRj2qKPOf6UjeNqyXVyBIa5V4PGwzdvtvhLdWlXTM+CeVHh vqyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WIn67ZBSx+RGLSsvxq3BMQ4Lv2HLYgsTM32D6M9699s=; b=V4lOYkqG7wR6yXU5w94EDeimUaTXZDttNSZ4MjUwfyPuMlqlZtUQY8SX3PDFauXBA4 J375+l1OCpKOZgtl6nmKjX6hydwUL6MO3NQ7cgFmzUlXdm5Uahop+LRfhCb+nnMpaGPs +lYeHREINhPdm1JTQ4hvPJCLv24+WT+6+J8l69KGATxRnPTjOkZJyffsftWumm0MUhPl KUJGCyZxigY2UvqR6zWRftEE7AtvrZH2/VQMpmzoTjbd0PHpZErK/g1LoJeXVEHkVYyB 8CU8Xvnxjq9Cl07XvQZmVsHz2B1hrJ0dFMnlJJik1wdUXAQh/jtbakwEvtjmdwb1Irwb SDxQ== X-Gm-Message-State: AD7BkJLR22euPoL7WfSUsQXD6FwJuNfZjaJLdJzLWRAJ9TwHeehqJ7k4m/6QzBnQXad0vg== X-Received: by 10.55.72.86 with SMTP id v83mr26100814qka.72.1458349577143; Fri, 18 Mar 2016 18:06:17 -0700 (PDT) Received: from ubuntu.twitter.corp? ([8.25.196.26]) by smtp.gmail.com with ESMTPSA id 139sm7186154qho.2.2016.03.18.18.06.15 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 18 Mar 2016 18:06:15 -0700 (PDT) X-Mailer: git-send-email 2.4.2.767.g62658d5-twtrsrc In-Reply-To: <1458349490-1704-1-git-send-email-dturner@twopensource.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: =46rom: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy The previous patch has the logic to clear bits in 'WAMA' bitmap. This patch has logic to set bits as told by watchman. The missing bit, _using_ these bits, are not here yet. A lot of this code is written by David Turner originally, mostly from [1]. I'm just copying and polishing it a bit. [1] http://article.gmane.org/gmane.comp.version-control.git/248006 Signed-off-by: David Turner Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- Makefile | 12 +++++ cache.h | 1 + config.c | 5 ++ configure.ac | 8 ++++ environment.c | 3 ++ watchman-support.c | 134 +++++++++++++++++++++++++++++++++++++++++++++= ++++++++ watchman-support.h | 7 +++ 7 files changed, 170 insertions(+) create mode 100644 watchman-support.c create mode 100644 watchman-support.h diff --git a/Makefile b/Makefile index 2d72771..8bf705b 100644 --- a/Makefile +++ b/Makefile @@ -453,6 +453,7 @@ MSGFMT =3D msgfmt CURL_CONFIG =3D curl-config PTHREAD_LIBS =3D -lpthread PTHREAD_CFLAGS =3D +WATCHMAN_LIBS =3D GCOV =3D gcov =20 export TCL_PATH TCLTK_PATH @@ -1419,6 +1420,13 @@ else LIB_OBJS +=3D thread-utils.o endif =20 +ifdef USE_WATCHMAN + LIB_H +=3D watchman-support.h + LIB_OBJS +=3D watchman-support.o + WATCHMAN_LIBS =3D -lwatchman + BASIC_CFLAGS +=3D -DUSE_WATCHMAN +endif + ifdef HAVE_PATHS_H BASIC_CFLAGS +=3D -DHAVE_PATHS_H endif @@ -2030,6 +2038,9 @@ git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAG= S $(GITLIBS) $(VCSSVN_LIB) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^= ) $(LIBS) \ $(VCSSVN_LIB) =20 +git-index-helper$X: index-helper.o GIT-LDFLAGS $(GITLIBS) + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^= ) $(LIBS) $(WATCHMAN_LIBS) + $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY) $(QUIET_LNCP)$(RM) $@ && \ ln $< $@ 2>/dev/null || \ @@ -2168,6 +2179,7 @@ GIT-BUILD-OPTIONS: FORCE @echo NO_PERL=3D\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@= + @echo NO_PYTHON=3D\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' = >>$@+ @echo NO_UNIX_SOCKETS=3D\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SO= CKETS)))'\' >>$@+ + @echo USE_WATCHMAN=3D\''$(subst ','\'',$(subst ','\'',$(USE_WATCHMAN)= ))'\' >>$@+ ifdef TEST_OUTPUT_DIRECTORY @echo TEST_OUTPUT_DIRECTORY=3D\''$(subst ','\'',$(subst ','\'',$(TEST= _OUTPUT_DIRECTORY)))'\' >>$@+ endif diff --git a/cache.h b/cache.h index 5b10d52..95715fd 100644 --- a/cache.h +++ b/cache.h @@ -688,6 +688,7 @@ extern char *git_replace_ref_base; =20 extern int fsync_object_files; extern int core_preload_index; +extern int core_watchman_sync_timeout; extern int core_apply_sparse_checkout; extern int precomposed_unicode; extern int protect_hfs; diff --git a/config.c b/config.c index 9ba40bc..e6dc141 100644 --- a/config.c +++ b/config.c @@ -882,6 +882,11 @@ static int git_default_core_config(const char *var= , const char *value) return 0; } =20 + if (!strcmp(var, "core.watchmansynctimeout")) { + core_watchman_sync_timeout =3D git_config_int(var, value); + return 0; + } + if (!strcmp(var, "core.createobject")) { if (!strcmp(value, "rename")) object_creation_mode =3D OBJECT_CREATION_USES_RENAMES; diff --git a/configure.ac b/configure.ac index 0cd9f46..334d63b 100644 --- a/configure.ac +++ b/configure.ac @@ -1099,6 +1099,14 @@ AC_COMPILE_IFELSE([BSD_SYSCTL_SRC], HAVE_BSD_SYSCTL=3D]) GIT_CONF_SUBST([HAVE_BSD_SYSCTL]) =20 +# +# Check for watchman client library + +AC_CHECK_LIB([watchman], [watchman_connect], + [USE_WATCHMAN=3DYesPlease], + [USE_WATCHMAN=3D]) +GIT_CONF_SUBST([USE_WATCHMAN]) + ## Other checks. # Define USE_PIC if you need the main git objects to be built with -fP= IC # in order to build and link perl/Git.so. x86-64 seems to need this. diff --git a/environment.c b/environment.c index 6dec9d0..35e03c7 100644 --- a/environment.c +++ b/environment.c @@ -94,6 +94,9 @@ int core_preload_index =3D 1; */ int ignore_untracked_cache_config; =20 +int core_watchman_sync_timeout =3D 300; + + /* This is set by setup_git_dir_gently() and/or git_default_config() *= / char *git_work_tree_cfg; static char *work_tree; diff --git a/watchman-support.c b/watchman-support.c new file mode 100644 index 0000000..b7302b9 --- /dev/null +++ b/watchman-support.c @@ -0,0 +1,134 @@ +#include "cache.h" +#include "watchman-support.h" +#include "strbuf.h" +#include "dir.h" +#include + +static struct watchman_query *make_query(const char *last_update) +{ + struct watchman_query *query =3D watchman_query(); + watchman_query_set_fields(query, WATCHMAN_FIELD_NAME | + WATCHMAN_FIELD_EXISTS | + WATCHMAN_FIELD_NEWER); + watchman_query_set_empty_on_fresh(query, 1); + query->sync_timeout =3D core_watchman_sync_timeout; + if (*last_update) + watchman_query_set_since_oclock(query, last_update); + return query; +} + +static struct watchman_query_result* query_watchman( + struct index_state *istate, struct watchman_connection *connection, + const char *fs_path, const char *last_update) +{ + struct watchman_error wm_error; + struct watchman_query *query; + struct watchman_expression *expr; + struct watchman_query_result *result; + + query =3D make_query(last_update); + expr =3D watchman_true_expression(); + result =3D watchman_do_query(connection, fs_path, query, expr, &wm_er= ror); + watchman_free_query(query); + watchman_free_expression(expr); + + if (!result) + warning("Watchman query error: %s (at %s)", + wm_error.message, + *last_update ? last_update : "the beginning"); + + return result; +} + +static void update_index(struct index_state *istate, + struct watchman_query_result *result) +{ + int i; + + if (result->is_fresh_instance) { + /* let refresh clear them later */ + for (i =3D 0; i < istate->cache_nr; i++) + istate->cache[i]->ce_flags |=3D CE_WATCHMAN_DIRTY; + goto done; + } + + for (i =3D 0; i < result->nr; i++) { + struct watchman_stat *wm =3D result->stats + i; + int pos; + + if (!strncmp(wm->name, ".git/", 5) || + strstr(wm->name, "/.git/")) + continue; + + pos =3D index_name_pos(istate, wm->name, strlen(wm->name)); + if (pos < 0) { + if (istate->untracked) { + char *name =3D xstrdup(wm->name); + char *dname =3D dirname(name); + + /* + * dirname() returns '.' for the root, + * but we call it ''. + */ + if (dname[0] =3D=3D '.' && dname[1] =3D=3D 0) + string_list_append(&istate->untracked->invalid_untracked, ""); + else + string_list_append(&istate->untracked->invalid_untracked, + dname); + free(name); + } + continue; + } + /* FIXME: ignore staged entries and gitlinks too? */ + + istate->cache[pos]->ce_flags |=3D CE_WATCHMAN_DIRTY; + } + +done: + free(istate->last_update); + istate->last_update =3D xstrdup(result->clock); + istate->cache_changed |=3D WATCHMAN_CHANGED; + if (istate->untracked) + string_list_remove_duplicates(&istate->untracked->invalid_untracked,= 0); +} + +int check_watchman(struct index_state *istate) +{ + struct watchman_error wm_error; + struct watchman_connection *connection; + struct watchman_query_result *result; + const char *fs_path; + struct timeval timeout; + /* + * Convert core_watchman_sync_timeout, in milliseconds, to + * struct timeval, in seconds and microseconds. + */ + + fs_path =3D get_git_work_tree(); + if (!fs_path) + return -1; + + timeout.tv_sec =3D core_watchman_sync_timeout / 1000; + timeout.tv_usec =3D (core_watchman_sync_timeout % 1000) * 1000; + connection =3D watchman_connect(timeout, &wm_error); + + if (!connection) { + warning("Watchman watch error: %s", wm_error.message); + return -1; + } + + if (watchman_watch(connection, fs_path, &wm_error)) { + warning("Watchman watch error: %s", wm_error.message); + watchman_connection_close(connection); + return -1; + } + + + result =3D query_watchman(istate, connection, fs_path, istate->last_u= pdate); + watchman_connection_close(connection); + if (!result) + return -1; + update_index(istate, result); + watchman_free_query_result(result); + return 0; +} diff --git a/watchman-support.h b/watchman-support.h new file mode 100644 index 0000000..ee1ef2c --- /dev/null +++ b/watchman-support.h @@ -0,0 +1,7 @@ +#ifndef WATCHMAN_SUPPORT_H +#define WATCHMAN_SUPPORT_H + +struct index_state; +int check_watchman(struct index_state *index); + +#endif /* WATCHMAN_SUPPORT_H */ --=20 2.4.2.767.g62658d5-twtrsrc