author | mlarsson |
Wed, 28 Feb 2018 09:30:06 +0100 | |
changeset 49180 | 9637557def32 |
parent 49016 | ea85eed8b012 |
child 49181 | fde9b3c56de4 |
permissions | -rw-r--r-- |
33097 | 1 |
/* |
49015 | 2 |
* Copyright (c) 2015, 2018, 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" |
|
47765
b7c7428eaab9
8189610: Reconcile jvm.h and all jvm_md.h between java.base and hotspot
coleenp
parents:
47216
diff
changeset
|
25 |
#include "jvm.h" |
33097 | 26 |
#include "logging/log.hpp" |
27 |
#include "logging/logConfiguration.hpp" |
|
28 |
#include "logging/logDecorations.hpp" |
|
29 |
#include "logging/logDecorators.hpp" |
|
30 |
#include "logging/logDiagnosticCommand.hpp" |
|
31 |
#include "logging/logFileOutput.hpp" |
|
32 |
#include "logging/logOutput.hpp" |
|
49016
ea85eed8b012
8196783: Refactor LogTagLevelExpression into separate classes
mlarsson
parents:
49015
diff
changeset
|
33 |
#include "logging/logSelectionList.hpp" |
38292
73a0be9b2f47
8146948: Enable listing of LogTagSets and add support for LogTagSet descriptions
mlarsson
parents:
38195
diff
changeset
|
34 |
#include "logging/logStream.hpp" |
33097 | 35 |
#include "logging/logTagSet.hpp" |
36 |
#include "memory/allocation.inline.hpp" |
|
37 |
#include "memory/resourceArea.hpp" |
|
38 |
#include "runtime/os.inline.hpp" |
|
35228
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
39 |
#include "runtime/semaphore.hpp" |
33097 | 40 |
#include "utilities/globalDefinitions.hpp" |
41 |
||
42 |
LogOutput** LogConfiguration::_outputs = NULL; |
|
43 |
size_t LogConfiguration::_n_outputs = 0; |
|
44 |
||
37108
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
45 |
LogConfiguration::UpdateListenerFunction* LogConfiguration::_listener_callbacks = NULL; |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
46 |
size_t LogConfiguration::_n_listener_callbacks = 0; |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
47 |
|
40902
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
48 |
// LogFileOutput is the default type of output, its type prefix should be used if no type was specified |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
49 |
static const char* implicit_output_prefix = LogFileOutput::Prefix; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
50 |
|
35228
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
51 |
// Stack object to take the lock for configuring the logging. |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
52 |
// Should only be held during the critical parts of the configuration |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
53 |
// (when calling configure_output or reading/modifying the outputs array). |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
54 |
// Thread must never block when holding this lock. |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
55 |
class ConfigurationLock : public StackObj { |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
56 |
private: |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
57 |
// Semaphore used as lock |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
58 |
static Semaphore _semaphore; |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
59 |
debug_only(static intx _locking_thread_id;) |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
60 |
public: |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
61 |
ConfigurationLock() { |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
62 |
_semaphore.wait(); |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
63 |
debug_only(_locking_thread_id = os::current_thread_id()); |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
64 |
} |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
65 |
~ConfigurationLock() { |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
66 |
debug_only(_locking_thread_id = -1); |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
67 |
_semaphore.signal(); |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
68 |
} |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
69 |
debug_only(static bool current_thread_has_lock();) |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
70 |
}; |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
71 |
|
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
72 |
Semaphore ConfigurationLock::_semaphore(1); |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
73 |
#ifdef ASSERT |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
74 |
intx ConfigurationLock::_locking_thread_id = -1; |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
75 |
bool ConfigurationLock::current_thread_has_lock() { |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
76 |
return _locking_thread_id == os::current_thread_id(); |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
77 |
} |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
78 |
#endif |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
79 |
|
33097 | 80 |
void LogConfiguration::post_initialize() { |
81 |
LogDiagnosticCommand::registerCommand(); |
|
37242 | 82 |
Log(logging) log; |
38292
73a0be9b2f47
8146948: Enable listing of LogTagSets and add support for LogTagSet descriptions
mlarsson
parents:
38195
diff
changeset
|
83 |
if (log.is_info()) { |
73a0be9b2f47
8146948: Enable listing of LogTagSets and add support for LogTagSet descriptions
mlarsson
parents:
38195
diff
changeset
|
84 |
log.info("Log configuration fully initialized."); |
73a0be9b2f47
8146948: Enable listing of LogTagSets and add support for LogTagSet descriptions
mlarsson
parents:
38195
diff
changeset
|
85 |
log_develop_info(logging)("Develop logging is available."); |
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
86 |
|
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
87 |
LogStream info_stream(log.info()); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
88 |
describe_available(&info_stream); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
89 |
|
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
90 |
LogStream debug_stream(log.debug()); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
91 |
LogTagSet::list_all_tagsets(&debug_stream); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
92 |
|
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
93 |
ConfigurationLock cl; |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
94 |
describe_current_configuration(&info_stream); |
33097 | 95 |
} |
96 |
} |
|
97 |
||
98 |
void LogConfiguration::initialize(jlong vm_start_time) { |
|
99 |
LogFileOutput::set_file_name_parameters(vm_start_time); |
|
36174 | 100 |
LogDecorations::initialize(vm_start_time); |
33097 | 101 |
assert(_outputs == NULL, "Should not initialize _outputs before this function, initialize called twice?"); |
102 |
_outputs = NEW_C_HEAP_ARRAY(LogOutput*, 2, mtLogging); |
|
42067
34b99c8faa51
8146009: "pure virtual method called" with using new GC logging mechanism
mlarsson
parents:
40924
diff
changeset
|
103 |
_outputs[0] = &StdoutLog; |
34b99c8faa51
8146009: "pure virtual method called" with using new GC logging mechanism
mlarsson
parents:
40924
diff
changeset
|
104 |
_outputs[1] = &StderrLog; |
33097 | 105 |
_n_outputs = 2; |
106 |
} |
|
107 |
||
108 |
void LogConfiguration::finalize() { |
|
42067
34b99c8faa51
8146009: "pure virtual method called" with using new GC logging mechanism
mlarsson
parents:
40924
diff
changeset
|
109 |
for (size_t i = _n_outputs; i > 0; i--) { |
34b99c8faa51
8146009: "pure virtual method called" with using new GC logging mechanism
mlarsson
parents:
40924
diff
changeset
|
110 |
disable_output(i - 1); |
33097 | 111 |
} |
112 |
FREE_C_HEAP_ARRAY(LogOutput*, _outputs); |
|
113 |
} |
|
114 |
||
40902
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
115 |
// Normalizes the given LogOutput name to type=name form. |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
116 |
// For example, foo, "foo", file="foo", will all be normalized to file=foo (no quotes, prefixed). |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
117 |
static bool normalize_output_name(const char* full_name, char* buffer, size_t len, outputStream* errstream) { |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
118 |
const char* start_quote = strchr(full_name, '"'); |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
119 |
const char* equals = strchr(full_name, '='); |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
120 |
const bool quoted = start_quote != NULL; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
121 |
const bool is_stdout_or_stderr = (strcmp(full_name, "stdout") == 0 || strcmp(full_name, "stderr") == 0); |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
122 |
|
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
123 |
// ignore equals sign within quotes |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
124 |
if (quoted && equals > start_quote) { |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
125 |
equals = NULL; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
126 |
} |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
127 |
|
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
128 |
const char* prefix = ""; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
129 |
size_t prefix_len = 0; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
130 |
const char* name = full_name; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
131 |
if (equals != NULL) { |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
132 |
// split on equals sign |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
133 |
name = equals + 1; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
134 |
prefix = full_name; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
135 |
prefix_len = equals - full_name + 1; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
136 |
} else if (!is_stdout_or_stderr) { |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
137 |
prefix = implicit_output_prefix; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
138 |
prefix_len = strlen(prefix); |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
139 |
} |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
140 |
size_t name_len = strlen(name); |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
141 |
|
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
142 |
if (quoted) { |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
143 |
const char* end_quote = strchr(start_quote + 1, '"'); |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
144 |
if (end_quote == NULL) { |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
145 |
errstream->print_cr("Output name has opening quote but is missing a terminating quote."); |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
146 |
return false; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
147 |
} |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
148 |
if (start_quote != name || end_quote[1] != '\0') { |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
149 |
errstream->print_cr("Output name can not be partially quoted." |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
150 |
" Either surround the whole name with quotation marks," |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
151 |
" or do not use quotation marks at all."); |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
152 |
return false; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
153 |
} |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
154 |
// strip start and end quote |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
155 |
name++; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
156 |
name_len -= 2; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
157 |
} |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
158 |
|
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
159 |
int ret = jio_snprintf(buffer, len, "%.*s%.*s", prefix_len, prefix, name_len, name); |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
160 |
assert(ret > 0, "buffer issue"); |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
161 |
return true; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
162 |
} |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
163 |
|
33097 | 164 |
size_t LogConfiguration::find_output(const char* name) { |
165 |
for (size_t i = 0; i < _n_outputs; i++) { |
|
166 |
if (strcmp(_outputs[i]->name(), name) == 0) { |
|
167 |
return i; |
|
168 |
} |
|
169 |
} |
|
170 |
return SIZE_MAX; |
|
171 |
} |
|
172 |
||
40902
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
173 |
LogOutput* LogConfiguration::new_output(const char* name, |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
174 |
const char* options, |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
175 |
outputStream* errstream) { |
33097 | 176 |
LogOutput* output; |
40902
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
177 |
if (strncmp(name, LogFileOutput::Prefix, strlen(LogFileOutput::Prefix)) == 0) { |
33097 | 178 |
output = new LogFileOutput(name); |
179 |
} else { |
|
40902
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
180 |
errstream->print_cr("Unsupported log output type: %s", name); |
33097 | 181 |
return NULL; |
182 |
} |
|
183 |
||
37465
1d5551f466ee
8146879: Add option for handling existing log files in UL
mlarsson
parents:
37242
diff
changeset
|
184 |
bool success = output->initialize(options, errstream); |
33097 | 185 |
if (!success) { |
35229
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
186 |
errstream->print_cr("Initialization of output '%s' using options '%s' failed.", name, options); |
33097 | 187 |
delete output; |
188 |
return NULL; |
|
189 |
} |
|
190 |
return output; |
|
191 |
} |
|
192 |
||
193 |
size_t LogConfiguration::add_output(LogOutput* output) { |
|
194 |
size_t idx = _n_outputs++; |
|
195 |
_outputs = REALLOC_C_HEAP_ARRAY(LogOutput*, _outputs, _n_outputs, mtLogging); |
|
196 |
_outputs[idx] = output; |
|
197 |
return idx; |
|
198 |
} |
|
199 |
||
200 |
void LogConfiguration::delete_output(size_t idx) { |
|
201 |
assert(idx > 1 && idx < _n_outputs, |
|
33105
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
33097
diff
changeset
|
202 |
"idx must be in range 1 < idx < _n_outputs, but idx = " SIZE_FORMAT |
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
33097
diff
changeset
|
203 |
" and _n_outputs = " SIZE_FORMAT, idx, _n_outputs); |
33097 | 204 |
LogOutput* output = _outputs[idx]; |
205 |
// Swap places with the last output and shrink the array |
|
206 |
_outputs[idx] = _outputs[--_n_outputs]; |
|
207 |
_outputs = REALLOC_C_HEAP_ARRAY(LogOutput*, _outputs, _n_outputs, mtLogging); |
|
208 |
delete output; |
|
209 |
} |
|
210 |
||
49016
ea85eed8b012
8196783: Refactor LogTagLevelExpression into separate classes
mlarsson
parents:
49015
diff
changeset
|
211 |
void LogConfiguration::configure_output(size_t idx, const LogSelectionList& selections, const LogDecorators& decorators) { |
35228
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
212 |
assert(ConfigurationLock::current_thread_has_lock(), "Must hold configuration lock to call this function."); |
33105
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
33097
diff
changeset
|
213 |
assert(idx < _n_outputs, "Invalid index, idx = " SIZE_FORMAT " and _n_outputs = " SIZE_FORMAT, idx, _n_outputs); |
33097 | 214 |
LogOutput* output = _outputs[idx]; |
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
215 |
|
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
216 |
// Clear the previous config description |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
217 |
output->clear_config_string(); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
218 |
|
33097 | 219 |
bool enabled = false; |
220 |
for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) { |
|
49016
ea85eed8b012
8196783: Refactor LogTagLevelExpression into separate classes
mlarsson
parents:
49015
diff
changeset
|
221 |
LogLevelType level = selections.level_for(*ts); |
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
222 |
|
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
223 |
// Ignore tagsets that do not, and will not log on the output |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
224 |
if (!ts->has_output(output) && (level == LogLevel::NotMentioned || level == LogLevel::Off)) { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
225 |
continue; |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
226 |
} |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
227 |
|
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
228 |
// Update decorators before adding/updating output level, |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
229 |
// so that the tagset will have the necessary decorators when requiring them. |
33097 | 230 |
if (level != LogLevel::Off) { |
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
231 |
ts->update_decorators(decorators); |
33097 | 232 |
} |
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
233 |
|
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
234 |
// Set the new level, if it changed |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
235 |
if (level != LogLevel::NotMentioned) { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
236 |
ts->set_output_level(output, level); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
237 |
} |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
238 |
|
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
239 |
if (level != LogLevel::Off) { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
240 |
// Keep track of whether or not the output is ever used by some tagset |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
241 |
enabled = true; |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
242 |
|
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
243 |
if (level == LogLevel::NotMentioned) { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
244 |
// Look up the previously set level for this output on this tagset |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
245 |
level = ts->level_for(output); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
246 |
} |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
247 |
|
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
248 |
// Update the config description with this tagset and level |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
249 |
output->add_to_config_string(ts, level); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
250 |
} |
33097 | 251 |
} |
252 |
||
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
253 |
// It is now safe to set the new decorators for the actual output |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
254 |
output->set_decorators(decorators); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
255 |
|
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
256 |
// Update the decorators on all tagsets to get rid of unused decorators |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
257 |
for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
258 |
ts->update_decorators(); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
259 |
} |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
260 |
|
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
261 |
if (enabled) { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
262 |
assert(strlen(output->config_string()) > 0, |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
263 |
"Should always have a config description if the output is enabled."); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
264 |
} else if (idx > 1) { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
265 |
// Output is unused and should be removed. |
33097 | 266 |
delete_output(idx); |
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
267 |
} else { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
268 |
// Output is either stdout or stderr, which means we can't remove it. |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
269 |
// Update the config description to reflect that the output is disabled. |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
270 |
output->set_config_string("all=off"); |
33097 | 271 |
} |
272 |
} |
|
273 |
||
274 |
void LogConfiguration::disable_output(size_t idx) { |
|
40885 | 275 |
assert(idx < _n_outputs, "invalid index: " SIZE_FORMAT " (_n_outputs: " SIZE_FORMAT ")", idx, _n_outputs); |
33097 | 276 |
LogOutput* out = _outputs[idx]; |
277 |
||
278 |
// Remove the output from all tagsets. |
|
279 |
for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) { |
|
280 |
ts->set_output_level(out, LogLevel::Off); |
|
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
281 |
ts->update_decorators(); |
33097 | 282 |
} |
283 |
||
42067
34b99c8faa51
8146009: "pure virtual method called" with using new GC logging mechanism
mlarsson
parents:
40924
diff
changeset
|
284 |
// Delete the output unless stdout or stderr (idx 0 or 1) |
34b99c8faa51
8146009: "pure virtual method called" with using new GC logging mechanism
mlarsson
parents:
40924
diff
changeset
|
285 |
if (idx > 1) { |
40885 | 286 |
delete_output(idx); |
33097 | 287 |
} else { |
288 |
out->set_config_string("all=off"); |
|
289 |
} |
|
290 |
} |
|
291 |
||
292 |
void LogConfiguration::disable_logging() { |
|
35228
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
293 |
ConfigurationLock cl; |
40885 | 294 |
for (size_t i = _n_outputs; i > 0; i--) { |
295 |
disable_output(i - 1); |
|
33097 | 296 |
} |
37108
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
297 |
notify_update_listeners(); |
33097 | 298 |
} |
299 |
||
48824 | 300 |
void LogConfiguration::configure_stdout(LogLevelType level, int exact_match, ...) { |
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
301 |
size_t i; |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
302 |
va_list ap; |
49016
ea85eed8b012
8196783: Refactor LogTagLevelExpression into separate classes
mlarsson
parents:
49015
diff
changeset
|
303 |
LogTagType tags[LogTag::MaxTags]; |
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
304 |
va_start(ap, exact_match); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
305 |
for (i = 0; i < LogTag::MaxTags; i++) { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
306 |
LogTagType tag = static_cast<LogTagType>(va_arg(ap, int)); |
49016
ea85eed8b012
8196783: Refactor LogTagLevelExpression into separate classes
mlarsson
parents:
49015
diff
changeset
|
307 |
tags[i] = tag; |
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
308 |
if (tag == LogTag::__NO_TAG) { |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
309 |
assert(i > 0, "Must specify at least one tag!"); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
310 |
break; |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
311 |
} |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
312 |
} |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
313 |
assert(i < LogTag::MaxTags || static_cast<LogTagType>(va_arg(ap, int)) == LogTag::__NO_TAG, |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
314 |
"Too many tags specified! Can only have up to " SIZE_FORMAT " tags in a tag set.", LogTag::MaxTags); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
315 |
va_end(ap); |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
316 |
|
49016
ea85eed8b012
8196783: Refactor LogTagLevelExpression into separate classes
mlarsson
parents:
49015
diff
changeset
|
317 |
LogSelection selection(tags, !exact_match, level); |
ea85eed8b012
8196783: Refactor LogTagLevelExpression into separate classes
mlarsson
parents:
49015
diff
changeset
|
318 |
assert(selection.tag_sets_selected() > 0, |
ea85eed8b012
8196783: Refactor LogTagLevelExpression into separate classes
mlarsson
parents:
49015
diff
changeset
|
319 |
"configure_stdout() called with invalid/non-existing log selection"); |
ea85eed8b012
8196783: Refactor LogTagLevelExpression into separate classes
mlarsson
parents:
49015
diff
changeset
|
320 |
LogSelectionList list(selection); |
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
321 |
|
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
322 |
// Apply configuration to stdout (output #0), with the same decorators as before. |
35228
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
323 |
ConfigurationLock cl; |
49016
ea85eed8b012
8196783: Refactor LogTagLevelExpression into separate classes
mlarsson
parents:
49015
diff
changeset
|
324 |
configure_output(0, list, _outputs[0]->decorators()); |
37108
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
325 |
notify_update_listeners(); |
34316
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
326 |
} |
4d876653d940
8142952: Unified Logging framework does not allow multiple -Xlog: arguments.
mlarsson
parents:
34252
diff
changeset
|
327 |
|
33097 | 328 |
bool LogConfiguration::parse_command_line_arguments(const char* opts) { |
329 |
char* copy = os::strdup_check_oom(opts, mtLogging); |
|
330 |
||
331 |
// Split the option string to its colon separated components. |
|
35229
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
332 |
char* str = copy; |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
333 |
char* substrings[4] = {0}; |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
334 |
for (int i = 0 ; i < 4; i++) { |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
335 |
substrings[i] = str; |
33097 | 336 |
|
35229
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
337 |
// Find the next colon or quote |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
338 |
char* next = strpbrk(str, ":\""); |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
339 |
while (next != NULL && *next == '"') { |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
340 |
char* end_quote = strchr(next + 1, '"'); |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
341 |
if (end_quote == NULL) { |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
342 |
log_error(logging)("Missing terminating quote in -Xlog option '%s'", str); |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
343 |
os::free(copy); |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
344 |
return false; |
33097 | 345 |
} |
35229
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
346 |
// Keep searching after the quoted substring |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
347 |
next = strpbrk(end_quote + 1, ":\""); |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
348 |
} |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
349 |
|
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
350 |
if (next != NULL) { |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
351 |
*next = '\0'; |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
352 |
str = next + 1; |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
353 |
} else { |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
354 |
break; |
33097 | 355 |
} |
356 |
} |
|
357 |
||
35229
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
358 |
// Parse and apply the separated configuration options |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
359 |
char* what = substrings[0]; |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
360 |
char* output = substrings[1]; |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
361 |
char* decorators = substrings[2]; |
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
362 |
char* output_options = substrings[3]; |
33097 | 363 |
char errbuf[512]; |
364 |
stringStream ss(errbuf, sizeof(errbuf)); |
|
35229
b8d78ee728b2
8144220: UL does not support full path names for log files on windows
mlarsson
parents:
35228
diff
changeset
|
365 |
bool success = parse_log_arguments(output, what, decorators, output_options, &ss); |
40884
0e28c526f5d3
8150894: Unused -Xlog tag sequences are silently ignored.
mlarsson
parents:
39707
diff
changeset
|
366 |
|
0e28c526f5d3
8150894: Unused -Xlog tag sequences are silently ignored.
mlarsson
parents:
39707
diff
changeset
|
367 |
if (ss.size() > 0) { |
0e28c526f5d3
8150894: Unused -Xlog tag sequences are silently ignored.
mlarsson
parents:
39707
diff
changeset
|
368 |
// If it failed, log the error. If it didn't fail, but something was written |
0e28c526f5d3
8150894: Unused -Xlog tag sequences are silently ignored.
mlarsson
parents:
39707
diff
changeset
|
369 |
// to the stream, log it as a warning. |
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
370 |
LogLevelType level = success ? LogLevel::Warning : LogLevel::Error; |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
371 |
|
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
372 |
Log(logging) log; |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
373 |
char* start = errbuf; |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
374 |
char* end = strchr(start, '\n'); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
375 |
assert(end != NULL, "line must end with newline '%s'", start); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
376 |
do { |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
377 |
assert(start < errbuf + sizeof(errbuf) && |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
378 |
end < errbuf + sizeof(errbuf), |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
379 |
"buffer overflow"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
380 |
*end = '\0'; |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
381 |
log.write(level, "%s", start); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
382 |
start = end + 1; |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
383 |
end = strchr(start, '\n'); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
384 |
assert(end != NULL || *start == '\0', "line must end with newline '%s'", start); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
385 |
} while (end != NULL); |
33097 | 386 |
} |
387 |
||
388 |
os::free(copy); |
|
389 |
return success; |
|
390 |
} |
|
391 |
||
392 |
bool LogConfiguration::parse_log_arguments(const char* outputstr, |
|
49016
ea85eed8b012
8196783: Refactor LogTagLevelExpression into separate classes
mlarsson
parents:
49015
diff
changeset
|
393 |
const char* selectionstr, |
33097 | 394 |
const char* decoratorstr, |
395 |
const char* output_options, |
|
396 |
outputStream* errstream) { |
|
40924 | 397 |
assert(errstream != NULL, "errstream can not be NULL"); |
33097 | 398 |
if (outputstr == NULL || strlen(outputstr) == 0) { |
399 |
outputstr = "stdout"; |
|
400 |
} |
|
401 |
||
49016
ea85eed8b012
8196783: Refactor LogTagLevelExpression into separate classes
mlarsson
parents:
49015
diff
changeset
|
402 |
LogSelectionList selections; |
ea85eed8b012
8196783: Refactor LogTagLevelExpression into separate classes
mlarsson
parents:
49015
diff
changeset
|
403 |
if (!selections.parse(selectionstr, errstream)) { |
35228
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
404 |
return false; |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
405 |
} |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
406 |
|
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
407 |
LogDecorators decorators; |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
408 |
if (!decorators.parse(decoratorstr, errstream)) { |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
409 |
return false; |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
410 |
} |
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
411 |
|
e7bbfb90fd31
8145083: Use semaphore instead of mutex for synchronization of Unified Logging configuration
mlarsson
parents:
34637
diff
changeset
|
412 |
ConfigurationLock cl; |
33097 | 413 |
size_t idx; |
40902
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
414 |
if (outputstr[0] == '#') { // Output specified using index |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
415 |
int ret = sscanf(outputstr + 1, SIZE_FORMAT, &idx); |
33097 | 416 |
if (ret != 1 || idx >= _n_outputs) { |
417 |
errstream->print_cr("Invalid output index '%s'", outputstr); |
|
418 |
return false; |
|
419 |
} |
|
40902
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
420 |
} else { // Output specified using name |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
421 |
// Normalize the name, stripping quotes and ensures it includes type prefix |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
422 |
size_t len = strlen(outputstr) + strlen(implicit_output_prefix) + 1; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
423 |
char* normalized = NEW_C_HEAP_ARRAY(char, len, mtLogging); |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
424 |
if (!normalize_output_name(outputstr, normalized, len, errstream)) { |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
425 |
return false; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
426 |
} |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
427 |
|
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
428 |
idx = find_output(normalized); |
33097 | 429 |
if (idx == SIZE_MAX) { |
40902
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
430 |
// Attempt to create and add the output |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
431 |
LogOutput* output = new_output(normalized, output_options, errstream); |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
432 |
if (output != NULL) { |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
433 |
idx = add_output(output); |
33097 | 434 |
} |
435 |
} else if (output_options != NULL && strlen(output_options) > 0) { |
|
436 |
errstream->print_cr("Output options for existing outputs are ignored."); |
|
437 |
} |
|
40902
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
438 |
|
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
439 |
FREE_C_HEAP_ARRAY(char, normalized); |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
440 |
if (idx == SIZE_MAX) { |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
441 |
return false; |
395e1f3ec886
8157948: UL allows same log file with multiple file=
mlarsson
parents:
40885
diff
changeset
|
442 |
} |
33097 | 443 |
} |
49016
ea85eed8b012
8196783: Refactor LogTagLevelExpression into separate classes
mlarsson
parents:
49015
diff
changeset
|
444 |
configure_output(idx, selections, decorators); |
37108
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
445 |
notify_update_listeners(); |
49016
ea85eed8b012
8196783: Refactor LogTagLevelExpression into separate classes
mlarsson
parents:
49015
diff
changeset
|
446 |
selections.verify_selections(errstream); |
33097 | 447 |
return true; |
448 |
} |
|
449 |
||
37994
1a816b464178
8151526: Print -Xlog configuration in the hs_err_pid file
mockner
parents:
37465
diff
changeset
|
450 |
void LogConfiguration::describe_available(outputStream* out){ |
33097 | 451 |
out->print("Available log levels:"); |
452 |
for (size_t i = 0; i < LogLevel::Count; i++) { |
|
453 |
out->print("%s %s", (i == 0 ? "" : ","), LogLevel::name(static_cast<LogLevelType>(i))); |
|
454 |
} |
|
455 |
out->cr(); |
|
456 |
||
457 |
out->print("Available log decorators:"); |
|
458 |
for (size_t i = 0; i < LogDecorators::Count; i++) { |
|
459 |
LogDecorators::Decorator d = static_cast<LogDecorators::Decorator>(i); |
|
460 |
out->print("%s %s (%s)", (i == 0 ? "" : ","), LogDecorators::name(d), LogDecorators::abbreviation(d)); |
|
461 |
} |
|
462 |
out->cr(); |
|
463 |
||
464 |
out->print("Available log tags:"); |
|
49015 | 465 |
LogTag::list_tags(out); |
33097 | 466 |
|
38292
73a0be9b2f47
8146948: Enable listing of LogTagSets and add support for LogTagSet descriptions
mlarsson
parents:
38195
diff
changeset
|
467 |
LogTagSet::describe_tagsets(out); |
37994
1a816b464178
8151526: Print -Xlog configuration in the hs_err_pid file
mockner
parents:
37465
diff
changeset
|
468 |
} |
1a816b464178
8151526: Print -Xlog configuration in the hs_err_pid file
mockner
parents:
37465
diff
changeset
|
469 |
|
1a816b464178
8151526: Print -Xlog configuration in the hs_err_pid file
mockner
parents:
37465
diff
changeset
|
470 |
void LogConfiguration::describe_current_configuration(outputStream* out){ |
33097 | 471 |
out->print_cr("Log output configuration:"); |
472 |
for (size_t i = 0; i < _n_outputs; i++) { |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
473 |
out->print(" #" SIZE_FORMAT ": ", i); |
39707 | 474 |
_outputs[i]->describe(out); |
33097 | 475 |
out->cr(); |
476 |
} |
|
477 |
} |
|
478 |
||
37994
1a816b464178
8151526: Print -Xlog configuration in the hs_err_pid file
mockner
parents:
37465
diff
changeset
|
479 |
void LogConfiguration::describe(outputStream* out) { |
1a816b464178
8151526: Print -Xlog configuration in the hs_err_pid file
mockner
parents:
37465
diff
changeset
|
480 |
describe_available(out); |
1a816b464178
8151526: Print -Xlog configuration in the hs_err_pid file
mockner
parents:
37465
diff
changeset
|
481 |
ConfigurationLock cl; |
1a816b464178
8151526: Print -Xlog configuration in the hs_err_pid file
mockner
parents:
37465
diff
changeset
|
482 |
describe_current_configuration(out); |
1a816b464178
8151526: Print -Xlog configuration in the hs_err_pid file
mockner
parents:
37465
diff
changeset
|
483 |
} |
1a816b464178
8151526: Print -Xlog configuration in the hs_err_pid file
mockner
parents:
37465
diff
changeset
|
484 |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
485 |
void LogConfiguration::print_command_line_help(outputStream* out) { |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
486 |
out->print_cr("-Xlog Usage: -Xlog[:[selections][:[output][:[decorators][:output-options]]]]"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
487 |
out->print_cr("\t where 'selections' are combinations of tags and levels of the form tag1[+tag2...][*][=level][,...]"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
488 |
out->print_cr("\t NOTE: Unless wildcard (*) is specified, only log messages tagged with exactly the tags specified will be matched."); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
489 |
out->cr(); |
33097 | 490 |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
491 |
out->print_cr("Available log levels:"); |
33097 | 492 |
for (size_t i = 0; i < LogLevel::Count; i++) { |
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
493 |
out->print("%s %s", (i == 0 ? "" : ","), LogLevel::name(static_cast<LogLevelType>(i))); |
33097 | 494 |
} |
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
495 |
out->cr(); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
496 |
out->cr(); |
33097 | 497 |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
498 |
out->print_cr("Available log decorators: "); |
33097 | 499 |
for (size_t i = 0; i < LogDecorators::Count; i++) { |
500 |
LogDecorators::Decorator d = static_cast<LogDecorators::Decorator>(i); |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
501 |
out->print("%s %s (%s)", (i == 0 ? "" : ","), LogDecorators::name(d), LogDecorators::abbreviation(d)); |
33097 | 502 |
} |
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
503 |
out->cr(); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
504 |
out->print_cr(" Decorators can also be specified as 'none' for no decoration."); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
505 |
out->cr(); |
33097 | 506 |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
507 |
out->print_cr("Available log tags:"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
508 |
LogTag::list_tags(out); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
509 |
out->print_cr(" Specifying 'all' instead of a tag combination matches all tag combinations."); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
510 |
out->cr(); |
33097 | 511 |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
512 |
LogTagSet::describe_tagsets(out); |
38292
73a0be9b2f47
8146948: Enable listing of LogTagSets and add support for LogTagSet descriptions
mlarsson
parents:
38195
diff
changeset
|
513 |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
514 |
out->print_cr("\nAvailable log outputs:"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
515 |
out->print_cr(" stdout/stderr"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
516 |
out->print_cr(" file=<filename>"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
517 |
out->print_cr(" If the filename contains %%p and/or %%t, they will expand to the JVM's PID and startup timestamp, respectively."); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
518 |
out->print_cr(" Additional output-options for file outputs:"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
519 |
out->print_cr(" filesize=.. - Target byte size for log rotation (supports K/M/G suffix)." |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
520 |
" If set to 0, log rotation will not trigger automatically," |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
521 |
" but can be performed manually (see the VM.log DCMD)."); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
522 |
out->print_cr(" filecount=.. - Number of files to keep in rotation (not counting the active file)." |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
523 |
" If set to 0, log rotation is disabled." |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
524 |
" This will cause existing log files to be overwritten."); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
525 |
out->cr(); |
33097 | 526 |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
527 |
out->print_cr("Some examples:"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
528 |
out->print_cr(" -Xlog"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
529 |
out->print_cr("\t Log all messages using 'info' level to stdout with 'uptime', 'levels' and 'tags' decorations."); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
530 |
out->print_cr("\t (Equivalent to -Xlog:all=info:stdout:uptime,levels,tags)."); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
531 |
out->cr(); |
33097 | 532 |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
533 |
out->print_cr(" -Xlog:gc"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
534 |
out->print_cr("\t Log messages tagged with 'gc' tag using 'info' level to stdout, with default decorations."); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
535 |
out->cr(); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
536 |
|
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
537 |
out->print_cr(" -Xlog:gc,safepoint"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
538 |
out->print_cr("\t Log messages tagged either with 'gc' or 'safepoint' tags, both using 'info' level, to stdout, with default decorations."); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
539 |
out->print_cr("\t (Messages tagged with both 'gc' and 'safepoint' will not be logged.)"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
540 |
out->cr(); |
43417
90c1f522d37e
8170855: Example for -Xlog:help do not contain one with multiple tags
mlarsson
parents:
42067
diff
changeset
|
541 |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
542 |
out->print_cr(" -Xlog:gc+ref=debug"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
543 |
out->print_cr("\t Log messages tagged with both 'gc' and 'ref' tags, using 'debug' level, to stdout, with default decorations."); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
544 |
out->print_cr("\t (Messages tagged only with one of the two tags will not be logged.)"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
545 |
out->cr(); |
43417
90c1f522d37e
8170855: Example for -Xlog:help do not contain one with multiple tags
mlarsson
parents:
42067
diff
changeset
|
546 |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
547 |
out->print_cr(" -Xlog:gc=debug:file=gc.txt:none"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
548 |
out->print_cr("\t Log messages tagged with 'gc' tag using 'debug' level to file 'gc.txt' with no decorations."); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
549 |
out->cr(); |
33097 | 550 |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
551 |
out->print_cr(" -Xlog:gc=trace:file=gctrace.txt:uptimemillis,pids:filecount=5,filesize=1m"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
552 |
out->print_cr("\t Log messages tagged with 'gc' tag using 'trace' level to a rotating fileset of 5 files of size 1MB,"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
553 |
out->print_cr("\t using the base name 'gctrace.txt', with 'uptimemillis' and 'pid' decorations."); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
554 |
out->cr(); |
33097 | 555 |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
556 |
out->print_cr(" -Xlog:gc::uptime,tid"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
557 |
out->print_cr("\t Log messages tagged with 'gc' tag using 'info' level to output 'stdout', using 'uptime' and 'tid' decorations."); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
558 |
out->cr(); |
33097 | 559 |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
560 |
out->print_cr(" -Xlog:gc*=info,safepoint*=off"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
561 |
out->print_cr("\t Log messages tagged with at least 'gc' using 'info' level, but turn off logging of messages tagged with 'safepoint'."); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
562 |
out->print_cr("\t (Messages tagged with both 'gc' and 'safepoint' will not be logged.)"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
563 |
out->cr(); |
33097 | 564 |
|
49180
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
565 |
out->print_cr(" -Xlog:disable -Xlog:safepoint=trace:safepointtrace.txt"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
566 |
out->print_cr("\t Turn off all logging, including warnings and errors,"); |
9637557def32
8190346: improve unified JVM logging help message and warnings
mlarsson
parents:
49016
diff
changeset
|
567 |
out->print_cr("\t and then enable messages tagged with 'safepoint' using 'trace' level to file 'safepointtrace.txt'."); |
33097 | 568 |
} |
34637
9b9298044d23
8140556: Add force rotation option to VM.log jcmd
ysuenaga
parents:
34316
diff
changeset
|
569 |
|
9b9298044d23
8140556: Add force rotation option to VM.log jcmd
ysuenaga
parents:
34316
diff
changeset
|
570 |
void LogConfiguration::rotate_all_outputs() { |
35230
a528ea8203ec
8145294: TestLogRotation.java triggers a race in the UL framework
mlarsson
parents:
35229
diff
changeset
|
571 |
// Start from index 2 since neither stdout nor stderr can be rotated. |
a528ea8203ec
8145294: TestLogRotation.java triggers a race in the UL framework
mlarsson
parents:
35229
diff
changeset
|
572 |
for (size_t idx = 2; idx < _n_outputs; idx++) { |
a528ea8203ec
8145294: TestLogRotation.java triggers a race in the UL framework
mlarsson
parents:
35229
diff
changeset
|
573 |
_outputs[idx]->force_rotate(); |
34637
9b9298044d23
8140556: Add force rotation option to VM.log jcmd
ysuenaga
parents:
34316
diff
changeset
|
574 |
} |
9b9298044d23
8140556: Add force rotation option to VM.log jcmd
ysuenaga
parents:
34316
diff
changeset
|
575 |
} |
9b9298044d23
8140556: Add force rotation option to VM.log jcmd
ysuenaga
parents:
34316
diff
changeset
|
576 |
|
37108
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
577 |
void LogConfiguration::register_update_listener(UpdateListenerFunction cb) { |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
578 |
assert(cb != NULL, "Should not register NULL as listener"); |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
579 |
ConfigurationLock cl; |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
580 |
size_t idx = _n_listener_callbacks++; |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
581 |
_listener_callbacks = REALLOC_C_HEAP_ARRAY(UpdateListenerFunction, |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
582 |
_listener_callbacks, |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
583 |
_n_listener_callbacks, |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
584 |
mtLogging); |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
585 |
_listener_callbacks[idx] = cb; |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
586 |
} |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
587 |
|
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
588 |
void LogConfiguration::notify_update_listeners() { |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
589 |
assert(ConfigurationLock::current_thread_has_lock(), "notify_update_listeners must be called in ConfigurationLock scope (lock held)"); |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
590 |
for (size_t i = 0; i < _n_listener_callbacks; i++) { |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
591 |
_listener_callbacks[i](); |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
592 |
} |
fe800ec86077
8151264: Add a notification mechanism for UL configuration changes.
rehn
parents:
36174
diff
changeset
|
593 |
} |