Skip to content

8372977: Unnecessary gthread-2.0 loading #2515

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
GoeLin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

8372977: Unnecessary gthread-2.0 loading #2515

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a3edc3
Backport 5ea2b6402114d34465b2ad9e476ab8e36ddeea06
Dec 11, 2025
daa3ad0
Undo changes in header, needed for gtk2. See 8329471: Remove GTK2
GoeLin Dec 15, 2025
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
21 changes: 0 additions & 21 deletions src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
#include "debug_assert.h"

static void *gtk3_libhandle = NULL;
static void *gthread_libhandle = NULL;

static void transform_detail_string (const gchar *detail,
GtkStyleContext *context);
Expand Down Expand Up @@ -79,15 +78,6 @@ static void* dl_symbol(const char* name)
return result;
}

static void* dl_symbol_gthread(const char* name)
{
void* result = dlsym(gthread_libhandle, name);
if (!result)
longjmp(j, NO_SYMBOL_EXCEPTION);

return result;
}

gboolean gtk3_check(const char* lib_name, gboolean load)
{
if (gtk3_libhandle != NULL) {
Expand Down Expand Up @@ -264,13 +254,6 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name)
return FALSE;
}

gthread_libhandle = dlopen(GTHREAD_LIB_VERSIONED, RTLD_LAZY | RTLD_LOCAL);
if (gthread_libhandle == NULL) {
gthread_libhandle = dlopen(GTHREAD_LIB, RTLD_LAZY | RTLD_LOCAL);
if (gthread_libhandle == NULL)
return FALSE;
}

if (setjmp(j) == 0)
{
fp_gtk_check_version = dl_symbol("gtk_check_version");
Expand Down Expand Up @@ -637,9 +620,6 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name)
dlclose(gtk3_libhandle);
gtk3_libhandle = NULL;

dlclose(gthread_libhandle);
gthread_libhandle = NULL;

return NULL;
}

Expand Down Expand Up @@ -738,7 +718,6 @@ static int gtk3_unload()

dlerror();
dlclose(gtk3_libhandle);
dlclose(gthread_libhandle);
if ((gtk3_error = dlerror()) != NULL)
{
return FALSE;
Expand Down