diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-06-10 15:04:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-10 15:04:15 -0700 |
| commit | 9e496fffc872b20a147d7b80330335edfff919cc (patch) | |
| tree | 5fba6f05485f020f71ff77d6b4a2d108d4f87ddc /fsmonitor--daemon.h | |
| parent | Merge branch 'gc/zero-length-branch-config-fix' (diff) | |
| parent | t7527: improve implicit shutdown testing in fsmonitor--daemon (diff) | |
| download | git-9e496fffc872b20a147d7b80330335edfff919cc.tar.gz git-9e496fffc872b20a147d7b80330335edfff919cc.zip | |
Merge branch 'jh/builtin-fsmonitor-part3'
More fsmonitor--daemon.
* jh/builtin-fsmonitor-part3: (30 commits)
t7527: improve implicit shutdown testing in fsmonitor--daemon
fsmonitor--daemon: allow --super-prefix argument
t7527: test Unicode NFC/NFD handling on MacOS
t/lib-unicode-nfc-nfd: helper prereqs for testing unicode nfc/nfd
t/helper/hexdump: add helper to print hexdump of stdin
fsmonitor: on macOS also emit NFC spelling for NFD pathname
t7527: test FSMonitor on case insensitive+preserving file system
fsmonitor: never set CE_FSMONITOR_VALID on submodules
t/perf/p7527: add perf test for builtin FSMonitor
t7527: FSMonitor tests for directory moves
fsmonitor: optimize processing of directory events
fsm-listen-darwin: shutdown daemon if worktree root is moved/renamed
fsm-health-win32: force shutdown daemon if worktree root moves
fsm-health-win32: add polling framework to monitor daemon health
fsmonitor--daemon: stub in health thread
fsmonitor--daemon: rename listener thread related variables
fsmonitor--daemon: prepare for adding health thread
fsmonitor--daemon: cd out of worktree root
fsm-listen-darwin: ignore FSEvents caused by xattr changes on macOS
unpack-trees: initialize fsmonitor_has_run_once in o->result
...
Diffstat (limited to 'fsmonitor--daemon.h')
| -rw-r--r-- | fsmonitor--daemon.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fsmonitor--daemon.h b/fsmonitor--daemon.h index bd09fffc17..2102a5c9ff 100644 --- a/fsmonitor--daemon.h +++ b/fsmonitor--daemon.h @@ -33,10 +33,12 @@ void fsmonitor_batch__free_list(struct fsmonitor_batch *batch); */ void fsmonitor_batch__add_path(struct fsmonitor_batch *batch, const char *path); -struct fsmonitor_daemon_backend_data; /* opaque platform-specific data */ +struct fsm_listen_data; /* opaque platform-specific data for listener thread */ +struct fsm_health_data; /* opaque platform-specific data for health thread */ struct fsmonitor_daemon_state { pthread_t listener_thread; + pthread_t health_thread; pthread_mutex_t main_lock; struct strbuf path_worktree_watch; @@ -50,10 +52,13 @@ struct fsmonitor_daemon_state { int cookie_seq; struct hashmap cookies; - int error_code; - struct fsmonitor_daemon_backend_data *backend_data; + int listen_error_code; + int health_error_code; + struct fsm_listen_data *listen_data; + struct fsm_health_data *health_data; struct ipc_server_data *ipc_server_data; + struct strbuf path_ipc; }; /* |