infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-14 15:39:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Serguei Spitsyn 2017-08-08 01:44:43 +00:00
commit 21e615836f
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hotspot/src/share/vm/oops/instanceKlass.cpp
View File

@ -101,7 +101,7 @@
len = clss_name->utf8_length(); \
} \
HOTSPOT_CLASS_INITIALIZATION_##type( \
data, len, class_loader(), thread_type); \
data, len, (void*)class_loader(), thread_type); \
}
#define DTRACE_CLASSINIT_PROBE_WAIT(type, thread_type, wait) \
@ -114,7 +114,7 @@
len = clss_name->utf8_length(); \
} \
HOTSPOT_CLASS_INITIALIZATION_##type( \
data, len, class_loader(), thread_type, wait); \
data, len, (void*)class_loader(), thread_type, wait); \
}
#else // ndef DTRACE_ENABLED

11
hotspot/src/share/vm/runtime/mutex.cpp
View File

@ -1159,9 +1159,12 @@ Monitor::~Monitor() {
uintptr_t entrylist = UNS(_EntryList);
uintptr_t waitset = UNS(_WaitSet);
uintptr_t ondeck = UNS(_OnDeck);
// Print _name with precision limit, in case failure is due to memory
// corruption that also trashed _name.
assert((owner|lockword|entrylist|waitset|ondeck) == 0,
"_owner(" INTPTR_FORMAT ")|_LockWord(" INTPTR_FORMAT ")|_EntryList(" INTPTR_FORMAT ")|_WaitSet("
INTPTR_FORMAT ")|_OnDeck(" INTPTR_FORMAT ") != 0", owner, lockword, entrylist, waitset, ondeck);
"%.*s: _owner(" INTPTR_FORMAT ")|_LockWord(" INTPTR_FORMAT ")|_EntryList(" INTPTR_FORMAT ")|_WaitSet("
INTPTR_FORMAT ")|_OnDeck(" INTPTR_FORMAT ") != 0",
MONITOR_NAME_LEN, _name, owner, lockword, entrylist, waitset, ondeck);
#endif
}
@ -1193,10 +1196,6 @@ Monitor::Monitor(int Rank, const char * name, bool allow_vm_block,
#endif
}
Mutex::~Mutex() {
assert((UNS(_owner)|UNS(_LockWord.FullWord)|UNS(_EntryList)|UNS(_WaitSet)|UNS(_OnDeck)) == 0, "");
}
Mutex::Mutex(int Rank, const char * name, bool allow_vm_block,
SafepointCheckRequired safepoint_check_required) {
ClearMonitor((Monitor *) this, name);

2
hotspot/src/share/vm/runtime/mutex.hpp
View File

@ -303,7 +303,7 @@ class Mutex : public Monitor { // degenerate Monitor
public:
Mutex(int rank, const char *name, bool allow_vm_block = false,
SafepointCheckRequired safepoint_check_required = _safepoint_check_always);
~Mutex () ;
// default destructor
private:
bool notify () { ShouldNotReachHere(); return false; }
bool notify_all() { ShouldNotReachHere(); return false; }

2
hotspot/src/share/vm/services/classLoadingService.cpp
View File

@ -53,7 +53,7 @@
len = name->utf8_length(); \
} \
HOTSPOT_CLASS_##type( /* type = unloaded, loaded */ \
data, len, (clss)->class_loader(), (shared)); \
data, len, (void*)(clss)->class_loader(), (shared)); \
}
#else // ndef DTRACE_ENABLED