truffle: src/share/vm/utilities/ostream.cpp comparison

comparison src/share/vm/utilities/ostream.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26

author	Gilles Duboscq <duboscq@ssw.jku.at>
date	Wed, 15 Oct 2014 16:02:50 +0200
parents	4ca6dc0799b6 78bbf4d43a14
children	7848fc12602b

comparison

equal deleted inserted replaced

-:45d7b2c7029d
+:52b4284cb496
 /*
-* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2014, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 #ifdef TARGET_OS_FAMILY_solaris
 # include "os_solaris.inline.hpp"
 #endif
 #ifdef TARGET_OS_FAMILY_windows
 # include "os_windows.inline.hpp"
+#endif
+#ifdef TARGET_OS_FAMILY_aix
+# include "os_aix.inline.hpp"
 #endif
 #ifdef TARGET_OS_FAMILY_bsd
 # include "os_bsd.inline.hpp"
 #endif
 */
 void outputStream::print_data(void* data, size_t len, bool with_ascii) {
 size_t limit = (len + 16) / 16 * 16;
 for (size_t i = 0; i < limit; ++i) {
 if (i % 16 == 0) {
-indent().print("%07x:", i);
+indent().print(SIZE_FORMAT_HEX_W(07)":", i);
 }
 if (i % 2 == 0) {
 print(" ");
 }
 if (i < len) {
 char c = ((char*)data)[idx];
 print("%c", c >= 32 && c <= 126 ? c : '.');
 }
 }
 }
-print_cr("");
+cr();
 }
 }
 }
 stringStream::stringStream(size_t initial_size) : outputStream() {
 // dump vm version, os version, platform info, build id,
 // memory usage and command line flags into header
 void gcLogFileStream::dump_loggc_header() {
 if (is_open()) {
-print_cr(Abstract_VM_Version::internal_vm_info_string());
+print_cr("%s", Abstract_VM_Version::internal_vm_info_string());
 os::print_memory_info(this);
 print("CommandLine flags: ");
 CommandLineFlags::printSetFlags(this);
 }
 }
 // function directly. Currently, it is safe to rotate log at safepoint through VMThread.
 // That is, no mutator threads and concurrent GC threads run parallel with VMThread to
 // write to gc log file at safepoint. If in future, changes made for mutator threads or
 // concurrent GC threads to run parallel with VMThread at safepoint, write and rotate_log
 // must be synchronized.
-void gcLogFileStream::rotate_log() {
+void gcLogFileStream::rotate_log(bool force, outputStream* out) {
 char time_msg[FILENAMEBUFLEN];
 char time_str[EXTRACHARLEN];
 char current_file_name[FILENAMEBUFLEN];
 char renamed_file_name[FILENAMEBUFLEN];
-if (_bytes_written < (jlong)GCLogFileSize) {
+if (!should_rotate(force)) {
 return;
 }
 #ifdef ASSERT
 Thread *thread = Thread::current();
 rewind();
 _bytes_written = 0L;
 jio_snprintf(time_msg, sizeof(time_msg), "File  %s rotated at %s\n",
 _file_name, os::local_time_string((char *)time_str, sizeof(time_str)));
 write(time_msg, strlen(time_msg));
+if (out != NULL) {
+out->print("%s", time_msg);
+}
 dump_loggc_header();
 return;
 }
 #if defined(_WINDOWS)
 if (_file != NULL) {
 jio_snprintf(renamed_file_name, filename_len + EXTRACHARLEN, "%s.%d",
 _file_name, _cur_file_num);
 jio_snprintf(current_file_name, filename_len + EXTRACHARLEN, "%s.%d" CURRENTAPPX,
 _file_name, _cur_file_num);
-jio_snprintf(time_msg, sizeof(time_msg), "%s GC log file has reached the"
-" maximum size. Saved as %s\n",
+const char* msg = force ? "GC log rotation request has been received."
-os::local_time_string((char *)time_str, sizeof(time_str)),
+: "GC log file has reached the maximum size.";
-renamed_file_name);
+jio_snprintf(time_msg, sizeof(time_msg), "%s %s Saved as %s\n",
+os::local_time_string((char *)time_str, sizeof(time_str)),
+msg, renamed_file_name);
 write(time_msg, strlen(time_msg));
+if (out != NULL) {
+out->print("%s", time_msg);
+}
 fclose(_file);
 _file = NULL;
 bool can_rename = true;
 "%s.%d", _file_name, _cur_file_num);
 jio_snprintf(time_msg, sizeof(time_msg), "%s GC log file created %s\n",
 os::local_time_string((char *)time_str, sizeof(time_str)),
 current_file_name);
 write(time_msg, strlen(time_msg));
+if (out != NULL) {
+out->print("%s", time_msg);
+}
 dump_loggc_header();
 // remove the existing file
 if (access(current_file_name, F_OK) == 0) {
 if (remove(current_file_name) != 0) {
 warning("Could not delete existing file %s\n", current_file_name);
 // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if
 // we ever get round to introduce that method on the os class
 xs->head("hotspot_log version='%d %d'"
 " process='%d' time_ms='"INT64_FORMAT"'",
 LOG_MAJOR_VERSION, LOG_MINOR_VERSION,
-os::current_process_id(), time_ms);
+os::current_process_id(), (int64_t)time_ms);
 // Write VM version header immediately.
 xs->head("vm_version");
 xs->head("name"); xs->text("%s", VM_Version::vm_name()); xs->cr();
 xs->tail("name");
 xs->head("release"); xs->text("%s", VM_Version::vm_release()); xs->cr();
 }
 }
 #ifndef PRODUCT
-#if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE)
+#if defined(SOLARIS) || defined(LINUX) || defined(AIX) || defined(_ALLBSD_SOURCE)
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #endif

Mercurial > hg > truffle

comparison src/share/vm/utilities/ostream.cpp @ 18041:52b4284cb496