fixup! fsmonitor: config settings are repository-specific

This reverts commit 81f7337.

Signed-off-by: Jeff Hostetler <[email protected]>

Author: jeffhostetler

Makefile

@@ -904,7 +904,6 @@ LIB_OBJS += fmt-merge-msg.o
 LIB_OBJS += fsck.o
 LIB_OBJS += fsmonitor.o
 LIB_OBJS += fsmonitor-ipc.o
-LIB_OBJS += fsmonitor-settings.o
 LIB_OBJS += gettext.o
 LIB_OBJS += gpg-interface.o
 LIB_OBJS += graph.o

builtin/update-index.c

@@ -1216,25 +1216,14 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 	}
 
 	if (fsmonitor > 0) {
-		enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(r);
-
-		if (fsm_mode == FSMONITOR_MODE_DISABLED) {
-			warning(_("core.useBuiltinFSMonitor is unset; "
-				"set it if you really want to enable the "
-				"builtin fsmonitor"));
+		if (git_config_get_fsmonitor() == 0)
 			warning(_("core.fsmonitor is unset; "
-				"set it if you really want to enable the "
-				"hook-based fsmonitor"));
-		}
+				"set it if you really want to "
+				"enable fsmonitor"));
 		add_fsmonitor(&the_index);
 		report(_("fsmonitor enabled"));
 	} else if (!fsmonitor) {
-		enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(r);
-		if (fsm_mode == FSMONITOR_MODE_IPC)
-			warning(_("core.useBuiltinFSMonitor is set; "
-				"remove it if you really want to "
-				"disable fsmonitor"));
-		if (fsm_mode == FSMONITOR_MODE_HOOK)
+		if (git_config_get_fsmonitor() == 1)
 			warning(_("core.fsmonitor is set; "
 				"remove it if you really want to "
 				"disable fsmonitor"));

cache.h

@@ -990,6 +990,7 @@ extern int core_preload_index;
 extern int precomposed_unicode;
 extern int protect_hfs;
 extern int protect_ntfs;
+extern const char *core_fsmonitor;
 
 extern int core_apply_sparse_checkout;
 extern int core_sparse_checkout_cone;

config.c

@@ -2517,6 +2517,20 @@ int git_config_get_max_percent_split_change(void)
 	return -1; /* default value */
 }
 
