> -----Original Message----- > From: Eric DeCosta via GitGitGadget <gitgitgadget@xxxxxxxxx> > Sent: Saturday, September 24, 2022 3:46 PM > To: git@xxxxxxxxxxxxxxx > Cc: Jeff Hostetler <git@xxxxxxxxxxxxxxxxx>; Eric Sunshine > <sunshine@xxxxxxxxxxxxxx>; Torsten Bögershausen <tboegi@xxxxxx>; > Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>; Ramsay Jones > <ramsay@xxxxxxxxxxxxxxxxxxxx>; Johannes Schindelin > <Johannes.Schindelin@xxxxxx>; Eric DeCosta <edecosta@xxxxxxxxxxxxx> > Subject: [PATCH v12 0/6] fsmonitor: option to allow fsmonitor to run against > network-mounted repos > > Follow-on to the work done to allow Windows to work against network- > mounted repos for macOS. > > Have macOS take advantage of the same configuration option, > 'fsmonitor.allowRemote' that was introduced for Windows. Setting this > option to true will override the default behavior (erroring-out) when a > network-mounted repo is detected by fsmonitor. > > The added wrinkle being that the Unix domain socket (UDS) file used for IPC > cannot be created in a network location; instead $HOME is used if the default > location is on the network. The user may, optionally, set the > 'fsmonitor.socketDir' configuration option to a valid, local directory if $HOME > itself is on the network or is simply not the desired location for the UDS file. > > An additional issue is that for mount points in the root directory, FSEvents > does not report a path that matches the worktree directory due to the > introduction of 'synthetic firmlinks'. fsmonitor must map the FSEvents paths > to the worktree directory by interrogating the root filesystem for synthetic > firmlinks and using that information to translate the path. > > v12 differs from v11: > > * bug fixes > > v11 differs from v10: > > * incorporates code review feedback > * fix memory leak in fsm-listen-darwin.c > > v10 differs from v9: > > * incorporates code review feedback > * improves error messaging for incompatible socket directory > > v9 differs from v8: > > * incorporates code review feedback > * check for incompatibility before communicating with fsmonitor > > v8 differs from v7: > > * incorporates code review feedback > * gets the rebase right > > v7 differs from v6: > > * incorporates code review feedback > > v6 differs from v5: > > * incorporates earlier, Windows-specific changes that have not made it back > yet to the master branch > * incorporates code review feedback > * adds documentation for 'fsmonitor.allowRemote' and 'fsmonitor.socketDir' > > v5 differs significantly from earlier versions: > > * redesign of handling 'fsmonitor.allowRemote' and 'fsmonitor.socketDir' > such that these options are no longer added to the settings data structure > but are rather read from config at point of use > * refactoring of code for handling platform-specific file system checks via a > common interface to avoid platform #ifdef in IPC code and be in-model with > other platform-specific fsmonitor code > * dealing with 'synthetic firmlinks' on macOS > > Eric DeCosta (6): > fsmonitor: refactor filesystem checks to common interface > fsmonitor: relocate socket file if .git directory is remote > fsmonitor: avoid socket location check if using hook > fsmonitor: deal with synthetic firmlinks on macOS > fsmonitor: check for compatability before communicating with fsmonitor > fsmonitor: add documentation for allowRemote and socketDir options > Any further thoughts? If not I think this patch set is good to merge. -Eric > Documentation/git-fsmonitor--daemon.txt | 48 ++++++- Makefile | 2 + > builtin/fsmonitor--daemon.c | 11 +- compat/fsmonitor/fsm-ipc-darwin.c | 52 > +++++++ compat/fsmonitor/fsm-ipc-win32.c | 9 ++ compat/fsmonitor/fsm- > listen-darwin.c | 14 +- compat/fsmonitor/fsm-path-utils-darwin.c | 132 > +++++++++++++++++ compat/fsmonitor/fsm-path-utils-win32.c | 145 > +++++++++++++++++++ compat/fsmonitor/fsm-settings-darwin.c | 72 +++----- > -- compat/fsmonitor/fsm-settings-win32.c | 174 +---------------------- > contrib/buildsystems/CMakeLists.txt | 4 + fsmonitor--daemon.h | 3 + > fsmonitor-ipc.c | 18 ++- fsmonitor-ipc.h | 4 +- fsmonitor-path-utils.h | 59 > ++++++++ fsmonitor-settings.c | 68 ++++++++- fsmonitor-settings.h | 4 +- > fsmonitor.c | 7 + > 18 files changed, 580 insertions(+), 246 deletions(-) create mode 100644 > compat/fsmonitor/fsm-ipc-darwin.c create mode 100644 > compat/fsmonitor/fsm-ipc-win32.c create mode 100644 > compat/fsmonitor/fsm-path-utils-darwin.c > create mode 100644 compat/fsmonitor/fsm-path-utils-win32.c > create mode 100644 fsmonitor-path-utils.h > > > base-commit: 4b79ee4b0cd1130ba8907029cdc5f6a1632aca26 > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr- > 1326%2Fedecosta-mw%2Ffsmonitor_macos-v12 <https://protect- > us.mimecast.com/s/8B-_CDkx7zSvvOYvhZsW8c?domain=github.com> > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git <https://protect- > us.mimecast.com/s/G1p4CERy7Ah99649sZioql?domain=github.com> pr- > 1326/edecosta-mw/fsmonitor_macos-v12 > Pull-Request: https://github.com/gitgitgadget/git/pull/1326 <https://protect- > us.mimecast.com/s/tTa3CG6A7DIYYL3Ys0on8b?domain=github.com> > > Range-diff vs v11: > > 1: 155a6890806 = 1: 5958dab0163 fsmonitor: refactor filesystem checks to > common interface > 2: dbe113abb87 ! 2: 20220b08edb fsmonitor: relocate socket file if .git > directory is remote @@ compat/fsmonitor/fsm-ipc-darwin.c (new) > + > +const char *fsmonitor_ipc__get_path(struct repository *r) { > -+ static const char *ipc_path; > ++ static const char *ipc_path = NULL; > + SHA_CTX sha1ctx; > + char *sock_dir = NULL; > + struct strbuf ipc_file = STRBUF_INIT; > @@ compat/fsmonitor/fsm-ipc-darwin.c (new) > + if (ipc_path) > + return ipc_path; > + > -+ ipc_path = fsmonitor_ipc__get_default_path(); > + > + /* By default the socket file is created in the .git directory */ > -+ if (fsmonitor__is_fs_remote(ipc_path) < 1) > ++ if (fsmonitor__is_fs_remote(r->gitdir) < 1) { ipc_path = > ++ fsmonitor_ipc__get_default_path(); > + return ipc_path; > ++ } > + > + SHA1_Init(&sha1ctx); > + SHA1_Update(&sha1ctx, r->worktree, strlen(r->worktree)); > 3: 86c15299ae8 = 3: e9921550a67 fsmonitor: avoid socket location check if > using hook > 4: 1a516fd9214 = 4: 6efdc6ed74e fsmonitor: deal with synthetic firmlinks on > macOS > 5: e0fe05dabef ! 5: 421d77775dc fsmonitor: check for compatability before > communicating with fsmonitor @@ fsmonitor-settings.h: enum > fsmonitor_mode fsm_settings__get_mode(struct reposito struct > fsmonitor_settings; > > ## fsmonitor.c ## > +@@ fsmonitor.c: static int fsmonitor_force_update_threshold = 100; > + > + void refresh_fsmonitor(struct index_state *istate) { > ++ static int warn_once = 0; > + struct strbuf query_result = STRBUF_INIT; int query_success = 0, > + hook_version = -1; size_t bol = 0; /* beginning of line */ > @@ fsmonitor.c: void refresh_fsmonitor(struct index_state *istate) int > is_trivial = 0; struct repository *r = istate->repo ? istate->repo : > the_repository; enum fsmonitor_mode fsm_mode = > fsm_settings__get_mode(r); > + enum fsmonitor_reason reason = fsm_settings__get_reason(r); > + > -+ if (reason > FSMONITOR_REASON_OK) > ++ if (!warn_once && reason > FSMONITOR_REASON_OK) { warn_once = 1; > + warning("%s", fsm_settings__get_incompatible_msg(r, reason)); > ++ } > > if (fsm_mode <= FSMONITOR_MODE_DISABLED || > istate->fsmonitor_has_run_once) > 6: 3200b505988 = 6: b375b0ac798 fsmonitor: add documentation for > allowRemote and socketDir options > > -- > gitgitgadget
