author | kbarrett |
Thu, 22 Jun 2017 20:47:22 -0400 | |
changeset 46560 | 388aa8d67c80 |
parent 42067 | 34b99c8faa51 |
permissions | -rw-r--r-- |
33097 | 1 |
/* |
46560
388aa8d67c80
8181449: Fix debug.hpp / globalDefinitions.hpp dependency inversion
kbarrett
parents:
42067
diff
changeset
|
2 |
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. |
33097 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
22 |
* |
|
23 |
*/ |
|
24 |
#include "precompiled.hpp" |
|
25 |
#include "logging/logFileStreamOutput.hpp" |
|
26 |
#include "logging/logOutput.hpp" |
|
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
27 |
#include "logging/logTagSet.hpp" |
33097 | 28 |
#include "memory/allocation.inline.hpp" |
46560
388aa8d67c80
8181449: Fix debug.hpp / globalDefinitions.hpp dependency inversion
kbarrett
parents:
42067
diff
changeset
|
29 |
#include "prims/jvm.h" |
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
30 |
#include "runtime/mutexLocker.hpp" |
33097 | 31 |
#include "runtime/os.inline.hpp" |
32 |
||
33 |
LogOutput::~LogOutput() { |
|
34 |
os::free(_config_string); |
|
35 |
} |
|
36 |
||
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
37 |
void LogOutput::clear_config_string() { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
38 |
os::free(_config_string); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
39 |
_config_string_buffer_size = InitialConfigBufferSize; |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
40 |
_config_string = NEW_C_HEAP_ARRAY(char, _config_string_buffer_size, mtLogging); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
41 |
_config_string[0] = '\0'; |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
42 |
} |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
43 |
|
33097 | 44 |
void LogOutput::set_config_string(const char* string) { |
45 |
os::free(_config_string); |
|
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
46 |
_config_string = os::strdup(string, mtLogging); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
47 |
_config_string_buffer_size = strlen(_config_string) + 1; |
33097 | 48 |
} |
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
49 |
|
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
50 |
void LogOutput::add_to_config_string(const LogTagSet* ts, LogLevelType level) { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
51 |
if (_config_string_buffer_size < InitialConfigBufferSize) { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
52 |
_config_string_buffer_size = InitialConfigBufferSize; |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
53 |
_config_string = REALLOC_C_HEAP_ARRAY(char, _config_string, _config_string_buffer_size, mtLogging); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
54 |
} |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
55 |
|
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
56 |
size_t offset = strlen(_config_string); |
37239
a6cda2376a19
8153174: Remove trailing comma from log configuration listings
mlarsson
parents:
35228
diff
changeset
|
57 |
if (offset > 0) { |
a6cda2376a19
8153174: Remove trailing comma from log configuration listings
mlarsson
parents:
35228
diff
changeset
|
58 |
// Add commas in-between tag and level combinations in the config string |
a6cda2376a19
8153174: Remove trailing comma from log configuration listings
mlarsson
parents:
35228
diff
changeset
|
59 |
_config_string[offset++] = ','; |
a6cda2376a19
8153174: Remove trailing comma from log configuration listings
mlarsson
parents:
35228
diff
changeset
|
60 |
} |
a6cda2376a19
8153174: Remove trailing comma from log configuration listings
mlarsson
parents:
35228
diff
changeset
|
61 |
|
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
62 |
for (;;) { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
63 |
int ret = ts->label(_config_string + offset, _config_string_buffer_size - offset, "+"); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
64 |
if (ret == -1) { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
65 |
// Double the buffer size and retry |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
66 |
_config_string_buffer_size *= 2; |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
67 |
_config_string = REALLOC_C_HEAP_ARRAY(char, _config_string, _config_string_buffer_size, mtLogging); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
68 |
continue; |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
69 |
} |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
70 |
break; |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
71 |
}; |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
72 |
|
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
73 |
offset = strlen(_config_string); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
74 |
for (;;) { |
37239
a6cda2376a19
8153174: Remove trailing comma from log configuration listings
mlarsson
parents:
35228
diff
changeset
|
75 |
int ret = jio_snprintf(_config_string + offset, _config_string_buffer_size - offset, "=%s", LogLevel::name(level)); |
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
76 |
if (ret == -1) { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
77 |
_config_string_buffer_size *= 2; |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
78 |
_config_string = REALLOC_C_HEAP_ARRAY(char, _config_string, _config_string_buffer_size, mtLogging); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
79 |
continue; |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
80 |
} |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
81 |
break; |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
82 |
} |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
33097
diff
changeset
|
83 |
} |
39707 | 84 |
|
85 |
void LogOutput::describe(outputStream *out) { |
|
86 |
out->print("%s ", name()); |
|
87 |
out->print_raw(config_string()); |
|
88 |
out->print(" "); |
|
89 |
char delimiter[2] = {0}; |
|
90 |
for (size_t d = 0; d < LogDecorators::Count; d++) { |
|
91 |
LogDecorators::Decorator decorator = static_cast<LogDecorators::Decorator>(d); |
|
92 |
if (decorators().is_decorator(decorator)) { |
|
93 |
out->print("%s%s", delimiter, LogDecorators::name(decorator)); |
|
94 |
*delimiter = ','; |
|
95 |
} |
|
96 |
} |
|
97 |
} |
|
98 |