Mercurial > hg > graal-jvmci-8

comparison src/share/vm/utilities/ostream.cpp @ 13086:096c224171c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 20 Nov 2013 00:10:38 +0100
parents cefad50507d8 bf8a21c3ab3b
children d8041d695d19
comparison
equal deleted inserted replaced
12782:92b7ec34ddfa 13086:096c224171c4
463 strcat(buf, tail); // append rest of name, or all of name 463 strcat(buf, tail); // append rest of name, or all of name
464 return buf; 464 return buf;
465 } 465 }
466 466
467 // log_name comes from -XX:LogFile=log_name or -Xloggc:log_name 467 // log_name comes from -XX:LogFile=log_name or -Xloggc:log_name
468 // in log_name, %p => pipd1234 and 468 // in log_name, %p => pid1234 and
469 // %t => YYYY-MM-DD_HH-MM-SS 469 // %t => YYYY-MM-DD_HH-MM-SS
470 static const char* make_log_name(const char* log_name, const char* force_directory) { 470 static const char* make_log_name(const char* log_name, const char* force_directory) {
471 char timestr[32]; 471 char timestr[32];
472 get_datetime_string(timestr, sizeof(timestr)); 472 get_datetime_string(timestr, sizeof(timestr));
473 return make_log_name_internal(log_name, force_directory, os::current_process_id(), 473 return make_log_name_internal(log_name, force_directory, os::current_process_id(),
790 return _log_file != NULL; 790 return _log_file != NULL;
791 } 791 }
792 792
793 void defaultStream::init_log() { 793 void defaultStream::init_log() {
794 // %%% Need a MutexLocker? 794 // %%% Need a MutexLocker?
795 const char* log_name = LogFile != NULL ? LogFile : "hotspot_pid%p.log"; 795 const char* log_name = LogFile != NULL ? LogFile : "hotspot_%p.log";
796 const char* try_name = make_log_name(log_name, NULL); 796 const char* try_name = make_log_name(log_name, NULL);
797 fileStream* file = new(ResourceObj::C_HEAP, mtInternal) fileStream(try_name); 797 fileStream* file = new(ResourceObj::C_HEAP, mtInternal) fileStream(try_name);
798 if (!file->is_open()) { 798 if (!file->is_open()) {
799 // Try again to open the file. 799 // Try again to open the file.
800 char warnbuf[O_BUFLEN*2]; 800 char warnbuf[O_BUFLEN*2];