Skip to content

Removed reference counting from IncrementalBuilder; now relies on GC. #6863

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
TIHan merged 11 commits into from
May 31, 2019
Merged

Removed reference counting from IncrementalBuilder; now relies on GC. #6863

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cc41ebe
TcImports doesn't explicitly have to be disposed, relies on GC. Remov…
TIHan May 23, 2019
5779215
Removing any notion of being incremental builder reference counting a…
TIHan May 24, 2019
9251353
Added ITypeProviderThread
TIHan May 25, 2019
b3d0b38
Fixed declaration list item
TIHan May 25, 2019
fb8ecf7
Changed EnqueueWorkAndWait to just EnqueueWork that's not blocking
TIHan May 25, 2019
84308e5
Minor cleanup
TIHan May 25, 2019
2a693f8
Forgot to check disposed
TIHan May 25, 2019
05b7d39
Quick update on comment
TIHan May 25, 2019
e11699d
Update FCS project
TIHan May 25, 2019
a6c6306
Renamed ITypeProviderThread to ICompilationThread
TIHan May 30, 2019
0262e2d
Changes from feedback and added a test
TIHan May 30, 2019
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
Prev Previous commit
Next Next commit
Changed EnqueueWorkAndWait to just EnqueueWork that's not blocking
  • Loading branch information
@TIHan
TIHan committed May 25, 2019
commit fb8ecf79c26e20c3b659106c63dcb119108ee70a
6 changes: 3 additions & 3 deletions src/fsharp/CompileOps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1964,7 +1964,7 @@ type ResolvedExtensionReference = ResolvedExtensionReference of string * Assembl

type ITypeProviderThread =

abstract EnqueueWorkAndWait: (unit -> 'T) -> 'T
abstract EnqueueWork: (unit -> unit) -> unit
#endif

type ImportedBinary =
Expand Down Expand Up @@ -2278,7 +2278,7 @@ type TcConfigBuilder =
continueAfterParseFailure = false
#if !NO_EXTENSIONTYPING
showExtensionTypeMessages = false
typeProviderThread = { new ITypeProviderThread with member __.EnqueueWorkAndWait work = work () }
typeProviderThread = { new ITypeProviderThread with member __.EnqueueWork work = work () }
#endif
pause = false
alwaysCallVirt = true
Expand Down Expand Up @@ -3815,7 +3815,7 @@ and [<Sealed>] TcImports(tcConfigP: TcConfigProvider, initialResolutions: TcAsse
let actions = disposeTypeProviderActions
disposeTypeProviderActions <- []
if actions.Length > 0 then
typeProviderThread.EnqueueWorkAndWait (fun () -> for action in actions do action())
typeProviderThread.EnqueueWork (fun () -> for action in actions do action())
#endif
let actions = disposeActions
disposeActions <- []
Expand Down
3 changes: 1 addition & 2 deletions src/fsharp/CompileOps.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,7 @@ type ResolvedExtensionReference = ResolvedExtensionReference of string * Assembl
type ITypeProviderThread =

/// Enqueue work to be done on the type provider thread.
/// This is a synchronous call.
abstract EnqueueWorkAndWait: (unit -> 'T) -> 'T
abstract EnqueueWork: (unit -> unit) -> unit
#endif

[<RequireQualifiedAccess>]
Expand Down
9 changes: 4 additions & 5 deletions src/fsharp/service/IncrementalBuild.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1752,11 +1752,10 @@ type IncrementalBuilder(tcGlobals, frameworkTcImports, nonFrameworkAssemblyInput
#if !NO_EXTENSIONTYPING
tcConfigB.typeProviderThread <-
{ new ITypeProviderThread with
member __.EnqueueWorkAndWait work =
Reactor.Singleton.EnqueueAndAwaitOpAsync ("Unknown", "ITypeProvider.EnqueueWorkAndWait", "work", fun _ ->
// not cancellable
Cancellable.ret (work ())
) |> Async.RunSynchronously
member __.EnqueueWork work =
Reactor.Singleton.EnqueueOp ("Unknown", "ITypeProvider.EnqueueWorkAndWait", "work", fun _ ->
work ()
)
}
#endif

Expand Down