mirror of
https://github.com/git-for-windows/git.git
synced 2026-03-19 02:22:21 -05:00
Builtin FSMonitor Feature
Here is V2 of my patch series to add a builtin FSMonitor daemon to Git.
V2 includes addresses most of the review comments from the RFC and many of
the issues seen during out beta-testing with selected GVFS users. However,
there are still a few items that I need to address:
[ ] Revisit the how the client handles the IPC_STATE__NOT_LISTENING state
(where a daemon appears to be running, but is non-responsive) [ ] Revisit
use of global core_fsmonitor as both a pathname and a boolean. The existing
fsmonitor code uses it as the pathname to the fsmonitor hook and as a flag
to indicate that a hook is configured. [ ] Consider having daemon chdir()
out of the working directory to avoid directory handle issues on Windows. [
] Some documentation recommendations. [ ] Split up the commit containing the
tests and move some earlier in patch series. [ ] Move my FSMonitor PREREQ to
test-lib.sh instead of having it in my test scripts. [ ] Document
performance gains. [ ] On Windows, If the daemon is started as an elevated
process, then client commands might not have access to communicate with it.
[ ] Review if/how we decide to shutdown the FSMonitor daemon after and a
significant idle period. [ ] Investigate ways to temporarily shutdown
FSMonitor daemons processes so that the Git for Windows installer can
install an upgrade.
In this version, the first commit updates the Simple IPC API to make it
easier to pass binary data using {char *, size_t} rather than assuming that
the message is a null-terminated string. FSMonitor does not use binary
messages and doesn't really need this API change, but I thought it best to
fix the API now before we have other callers of IPC.
This V2 version will hopefully be previewed as an experimental feature in
Git for Windows v2.32.0.windows.*.
Jeff Hostetler (26):
simple-ipc: preparations for supporting binary messages.
fsmonitor--daemon: man page
fsmonitor--daemon: update fsmonitor documentation
fsmonitor-ipc: create client routines for git-fsmonitor--daemon
help: include fsmonitor--daemon feature flag in version info
fsmonitor--daemon: add a built-in fsmonitor daemon
fsmonitor--daemon: implement client command options
t/helper/fsmonitor-client: create IPC client to talk to FSMonitor
Daemon
fsmonitor-fs-listen-win32: stub in backend for Windows
fsmonitor-fs-listen-macos: stub in backend for MacOS
fsmonitor--daemon: implement daemon command options
fsmonitor--daemon: add pathname classification
fsmonitor--daemon: define token-ids
fsmonitor--daemon: create token-based changed path cache
fsmonitor-fs-listen-win32: implement FSMonitor backend on Windows
fsmonitor-fs-listen-macos: add macos header files for FSEvent
fsmonitor-fs-listen-macos: implement FSEvent listener on MacOS
fsmonitor--daemon: implement handle_client callback
fsmonitor--daemon: periodically truncate list of modified files
fsmonitor--daemon: use a cookie file to sync with file system
fsmonitor: enhance existing comments
fsmonitor: force update index after large responses
t7527: create test for fsmonitor--daemon
p7519: add fsmonitor--daemon
t7527: test status with untracked-cache and fsmonitor--daemon
t/perf: avoid copying builtin fsmonitor files into test repo
Johannes Schindelin (2):
config: FSMonitor is repository-specific
fsmonitor: introduce `core.useBuiltinFSMonitor` to call the daemon via
IPC
.gitignore | 1 +
Documentation/config/core.txt | 56 +-
Documentation/git-fsmonitor--daemon.txt | 75 +
Documentation/git-update-index.txt | 27 +-
Documentation/githooks.txt | 3 +-
Makefile | 16 +
builtin.h | 1 +
builtin/fsmonitor--daemon.c | 1511 ++++++++++++++++++
builtin/update-index.c | 4 +-
compat/fsmonitor/fsmonitor-fs-listen-macos.c | 497 ++++++
compat/fsmonitor/fsmonitor-fs-listen-win32.c | 553 +++++++
compat/fsmonitor/fsmonitor-fs-listen.h | 49 +
compat/simple-ipc/ipc-unix-socket.c | 14 +-
compat/simple-ipc/ipc-win32.c | 14 +-
config.c | 9 +-
config.h | 2 +-
config.mak.uname | 4 +
contrib/buildsystems/CMakeLists.txt | 8 +
fsmonitor--daemon.h | 140 ++
fsmonitor-ipc.c | 179 +++
fsmonitor-ipc.h | 48 +
fsmonitor.c | 132 +-
git.c | 1 +
help.c | 4 +
repo-settings.c | 3 +
repository.h | 2 +
simple-ipc.h | 7 +-
t/helper/test-fsmonitor-client.c | 125 ++
t/helper/test-simple-ipc.c | 34 +-
t/helper/test-tool.c | 1 +
t/helper/test-tool.h | 1 +
t/perf/p7519-fsmonitor.sh | 42 +-
t/perf/perf-lib.sh | 2 +-
t/t7527-builtin-fsmonitor.sh | 572 +++++++
34 files changed, 4069 insertions(+), 68 deletions(-)
create mode 100644 Documentation/git-fsmonitor--daemon.txt
create mode 100644 builtin/fsmonitor--daemon.c
create mode 100644 compat/fsmonitor/fsmonitor-fs-listen-macos.c
create mode 100644 compat/fsmonitor/fsmonitor-fs-listen-win32.c
create mode 100644 compat/fsmonitor/fsmonitor-fs-listen.h
create mode 100644 fsmonitor--daemon.h
create mode 100644 fsmonitor-ipc.c
create mode 100644 fsmonitor-ipc.h
create mode 100644 t/helper/test-fsmonitor-client.c
create mode 100755 t/t7527-builtin-fsmonitor.sh
base-commit: b0c09ab879
Submitted-As: https://lore.kernel.org/git/pull.923.v2.git.1621691828.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.923.git.1617291666.gitgitgadget@gmail.com
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
213 lines
5.7 KiB
C
213 lines
5.7 KiB
C
#ifndef REPOSITORY_H
|
|
#define REPOSITORY_H
|
|
|
|
#include "path.h"
|
|
|
|
struct config_set;
|
|
struct git_hash_algo;
|
|
struct index_state;
|
|
struct lock_file;
|
|
struct pathspec;
|
|
struct raw_object_store;
|
|
struct submodule_cache;
|
|
|
|
enum untracked_cache_setting {
|
|
UNTRACKED_CACHE_UNSET = -1,
|
|
UNTRACKED_CACHE_REMOVE = 0,
|
|
UNTRACKED_CACHE_KEEP = 1,
|
|
UNTRACKED_CACHE_WRITE = 2
|
|
};
|
|
|
|
enum fetch_negotiation_setting {
|
|
FETCH_NEGOTIATION_UNSET = -1,
|
|
FETCH_NEGOTIATION_NONE = 0,
|
|
FETCH_NEGOTIATION_DEFAULT = 1,
|
|
FETCH_NEGOTIATION_SKIPPING = 2,
|
|
FETCH_NEGOTIATION_NOOP = 3,
|
|
};
|
|
|
|
struct repo_settings {
|
|
int initialized;
|
|
|
|
int core_commit_graph;
|
|
int commit_graph_read_changed_paths;
|
|
int gc_write_commit_graph;
|
|
int fetch_write_commit_graph;
|
|
|
|
int index_version;
|
|
enum untracked_cache_setting core_untracked_cache;
|
|
|
|
int pack_use_sparse;
|
|
enum fetch_negotiation_setting fetch_negotiation_algorithm;
|
|
|
|
int core_multi_pack_index;
|
|
|
|
unsigned command_requires_full_index:1,
|
|
sparse_index:1;
|
|
};
|
|
|
|
struct repository {
|
|
/* Environment */
|
|
/*
|
|
* Path to the git directory.
|
|
* Cannot be NULL after initialization.
|
|
*/
|
|
char *gitdir;
|
|
|
|
/*
|
|
* Path to the common git directory.
|
|
* Cannot be NULL after initialization.
|
|
*/
|
|
char *commondir;
|
|
|
|
/*
|
|
* Holds any information related to accessing the raw object content.
|
|
*/
|
|
struct raw_object_store *objects;
|
|
|
|
/*
|
|
* All objects in this repository that have been parsed. This structure
|
|
* owns all objects it references, so users of "struct object *"
|
|
* generally do not need to free them; instead, when a repository is no
|
|
* longer used, call parsed_object_pool_clear() on this structure, which
|
|
* is called by the repositories repo_clear on its desconstruction.
|
|
*/
|
|
struct parsed_object_pool *parsed_objects;
|
|
|
|
/*
|
|
* The store in which the refs are held. This should generally only be
|
|
* accessed via get_main_ref_store(), as that will lazily initialize
|
|
* the ref object.
|
|
*/
|
|
struct ref_store *refs_private;
|
|
|
|
/*
|
|
* Contains path to often used file names.
|
|
*/
|
|
struct path_cache cached_paths;
|
|
|
|
/*
|
|
* Path to the repository's graft file.
|
|
* Cannot be NULL after initialization.
|
|
*/
|
|
char *graft_file;
|
|
|
|
/*
|
|
* Path to the current worktree's index file.
|
|
* Cannot be NULL after initialization.
|
|
*/
|
|
char *index_file;
|
|
|
|
/*
|
|
* Path to the working directory.
|
|
* A NULL value indicates that there is no working directory.
|
|
*/
|
|
char *worktree;
|
|
|
|
/*
|
|
* Path from the root of the top-level superproject down to this
|
|
* repository. This is only non-NULL if the repository is initialized
|
|
* as a submodule of another repository.
|
|
*/
|
|
char *submodule_prefix;
|
|
|
|
struct repo_settings settings;
|
|
|
|
/* Subsystems */
|
|
/*
|
|
* Repository's config which contains key-value pairs from the usual
|
|
* set of config files (i.e. repo specific .git/config, user wide
|
|
* ~/.gitconfig, XDG config file and the global /etc/gitconfig)
|
|
*/
|
|
struct config_set *config;
|
|
|
|
/* Repository's submodule config as defined by '.gitmodules' */
|
|
struct submodule_cache *submodule_cache;
|
|
|
|
/*
|
|
* Repository's in-memory index.
|
|
* 'repo_read_index()' can be used to populate 'index'.
|
|
*/
|
|
struct index_state *index;
|
|
|
|
/* Repository's current hash algorithm, as serialized on disk. */
|
|
const struct git_hash_algo *hash_algo;
|
|
|
|
/* A unique-id for tracing purposes. */
|
|
int trace2_repo_id;
|
|
|
|
/* True if commit-graph has been disabled within this process. */
|
|
int commit_graph_disabled;
|
|
|
|
/* Configurations */
|
|
|
|
/* Indicate if a repository has a different 'commondir' from 'gitdir' */
|
|
unsigned different_commondir:1;
|
|
};
|
|
|
|
extern struct repository *the_repository;
|
|
|
|
/*
|
|
* Define a custom repository layout. Any field can be NULL, which
|
|
* will default back to the path according to the default layout.
|
|
*/
|
|
struct set_gitdir_args {
|
|
const char *commondir;
|
|
const char *object_dir;
|
|
const char *graft_file;
|
|
const char *index_file;
|
|
const char *alternate_db;
|
|
};
|
|
|
|
void repo_set_gitdir(struct repository *repo, const char *root,
|
|
const struct set_gitdir_args *extra_args);
|
|
void repo_set_worktree(struct repository *repo, const char *path);
|
|
void repo_set_hash_algo(struct repository *repo, int algo);
|
|
void initialize_the_repository(void);
|
|
int repo_init(struct repository *r, const char *gitdir, const char *worktree);
|
|
|
|
/*
|
|
* Initialize the repository 'subrepo' as the submodule given by the
|
|
* struct submodule 'sub' in parent repository 'superproject'.
|
|
* Return 0 upon success and a non-zero value upon failure, which may happen
|
|
* if the submodule is not found, or 'sub' is NULL.
|
|
*/
|
|
struct submodule;
|
|
int repo_submodule_init(struct repository *subrepo,
|
|
struct repository *superproject,
|
|
const struct submodule *sub);
|
|
void repo_clear(struct repository *repo);
|
|
|
|
/*
|
|
* Populates the repository's index from its index_file, an index struct will
|
|
* be allocated if needed.
|
|
*
|
|
* Return the number of index entries in the populated index or a value less
|
|
* than zero if an error occurred. If the repository's index has already been
|
|
* populated then the number of entries will simply be returned.
|
|
*/
|
|
int repo_read_index(struct repository *repo);
|
|
int repo_hold_locked_index(struct repository *repo,
|
|
struct lock_file *lf,
|
|
int flags);
|
|
|
|
int repo_read_index_preload(struct repository *,
|
|
const struct pathspec *pathspec,
|
|
unsigned refresh_flags);
|
|
int repo_read_index_unmerged(struct repository *);
|
|
/*
|
|
* Opportunistically update the index but do not complain if we can't.
|
|
* The lockfile is always committed or rolled back.
|
|
*/
|
|
void repo_update_index_if_able(struct repository *, struct lock_file *);
|
|
|
|
void prepare_repo_settings(struct repository *r);
|
|
|
|
/*
|
|
* Return 1 if upgrade repository format to target_version succeeded,
|
|
* 0 if no upgrade is necessary, and -1 when upgrade is not possible.
|
|
*/
|
|
int upgrade_repository_format(int target_version);
|
|
|
|
#endif /* REPOSITORY_H */
|