Skip to content

Commit 4d8f4f7

Browse files
David's feedback
1 parent 1c2726d commit 4d8f4f7

File tree

6 files changed

+6
-39
lines changed

6 files changed

+6
-39
lines changed

src/hotspot/os/aix/os_aix.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,10 +1439,6 @@ void os::pd_print_cpu_info(outputStream* st, char* buf, size_t buflen) {
14391439
// Nothing to do beyond of what os::print_cpu_info() does.
14401440
}
14411441

1442-
void os::print_signal_handlers(outputStream* st, char* buf, size_t buflen) {
1443-
PosixSignals::print_signal_handlers(st, buf, buflen);
1444-
}
1445-
14461442
static char saved_jvm_path[MAXPATHLEN] = {0};
14471443

14481444
// Find the full path to the current module, libjvm.so.
@@ -2575,10 +2571,6 @@ bool os::bind_to_processor(uint processor_id) {
25752571
return false;
25762572
}
25772573

2578-
void os::SuspendedThreadTask::internal_do_task() {
2579-
PosixSignals::do_task(_thread, this);
2580-
}
2581-
25822574
////////////////////////////////////////////////////////////////////////////////
25832575
// debug support
25842576

src/hotspot/os/bsd/os_bsd.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,10 +1539,6 @@ void os::print_memory_info(outputStream* st) {
15391539
st->cr();
15401540
}
15411541

1542-
void os::print_signal_handlers(outputStream* st, char* buf, size_t buflen) {
1543-
PosixSignals::print_signal_handlers(st, buf, buflen);
1544-
}
1545-
15461542
static char saved_jvm_path[MAXPATHLEN] = {0};
15471543

15481544
// Find the full path to the current module, libjvm
@@ -2261,10 +2257,6 @@ bool os::bind_to_processor(uint processor_id) {
22612257
return false;
22622258
}
22632259

2264-
void os::SuspendedThreadTask::internal_do_task() {
2265-
PosixSignals::do_task(_thread, this);
2266-
}
2267-
22682260
////////////////////////////////////////////////////////////////////////////////
22692261
// debug support
22702262

src/hotspot/os/linux/os_linux.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2600,10 +2600,6 @@ void os::get_summary_cpu_info(char* cpuinfo, size_t length) {
26002600
#endif
26012601
}
26022602

2603-
void os::print_signal_handlers(outputStream* st, char* buf, size_t buflen) {
2604-
PosixSignals::print_signal_handlers(st, buf, buflen);
2605-
}
2606-
26072603
static char saved_jvm_path[MAXPATHLEN] = {0};
26082604

26092605
// Find the full path to the current module, libjvm.so
@@ -4681,12 +4677,6 @@ bool os::bind_to_processor(uint processor_id) {
46814677
return false;
46824678
}
46834679

4684-
///
4685-
4686-
void os::SuspendedThreadTask::internal_do_task() {
4687-
PosixSignals::do_task(_thread, this);
4688-
}
4689-
46904680
////////////////////////////////////////////////////////////////////////////////
46914681
// debug support
46924682

src/hotspot/os/posix/signals_posix.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@ void PosixSignals::print_signal_handler(outputStream* st, int sig,
12811281
st->cr();
12821282
}
12831283

1284-
void PosixSignals::print_signal_handlers(outputStream* st, char* buf, size_t buflen) {
1284+
void os::print_signal_handlers(outputStream* st, char* buf, size_t buflen) {
12851285
st->print_cr("Signal Handlers:");
12861286
PosixSignals::print_signal_handler(st, SIGSEGV, buf, buflen);
12871287
PosixSignals::print_signal_handler(st, SIGBUS , buf, buflen);
@@ -1638,11 +1638,11 @@ void PosixSignals::do_resume(OSThread* osthread) {
16381638
guarantee(osthread->sr.is_running(), "Must be running!");
16391639
}
16401640

1641-
void PosixSignals::do_task(Thread* thread, os::SuspendedThreadTask* task) {
1642-
if (PosixSignals::do_suspend(thread->osthread())) {
1643-
os::SuspendedThreadTaskContext context(thread, thread->osthread()->ucontext());
1644-
task->do_task(context);
1645-
PosixSignals::do_resume(thread->osthread());
1641+
void os::SuspendedThreadTask::internal_do_task() {
1642+
if (PosixSignals::do_suspend(_thread->osthread())) {
1643+
os::SuspendedThreadTaskContext context(_thread, _thread->osthread()->ucontext());
1644+
do_task(context);
1645+
PosixSignals::do_resume(_thread->osthread());
16461646
}
16471647
}
16481648

src/hotspot/os/posix/signals_posix.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ typedef sigset_t sigset_t;
3535
class outputStream;
3636
class Thread;
3737
class OSThread;
38-
class SuspendedThreadTask;
3938

4039
class PosixSignals : public AllStatic {
4140

@@ -55,12 +54,10 @@ class PosixSignals : public AllStatic {
5554
static void hotspot_sigmask(Thread* thread);
5655

5756
static void print_signal_handler(outputStream* st, int sig, char* buf, size_t buflen);
58-
static void print_signal_handlers(outputStream* st, char* buf, size_t buflen);
5957

6058
// Suspend-resume
6159
static bool do_suspend(OSThread* osthread);
6260
static void do_resume(OSThread* osthread);
63-
static void do_task(Thread* thread, os::SuspendedThreadTask* task);
6461

6562
// For signal-chaining
6663
static bool chained_handler(int sig, siginfo_t* siginfo, void* context);

src/hotspot/os/windows/os_windows.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1872,10 +1872,6 @@ bool os::signal_thread(Thread* thread, int sig, const char* reason) {
18721872
return false;
18731873
}
18741874

1875-
void os::print_signal_handlers(outputStream* st, char* buf, size_t buflen) {
1876-
// do nothing
1877-
}
1878-
18791875
static char saved_jvm_path[MAX_PATH] = {0};
18801876

18811877
// Find the full path to the current module, jvm.dll

0 commit comments

Comments
 (0)