stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8201649: Remove dubious call_jio_print in ostream.cpp

Browse Source 
Reviewed-by: stuefe, dholmes
This commit is contained in:
Christoph Langer 2018-04-17 15:54:14 +02:00
parent 1c744f99a5
commit a9b0242eef
2 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hotspot/share/prims/jvm.cpp
View File

@ -2768,15 +2768,14 @@ JNIEXPORT int jio_printf(const char *fmt, ...) {
return len; return len;
} }
// HotSpot specific jio method // HotSpot specific jio method
void jio_print(const char* s) { void jio_print(const char* s, size_t len) {
// Try to make this function as atomic as possible. // Try to make this function as atomic as possible.
if (Arguments::vfprintf_hook() != NULL) { if (Arguments::vfprintf_hook() != NULL) {
jio_fprintf(defaultStream::output_stream(), "%s", s); jio_fprintf(defaultStream::output_stream(), "%.*s", (int)len, s);
} else { } else {
// Make an unused local variable to avoid warning from gcc 4.x compiler. // Make an unused local variable to avoid warning from gcc 4.x compiler.
size_t count = ::write(defaultStream::output_fd(), s, (int)strlen(s)); size_t count = ::write(defaultStream::output_fd(), s, (int)len);
} }
} }

34
src/hotspot/share/utilities/ostream.cpp
View File

@ -36,7 +36,9 @@
#include "utilities/vmError.hpp" #include "utilities/vmError.hpp"
#include "utilities/xmlstream.hpp" #include "utilities/xmlstream.hpp"
extern "C" void jio_print(const char* s); // Declarationtion of jvm method // Declarations of jvm methods
extern "C" void jio_print(const char* s, size_t len);
extern "C" int jio_printf(const char *fmt, ...);
outputStream::outputStream(int width) { outputStream::outputStream(int width) {
_width = width; _width = width;
@ -612,19 +614,15 @@ fileStream* defaultStream::open_file(const char* log_name) {
// Try again to open the file in the temp directory. // Try again to open the file in the temp directory.
delete file; delete file;
char warnbuf[O_BUFLEN*2]; // Note: This feature is for maintainer use only. No need for L10N.
jio_snprintf(warnbuf, sizeof(warnbuf), "Warning: Cannot open log file: %s\n", log_name); jio_printf("Warning: Cannot open log file: %s\n", log_name);
// Note: This feature is for maintainer use only. No need for L10N.
jio_print(warnbuf);
try_name = make_log_name(log_name, os::get_temp_directory()); try_name = make_log_name(log_name, os::get_temp_directory());
if (try_name == NULL) { if (try_name == NULL) {
warning("Cannot open file %s: file name is too long for directory %s.\n", log_name, os::get_temp_directory()); warning("Cannot open file %s: file name is too long for directory %s.\n", log_name, os::get_temp_directory());
return NULL; return NULL;
} }
jio_snprintf(warnbuf, sizeof(warnbuf), jio_printf("Warning: Forcing option -XX:LogFile=%s\n", try_name);
"Warning: Forcing option -XX:LogFile=%s\n", try_name);
jio_print(warnbuf);
file = new(ResourceObj::C_HEAP, mtInternal) fileStream(try_name); file = new(ResourceObj::C_HEAP, mtInternal) fileStream(try_name);
FREE_C_HEAP_ARRAY(char, try_name); FREE_C_HEAP_ARRAY(char, try_name);
@ -824,20 +822,6 @@ void defaultStream::release(intx holder) {
tty_lock->unlock(); tty_lock->unlock();
} }
// Yuck: jio_print does not accept char*/len.
static void call_jio_print(const char* s, size_t len) {
char buffer[O_BUFLEN+100];
if (len > sizeof(buffer)-1) {
warning("increase O_BUFLEN in ostream.cpp -- output truncated");
len = sizeof(buffer)-1;
}
strncpy(buffer, s, len);
buffer[len] = '\0';
jio_print(buffer);
}
void defaultStream::write(const char* s, size_t len) { void defaultStream::write(const char* s, size_t len) {
intx thread_id = os::current_thread_id(); intx thread_id = os::current_thread_id();
intx holder = hold(thread_id); intx holder = hold(thread_id);
@ -845,11 +829,7 @@ void defaultStream::write(const char* s, size_t len) {
if (DisplayVMOutput && if (DisplayVMOutput &&
(_outer_xmlStream == NULL || !_outer_xmlStream->inside_attrs())) { (_outer_xmlStream == NULL || !_outer_xmlStream->inside_attrs())) {
// print to output stream. It can be redirected by a vfprintf hook // print to output stream. It can be redirected by a vfprintf hook
if (s[len] == '\0') { jio_print(s, len);
jio_print(s);
} else {
call_jio_print(s, len);
}
} }
// print to log file // print to log file