Skip to content

8384085: Make os::Bsd::dlopen_helper private, and drop unused arg #31069

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
snake66 wants to merge 3 commits into
base: master
Choose a base branch
from
+5 −6
Open

8384085: Make os::Bsd::dlopen_helper private, and drop unused arg #31069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf2732c
8384085: Make os::Bsd::dlopen_helper private, and drop unused arg
snake66 Jun 27, 2025
64615c7
Make dlopen_helper a static function
snake66 May 7, 2026
dff3cd7
Update copyright year
snake66 May 8, 2026
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
6 changes: 3 additions & 3 deletions src/hotspot/os/bsd/os_bsd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@ bool os::dll_address_to_library_name(address addr, char* buf,
// in case of error it checks if .dll/.so was built for the
// same architecture as Hotspot is running on

void *os::Bsd::dlopen_helper(const char *filename, int mode, char *ebuf, int ebuflen) {
static void *dlopen_helper(const char *filename, char *ebuf, int ebuflen) {
bool ieee_handling = IEEE_subnormal_handling_OK();
if (!ieee_handling) {
Events::log_dll_message(nullptr, "IEEE subnormal handling check failed before loading %s", filename);
Expand Down Expand Up @@ -1207,7 +1207,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {

log_info(os)("attempting shared library load of %s", filename);

return os::Bsd::dlopen_helper(filename, RTLD_LAZY, ebuf, ebuflen);
return dlopen_helper(filename, ebuf, ebuflen);
}
#else
void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
Expand All @@ -1218,7 +1218,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
log_info(os)("attempting shared library load of %s", filename);

void* result;
result = os::Bsd::dlopen_helper(filename, RTLD_LAZY, ebuf, ebuflen);
result = dlopen_helper(filename, ebuf, ebuflen);
if (result != nullptr) {
return result;
}
Expand Down
5 changes: 2 additions & 3 deletions src/hotspot/os/bsd/os_bsd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -76,8 +76,6 @@ class os::Bsd {
// Real-time clock functions
static void clock_init(void);

static void *dlopen_helper(const char *path, int mode, char *ebuf, int ebuflen);

// Stack repair handling

// none present
Expand Down Expand Up @@ -105,6 +103,7 @@ class os::Bsd {
static void set_numa_tonode_memory(numa_tonode_memory_func_t func) { _numa_tonode_memory = func; }
static void set_numa_interleave_memory(numa_interleave_memory_func_t func) { _numa_interleave_memory = func; }
static void set_numa_all_nodes(unsigned long* ptr) { _numa_all_nodes = ptr; }

public:
static int sched_getcpu() { return _sched_getcpu != nullptr ? _sched_getcpu() : -1; }
static int numa_node_to_cpus(int node, unsigned long *buffer, int bufferlen) {
Expand Down