# HG changeset patch # User mbaesken # Date 1537518312 -7200 # Fri Sep 21 10:25:12 2018 +0200 # Node ID abe49e14d001d466df1ff21444dce8c717cc7c1d # Parent c26fbf1434c4d0dc0041cdbea3671e899a182437 8210964: add more ld preloading info to hs_error file on Linux diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp @@ -1975,6 +1975,8 @@ os::Linux::print_proc_sys_info(st); + os::Linux::print_system_config_info(st); + os::Linux::print_container_info(st); } @@ -2133,6 +2135,15 @@ st->cr(); } +void os::Linux::print_system_config_info(outputStream* st) { + st->cr(); + st->print_cr("/etc/ld.so.preload (system-wide LD_PRELOAD config file):"); + bool file_present = _print_ascii_file("/etc/ld.so.preload", st); + if (!file_present) { st->print("file not present"); } + st->cr(); + st->cr(); +} + void os::Linux::print_container_info(outputStream* st) { if (!OSContainer::is_containerized()) { return; diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp --- a/src/hotspot/os/linux/os_linux.hpp +++ b/src/hotspot/os/linux/os_linux.hpp @@ -114,6 +114,7 @@ static void print_distro_info(outputStream* st); static void print_libversion_info(outputStream* st); static void print_proc_sys_info(outputStream* st); + static void print_system_config_info(outputStream* st); public: static bool _stack_is_executable;