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

[BUG][JNI] Trigger MemoryBuffer.onClosed after memory is freed #15351

Merged
merged 3 commits into from
Mar 20, 2024
Merged

[BUG][JNI] Trigger MemoryBuffer.onClosed after memory is freed #15351

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73d6303
Trigger onClosed later in MemoryBuffer
abellina Mar 20, 2024
446ab9b
Trigger onClose later in ColumnVector
abellina Mar 20, 2024
31e5be3
Trigger onClose later in HostColumnVector
abellina Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 13 additions & 10 deletions java/src/main/java/ai/rapids/cudf/MemoryBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Copyright (c) 2019-2022, NVIDIA CORPORATION.
* Copyright (c) 2019-2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -240,15 +240,18 @@ public synchronized void close() {
if (cleaner != null) {
refCount--;
cleaner.delRef();
if (eventHandler != null) {
eventHandler.onClosed(refCount);
}
if (refCount == 0) {
cleaner.clean(false);
closed = true;
} else if (refCount < 0) {
cleaner.logRefCountDebug("double free " + this);
throw new IllegalStateException("Close called too many times " + this);
try {
if (refCount == 0) {
cleaner.clean(false);
closed = true;
} else if (refCount < 0) {
cleaner.logRefCountDebug("double free " + this);
throw new IllegalStateException("Close called too many times " + this);
}
} finally {
if (eventHandler != null) {
eventHandler.onClosed(refCount);
}
}
abellina marked this conversation as resolved.
Show resolved Hide resolved
}
}
Expand Down