1e0ea5c431
Move fsmonitor config settings to a new and opaque `struct fsmonitor_settings` structure. Add a lazily-loaded pointer to this into `struct repo_settings` Create an `enum fsmonitor_mode` type in `struct fsmonitor_settings` to represent the state of fsmonitor. This lets us represent which, if any, fsmonitor provider (hook or IPC) is enabled. Create `fsm_settings__get_*()` getters to lazily look up fsmonitor- related config settings. Get rid of the `core_fsmonitor` global variable. Move the code to lookup the existing `core.fsmonitor` config value into the fsmonitor settings. Create a hook pathname variable in `struct fsmonitor-settings` and only set it when in hook mode. Extend the definition of `core.fsmonitor` to be either a boolean or a hook pathname. When true, the builtin FSMonitor is used. When false or unset, no FSMonitor (neither builtin nor hook) is used. The existing `core_fsmonitor` global variable was used to store the pathname to the fsmonitor hook *and* it was used as a boolean to see if fsmonitor was enabled. This dual usage and global visibility leads to confusion when we add the IPC-based provider. So lets hide the details in fsmonitor-settings.c and let it decide which provider to use in the case of multiple settings. This avoids cluttering up repo-settings.c with these private details. A future commit in builtin-fsmonitor series will add the ability to disqualify worktrees for various reasons, such as being mounted from a remote volume, where fsmonitor should not be started. Having the config settings hidden in fsmonitor-settings.c allows such worktree restrictions to override the config values used. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
22 lines
615 B
C
22 lines
615 B
C
#ifndef FSMONITOR_SETTINGS_H
|
|
#define FSMONITOR_SETTINGS_H
|
|
|
|
struct repository;
|
|
|
|
enum fsmonitor_mode {
|
|
FSMONITOR_MODE_DISABLED = 0,
|
|
FSMONITOR_MODE_HOOK = 1, /* core.fsmonitor=<hook_path> */
|
|
FSMONITOR_MODE_IPC = 2, /* core.fsmonitor=<true> */
|
|
};
|
|
|
|
void fsm_settings__set_ipc(struct repository *r);
|
|
void fsm_settings__set_hook(struct repository *r, const char *path);
|
|
void fsm_settings__set_disabled(struct repository *r);
|
|
|
|
enum fsmonitor_mode fsm_settings__get_mode(struct repository *r);
|
|
const char *fsm_settings__get_hook_path(struct repository *r);
|
|
|
|
struct fsmonitor_settings;
|
|
|
|
#endif /* FSMONITOR_SETTINGS_H */
|