-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allocate one single DestroyNotify callback to properly handle scope="…
…notified" callbacks. Fixes #125
- Loading branch information
Showing
8 changed files
with
131 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
modules/glib/src/main/java/io/github/jwharm/javagi/interop/Arenas.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* Java-GI - Java language bindings for GObject-Introspection-based libraries | ||
| * Copyright (C) 2022-2024 the Java-GI developers | ||
| * | ||
| * SPDX-License-Identifier: LGPL-2.1-or-later | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2.1 of the License, or (at your option) any later version. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this library; if not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package io.github.jwharm.javagi.interop; | ||
|
|
||
| import java.lang.foreign.*; | ||
| import java.lang.invoke.MethodHandle; | ||
| import java.lang.invoke.MethodHandles; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * Keeps a list of open Arenas that will be closed in a DestroyNotify callback. | ||
| * The DestroyNotify callback will know which Arena to close, based on the | ||
| * hashcode that is passed in the user_data parameter. | ||
| */ | ||
| public class Arenas { | ||
|
|
||
| // Contains all open callback arenas that are closed using DestroyNotify | ||
| private static final Map<Integer, Arena> ARENAS = new HashMap<>(); | ||
|
|
||
| /** | ||
| * The upcall stub for the DestroyNotify callback method | ||
| */ | ||
| public static final MemorySegment CLOSE_CB_SYM; | ||
|
|
||
| // Allocate the upcall stub for the DestroyNotify callback method | ||
| static { | ||
| try { | ||
| FunctionDescriptor _fdesc = FunctionDescriptor.ofVoid(ValueLayout.ADDRESS); | ||
| MethodHandle _handle = MethodHandles.lookup().findStatic( | ||
| Arenas.class, "close_cb", _fdesc.toMethodType()); | ||
| CLOSE_CB_SYM = Linker.nativeLinker().upcallStub(_handle, _fdesc, Arena.global()); | ||
| } catch (NoSuchMethodException | IllegalAccessException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * This is called by native code when it runs the DestroyNotify callback. | ||
| * It will close the accompanying Arena. | ||
| * | ||
| * @param data pointer to the hashcode of the Arena to close | ||
| */ | ||
| public static void close_cb(MemorySegment data) { | ||
| int hashCode = data.reinterpret(ValueLayout.JAVA_INT.byteSize()) | ||
| .get(ValueLayout.JAVA_INT, 0); | ||
| Arena arena = ARENAS.remove(hashCode); | ||
| if (arena != null) | ||
| arena.close(); | ||
| } | ||
|
|
||
| /** | ||
| * This will add the Arena to the global static list of open arenas, and | ||
| * return a pointer to the hashcode of the Arena. | ||
| * | ||
| * @param arena the Arena to cache | ||
| * @return a pointer to the hashcode of the Arena | ||
| */ | ||
| public static MemorySegment cacheArena(Arena arena) { | ||
| int hashCode = arena.hashCode(); | ||
| ARENAS.put(hashCode, arena); | ||
| return arena.allocateFrom(ValueLayout.JAVA_INT, hashCode); | ||
| } | ||
| } |