Skip to content

Use cleaner instead of finalize #350

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use cleaner instead of finalize #350

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
27 changes: 14 additions & 13 deletions src/main/java/jnr/ffi/provider/jffi/AbstractA64StubCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.kenai.jffi.NativeMethod;
import com.kenai.jffi.NativeMethods;
import com.kenai.jffi.PageManager;
import com.kenai.jffi.internal.Cleaner;
import jnr.a64asm.Assembler_A64;
import jnr.ffi.Platform;
import jnr.ffi.Runtime;
Expand Down Expand Up @@ -86,21 +87,21 @@ public PageHolder(PageManager pm, long memory, long pageCount) {
this.pm = pm;
this.memory = memory;
this.pageCount = pageCount;
}

@Override
protected void finalize() throws Throwable {
try {
int disposed = PAGE_HOLDER_UPDATER.getAndSet(this, 1);
if (disposed == 0) {
pm.freePages(memory, (int) pageCount);
Cleaner.register(this, new Runnable() {
@Override
public void run() {
try {
int disposed = PAGE_HOLDER_UPDATER.getAndSet(PageHolder.this, 1);
if (disposed == 0) {
pm.freePages(memory, (int) pageCount);
}
} catch (Throwable t) {
Logger.getLogger(getClass().getName()).log(Level.WARNING,
"Exception when freeing native pages: %s", t.getLocalizedMessage());
}
}
} catch (Throwable t) {
Logger.getLogger(getClass().getName()).log(Level.WARNING,
"Exception when freeing native pages: %s", t.getLocalizedMessage());
} finally {
super.finalize();
}
});
}

}
Expand Down
27 changes: 14 additions & 13 deletions src/main/java/jnr/ffi/provider/jffi/AbstractX86StubCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.kenai.jffi.NativeMethod;
import com.kenai.jffi.NativeMethods;
import com.kenai.jffi.PageManager;
import com.kenai.jffi.internal.Cleaner;
import jnr.ffi.Platform;
import jnr.ffi.Runtime;
import jnr.x86asm.Assembler;
Expand Down Expand Up @@ -86,21 +87,21 @@ public PageHolder(PageManager pm, long memory, long pageCount) {
this.pm = pm;
this.memory = memory;
this.pageCount = pageCount;
}

@Override
protected void finalize() throws Throwable {
try {
int disposed = PAGE_HOLDER_UPDATER.getAndSet(this, 1);
if (disposed == 0) {
pm.freePages(memory, (int) pageCount);
Cleaner.register(this, new Runnable() {
@Override
public void run() {
try {
int disposed = PAGE_HOLDER_UPDATER.getAndSet(PageHolder.this, 1);
if (disposed == 0) {
pm.freePages(memory, (int) pageCount);
}
} catch (Throwable t) {
Logger.getLogger(getClass().getName()).log(Level.WARNING,
"Exception when freeing native pages: %s", t.getLocalizedMessage());
}
}
} catch (Throwable t) {
Logger.getLogger(getClass().getName()).log(Level.WARNING,
"Exception when freeing native pages: %s", t.getLocalizedMessage());
} finally {
super.finalize();
}
});
}

}
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/jnr/ffi/provider/jffi/AllocatedDirectMemoryIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package jnr.ffi.provider.jffi;

import com.kenai.jffi.internal.Cleaner;
import jnr.ffi.Runtime;

import java.util.concurrent.atomic.AtomicBoolean;
Expand All @@ -32,6 +33,15 @@ public AllocatedDirectMemoryIO(Runtime runtime, long size, boolean clear) {
if (address() == 0L) {
throw new OutOfMemoryError("Failed to allocate " + size + " bytes");
}

Cleaner.register(this, new Runnable() {
@Override
public void run() {
if (allocated.getAndSet(false)) {
IO.freeMemory(address());
}
}
});
}

@Override
Expand Down Expand Up @@ -60,14 +70,4 @@ public final void dispose() {
}
}

@Override
protected void finalize() throws Throwable {
try {
if (allocated.getAndSet(false)) {
IO.freeMemory(address());
}
} finally {
super.finalize();
}
}
}