Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/mutex.cpp @ 14909:4ca6dc0799b6
Backout jdk9 merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 01 Apr 2014 13:57:07 +0200 |
parents | c86519f8d826 |
children | 51c6ce89d4dd |
line wrap: on
line diff
--- a/src/share/vm/runtime/mutex.cpp Tue Apr 01 14:09:03 2014 +0200 +++ b/src/share/vm/runtime/mutex.cpp Tue Apr 01 13:57:07 2014 +0200 @@ -1,6 +1,6 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2012, 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 @@ -280,6 +280,16 @@ return x & 0x7FFFFFFF ; } +static inline jint MarsagliaXOR (jint * const a) { + jint x = *a ; + if (x == 0) x = UNS(a)|1 ; + x ^= x << 6; + x ^= ((unsigned)x) >> 21; + x ^= x << 7 ; + *a = x ; + return x & 0x7FFFFFFF ; +} + static int Stall (int its) { static volatile jint rv = 1 ; volatile int OnFrame = 0 ; @@ -497,7 +507,7 @@ _OnDeck = NULL ; // Note that we current drop the inner lock (clear OnDeck) in the slow-path - // epilogue immediately after having acquired the outer lock. + // epilog immediately after having acquired the outer lock. // But instead we could consider the following optimizations: // A. Shift or defer dropping the inner lock until the subsequent IUnlock() operation. // This might avoid potential reacquisition of the inner lock in IUlock(). @@ -921,7 +931,7 @@ check_block_state(Self); if (Self->is_Java_thread()) { - // Horrible dictu - we suffer through a state transition + // Horribile dictu - we suffer through a state transition assert(rank() > Mutex::special, "Potential deadlock with special or lesser rank mutex"); ThreadBlockInVM tbivm ((JavaThread *) Self) ; ILock (Self) ; @@ -953,7 +963,7 @@ } -// Returns true if thread succeeds in grabbing the lock, otherwise false. +// Returns true if thread succeceed [sic] in grabbing the lock, otherwise false. bool Monitor::try_lock() { Thread * const Self = Thread::current();