Skip to content
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

Jump to bottom

Fix memory leak: Avoid disposing python stream in finalizer thread #1142

Merged
merged 2 commits into from
Dec 13, 2023
Merged

Fix memory leak: Avoid disposing python stream in finalizer thread #1142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
902985c
Fix memory leak: Avoid disposing python stream in finalizer thread
sunnycase Dec 13, 2023
c71f9f1
Merge branch 'master' into fix/mem_leak
sunnycase Dec 13, 2023
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
3 changes: 3 additions & 0 deletions src/Native/include/nncase/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ typedef struct {
clr_object_handle_t (*calibration_dataset_provider_create)(
clr_object_handle_t dataset, size_t samplesCount,
clr_object_handle_t fn_params);
void (*handle_dispose)(clr_object_handle_t handle);
void (*handle_free)(clr_object_handle_t handle);
clr_object_handle_t (*compile_options_create)();
void (*compile_options_set_input_file)(clr_object_handle_t compile_options,
Expand Down Expand Up @@ -478,6 +479,8 @@ class cstream : public clr_object_base {
cstream(const nncase_stream_mt_t *mt, void *handle) {
obj_ = nncase_clr_api()->stream_create(mt, handle);
}

~cstream() { nncase_clr_api()->handle_dispose(obj_.get()); }
};

class compile_options : public clr_object_base {
Expand Down
8 changes: 8 additions & 0 deletions src/Nncase.Compiler/Interop/CApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public unsafe struct CApiMT
public delegate* unmanaged<IntPtr, nuint, IntPtr> ArrayGetItemPtr;
public delegate* unmanaged<IntPtr, nuint> ArrayGetLengthPtr;
public delegate* unmanaged<IntPtr, nuint, IntPtr, IntPtr> CalibrationDatasetProviderCreatePtr;
public delegate* unmanaged<IntPtr, void> ClrHandleDisposePtr;
public delegate* unmanaged<IntPtr, void> ClrHandleFreePtr;
public delegate* unmanaged<IntPtr> CompileOptionsCreatePtr;
public delegate* unmanaged<IntPtr, byte*, nuint, void> CompileOptionsSetInputFilePtr;
Expand Down Expand Up @@ -112,6 +113,7 @@ public static void Initialize(CApiMT* mt)
mt->ArrayGetItemPtr = &ArrayGetItem;
mt->ArrayGetLengthPtr = &ArrayGetLength;
mt->CalibrationDatasetProviderCreatePtr = &CalibrationDatasetProviderCreate;
mt->ClrHandleDisposePtr = &ClrHandleDispose;
mt->ClrHandleFreePtr = &ClrHandleFree;
mt->CompileOptionsCreatePtr = &CompileOptionsCreate;
mt->CompileOptionsSetInputFilePtr = &CompileOptionsSetInputFile;
Expand Down Expand Up @@ -225,6 +227,12 @@ private static IntPtr CalibrationDatasetProviderCreate(IntPtr datasetHandle, nui
return GCHandle.ToIntPtr(GCHandle.Alloc(new CCalibrationDatasetProvider(samples, (int)samplesCount)));
}

[UnmanagedCallersOnly]
private static void ClrHandleDispose(IntPtr handle)
{
Get<IDisposable>(handle).Dispose();
}

[UnmanagedCallersOnly]
private static void ClrHandleFree(IntPtr handle)
{
Expand Down
Loading