Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace pre-V4 of FSMonitor with V4 using GFW experimental commits #437

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
7ed17ed
fixup! Enable the built-in FSMonitor as an experimental feature
jeffhostetler Sep 29, 2021
49e51c0
fixup! fsmonitor: mark the built-in FSMonitor as experimental
jeffhostetler Sep 29, 2021
fa7afc2
Merge branch 'revert-pre-v4-fsmonitor-experimental' into revert-pre-v…
jeffhostetler Sep 29, 2021
bfa0044
fixup! mingw: support long paths
jeffhostetler Sep 29, 2021
98b55c3
fixup! fsmonitor-settings: remote repos on Windows are incompatible w…
jeffhostetler Sep 29, 2021
479df9f
fixup! fsmonitor-settings: remote repos on MacOS are incompatible wit…
jeffhostetler Sep 29, 2021
6276712
fixup! fsmonitor-settings: stub in platform-specific incompatibility …
jeffhostetler Sep 29, 2021
1a545a1
fixup! fsmonitor--daemon: background daemon must free the console on …
jeffhostetler Sep 29, 2021
5a54dfa
fixup! fsmonitor-settings: virtual repos are incompatible with FSMonitor
jeffhostetler Sep 29, 2021
cd4411c
fixup! fsmonitor-settings: stub in platform-specific incompatibility …
jeffhostetler Sep 29, 2021
c83e5be
Merge branch 'revert-pre-v4-fsmonitor-long-path' into revert-pre-v4-f…
jeffhostetler Sep 29, 2021
09f9385
fixup! ipc-win32: add trace2 debugging
jeffhostetler Sep 29, 2021
9fd734e
fixup! t/helper/fsmonitor-client: create stress test
jeffhostetler Sep 29, 2021
126ab52
fixup! t7527: test builtin FSMonitor watching repos with unicode paths
jeffhostetler Sep 29, 2021
2388883
fixup! t7527: test FS event reporing on MacOS WRT case and Unicode
jeffhostetler Sep 29, 2021
0e32575
fixup! fsmonitor: handle shortname for .git
jeffhostetler Sep 29, 2021
ee717d5
fixup! t7527: test status with untracked-cache and fsmonitor--daemon
jeffhostetler Sep 29, 2021
4f40cd4
fixup! fsmonitor: force update index after large responses
jeffhostetler Sep 29, 2021
6cea160
fixup! fsmonitor: enhance existing comments
jeffhostetler Sep 29, 2021
39e0489
fixup! fsmonitor--daemon: use a cookie file to sync with file system
jeffhostetler Sep 29, 2021
0dae22b
fixup! fsmonitor--daemon: periodically truncate list of modified files
jeffhostetler Sep 29, 2021
bfc1efc
fixup! t7527: create test for fsmonitor--daemon
jeffhostetler Sep 29, 2021
b1488ad
fixup! t/perf/p7519: add fsmonitor--daemon test cases
jeffhostetler Sep 29, 2021
62cad11
fixup! t/perf: avoid copying builtin fsmonitor files into test repo
jeffhostetler Sep 29, 2021
43ab881
fixup! t/perf/p7519: speed up test on Windows
jeffhostetler Sep 29, 2021
b244b54
fixup! t/helper/test-chmtime: skip directories on Windows
jeffhostetler Sep 29, 2021
492c04e
fixup! fsmonitor--daemon: implement handle_client callback
jeffhostetler Sep 29, 2021
b27da82
fixup! fsm-listen-darwin: implement FSEvent listener on MacOS
jeffhostetler Sep 29, 2021
6fe4f74
fixup! fsm-listen-darwin: add macos header files for FSEvent
jeffhostetler Sep 29, 2021
32c3a20
fixup! fsm-listen-win32: implement FSMonitor backend on Windows
jeffhostetler Sep 29, 2021
f394cb1
fixup! fsmonitor--daemon: create token-based changed path cache
jeffhostetler Sep 29, 2021
1be0de1
fixup! fsmonitor--daemon: define token-ids
jeffhostetler Sep 29, 2021
d27ea8b
fixup! fsmonitor--daemon: add pathname classification
jeffhostetler Sep 29, 2021
eee16aa
fixup! fsmonitor--daemon: do not try to operate on bare repos
jeffhostetler Sep 29, 2021
4ef3173
fixup! fsmonitor--daemon: implement 'start' command
jeffhostetler Sep 29, 2021
d5fd4ed
fixup! fsmonitor--daemon: implement 'run' command
jeffhostetler Sep 29, 2021
d953cad
fixup! fsm-listen-darwin: stub in backend for Darwin
jeffhostetler Sep 29, 2021
c1b76c0
fixup! fsm-listen-win32: stub in backend for Windows
jeffhostetler Sep 29, 2021
7fbbac3
fixup! t/helper/fsmonitor-client: create IPC client to talk to FSMoni…
jeffhostetler Sep 29, 2021
a9bfc01
fixup! fsmonitor--daemon: implement 'stop' and 'status' commands
jeffhostetler Sep 29, 2021
669c955
fixup! fsmonitor--daemon: add a built-in fsmonitor daemon
jeffhostetler Sep 29, 2021
c6e29c2
fixup! fsmonitor: use IPC to query the builtin FSMonitor daemon
jeffhostetler Sep 29, 2021
feea1cb
fixup! fsmonitor: config settings are repository-specific
jeffhostetler Sep 29, 2021
a63209e
fixup! help: include fsmonitor--daemon feature flag in version info
jeffhostetler Sep 29, 2021
513dee5
fixup! fsmonitor-ipc: create client routines for git-fsmonitor--daemon
jeffhostetler Sep 29, 2021
5c2eb20
fixup! fsmonitor--daemon: update fsmonitor documentation
jeffhostetler Sep 29, 2021
f3c5e26
fixup! fsmonitor--daemon: man page
jeffhostetler Sep 29, 2021
19ee980
fixup! simple-ipc: preparations for supporting binary messages.
jeffhostetler Sep 29, 2021
54ddae0
trace2: add trace2_child_ready() to report on background children
jeffhostetler Sep 20, 2021
f183cc7
simple-ipc: preparations for supporting binary messages.
jeffhostetler Apr 20, 2021
a0a6ebe
simple-ipc: move definition of ipc_active_state outside of ifdef
jeffhostetler Aug 19, 2021
e5a1d91
simple-ipc/ipc-win32: add trace2 debugging
jeffhostetler Jul 28, 2021
e3ac087
simple-ipc/ipc-win32: add Windows ACL to named pipe
jeffhostetler Aug 26, 2021
e96c86e
run-command: create start_bg_command
jeffhostetler Aug 12, 2021
e490554
Merge branch 'revert-pre-v4-fsmonitor-proper' into revert-pre-v4-fsmo…
jeffhostetler Sep 29, 2021
e7939e0
fsmonitor: enhance existing comments
jeffhostetler May 19, 2021
c624a60
fsmonitor-ipc: create client routines for git-fsmonitor--daemon
jeffhostetler May 12, 2021
c008c3b
fsmonitor: config settings are repository-specific
jeffhostetler Mar 5, 2021
3587437
fsmonitor: use IPC to query the builtin FSMonitor daemon
jeffhostetler Aug 2, 2019
64e6847
t/helper/simple-ipc: convert test-simple-ipc to use start_bg_command
jeffhostetler Aug 16, 2021
8d563f0
fsmonitor: update fsmonitor config documentation
jeffhostetler May 11, 2021
585b155
Merge branch 'try-v4-fsmonitor-part1' into try-v4-fsmonitor
jeffhostetler Sep 29, 2021
0f795e4
fsmonitor--daemon: man page
jeffhostetler May 11, 2021
19e42f8
fsmonitor--daemon: add a built-in fsmonitor daemon
jeffhostetler Dec 16, 2020
0e97154
builtin/fsmonitor--daemon: use parse-options API fully
carenas Aug 17, 2021
94ec0e5
fsmonitor--daemon: implement 'stop' and 'status' commands
jeffhostetler Dec 16, 2020
3aac461
compat/fsmonitor/fsm-listen-win32: stub in backend for Windows
jeffhostetler Dec 17, 2020
c569886
compat/fsmonitor/fsm-listen-darwin: stub in backend for Darwin
jeffhostetler Dec 17, 2020
2685c53
fsmonitor--daemon: implement 'run' command
jeffhostetler Jun 29, 2021
34d228c
fsmonitor--daemon: implement 'start' command
jeffhostetler Jun 29, 2021
8744392
Merge branch 'try-v4-fsmonitor-part2' into try-v4-fsmonitor
jeffhostetler Sep 29, 2021
64971b4
fsmonitor--daemon: add pathname classification
jeffhostetler Dec 17, 2020
5567220
fsmonitor--daemon: define token-ids
jeffhostetler Dec 17, 2020
f54b4a4
fsmonitor--daemon: create token-based changed path cache
jeffhostetler Dec 17, 2020
dd378b4
compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on Win…
jeffhostetler Dec 17, 2020
7aa75f6
compat/fsmonitor/fsm-listen-darwin: add macos header files for FSEvent
jeffhostetler Dec 18, 2020
38560a3
compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOS
jeffhostetler Dec 18, 2020
cace837
fsmonitor--daemon: implement handle_client callback
jeffhostetler Dec 18, 2020
336e918
help: include fsmonitor--daemon feature flag in version info
jeffhostetler May 12, 2021
370af40
t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon
jeffhostetler May 11, 2021
6afcddb
t7527: create test for fsmonitor--daemon
jeffhostetler Dec 18, 2020
2ba3e35
t/perf: avoid copying builtin fsmonitor files into test repo
jeffhostetler Apr 21, 2021
3b617e8
t/helper/test-chmtime: skip directories on Windows
jeffhostetler Jul 20, 2021
f8013f4
t/perf/p7519: speed up test on Windows
jeffhostetler Jul 20, 2021
065492d
t/perf/p7519: add fsmonitor--daemon test cases
jeffhostetler Jan 15, 2021
4c1167f
fsmonitor--daemon: periodically truncate list of modified files
jeffhostetler Dec 18, 2020
a511ade
fsmonitor--daemon: use a cookie file to sync with file system
jeffhostetler Dec 18, 2020
67f2c1d
fsmonitor: force update index after large responses
jeffhostetler May 19, 2021
4597bc9
compat/fsmonitor/fsm-listen-win32: handle shortnames
jeffhostetler Jun 25, 2021
b6367c7
t7527: test status with untracked-cache and fsmonitor--daemon
jeffhostetler Mar 1, 2021
ee3be16
t7527: test FS event reporing on MacOS WRT case and Unicode
jeffhostetler Jun 30, 2021
10efa0a
Merge branch 'try-v4-fsmonitor-part3' into try-v4-fsmonitor
jeffhostetler Sep 29, 2021
a1fc4aa
t7527: test builtin FSMonitor watching repos with unicode paths
jeffhostetler Jul 12, 2021
42d62b4
t/helper/fsmonitor-client: create stress test
jeffhostetler Jul 27, 2021
386c369
fsmonitor-settings: bare repos are incompatible with FSMonitor
jeffhostetler Jun 23, 2021
b77197a
fsmonitor-settings: stub in platform-specific incompatibility checking
jeffhostetler Jul 29, 2021
d432e98
fsmonitor-settings: virtual repos are incompatible with FSMonitor
jeffhostetler Aug 2, 2021
c54c767
fsmonitor-settings: stub in platform-specific incompatibility checkin…
jeffhostetler Aug 4, 2021
6635d1a
fsmonitor-settings: remote repos on MacOS are incompatible with FSMon…
jeffhostetler Aug 4, 2021
e3c9f93
fsmonitor-settings: remote repos on Windows are incompatible with FSM…
jeffhostetler Aug 5, 2021
ea6e532
unpack-trees: initialize fsmonitor_has_run_once in o->result
jeffhostetler Aug 23, 2021
7059bab
compat/fsmonitor/fsm-listen-darwin: ignore FSEvents caused by xattr c…
jeffhostetler Aug 25, 2021
e0238f4
fsmonitor--daemon: print start message only if fsmonitor.announceStartup
jeffhostetler Aug 30, 2021
6fa4324
fsmonitor--daemon: cd out of worktree root
jeffhostetler Sep 2, 2021
e1c65c7
fsmonitor--daemon: prepare for adding health thread
jeffhostetler Sep 8, 2021
39f0fde
fsmonitor--daemon: rename listener thread related variables
jeffhostetler Sep 8, 2021
0398d35
fsmonitor--daemon: stub in health thread
jeffhostetler Sep 10, 2021
dd4bdde
compat/fsmonitor/fsm-health-win32: add framework for periodically mon…
jeffhostetler Sep 10, 2021
941ff16
compat/fsmonitor/fsm-health-win32: force shutdown daemon if worktree …
jeffhostetler Sep 10, 2021
991e668
compat/fsmonitor/fsm-listen-darwin: shutdown daemon if worktree root …
jeffhostetler Sep 10, 2021
edb45f0
fsmonitor: measure time taken to apply fsmonitor query result
jeffhostetler Sep 21, 2021
13f8336
fsmonitor: optimize processing of directory events
jeffhostetler Sep 21, 2021
a058260
Merge branch 'try-v4-fsmonitor-part4' into try-v4-fsmonitor
jeffhostetler Sep 29, 2021
9c05fd9
fsmonitor: mark the built-in FSMonitor as experimental
dscho Mar 5, 2021
1e54c4a
Enable the built-in FSMonitor as an experimental feature
dscho Mar 5, 2021
f715125
compat/fsmonitor/fsm-*-win32: support long paths
dscho Aug 5, 2021
d0c878a
Merge branch 'mark-v4-fsmonitor-experimental' into try-v4-fsmonitor
jeffhostetler Sep 29, 2021
e8f91a1
Merge branch 'fix-v4-fsmonitor-long-paths' into try-v4-fsmonitor
jeffhostetler Sep 29, 2021
9f82d43
Merge commit 'e8f91a13a0' into gvfs-try-v4-fsmonitor-take2
jeffhostetler Oct 5, 2021
e4dcae6
fixup! gvfs: disable the built-in FSMonitor
jeffhostetler Oct 5, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions Documentation/technical/api-trace2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,46 @@ stopping after the waitpid() and includes OS process creation overhead).
So this time will be slightly larger than the atexit time reported by
the child process itself.

