archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Ioi Lam 2014-02-11 10:05:02 -08:00
commit d0baa9304f
21 changed files with 122 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/make/bsd/makefiles/optimized.make
View file

@ -22,7 +22,7 @@
# #
# #
# Sets make macros for making optimized version of Gamma VM # Sets make macros for making optimized version of HotSpot VM
# (This is the "product", not the "release" version.) # (This is the "product", not the "release" version.)
# Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make

2
hotspot/make/bsd/makefiles/product.make
View file

@ -22,7 +22,7 @@
# #
# #
# Sets make macros for making optimized version of Gamma VM # Sets make macros for making optimized version of HotSpot VM
# (This is the "product", not the "release" version.) # (This is the "product", not the "release" version.)
# Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make

2
hotspot/make/bsd/makefiles/top.make
View file

@ -128,7 +128,7 @@ the_vm: vm_build_preliminaries $(adjust-mflags)
@$(UpdatePCH) @$(UpdatePCH)
@$(MAKE) -f vm.make $(MFLAGS-adjusted) @$(MAKE) -f vm.make $(MFLAGS-adjusted)
install gamma: the_vm install : the_vm
@$(MAKE) -f vm.make $@ @$(MAKE) -f vm.make $@
# next rules support "make foo.[ois]" # next rules support "make foo.[ois]"

2
hotspot/make/linux/makefiles/optimized.make
View file

@ -22,7 +22,7 @@
# #
# #
# Sets make macros for making optimized version of Gamma VM # Sets make macros for making optimized version of HotSpot VM
# (This is the "product", not the "release" version.) # (This is the "product", not the "release" version.)
# Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make

2
hotspot/make/linux/makefiles/product.make
View file

@ -22,7 +22,7 @@
# #
# #
# Sets make macros for making optimized version of Gamma VM # Sets make macros for making optimized version of HotSpot VM
# (This is the "product", not the "release" version.) # (This is the "product", not the "release" version.)
# Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make

2
hotspot/make/linux/makefiles/top.make
View file

@ -122,7 +122,7 @@ the_vm: vm_build_preliminaries $(adjust-mflags)
@$(UpdatePCH) @$(UpdatePCH)
@$(MAKE) -f vm.make $(MFLAGS-adjusted) @$(MAKE) -f vm.make $(MFLAGS-adjusted)
install gamma: the_vm install: the_vm
@$(MAKE) -f vm.make $@ @$(MAKE) -f vm.make $@
# next rules support "make foo.[ois]" # next rules support "make foo.[ois]"

2
hotspot/make/solaris/makefiles/optimized.make
View file

@ -22,7 +22,7 @@
# #
# #
# Sets make macros for making optimized version of Gamma VM # Sets make macros for making optimized version of HotSpot VM
# (This is the "product", not the "release" version.) # (This is the "product", not the "release" version.)
# Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make

2
hotspot/make/solaris/makefiles/product.make
View file

@ -22,7 +22,7 @@
# #
# #
# Sets make macros for making optimized version of Gamma VM # Sets make macros for making optimized version of HotSpot VM
# (This is the "product", not the "release" version.) # (This is the "product", not the "release" version.)
# Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make

2
hotspot/make/solaris/makefiles/top.make
View file

@ -114,7 +114,7 @@ $(adjust-mflags): $(GAMMADIR)/make/$(Platform_os_family)/makefiles/adjust-mflags
the_vm: vm_build_preliminaries $(adjust-mflags) the_vm: vm_build_preliminaries $(adjust-mflags)
@$(MAKE) -f vm.make $(MFLAGS-adjusted) @$(MAKE) -f vm.make $(MFLAGS-adjusted)
install gamma: the_vm install: the_vm
@$(MAKE) -f vm.make $@ @$(MAKE) -f vm.make $@
# next rules support "make foo.[oi]" # next rules support "make foo.[oi]"

