comparison src/share/vm/runtime/thread.cpp @ 1838:8f6f7587d292

6988678: fatal error deadlock handling was unintentionally disabled Reviewed-by: ysr
author jcoomes
date Thu, 30 Sep 2010 12:15:13 -0700
parents 894b1d7c7e01
children 6e0aac35bfa9
comparison
equal deleted inserted replaced
1837:c99c53f07c14 1838:8f6f7587d292
1071 break; 1071 break;
1072 prev_time = now; 1072 prev_time = now;
1073 } 1073 }
1074 } 1074 }
1075 1075
1076 #if 0
1077 if (is_error_reported()) { 1076 if (is_error_reported()) {
1078 // A fatal error has happened, the error handler(VMError::report_and_die) 1077 // A fatal error has happened, the error handler(VMError::report_and_die)
1079 // should abort JVM after creating an error log file. However in some 1078 // should abort JVM after creating an error log file. However in some
1080 // rare cases, the error handler itself might deadlock. Here we try to 1079 // rare cases, the error handler itself might deadlock. Here we try to
1081 // kill JVM if the fatal error handler fails to abort in 2 minutes. 1080 // kill JVM if the fatal error handler fails to abort in 2 minutes.
1099 // Wake up 5 seconds later, the fatal handler may reset OnError or 1098 // Wake up 5 seconds later, the fatal handler may reset OnError or
1100 // ShowMessageBoxOnError when it is ready to abort. 1099 // ShowMessageBoxOnError when it is ready to abort.
1101 os::sleep(this, 5 * 1000, false); 1100 os::sleep(this, 5 * 1000, false);
1102 } 1101 }
1103 } 1102 }
1104 #endif // #if 0
1105 1103
1106 PeriodicTask::real_time_tick(time_to_wait); 1104 PeriodicTask::real_time_tick(time_to_wait);
1107 1105
1108 // If we have no more tasks left due to dynamic disenrollment, 1106 // If we have no more tasks left due to dynamic disenrollment,
1109 // shut down the thread since we don't currently support dynamic enrollment 1107 // shut down the thread since we don't currently support dynamic enrollment