+int git_config_get_fsmonitor(void)
+{
+	if (git_config_get_pathname("core.fsmonitor", &core_fsmonitor))
+		core_fsmonitor = getenv("GIT_TEST_FSMONITOR");
+
+	if (core_fsmonitor && !*core_fsmonitor)
+		core_fsmonitor = NULL;
+
+	if (core_fsmonitor)
+		return 1;
+
+	return 0;
+}
+
 int git_config_get_index_threads(int *dest)
 {
 	int is_bool, val;

config.h

@@ -609,6 +609,7 @@ int git_config_get_index_threads(int *dest);
 int git_config_get_untracked_cache(void);
 int git_config_get_split_index(void);
 int git_config_get_max_percent_split_change(void);
+int git_config_get_fsmonitor(void);
 
 /* This dies if the configured or default date is in the future */
 int git_config_get_expiry(const char *key, const char **output);

environment.c

@@ -84,6 +84,7 @@ int protect_hfs = PROTECT_HFS_DEFAULT;
 #define PROTECT_NTFS_DEFAULT 1
 #endif
 int protect_ntfs = PROTECT_NTFS_DEFAULT;
+const char *core_fsmonitor;
 
 /*
  * The character that begins a commented line in user-editable file

fsmonitor-settings.c

@@ -3,7 +3,6 @@
 #include "dir.h"
 #include "ewah/ewok.h"
 #include "fsmonitor.h"
-#include "fsmonitor-ipc.h"
 #include "run-command.h"
 #include "strbuf.h"
 
@@ -149,18 +148,15 @@ void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate)
 /*
  * Call the query-fsmonitor hook passing the last update token of the saved results.
  */
-static int query_fsmonitor_hook(struct repository *r,
-				int version,
-				const char *last_update,
-				struct strbuf *query_result)
+static int query_fsmonitor(int version, const char *last_update, struct strbuf *query_result)
 {
 	struct child_process cp = CHILD_PROCESS_INIT;
 	int result;
 
-	if (fsm_settings__get_mode(r) != FSMONITOR_MODE_HOOK)
+	if (!core_fsmonitor)
 		return -1;
 
-	strvec_push(&cp.args, fsm_settings__get_hook_path(r));
+	strvec_push(&cp.args, core_fsmonitor);
 	strvec_pushf(&cp.args, "%d", version);
 	strvec_pushf(&cp.args, "%s", last_update);
 	cp.use_shell = 1;
@@ -242,43 +238,31 @@ void refresh_fsmonitor(struct index_state *istate)
 	struct strbuf last_update_token = STRBUF_INIT;
 	char *buf;
 	unsigned int i;
-	struct repository *r = istate->repo ? istate->repo : the_repository;
-	enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(r);
 
-	if (fsm_mode <= FSMONITOR_MODE_DISABLED ||
-	    istate->fsmonitor_has_run_once)
+	if (!core_fsmonitor || istate->fsmonitor_has_run_once)
 		return;
 
+	hook_version = fsmonitor_hook_version();
+
 	istate->fsmonitor_has_run_once = 1;
 
 	trace_printf_key(&trace_fsmonitor, "refresh fsmonitor");
-
-	if (fsm_mode == FSMONITOR_MODE_IPC) {
-		/* TODO */
-		return;
-	}
-
-	assert(fsm_mode == FSMONITOR_MODE_HOOK);
-
-	hook_version = fsmonitor_hook_version();
-
 	/*
-	 * This could be racy so save the date/time now and query_fsmonitor_hook
+	 * This could be racy so save the date/time now and query_fsmonitor
 	 * should be inclusive to ensure we don't miss potential changes.
 	 */
 	last_update = getnanotime();
 	if (hook_version == HOOK_INTERFACE_VERSION1)
 		strbuf_addf(&last_update_token, "%"PRIu64"", last_update);
 
 	/*
-	 * If we have a last update token, call query_fsmonitor_hook for the set of
+	 * If we have a last update token, call query_fsmonitor for the set of
 	 * changes since that token, else assume everything is possibly dirty
 	 * and check it all.
 	 */
 	if (istate->fsmonitor_last_update) {
 		if (hook_version == -1 || hook_version == HOOK_INTERFACE_VERSION2) {
-			query_success = !query_fsmonitor_hook(
-				r, HOOK_INTERFACE_VERSION2,
+			query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION2,
 				istate->fsmonitor_last_update, &query_result);
 
 			if (query_success) {
@@ -308,17 +292,13 @@ void refresh_fsmonitor(struct index_state *istate)
 		}
 
 		if (hook_version == HOOK_INTERFACE_VERSION1) {
-			query_success = !query_fsmonitor_hook(
-				r, HOOK_INTERFACE_VERSION1,
+			query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION1,
 				istate->fsmonitor_last_update, &query_result);
 		}
 
-		trace_performance_since(last_update, "fsmonitor process '%s'",
-					fsm_settings__get_hook_path(r));
-		trace_printf_key(&trace_fsmonitor,
-				 "fsmonitor process '%s' returned %s",
-				 fsm_settings__get_hook_path(r),
-				 query_success ? "success" : "failure");
+		trace_performance_since(last_update, "fsmonitor process '%s'", core_fsmonitor);
+		trace_printf_key(&trace_fsmonitor, "fsmonitor process '%s' returned %s",
+			core_fsmonitor, query_success ? "success" : "failure");
 	}
 
 	/* a fsmonitor process can return '/' to indicate all entries are invalid */
@@ -431,8 +411,7 @@ void remove_fsmonitor(struct index_state *istate)
 void tweak_fsmonitor(struct index_state *istate)
 {
 	unsigned int i;
-	struct repository *r = istate->repo ? istate->repo : the_repository;
-	int fsmonitor_enabled = (fsm_settings__get_mode(r) > FSMONITOR_MODE_DISABLED);
+	int fsmonitor_enabled = git_config_get_fsmonitor();
 
 	if (istate->fsmonitor_dirty) {
 		if (fsmonitor_enabled) {
@@ -452,8 +431,16 @@ void tweak_fsmonitor(struct index_state *istate)
 		istate->fsmonitor_dirty = NULL;
 	}
 
-	if (fsmonitor_enabled)
-		add_fsmonitor(istate);
-	else
+	switch (fsmonitor_enabled) {
+	case -1: /* keep: do nothing */
+		break;
+	case 0: /* false */
 		remove_fsmonitor(istate);
+		break;
+	case 1: /* true */
+		add_fsmonitor(istate);
+		break;
+	default: /* unknown value: do nothing */
+		break;
+	}
 }

fsmonitor-settings.h

@@ -3,7 +3,6 @@
 
 #include "cache.h"
 #include "dir.h"
-#include "fsmonitor-settings.h"
 
 extern struct trace_key trace_fsmonitor;
 
@@ -58,11 +57,7 @@ int fsmonitor_is_trivial_response(const struct strbuf *query_result);
  */
 static inline int is_fsmonitor_refreshed(const struct index_state *istate)
 {
-	struct repository *r = istate->repo ? istate->repo : the_repository;
-	enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(r);
-
-	return fsm_mode <= FSMONITOR_MODE_DISABLED ||
-		istate->fsmonitor_has_run_once;
+	return !core_fsmonitor || istate->fsmonitor_has_run_once;
 }
 
 /*
@@ -72,11 +67,7 @@ static inline int is_fsmonitor_refreshed(const struct index_state *istate)
  */
 static inline void mark_fsmonitor_valid(struct index_state *istate, struct cache_entry *ce)
 {
-	struct repository *r = istate->repo ? istate->repo : the_repository;
-	enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(r);
-
-	if (fsm_mode > FSMONITOR_MODE_DISABLED &&
-	    !(ce->ce_flags & CE_FSMONITOR_VALID)) {
+	if (core_fsmonitor && !(ce->ce_flags & CE_FSMONITOR_VALID)) {
 		istate->cache_changed = 1;
 		ce->ce_flags |= CE_FSMONITOR_VALID;
 		trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_clean '%s'", ce->name);
@@ -92,10 +83,7 @@ static inline void mark_fsmonitor_valid(struct index_state *istate, struct cache
  */
 static inline void mark_fsmonitor_invalid(struct index_state *istate, struct cache_entry *ce)
 {
-	struct repository *r = istate->repo ? istate->repo : the_repository;
-	enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(r);
-
-	if (fsm_mode > FSMONITOR_MODE_DISABLED) {
+	if (core_fsmonitor) {
 		ce->ce_flags &= ~CE_FSMONITOR_VALID;
 		untracked_cache_invalidate_path(istate, ce->name, 1);
 		trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_invalid '%s'", ce->name);