Skip to content

Make useFsEvents as default strategy for the watching #50366

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.

Sign up for GitHub

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

Merged
sheetalkamat merged 10 commits into from
Sep 6, 2022
Merged

Make useFsEvents as default strategy for the watching #50366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
88e574b
Remove unnecessary parameter
sheetalkamat Aug 15, 2022
266fbc5
Dont store name unnecessarily in the watchers
sheetalkamat Aug 15, 2022
956ee00
Polled watches and not files
sheetalkamat Aug 15, 2022
10a7b4e
Use fs events as default watching
sheetalkamat Aug 15, 2022
4d753d3
Some refactoring
sheetalkamat Aug 15, 2022
61a99bf
Make single per directory native watchers now that we are using it as…
sheetalkamat Aug 15, 2022
4c3a17f
Rename
sheetalkamat Aug 23, 2022
b9fc81c
Comment
sheetalkamat Aug 23, 2022
71140c7
Merge branch 'main' into defaultFsWatch
sheetalkamat Sep 6, 2022
b0f7c88
Merge branch 'main' into defaultFsWatch
sheetalkamat Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
Use fs events as default watching
  • Loading branch information
@sheetalkamat
sheetalkamat committed Aug 18, 2022
commit 10a7b4e252f2d6554895a923c48435d7211d30a7
2 changes: 1 addition & 1 deletion src/compiler/sys.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ namespace ts {
// Use notifications from FS to watch with falling back to fs.watchFile
generateWatchFileOptions(WatchFileKind.UseFsEventsOnParentDirectory, PollingWatchKind.PriorityInterval, options) :
// Default to do not use fixed polling interval
{ watchFile: defaultWatchFileKind?.() || WatchFileKind.FixedPollingInterval };
{ watchFile: defaultWatchFileKind?.() || WatchFileKind.UseFsEvents };
}
}