`"child_ready"`::
This event is generated after the current process has started
a background process and released all handles to it.
+
------------
{
"event":"child_ready",
...
"child_id":2,
"pid":14708, # child PID
"ready":"ready", # child ready state
"t_rel":0.110605 # observed run-time of child process
}
------------
+
Note that the session-id of the child process is not available to
the current/spawning process, so the child's PID is reported here as
a hint for post-processing. (But it is only a hint because the child
process may be a shell script which doesn't have a session-id.)
+
This event is generated after the child is started in the background
and given a little time to boot up and start working. If the child
startups normally and while the parent is still waiting, the "ready"
field will have the value "ready".
If the child is too slow to start and the parent times out, the field
will have the value "timeout".
If the child starts but the parent is unable to probe it, the field
will have the value "error".
+
After the parent process emits this event, it will release all of its
handles to the child process and treat the child as a background
daemon. So even if the child does eventually finish booting up,
the parent will not emit an updated event.
+
Note that the `t_rel` field contains the observed run time in seconds
when the parent released the child process into the background.
The child is assumed to be a long-running daemon process and may
outlive the parent process. So the parent's child event times should
not be compared to the child's atexit times.

`"exec"`::
This event is generated before git attempts to `exec()`
another command rather than starting a child process.
Expand Down
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,9 @@ all::
#
# If your platform supports a built-in fsmonitor backend, set
# FSMONITOR_DAEMON_BACKEND to the "<name>" of the corresponding
# `compat/fsmonitor/fsm-listen-<name>.c` that implements the
# `fsm_listen__*()` routines.
# `compat/fsmonitor/fsm-listen-<name>.c` and
# `compat/fsmonitor/fsm-health-<name>.c` files
# that implement the `fsm_listen__*()` and `fsm_health__*()` routines.
#
# If your platform has os-specific ways to tell if a repo is incompatible with
# fsmonitor (whether the hook or ipc daemon version), set FSMONITOR_OS_SETTINGS
Expand Down Expand Up @@ -1963,6 +1964,7 @@ endif
ifdef FSMONITOR_DAEMON_BACKEND
COMPAT_CFLAGS += -DHAVE_FSMONITOR_DAEMON_BACKEND
COMPAT_OBJS += compat/fsmonitor/fsm-listen-$(FSMONITOR_DAEMON_BACKEND).o
COMPAT_OBJS += compat/fsmonitor/fsm-health-$(FSMONITOR_DAEMON_BACKEND).o
endif

ifdef FSMONITOR_OS_SETTINGS
Expand Down
Loading