Skip to content

Release GCHandle in FSEventStreamContext release callback #52275

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
merged 1 commit into from
May 5, 2021
Merged

Release GCHandle in FSEventStreamContext release callback #52275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/OSX/Interop.EventStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ internal struct FSEventStreamContext
{
public CFIndex version;
public IntPtr info;
public IntPtr retainFunc;
public IntPtr releaseFunc;
public IntPtr retain;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Match the names in Apple SDK

public IntPtr release;
public IntPtr copyDescription;
}

Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/OSX/Interop.SystemConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ internal struct SCDynamicStoreContext
{
public CFIndex version;
public IntPtr info;
public IntPtr retainFunc;
public IntPtr releaseFunc;
public IntPtr retain;
public IntPtr release;
public IntPtr copyDescription;
}

Expand Down
15 changes: 12 additions & 3 deletions src/libraries/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.OSX.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,6 @@ private void CleanupEventStream()

StaticWatcherRunLoopManager.UnscheduleFromRunLoop(eventStream);
eventStream.Dispose();

Debug.Assert(_gcHandle.IsAllocated);
_gcHandle.Free();
}
}

Expand Down Expand Up @@ -314,6 +311,7 @@ internal unsafe void Start(CancellationToken cancellationToken)

Interop.EventStream.FSEventStreamContext context = default;
context.info = GCHandle.ToIntPtr(_gcHandle);
context.release = (IntPtr)(delegate* unmanaged<IntPtr, void>)&ReleaseCallback;

// Create the event stream for the path and tell the stream to watch for file system events.
SafeEventStreamHandle eventStream = Interop.EventStream.FSEventStreamCreate(
Expand All @@ -336,7 +334,10 @@ internal unsafe void Start(CancellationToken cancellationToken)
finally
{
if (cleanupGCHandle)
{
Debug.Assert(_gcHandle.Target is RunningInstance);
_gcHandle.Free();
}
arrPaths?.Dispose();
path?.Dispose();
}
Expand Down Expand Up @@ -373,6 +374,14 @@ internal unsafe void Start(CancellationToken cancellationToken)
}
}

[UnmanagedCallersOnly]
private static void ReleaseCallback(IntPtr clientCallBackInfo)
{
GCHandle gcHandle = GCHandle.FromIntPtr(clientCallBackInfo);
Debug.Assert(gcHandle.Target is RunningInstance);
gcHandle.Free();
}

[UnmanagedCallersOnly]
private static unsafe void FileSystemEventCallback(
FSEventStreamRef streamRef,
Expand Down