Expand Down
14 changes: 0 additions & 14 deletions src/tsserver/nodeServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,20 +247,6 @@ namespace ts.server {

// Override sys.write because fs.writeSync is not reliable on Node 4
sys.write = (s: string) => writeMessage(sys.bufferFrom!(s, "utf8") as globalThis.Buffer);
// REVIEW: for now this implementation uses polling.
// The advantage of polling is that it works reliably
// on all os and with network mounted files.
// For 90 referenced files, the average time to detect
// changes is 2*msInterval (by default 5 seconds).
// The overhead of this is .04 percent (1/2500) with
// average pause of < 1 millisecond (and max
// pause less than 1.5 milliseconds); question is
// do we anticipate reference sets in the 100s and
// do we care about waiting 10-20 seconds to detect
// changes for large reference sets? If so, do we want
// to increase the chunk size or decrease the interval
// time dynamically to match the large reference set?
sys.defaultWatchFileKind = () => WatchFileKind.FixedChunkSizePolling;

/* eslint-disable no-restricted-globals */
sys.setTimeout = setTimeout;
Expand Down
50 changes: 25 additions & 25 deletions ...baselines/reference/tsbuildWatch/configFileErrors/reports-syntax-errors-in-config-file.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ No cached semantic diagnostics in the builder::
No shapes updated in the builder::

PolledWatches::

FsWatches::
/user/username/projects/myproject/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/myproject/a.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/b.ts:
{"pollingInterval":250}

FsWatches::
{}

FsWatchesRecursive::

Expand Down Expand Up @@ -151,14 +151,14 @@ No cached semantic diagnostics in the builder::
No shapes updated in the builder::

PolledWatches::

FsWatches::
/user/username/projects/myproject/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/myproject/a.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/b.ts:
{"pollingInterval":250}

FsWatches::
{}

FsWatchesRecursive::

Expand Down Expand Up @@ -198,14 +198,14 @@ No cached semantic diagnostics in the builder::
No shapes updated in the builder::

PolledWatches::

FsWatches::
/user/username/projects/myproject/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/myproject/a.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/b.ts:
{"pollingInterval":250}

FsWatches::
{}

FsWatchesRecursive::

Expand Down Expand Up @@ -243,14 +243,14 @@ No cached semantic diagnostics in the builder::
No shapes updated in the builder::

PolledWatches::

FsWatches::
/user/username/projects/myproject/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/myproject/a.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/b.ts:
{"pollingInterval":250}

FsWatches::
{}

FsWatchesRecursive::

Expand Down Expand Up @@ -291,14 +291,14 @@ Shape signatures in builder refreshed for::
/user/username/projects/myproject/b.ts (computed .d.ts)

PolledWatches::

FsWatches::
/user/username/projects/myproject/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/myproject/a.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/b.ts:
{"pollingInterval":250}

FsWatches::
{}

FsWatchesRecursive::

Expand Down
56 changes: 28 additions & 28 deletions tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,30 +246,30 @@ Shape signatures in builder refreshed for::
/user/username/projects/demo/core/utilities.ts (used version)

PolledWatches::
/user/username/projects/demo/animals/package.json:
{"pollingInterval":2000}

FsWatches::
/user/username/projects/demo/core/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/tsconfig-base.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/core/utilities.ts:
{"pollingInterval":250}
/user/username/projects/demo/animals/package.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/animals/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/animals/animal.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/animals/dog.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/animals/index.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/zoo/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/zoo/zoo.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/tsconfig.json:
{"pollingInterval":250}

FsWatches::
{}

FsWatchesRecursive::
/user/username/projects/demo/core:
Expand Down Expand Up @@ -522,30 +522,30 @@ Shape signatures in builder refreshed for::
/user/username/projects/demo/animals/index.ts (computed .d.ts)

PolledWatches::
/user/username/projects/demo/animals/package.json:
{"pollingInterval":2000}

FsWatches::
/user/username/projects/demo/core/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/tsconfig-base.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/core/utilities.ts:
{"pollingInterval":250}
/user/username/projects/demo/animals/package.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/animals/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/animals/animal.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/animals/dog.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/animals/index.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/zoo/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/zoo/zoo.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/tsconfig.json:
{"pollingInterval":250}

FsWatches::
{}

FsWatchesRecursive::
/user/username/projects/demo/core:
Expand Down
48 changes: 24 additions & 24 deletions tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,28 +168,28 @@ Output::


PolledWatches::

FsWatches::
/user/username/projects/demo/animals/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/tsconfig-base.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/animals/animal.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/animals/dog.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/animals/index.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/zoo/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/zoo/zoo.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/core/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/core/utilities.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/tsconfig.json:
{"pollingInterval":250}

FsWatches::
{}

FsWatchesRecursive::
/user/username/projects/demo/animals:
Expand Down Expand Up @@ -299,28 +299,28 @@ Shape signatures in builder refreshed for::
/user/username/projects/demo/zoo/zoo.ts (computed .d.ts during emit)

PolledWatches::

FsWatches::
/user/username/projects/demo/animals/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/tsconfig-base.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/animals/animal.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/animals/dog.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/animals/index.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/zoo/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/zoo/zoo.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/core/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/demo/core/utilities.ts:
{"pollingInterval":250}
{}
/user/username/projects/demo/tsconfig.json:
{"pollingInterval":250}

FsWatches::
{}

FsWatchesRecursive::
/user/username/projects/demo/animals:
Expand Down
54 changes: 27 additions & 27 deletions ...buildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,22 +149,22 @@ Shape signatures in builder refreshed for::
/user/username/projects/myproject/packages/pkg1/index.ts (used version)

PolledWatches::

FsWatches::
/user/username/projects/myproject/packages/pkg2/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg2/const.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg2/index.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg2/other.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg1/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg1/index.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg2/package.json:
{"pollingInterval":250}

FsWatches::
{}

FsWatchesRecursive::
/user/username/projects/myproject/packages/pkg2:
Expand Down Expand Up @@ -337,22 +337,22 @@ Shape signatures in builder refreshed for::
/user/username/projects/myproject/packages/pkg1/index.ts (computed .d.ts)

PolledWatches::

FsWatches::
/user/username/projects/myproject/packages/pkg2/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg2/const.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg2/index.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg2/other.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg1/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg1/index.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg2/package.json:
{"pollingInterval":250}

FsWatches::
{}

FsWatchesRecursive::
/user/username/projects/myproject/packages/pkg2:
Expand Down Expand Up @@ -439,22 +439,22 @@ Shape signatures in builder refreshed for::
/user/username/projects/myproject/packages/pkg1/index.ts (computed .d.ts)

PolledWatches::

FsWatches::
/user/username/projects/myproject/packages/pkg2/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg2/const.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg2/index.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg2/other.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg1/tsconfig.json:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg1/index.ts:
{"pollingInterval":250}
{}
/user/username/projects/myproject/packages/pkg2/package.json:
{"pollingInterval":250}

FsWatches::
{}

FsWatchesRecursive::
/user/username/projects/myproject/packages/pkg2:
Expand Down
Loading