78
hotspot/src/share/vm/classfile/altHashing.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -39,18 +39,18 @@ intptr_t object_hash(Klass* k) {
} }
// Seed value used for each alternative hash calculated. // Seed value used for each alternative hash calculated.
jint AltHashing::compute_seed() { juint AltHashing::compute_seed() {
jlong nanos = os::javaTimeNanos(); jlong nanos = os::javaTimeNanos();
jlong now = os::javaTimeMillis(); jlong now = os::javaTimeMillis();
jint SEED_MATERIAL[8] = { int SEED_MATERIAL[8] = {
(jint) object_hash(SystemDictionary::String_klass()), (int) object_hash(SystemDictionary::String_klass()),
(jint) object_hash(SystemDictionary::System_klass()), (int) object_hash(SystemDictionary::System_klass()),
(jint) os::random(), // current thread isn't a java thread (int) os::random(), // current thread isn't a java thread
(jint) (((julong)nanos) >> 32), (int) (((julong)nanos) >> 32),
(jint) nanos, (int) nanos,
(jint) (((julong)now) >> 32), (int) (((julong)now) >> 32),
(jint) now, (int) now,
(jint) (os::javaTimeNanos() >> 2) (int) (os::javaTimeNanos() >> 2)
}; };
return murmur3_32(SEED_MATERIAL, 8); return murmur3_32(SEED_MATERIAL, 8);
@ -58,14 +58,14 @@ jint AltHashing::compute_seed() {
// Murmur3 hashing for Symbol // Murmur3 hashing for Symbol
jint AltHashing::murmur3_32(jint seed, const jbyte* data, int len) { juint AltHashing::murmur3_32(juint seed, const jbyte* data, int len) {
jint h1 = seed; juint h1 = seed;
int count = len; int count = len;
int offset = 0; int offset = 0;
// body // body
while (count >= 4) { while (count >= 4) {
jint k1 = (data[offset] & 0x0FF) juint k1 = (data[offset] & 0x0FF)
| (data[offset + 1] & 0x0FF) << 8 | (data[offset + 1] & 0x0FF) << 8
| (data[offset + 2] & 0x0FF) << 16 | (data[offset + 2] & 0x0FF) << 16
| data[offset + 3] << 24; | data[offset + 3] << 24;
@ -85,7 +85,7 @@ jint AltHashing::murmur3_32(jint seed, const jbyte* data, int len) {
// tail // tail
if (count > 0) { if (count > 0) {
jint k1 = 0; juint k1 = 0;
switch (count) { switch (count) {
case 3: case 3:
@ -109,18 +109,18 @@ jint AltHashing::murmur3_32(jint seed, const jbyte* data, int len) {
h1 ^= len; h1 ^= len;
// finalization mix force all bits of a hash block to avalanche // finalization mix force all bits of a hash block to avalanche
h1 ^= ((unsigned int)h1) >> 16; h1 ^= h1 >> 16;
h1 *= 0x85ebca6b; h1 *= 0x85ebca6b;
h1 ^= ((unsigned int)h1) >> 13; h1 ^= h1 >> 13;
h1 *= 0xc2b2ae35; h1 *= 0xc2b2ae35;
h1 ^= ((unsigned int)h1) >> 16; h1 ^= h1 >> 16;
return h1; return h1;
} }
// Murmur3 hashing for Strings // Murmur3 hashing for Strings
jint AltHashing::murmur3_32(jint seed, const jchar* data, int len) { juint AltHashing::murmur3_32(juint seed, const jchar* data, int len) {
jint h1 = seed; juint h1 = seed;
int off = 0; int off = 0;
int count = len; int count = len;
@ -129,7 +129,7 @@ jint AltHashing::murmur3_32(jint seed, const jchar* data, int len) {
while (count >= 2) { while (count >= 2) {
jchar d1 = data[off++] & 0xFFFF; jchar d1 = data[off++] & 0xFFFF;
jchar d2 = data[off++]; jchar d2 = data[off++];
jint k1 = (d1 | d2 << 16); juint k1 = (d1 | d2 << 16);
count -= 2; count -= 2;
@ -145,7 +145,7 @@ jint AltHashing::murmur3_32(jint seed, const jchar* data, int len) {
// tail // tail
if (count > 0) { if (count > 0) {
int k1 = data[off]; juint k1 = (juint)data[off];
k1 *= 0xcc9e2d51; k1 *= 0xcc9e2d51;
k1 = Integer_rotateLeft(k1, 15); k1 = Integer_rotateLeft(k1, 15);
@ -157,25 +157,25 @@ jint AltHashing::murmur3_32(jint seed, const jchar* data, int len) {
h1 ^= len * 2; // (Character.SIZE / Byte.SIZE); h1 ^= len * 2; // (Character.SIZE / Byte.SIZE);
// finalization mix force all bits of a hash block to avalanche // finalization mix force all bits of a hash block to avalanche
h1 ^= ((unsigned int)h1) >> 16; h1 ^= h1 >> 16;
h1 *= 0x85ebca6b; h1 *= 0x85ebca6b;
h1 ^= ((unsigned int)h1) >> 13; h1 ^= h1 >> 13;
h1 *= 0xc2b2ae35; h1 *= 0xc2b2ae35;
h1 ^= ((unsigned int)h1) >> 16; h1 ^= h1 >> 16;
return h1; return h1;
} }
// Hash used for the seed. // Hash used for the seed.
jint AltHashing::murmur3_32(jint seed, const int* data, int len) { juint AltHashing::murmur3_32(juint seed, const int* data, int len) {
jint h1 = seed; juint h1 = seed;
int off = 0; int off = 0;
int end = len; int end = len;
// body // body
while (off < end) { while (off < end) {
jint k1 = data[off++]; juint k1 = (juint)data[off++];
k1 *= 0xcc9e2d51; k1 *= 0xcc9e2d51;
k1 = Integer_rotateLeft(k1, 15); k1 = Integer_rotateLeft(k1, 15);
@ -193,26 +193,26 @@ jint AltHashing::murmur3_32(jint seed, const int* data, int len) {
h1 ^= len * 4; // (Integer.SIZE / Byte.SIZE); h1 ^= len * 4; // (Integer.SIZE / Byte.SIZE);
// finalization mix force all bits of a hash block to avalanche // finalization mix force all bits of a hash block to avalanche
h1 ^= ((juint)h1) >> 16; h1 ^= h1 >> 16;
h1 *= 0x85ebca6b; h1 *= 0x85ebca6b;
h1 ^= ((juint)h1) >> 13; h1 ^= h1 >> 13;
h1 *= 0xc2b2ae35; h1 *= 0xc2b2ae35;
h1 ^= ((juint)h1) >> 16; h1 ^= h1 >> 16;
return h1; return h1;
} }
jint AltHashing::murmur3_32(const int* data, int len) { juint AltHashing::murmur3_32(const int* data, int len) {
return murmur3_32(0, data, len); return murmur3_32(0, data, len);
} }
#ifndef PRODUCT #ifndef PRODUCT
// Overloaded versions for internal test. // Overloaded versions for internal test.
jint AltHashing::murmur3_32(const jbyte* data, int len) { juint AltHashing::murmur3_32(const jbyte* data, int len) {
return murmur3_32(0, data, len); return murmur3_32(0, data, len);
} }
jint AltHashing::murmur3_32(const jchar* data, int len) { juint AltHashing::murmur3_32(const jchar* data, int len) {
return murmur3_32(0, data, len); return murmur3_32(0, data, len);
} }
@ -251,11 +251,11 @@ void AltHashing::testMurmur3_32_ByteArray() {
// Hash subranges {}, {0}, {0,1}, {0,1,2}, ..., {0,...,255} // Hash subranges {}, {0}, {0,1}, {0,1,2}, ..., {0,...,255}
for (int i = 0; i < 256; i++) { for (int i = 0; i < 256; i++) {
jint hash = murmur3_32(256 - i, vector, i); juint hash = murmur3_32(256 - i, vector, i);
hashes[i * 4] = (jbyte) hash; hashes[i * 4] = (jbyte) hash;
hashes[i * 4 + 1] = (jbyte) (((juint)hash) >> 8); hashes[i * 4 + 1] = (jbyte)(hash >> 8);
hashes[i * 4 + 2] = (jbyte) (((juint)hash) >> 16); hashes[i * 4 + 2] = (jbyte)(hash >> 16);
hashes[i * 4 + 3] = (jbyte) (((juint)hash) >> 24); hashes[i * 4 + 3] = (jbyte)(hash >> 24);
} }
// hash to get const result. // hash to get const result.
@ -269,7 +269,7 @@ void AltHashing::testMurmur3_32_ByteArray() {
} }
void AltHashing::testEquivalentHashes() { void AltHashing::testEquivalentHashes() {
jint jbytes, jchars, ints; juint jbytes, jchars, ints;
// printf("testEquivalentHashes\n"); // printf("testEquivalentHashes\n");

20
hotspot/src/share/vm/classfile/altHashing.hpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -39,24 +39,24 @@
class AltHashing : AllStatic { class AltHashing : AllStatic {
// utility function copied from java/lang/Integer // utility function copied from java/lang/Integer
static jint Integer_rotateLeft(jint i, int distance) { static juint Integer_rotateLeft(juint i, int distance) {
return (i << distance) | (((juint)i) >> (32-distance)); return (i << distance) | (i >> (32-distance));
} }
static jint murmur3_32(const int* data, int len); static juint murmur3_32(const int* data, int len);
static jint murmur3_32(jint seed, const int* data, int len); static juint murmur3_32(juint seed, const int* data, int len);
#ifndef PRODUCT #ifndef PRODUCT
// Hashing functions used for internal testing // Hashing functions used for internal testing
static jint murmur3_32(const jbyte* data, int len); static juint murmur3_32(const jbyte* data, int len);
static jint murmur3_32(const jchar* data, int len); static juint murmur3_32(const jchar* data, int len);
static void testMurmur3_32_ByteArray(); static void testMurmur3_32_ByteArray();
static void testEquivalentHashes(); static void testEquivalentHashes();
#endif // PRODUCT #endif // PRODUCT
public: public:
static jint compute_seed(); static juint compute_seed();
static jint murmur3_32(jint seed, const jbyte* data, int len); static juint murmur3_32(juint seed, const jbyte* data, int len);
static jint murmur3_32(jint seed, const jchar* data, int len); static juint murmur3_32(juint seed, const jchar* data, int len);
NOT_PRODUCT(static void test_alt_hash();) NOT_PRODUCT(static void test_alt_hash();)
}; };
#endif // SHARE_VM_CLASSFILE_ALTHASHING_HPP #endif // SHARE_VM_CLASSFILE_ALTHASHING_HPP

3
hotspot/src/share/vm/oops/instanceKlass.hpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -554,6 +554,7 @@ class InstanceKlass: public Klass {
if (hk == NULL) { if (hk == NULL) {
return NULL; return NULL;
} else { } else {
assert(*hk != NULL, "host klass should always be set if the address is not null");
return *hk; return *hk;
} }
} }

4
hotspot/src/share/vm/oops/metadata.hpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -40,7 +40,7 @@ class Metadata : public MetaspaceObj {
int identity_hash() { return (int)(uintptr_t)this; } int identity_hash() { return (int)(uintptr_t)this; }
// Rehashing support for tables containing pointers to this // Rehashing support for tables containing pointers to this
unsigned int new_hash(jint seed) { ShouldNotReachHere(); return 0; } unsigned int new_hash(juint seed) { ShouldNotReachHere(); return 0; }
virtual bool is_klass() const volatile { return false; } virtual bool is_klass() const volatile { return false; }
virtual bool is_method() const volatile { return false; } virtual bool is_method() const volatile { return false; }

4
hotspot/src/share/vm/oops/oop.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -102,7 +102,7 @@ intptr_t oopDesc::slow_identity_hash() {
} }
// When String table needs to rehash // When String table needs to rehash
unsigned int oopDesc::new_hash(jint seed) { unsigned int oopDesc::new_hash(juint seed) {
EXCEPTION_MARK; EXCEPTION_MARK;
ResourceMark rm; ResourceMark rm;
int length; int length;

4
hotspot/src/share/vm/oops/oop.hpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -362,7 +362,7 @@ class oopDesc {
intptr_t slow_identity_hash(); intptr_t slow_identity_hash();
// Alternate hashing code if string table is rehashed // Alternate hashing code if string table is rehashed
unsigned int new_hash(jint seed); unsigned int new_hash(juint seed);
// marks are forwarded to stack when object is locked // marks are forwarded to stack when object is locked
bool has_displaced_mark() const; bool has_displaced_mark() const;

4
hotspot/src/share/vm/oops/symbol.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -207,7 +207,7 @@ const char* Symbol::as_klass_external_name() const {
} }
// Alternate hashing for unbalanced symbol tables. // Alternate hashing for unbalanced symbol tables.
unsigned int Symbol::new_hash(jint seed) { unsigned int Symbol::new_hash(juint seed) {
ResourceMark rm; ResourceMark rm;
// Use alternate hashing algorithm on this symbol. // Use alternate hashing algorithm on this symbol.
return AltHashing::murmur3_32(seed, (const jbyte*)as_C_string(), utf8_length()); return AltHashing::murmur3_32(seed, (const jbyte*)as_C_string(), utf8_length());

4
hotspot/src/share/vm/oops/symbol.hpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -154,7 +154,7 @@ class Symbol : private SymbolBase {
int identity_hash() { return _identity_hash; } int identity_hash() { return _identity_hash; }
// For symbol table alternate hashing // For symbol table alternate hashing
unsigned int new_hash(jint seed); unsigned int new_hash(juint seed);
// Reference counting. See comments above this class for when to use. // Reference counting. See comments above this class for when to use.
int refcount() const { return _refcount; } int refcount() const { return _refcount; }

8
hotspot/src/share/vm/prims/jvm.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -518,6 +518,12 @@ JVM_ENTRY(void, JVM_MonitorWait(JNIEnv* env, jobject handle, jlong ms))
JavaThreadInObjectWaitState jtiows(thread, ms != 0); JavaThreadInObjectWaitState jtiows(thread, ms != 0);
if (JvmtiExport::should_post_monitor_wait()) { if (JvmtiExport::should_post_monitor_wait()) {
JvmtiExport::post_monitor_wait((JavaThread *)THREAD, (oop)obj(), ms); JvmtiExport::post_monitor_wait((JavaThread *)THREAD, (oop)obj(), ms);
// The current thread already owns the monitor and it has not yet
// been added to the wait queue so the current thread cannot be
// made the successor. This means that the JVMTI_EVENT_MONITOR_WAIT
// event handler cannot accidentally consume an unpark() meant for
// the ParkEvent associated with this ObjectMonitor.
} }
ObjectSynchronizer::wait(obj, ms, CHECK); ObjectSynchronizer::wait(obj, ms, CHECK);
JVM_END JVM_END

56
hotspot/src/share/vm/runtime/objectMonitor.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -382,6 +382,12 @@ void ATTR ObjectMonitor::enter(TRAPS) {
DTRACE_MONITOR_PROBE(contended__enter, this, object(), jt); DTRACE_MONITOR_PROBE(contended__enter, this, object(), jt);
if (JvmtiExport::should_post_monitor_contended_enter()) { if (JvmtiExport::should_post_monitor_contended_enter()) {
JvmtiExport::post_monitor_contended_enter(jt, this); JvmtiExport::post_monitor_contended_enter(jt, this);
// The current thread does not yet own the monitor and does not
// yet appear on any queues that would get it made the successor.
// This means that the JVMTI_EVENT_MONITOR_CONTENDED_ENTER event
// handler cannot accidentally consume an unpark() meant for the
// ParkEvent associated with this ObjectMonitor.
} }
OSThreadContendState osts(Self->osthread()); OSThreadContendState osts(Self->osthread());
@ -439,6 +445,12 @@ void ATTR ObjectMonitor::enter(TRAPS) {
DTRACE_MONITOR_PROBE(contended__entered, this, object(), jt); DTRACE_MONITOR_PROBE(contended__entered, this, object(), jt);
if (JvmtiExport::should_post_monitor_contended_entered()) { if (JvmtiExport::should_post_monitor_contended_entered()) {
JvmtiExport::post_monitor_contended_entered(jt, this); JvmtiExport::post_monitor_contended_entered(jt, this);
// The current thread already owns the monitor and is not going to
// call park() for the remainder of the monitor enter protocol. So
// it doesn't matter if the JVMTI_EVENT_MONITOR_CONTENDED_ENTERED
// event handler consumed an unpark() issued by the thread that
// just exited the monitor.
} }
if (event.should_commit()) { if (event.should_commit()) {
@ -1456,6 +1468,14 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
// Note: 'false' parameter is passed here because the // Note: 'false' parameter is passed here because the
// wait was not timed out due to thread interrupt. // wait was not timed out due to thread interrupt.
JvmtiExport::post_monitor_waited(jt, this, false); JvmtiExport::post_monitor_waited(jt, this, false);
// In this short circuit of the monitor wait protocol, the
// current thread never drops ownership of the monitor and
// never gets added to the wait queue so the current thread
// cannot be made the successor. This means that the
// JVMTI_EVENT_MONITOR_WAITED event handler cannot accidentally
// consume an unpark() meant for the ParkEvent associated with
// this ObjectMonitor.
} }
if (event.should_commit()) { if (event.should_commit()) {
post_monitor_wait_event(&event, 0, millis, false); post_monitor_wait_event(&event, 0, millis, false);
@ -1499,21 +1519,6 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
exit (true, Self) ; // exit the monitor exit (true, Self) ; // exit the monitor
guarantee (_owner != Self, "invariant") ; guarantee (_owner != Self, "invariant") ;
// As soon as the ObjectMonitor's ownership is dropped in the exit()
// call above, another thread can enter() the ObjectMonitor, do the
// notify(), and exit() the ObjectMonitor. If the other thread's
// exit() call chooses this thread as the successor and the unpark()
// call happens to occur while this thread is posting a
// MONITOR_CONTENDED_EXIT event, then we run the risk of the event
// handler using RawMonitors and consuming the unpark().
//
// To avoid the problem, we re-post the event. This does no harm
// even if the original unpark() was not consumed because we are the
// chosen successor for this monitor.
if (node._notified != 0 && _succ == Self) {
node._event->unpark();
}
// The thread is on the WaitSet list - now park() it. // The thread is on the WaitSet list - now park() it.
// On MP systems it's conceivable that a brief spin before we park // On MP systems it's conceivable that a brief spin before we park
// could be profitable. // could be profitable.
@ -1595,6 +1600,25 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
// post monitor waited event. Note that this is past-tense, we are done waiting. // post monitor waited event. Note that this is past-tense, we are done waiting.
if (JvmtiExport::should_post_monitor_waited()) { if (JvmtiExport::should_post_monitor_waited()) {
JvmtiExport::post_monitor_waited(jt, this, ret == OS_TIMEOUT); JvmtiExport::post_monitor_waited(jt, this, ret == OS_TIMEOUT);
if (node._notified != 0 && _succ == Self) {
// In this part of the monitor wait-notify-reenter protocol it
// is possible (and normal) for another thread to do a fastpath
// monitor enter-exit while this thread is still trying to get
// to the reenter portion of the protocol.
//
// The ObjectMonitor was notified and the current thread is
// the successor which also means that an unpark() has already
// been done. The JVMTI_EVENT_MONITOR_WAITED event handler can
// consume the unpark() that was done when the successor was
// set because the same ParkEvent is shared between Java
// monitors and JVM/TI RawMonitors (for now).
//
// We redo the unpark() to ensure forward progress, i.e., we
// don't want all pending threads hanging (parked) with none
// entering the unlocked monitor.
node._event->unpark();
}
} }
if (event.should_commit()) { if (event.should_commit()) {

4
hotspot/src/share/vm/utilities/hashtable.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -93,7 +93,7 @@ template <MEMFLAGS F> bool BasicHashtable<F>::check_rehash_table(int count) {
return false; return false;
} }
template <class T, MEMFLAGS F> jint Hashtable<T, F>::_seed = 0; template <class T, MEMFLAGS F> juint Hashtable<T, F>::_seed = 0;
// Create a new table and using alternate hash code, populate the new table // Create a new table and using alternate hash code, populate the new table
// with the existing elements. This can be used to change the hash code // with the existing elements. This can be used to change the hash code

6
hotspot/src/share/vm/utilities/hashtable.hpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -280,7 +280,7 @@ protected:
// Function to move these elements into the new table. // Function to move these elements into the new table.
void move_to(Hashtable<T, F>* new_table); void move_to(Hashtable<T, F>* new_table);
static bool use_alternate_hashcode() { return _seed != 0; } static bool use_alternate_hashcode() { return _seed != 0; }
static jint seed() { return _seed; } static juint seed() { return _seed; }
static int literal_size(Symbol *symbol); static int literal_size(Symbol *symbol);
static int literal_size(oop oop); static int literal_size(oop oop);
@ -296,7 +296,7 @@ public:
void dump_table(outputStream* st, const char *table_name); void dump_table(outputStream* st, const char *table_name);
private: private:
static jint _seed; static juint _seed;
}; };