1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8255119: Monitor::wait takes signed integer as timeout

Browse Source 
Reviewed-by: jsjolen, stuefe, coleenp, gziemski
This commit is contained in:
David Holmes 2023-01-10 00:45:43 +00:00
parent 4395578b6f
commit a63866341e
6 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/os/posix/mutex_posix.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2023, 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
@ -133,7 +133,7 @@ class PlatformMonitor : public PlatformMutex {
NONCOPYABLE(PlatformMonitor);
public:
int wait(jlong millis);
int wait(uint64_t millis);
void notify();
void notify_all();
};

12
src/hotspot/os/posix/os_posix.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2023, 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
@ -1869,17 +1869,17 @@ PlatformMonitor::~PlatformMonitor() {
#endif // PLATFORM_MONITOR_IMPL_INDIRECT
// Must already be locked
int PlatformMonitor::wait(jlong millis) {
assert(millis >= 0, "negative timeout");
int PlatformMonitor::wait(uint64_t millis) {
if (millis > 0) {
struct timespec abst;
// We have to watch for overflow when converting millis to nanos,
// but if millis is that large then we will end up limiting to
// MAX_SECS anyway, so just do that here.
// MAX_SECS anyway, so just do that here. This also handles values
// larger than int64_t max.
if (millis / MILLIUNITS > MAX_SECS) {
millis = jlong(MAX_SECS) * MILLIUNITS;
millis = uint64_t(MAX_SECS) * MILLIUNITS;
}
to_abstime(&abst, millis_to_nanos(millis), false, false);
to_abstime(&abst, millis_to_nanos(int64_t(millis)), false, false);
int ret = OS_TIMEOUT;
int status = pthread_cond_timedwait(cond(), mutex(), &abst);

2
src/hotspot/os/windows/mutex_windows.hpp
View File

@ -56,7 +56,7 @@ class PlatformMonitor : public PlatformMutex {
public:
PlatformMonitor();
~PlatformMonitor();
int wait(jlong millis);
int wait(uint64_t millis);
void notify();
void notify_all();
};

11
src/hotspot/os/windows/os_windows.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2023, 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
@ -5358,11 +5358,14 @@ void Parker::unpark() {
// Platform Monitor implementation
// Must already be locked
int PlatformMonitor::wait(jlong millis) {
assert(millis >= 0, "negative timeout");
int PlatformMonitor::wait(uint64_t millis) {
int ret = OS_TIMEOUT;
// The timeout parameter for SleepConditionVariableCS is a DWORD
if (millis > UINT_MAX) {
millis = UINT_MAX;
}
int status = SleepConditionVariableCS(&_cond, &_mutex,
millis == 0 ? INFINITE : millis);
millis == 0 ? INFINITE : (DWORD)millis);
if (status != 0) {
ret = OS_OK;
}

12
src/hotspot/share/runtime/mutex.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2023, 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
@ -209,11 +209,10 @@ void Monitor::notify_all() {
_lock.notify_all();
}
bool Monitor::wait_without_safepoint_check(int64_t timeout) {
// timeout is in milliseconds - with zero meaning never timeout
bool Monitor::wait_without_safepoint_check(uint64_t timeout) {
Thread* const self = Thread::current();
// timeout is in milliseconds - with zero meaning never timeout
assert(timeout >= 0, "negative timeout");
assert_owner(self);
check_rank(self);
@ -229,13 +228,12 @@ bool Monitor::wait_without_safepoint_check(int64_t timeout) {
return wait_status != 0; // return true IFF timeout
}
bool Monitor::wait(int64_t timeout) {
// timeout is in milliseconds - with zero meaning never timeout
bool Monitor::wait(uint64_t timeout) {
JavaThread* const self = JavaThread::current();
// Safepoint checking logically implies an active JavaThread.
assert(self->is_active_Java_thread(), "invariant");
// timeout is in milliseconds - with zero meaning never timeout
assert(timeout >= 0, "negative timeout");
assert_owner(self);
check_rank(self);

6
src/hotspot/share/runtime/mutex.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2023, 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
@ -212,8 +212,8 @@ class Monitor : public Mutex {
// Wait until monitor is notified (or times out).
// Defaults are to make safepoint checks, wait time is forever (i.e.,
// zero). Returns true if wait times out; otherwise returns false.
bool wait(int64_t timeout = 0);
bool wait_without_safepoint_check(int64_t timeout = 0);
bool wait(uint64_t timeout = 0);
bool wait_without_safepoint_check(uint64_t timeout = 0);
void notify();
void notify_all();
};