395 |
|
final Throwable ex; |
396 |
|
ExceptionNode next; |
397 |
|
final long thrower; // use id not ref to avoid weak cycles |
398 |
+ |
final int hashCode; // store task hashCode before weak ref disappears |
399 |
|
ExceptionNode(ForkJoinTask<?> task, Throwable ex, ExceptionNode next) { |
400 |
|
super(task, exceptionTableRefQueue); |
401 |
|
this.ex = ex; |
402 |
|
this.next = next; |
403 |
|
this.thrower = Thread.currentThread().getId(); |
404 |
+ |
this.hashCode = System.identityHashCode(task); |
405 |
|
} |
406 |
|
} |
407 |
|
|
470 |
|
} |
471 |
|
|
472 |
|
/** |
473 |
< |
* Removes exception node and clears status |
473 |
> |
* Removes exception node and clears status. |
474 |
|
*/ |
475 |
|
private void clearExceptionalCompletion() { |
476 |
|
int h = System.identityHashCode(this); |
563 |
|
private static void expungeStaleExceptions() { |
564 |
|
for (Object x; (x = exceptionTableRefQueue.poll()) != null;) { |
565 |
|
if (x instanceof ExceptionNode) { |
566 |
< |
ForkJoinTask<?> key = ((ExceptionNode)x).get(); |
566 |
> |
int hashCode = ((ExceptionNode)x).hashCode; |
567 |
|
ExceptionNode[] t = exceptionTable; |
568 |
< |
int i = System.identityHashCode(key) & (t.length - 1); |
568 |
> |
int i = hashCode & (t.length - 1); |
569 |
|
ExceptionNode e = t[i]; |
570 |
|
ExceptionNode pred = null; |
571 |
|
while (e != null) { |
1487 |
|
private static sun.misc.Unsafe getUnsafe() { |
1488 |
|
try { |
1489 |
|
return sun.misc.Unsafe.getUnsafe(); |
1490 |
< |
} catch (SecurityException se) { |
1491 |
< |
try { |
1492 |
< |
return java.security.AccessController.doPrivileged |
1493 |
< |
(new java.security |
1494 |
< |
.PrivilegedExceptionAction<sun.misc.Unsafe>() { |
1495 |
< |
public sun.misc.Unsafe run() throws Exception { |
1496 |
< |
java.lang.reflect.Field f = sun.misc |
1497 |
< |
.Unsafe.class.getDeclaredField("theUnsafe"); |
1498 |
< |
f.setAccessible(true); |
1499 |
< |
return (sun.misc.Unsafe) f.get(null); |
1500 |
< |
}}); |
1501 |
< |
} catch (java.security.PrivilegedActionException e) { |
1502 |
< |
throw new RuntimeException("Could not initialize intrinsics", |
1503 |
< |
e.getCause()); |
1504 |
< |
} |
1490 |
> |
} catch (SecurityException tryReflectionInstead) {} |
1491 |
> |
try { |
1492 |
> |
return java.security.AccessController.doPrivileged |
1493 |
> |
(new java.security.PrivilegedExceptionAction<sun.misc.Unsafe>() { |
1494 |
> |
public sun.misc.Unsafe run() throws Exception { |
1495 |
> |
Class<sun.misc.Unsafe> k = sun.misc.Unsafe.class; |
1496 |
> |
for (java.lang.reflect.Field f : k.getDeclaredFields()) { |
1497 |
> |
f.setAccessible(true); |
1498 |
> |
Object x = f.get(null); |
1499 |
> |
if (k.isInstance(x)) |
1500 |
> |
return k.cast(x); |
1501 |
> |
} |
1502 |
> |
throw new NoSuchFieldError("the Unsafe"); |
1503 |
> |
}}); |
1504 |
> |
} catch (java.security.PrivilegedActionException e) { |
1505 |
> |
throw new RuntimeException("Could not initialize intrinsics", |
1506 |
> |
e.getCause()); |
1507 |
|
} |
1508 |
|
} |
1505 |
– |
|
1509 |
|
} |