< prev index next >
src/share/vm/utilities/ostream.cpp
Print this page
*** 30,39 ****
--- 30,40 ----
#include "runtime/os.hpp"
#include "runtime/vm_version.hpp"
#include "utilities/defaultStream.hpp"
#include "utilities/macros.hpp"
#include "utilities/ostream.hpp"
+ #include "utilities/vmError.hpp"
#include "utilities/xmlstream.hpp"
extern "C" void jio_print(const char* s); // Declarationtion of jvm method
outputStream::outputStream(int width) {
*** 594,604 ****
bool defaultStream::has_log_file() {
// lazily create log file (at startup, LogVMOutput is false even
// if +LogVMOutput is used, because the flags haven't been parsed yet)
// For safer printing during fatal error handling, do not init logfile
// if a VM error has been reported.
! if (!_inited && !is_error_reported()) init();
return _log_file != NULL;
}
fileStream* defaultStream::open_file(const char* log_name) {
const char* try_name = make_log_name(log_name, NULL);
--- 595,605 ----
bool defaultStream::has_log_file() {
// lazily create log file (at startup, LogVMOutput is false even
// if +LogVMOutput is used, because the flags haven't been parsed yet)
// For safer printing during fatal error handling, do not init logfile
// if a VM error has been reported.
! if (!_inited && !VMError::is_error_reported()) init();
return _log_file != NULL;
}
fileStream* defaultStream::open_file(const char* log_name) {
const char* try_name = make_log_name(log_name, NULL);
*** 786,796 ****
// developer hook
!SerializeVMOutput ||
// VM already unhealthy
! is_error_reported() ||
// safepoint == global lock (for VM only)
(SafepointSynchronize::is_synchronizing() &&
Thread::current()->is_VM_thread())
) {
--- 787,797 ----
// developer hook
!SerializeVMOutput ||
// VM already unhealthy
! VMError::is_error_reported() ||
// safepoint == global lock (for VM only)
(SafepointSynchronize::is_synchronizing() &&
Thread::current()->is_VM_thread())
) {
< prev index next >