Commit45c4026

Vasily Kirichenko

authored and

Vasily Kirichenko

committed

revert cancellation token to repeatedlyProgressUntilDoneOrTimeShareOverOrCanceled

1 parente05d9ee commit45c4026Copy full SHA for 45c4026

File tree

-5

lines changed

-5

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,7 @@ module ResultOrException =`
`494`	`494`	`/// captured by the NotYetDone closure. Computations do not need to be restartable.`
`495`	`495`	`///`
`496`	`496`	`/// - The key thing is that you can take an Eventually value and run it with`
`497`		`-/// Eventually.repeatedlyProgressUntilDoneOrTimeShareOver`
	`497`	`+/// Eventually.repeatedlyProgressUntilDoneOrTimeShareOverOrCanceled`
`498`	`498`	`typeEventually<'T>=`
`499`	`499`	`\| Doneof'T`
`500`	`500`	`\| NotYetDoneof(unit->Eventually<'T>)`
`@@ -521,7 +521,7 @@ module Eventually =`
`521`	`521`
`522`	`522`	`/// Keep running the computation bit by bit until a time limit is reached.`
`523`	`523`	`/// The runner gets called each time the computation is restarted`
`524`		`-letrepeatedlyProgressUntilDoneOrTimeShareOver timeShareInMilliseconds runner e=`
	`524`	`+letrepeatedlyProgressUntilDoneOrTimeShareOverOrCanceled timeShareInMilliseconds(ct:CancellationToken)runner e=`
`525`	`525`	`letsw=new System.Diagnostics.Stopwatch()`
`526`	`526`	`let recrunTimeShare e=`
`527`	`527`	`runner(fun()->`
`@@ -531,7 +531,7 @@ module Eventually =`
`531`	`531`	`match ewith`
`532`	`532`	`\| Done_-> e`
`533`	`533`	`\| NotYetDone work->`
`534`		`-if sw.ElapsedMilliseconds> timeShareInMillisecondsthen`
	`534`	`+ifct.IsCancellationRequested\|\|sw.ElapsedMilliseconds> timeShareInMillisecondsthen`
`535`	`535`	`sw.Stop();`
`536`	`536`	`NotYetDone(fun()-> runTimeShare e)`
`537`	`537`	`else`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1497,8 +1497,9 @@ type IncrementalBuilder(frameworkTcImportsCache: FrameworkImportsCache, tcConfig`
`1497`	`1497`	`if ensureReactivethen`
`1498`	`1498`	`lettimeSlicedComputation=`
`1499`	`1499`	`fullComputation\|>`
`1500`		`- Eventually.repeatedlyProgressUntilDoneOrTimeShareOver`
	`1500`	`+ Eventually.repeatedlyProgressUntilDoneOrTimeShareOverOrCanceled`
`1501`	`1501`	`maxTimeShareMilliseconds`
	`1502`	`+ CancellationToken.None`
`1502`	`1503`	`(fun f->`
`1503`	`1504`	`// Reinstall the compilation globals each time we start or restart`
`1504`	`1505`	`use unwind=new CompilationGlobalsScope(errorLogger, BuildPhase.TypeCheck, projectDirectory)`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1722,6 +1722,7 @@ module internal Parser =`
`1722`	`1722`
`1723`	`1723`	`// Typecheck the real input.`
`1724`	`1724`	`letsink= TcResultsSinkImpl(tcGlobals, source= source)`
	`1725`	`+let!ct= Async.CancellationToken`
`1725`	`1726`
`1726`	`1727`	`let!tcEnvAtEndOpt=`
`1727`	`1728`	`async{`
`@@ -1735,7 +1736,7 @@ module internal Parser =`
`1735`	`1736`
`1736`	`1737`	`let!result=`
`1737`	`1738`	`TypeCheckOneInputAndFinishEventually(checkForErrors,tcConfig, tcImports, tcGlobals, None, TcResultsSink.WithSink sink, tcState, parsedMainInput)`
`1738`		`-\|> Eventually.repeatedlyProgressUntilDoneOrTimeShareOver50L(fun f-> f())`
	`1739`	`+\|> Eventually.repeatedlyProgressUntilDoneOrTimeShareOverOrCanceled50L ct(fun f-> f())`
`1739`	`1740`	`\|> Eventually.forceAsync`
`1740`	`1741`	`(fun(work: unit-> Eventually<_>)->`
`1741`	`1742`	`reactorOps.EnqueueAndAwaitOpAsync("TypeCheckOneFile",`

Comments

(0)