Tue, 24 Jun 2008 16:00:14 -0700
6718676: putback for 6604014 is incomplete
Reviewed-by: kvn, jrose
duke@435 | 1 | /* |
duke@435 | 2 | * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. |
duke@435 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@435 | 4 | * |
duke@435 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@435 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@435 | 7 | * published by the Free Software Foundation. |
duke@435 | 8 | * |
duke@435 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@435 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@435 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@435 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@435 | 13 | * accompanied this code). |
duke@435 | 14 | * |
duke@435 | 15 | * You should have received a copy of the GNU General Public License version |
duke@435 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@435 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@435 | 18 | * |
duke@435 | 19 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@435 | 20 | * CA 95054 USA or visit www.sun.com if you need additional information or |
duke@435 | 21 | * have any questions. |
duke@435 | 22 | * |
duke@435 | 23 | */ |
duke@435 | 24 | |
duke@435 | 25 | # include "incls/_precompiled.incl" |
duke@435 | 26 | # include "incls/_ostream.cpp.incl" |
duke@435 | 27 | |
duke@435 | 28 | extern "C" void jio_print(const char* s); // Declarationtion of jvm method |
duke@435 | 29 | |
duke@435 | 30 | outputStream::outputStream(int width) { |
duke@435 | 31 | _width = width; |
duke@435 | 32 | _position = 0; |
duke@435 | 33 | _newlines = 0; |
duke@435 | 34 | _precount = 0; |
duke@435 | 35 | _indentation = 0; |
duke@435 | 36 | } |
duke@435 | 37 | |
duke@435 | 38 | outputStream::outputStream(int width, bool has_time_stamps) { |
duke@435 | 39 | _width = width; |
duke@435 | 40 | _position = 0; |
duke@435 | 41 | _newlines = 0; |
duke@435 | 42 | _precount = 0; |
duke@435 | 43 | _indentation = 0; |
duke@435 | 44 | if (has_time_stamps) _stamp.update(); |
duke@435 | 45 | } |
duke@435 | 46 | |
duke@435 | 47 | void outputStream::update_position(const char* s, size_t len) { |
duke@435 | 48 | for (size_t i = 0; i < len; i++) { |
duke@435 | 49 | char ch = s[i]; |
duke@435 | 50 | if (ch == '\n') { |
duke@435 | 51 | _newlines += 1; |
duke@435 | 52 | _precount += _position + 1; |
duke@435 | 53 | _position = 0; |
duke@435 | 54 | } else if (ch == '\t') { |
jrose@535 | 55 | int tw = 8 - (_position & 7); |
jrose@535 | 56 | _position += tw; |
jrose@535 | 57 | _precount -= tw-1; // invariant: _precount + _position == total count |
duke@435 | 58 | } else { |
duke@435 | 59 | _position += 1; |
duke@435 | 60 | } |
duke@435 | 61 | } |
duke@435 | 62 | } |
duke@435 | 63 | |
duke@435 | 64 | // Execute a vsprintf, using the given buffer if necessary. |
duke@435 | 65 | // Return a pointer to the formatted string. |
duke@435 | 66 | const char* outputStream::do_vsnprintf(char* buffer, size_t buflen, |
duke@435 | 67 | const char* format, va_list ap, |
duke@435 | 68 | bool add_cr, |
duke@435 | 69 | size_t& result_len) { |
duke@435 | 70 | const char* result; |
duke@435 | 71 | if (add_cr) buflen--; |
duke@435 | 72 | if (!strchr(format, '%')) { |
duke@435 | 73 | // constant format string |
duke@435 | 74 | result = format; |
duke@435 | 75 | result_len = strlen(result); |
duke@435 | 76 | if (add_cr && result_len >= buflen) result_len = buflen-1; // truncate |
duke@435 | 77 | } else if (format[0] == '%' && format[1] == 's' && format[2] == '\0') { |
duke@435 | 78 | // trivial copy-through format string |
duke@435 | 79 | result = va_arg(ap, const char*); |
duke@435 | 80 | result_len = strlen(result); |
duke@435 | 81 | if (add_cr && result_len >= buflen) result_len = buflen-1; // truncate |
duke@435 | 82 | } else if (vsnprintf(buffer, buflen, format, ap) >= 0) { |
duke@435 | 83 | result = buffer; |
duke@435 | 84 | result_len = strlen(result); |
duke@435 | 85 | } else { |
duke@435 | 86 | DEBUG_ONLY(warning("increase O_BUFLEN in ostream.hpp -- output truncated");) |
duke@435 | 87 | result = buffer; |
duke@435 | 88 | result_len = buflen - 1; |
duke@435 | 89 | buffer[result_len] = 0; |
duke@435 | 90 | } |
duke@435 | 91 | if (add_cr) { |
duke@435 | 92 | if (result != buffer) { |
duke@435 | 93 | strncpy(buffer, result, buflen); |
duke@435 | 94 | result = buffer; |
duke@435 | 95 | } |
duke@435 | 96 | buffer[result_len++] = '\n'; |
duke@435 | 97 | buffer[result_len] = 0; |
duke@435 | 98 | } |
duke@435 | 99 | return result; |
duke@435 | 100 | } |
duke@435 | 101 | |
duke@435 | 102 | void outputStream::print(const char* format, ...) { |
duke@435 | 103 | char buffer[O_BUFLEN]; |
duke@435 | 104 | va_list ap; |
duke@435 | 105 | va_start(ap, format); |
duke@435 | 106 | size_t len; |
duke@435 | 107 | const char* str = do_vsnprintf(buffer, O_BUFLEN, format, ap, false, len); |
duke@435 | 108 | write(str, len); |
duke@435 | 109 | va_end(ap); |
duke@435 | 110 | } |
duke@435 | 111 | |
duke@435 | 112 | void outputStream::print_cr(const char* format, ...) { |
duke@435 | 113 | char buffer[O_BUFLEN]; |
duke@435 | 114 | va_list ap; |
duke@435 | 115 | va_start(ap, format); |
duke@435 | 116 | size_t len; |
duke@435 | 117 | const char* str = do_vsnprintf(buffer, O_BUFLEN, format, ap, true, len); |
duke@435 | 118 | write(str, len); |
duke@435 | 119 | va_end(ap); |
duke@435 | 120 | } |
duke@435 | 121 | |
duke@435 | 122 | void outputStream::vprint(const char *format, va_list argptr) { |
duke@435 | 123 | char buffer[O_BUFLEN]; |
duke@435 | 124 | size_t len; |
duke@435 | 125 | const char* str = do_vsnprintf(buffer, O_BUFLEN, format, argptr, false, len); |
duke@435 | 126 | write(str, len); |
duke@435 | 127 | } |
duke@435 | 128 | |
duke@435 | 129 | void outputStream::vprint_cr(const char* format, va_list argptr) { |
duke@435 | 130 | char buffer[O_BUFLEN]; |
duke@435 | 131 | size_t len; |
duke@435 | 132 | const char* str = do_vsnprintf(buffer, O_BUFLEN, format, argptr, true, len); |
duke@435 | 133 | write(str, len); |
duke@435 | 134 | } |
duke@435 | 135 | |
duke@435 | 136 | void outputStream::fill_to(int col) { |
jrose@535 | 137 | int need_fill = col - position(); |
jrose@535 | 138 | sp(need_fill); |
jrose@535 | 139 | } |
jrose@535 | 140 | |
jrose@535 | 141 | void outputStream::move_to(int col, int slop, int min_space) { |
jrose@535 | 142 | if (position() >= col + slop) |
jrose@535 | 143 | cr(); |
jrose@535 | 144 | int need_fill = col - position(); |
jrose@535 | 145 | if (need_fill < min_space) |
jrose@535 | 146 | need_fill = min_space; |
jrose@535 | 147 | sp(need_fill); |
duke@435 | 148 | } |
duke@435 | 149 | |
duke@435 | 150 | void outputStream::put(char ch) { |
duke@435 | 151 | assert(ch != 0, "please fix call site"); |
duke@435 | 152 | char buf[] = { ch, '\0' }; |
duke@435 | 153 | write(buf, 1); |
duke@435 | 154 | } |
duke@435 | 155 | |
jrose@535 | 156 | #define SP_USE_TABS false |
jrose@535 | 157 | |
jrose@535 | 158 | void outputStream::sp(int count) { |
jrose@535 | 159 | if (count < 0) return; |
jrose@535 | 160 | if (SP_USE_TABS && count >= 8) { |
jrose@535 | 161 | int target = position() + count; |
jrose@535 | 162 | while (count >= 8) { |
jrose@535 | 163 | this->write("\t", 1); |
jrose@535 | 164 | count -= 8; |
jrose@535 | 165 | } |
jrose@535 | 166 | count = target - position(); |
jrose@535 | 167 | } |
jrose@535 | 168 | while (count > 0) { |
jrose@535 | 169 | int nw = (count > 8) ? 8 : count; |
jrose@535 | 170 | this->write(" ", nw); |
jrose@535 | 171 | count -= nw; |
jrose@535 | 172 | } |
duke@435 | 173 | } |
duke@435 | 174 | |
duke@435 | 175 | void outputStream::cr() { |
duke@435 | 176 | this->write("\n", 1); |
duke@435 | 177 | } |
duke@435 | 178 | |
duke@435 | 179 | void outputStream::stamp() { |
duke@435 | 180 | if (! _stamp.is_updated()) { |
duke@435 | 181 | _stamp.update(); // start at 0 on first call to stamp() |
duke@435 | 182 | } |
duke@435 | 183 | |
duke@435 | 184 | // outputStream::stamp() may get called by ostream_abort(), use snprintf |
duke@435 | 185 | // to avoid allocating large stack buffer in print(). |
duke@435 | 186 | char buf[40]; |
duke@435 | 187 | jio_snprintf(buf, sizeof(buf), "%.3f", _stamp.seconds()); |
duke@435 | 188 | print_raw(buf); |
duke@435 | 189 | } |
duke@435 | 190 | |
duke@435 | 191 | void outputStream::date_stamp(bool guard, |
duke@435 | 192 | const char* prefix, |
duke@435 | 193 | const char* suffix) { |
duke@435 | 194 | if (!guard) { |
duke@435 | 195 | return; |
duke@435 | 196 | } |
duke@435 | 197 | print_raw(prefix); |
duke@435 | 198 | static const char error_time[] = "yyyy-mm-ddThh:mm:ss.mmm+zzzz"; |
duke@435 | 199 | static const int buffer_length = 32; |
duke@435 | 200 | char buffer[buffer_length]; |
duke@435 | 201 | const char* iso8601_result = os::iso8601_time(buffer, buffer_length); |
duke@435 | 202 | if (iso8601_result != NULL) { |
duke@435 | 203 | print_raw(buffer); |
duke@435 | 204 | } else { |
duke@435 | 205 | print_raw(error_time); |
duke@435 | 206 | } |
duke@435 | 207 | print_raw(suffix); |
duke@435 | 208 | return; |
duke@435 | 209 | } |
duke@435 | 210 | |
duke@435 | 211 | void outputStream::indent() { |
duke@435 | 212 | while (_position < _indentation) sp(); |
duke@435 | 213 | } |
duke@435 | 214 | |
duke@435 | 215 | void outputStream::print_jlong(jlong value) { |
duke@435 | 216 | // N.B. Same as INT64_FORMAT |
duke@435 | 217 | print(os::jlong_format_specifier(), value); |
duke@435 | 218 | } |
duke@435 | 219 | |
duke@435 | 220 | void outputStream::print_julong(julong value) { |
duke@435 | 221 | // N.B. Same as UINT64_FORMAT |
duke@435 | 222 | print(os::julong_format_specifier(), value); |
duke@435 | 223 | } |
duke@435 | 224 | |
duke@435 | 225 | stringStream::stringStream(size_t initial_size) : outputStream() { |
duke@435 | 226 | buffer_length = initial_size; |
duke@435 | 227 | buffer = NEW_RESOURCE_ARRAY(char, buffer_length); |
duke@435 | 228 | buffer_pos = 0; |
duke@435 | 229 | buffer_fixed = false; |
duke@435 | 230 | } |
duke@435 | 231 | |
duke@435 | 232 | // useful for output to fixed chunks of memory, such as performance counters |
duke@435 | 233 | stringStream::stringStream(char* fixed_buffer, size_t fixed_buffer_size) : outputStream() { |
duke@435 | 234 | buffer_length = fixed_buffer_size; |
duke@435 | 235 | buffer = fixed_buffer; |
duke@435 | 236 | buffer_pos = 0; |
duke@435 | 237 | buffer_fixed = true; |
duke@435 | 238 | } |
duke@435 | 239 | |
duke@435 | 240 | void stringStream::write(const char* s, size_t len) { |
duke@435 | 241 | size_t write_len = len; // number of non-null bytes to write |
duke@435 | 242 | size_t end = buffer_pos + len + 1; // position after write and final '\0' |
duke@435 | 243 | if (end > buffer_length) { |
duke@435 | 244 | if (buffer_fixed) { |
duke@435 | 245 | // if buffer cannot resize, silently truncate |
duke@435 | 246 | end = buffer_length; |
duke@435 | 247 | write_len = end - buffer_pos - 1; // leave room for the final '\0' |
duke@435 | 248 | } else { |
duke@435 | 249 | // For small overruns, double the buffer. For larger ones, |
duke@435 | 250 | // increase to the requested size. |
duke@435 | 251 | if (end < buffer_length * 2) { |
duke@435 | 252 | end = buffer_length * 2; |
duke@435 | 253 | } |
duke@435 | 254 | char* oldbuf = buffer; |
duke@435 | 255 | buffer = NEW_RESOURCE_ARRAY(char, end); |
duke@435 | 256 | strncpy(buffer, oldbuf, buffer_pos); |
duke@435 | 257 | buffer_length = end; |
duke@435 | 258 | } |
duke@435 | 259 | } |
duke@435 | 260 | // invariant: buffer is always null-terminated |
duke@435 | 261 | guarantee(buffer_pos + write_len + 1 <= buffer_length, "stringStream oob"); |
duke@435 | 262 | buffer[buffer_pos + write_len] = 0; |
duke@435 | 263 | strncpy(buffer + buffer_pos, s, write_len); |
duke@435 | 264 | buffer_pos += write_len; |
duke@435 | 265 | |
duke@435 | 266 | // Note that the following does not depend on write_len. |
duke@435 | 267 | // This means that position and count get updated |
duke@435 | 268 | // even when overflow occurs. |
duke@435 | 269 | update_position(s, len); |
duke@435 | 270 | } |
duke@435 | 271 | |
duke@435 | 272 | char* stringStream::as_string() { |
duke@435 | 273 | char* copy = NEW_RESOURCE_ARRAY(char, buffer_pos+1); |
duke@435 | 274 | strncpy(copy, buffer, buffer_pos); |
duke@435 | 275 | copy[buffer_pos] = 0; // terminating null |
duke@435 | 276 | return copy; |
duke@435 | 277 | } |
duke@435 | 278 | |
duke@435 | 279 | stringStream::~stringStream() {} |
duke@435 | 280 | |
duke@435 | 281 | xmlStream* xtty; |
duke@435 | 282 | outputStream* tty; |
duke@435 | 283 | outputStream* gclog_or_tty; |
duke@435 | 284 | extern Mutex* tty_lock; |
duke@435 | 285 | |
duke@435 | 286 | fileStream::fileStream(const char* file_name) { |
duke@435 | 287 | _file = fopen(file_name, "w"); |
duke@435 | 288 | _need_close = true; |
duke@435 | 289 | } |
duke@435 | 290 | |
duke@435 | 291 | void fileStream::write(const char* s, size_t len) { |
duke@435 | 292 | if (_file != NULL) fwrite(s, 1, len, _file); |
duke@435 | 293 | update_position(s, len); |
duke@435 | 294 | } |
duke@435 | 295 | |
duke@435 | 296 | fileStream::~fileStream() { |
duke@435 | 297 | if (_file != NULL) { |
duke@435 | 298 | if (_need_close) fclose(_file); |
duke@435 | 299 | _file = NULL; |
duke@435 | 300 | } |
duke@435 | 301 | } |
duke@435 | 302 | |
duke@435 | 303 | void fileStream::flush() { |
duke@435 | 304 | fflush(_file); |
duke@435 | 305 | } |
duke@435 | 306 | |
duke@435 | 307 | fdStream::fdStream(const char* file_name) { |
duke@435 | 308 | _fd = open(file_name, O_WRONLY | O_CREAT | O_TRUNC, 0666); |
duke@435 | 309 | _need_close = true; |
duke@435 | 310 | } |
duke@435 | 311 | |
duke@435 | 312 | fdStream::~fdStream() { |
duke@435 | 313 | if (_fd != -1) { |
duke@435 | 314 | if (_need_close) close(_fd); |
duke@435 | 315 | _fd = -1; |
duke@435 | 316 | } |
duke@435 | 317 | } |
duke@435 | 318 | |
duke@435 | 319 | void fdStream::write(const char* s, size_t len) { |
duke@435 | 320 | if (_fd != -1) ::write(_fd, s, (int)len); |
duke@435 | 321 | update_position(s, len); |
duke@435 | 322 | } |
duke@435 | 323 | |
duke@435 | 324 | defaultStream* defaultStream::instance = NULL; |
duke@435 | 325 | int defaultStream::_output_fd = 1; |
duke@435 | 326 | int defaultStream::_error_fd = 2; |
duke@435 | 327 | FILE* defaultStream::_output_stream = stdout; |
duke@435 | 328 | FILE* defaultStream::_error_stream = stderr; |
duke@435 | 329 | |
duke@435 | 330 | #define LOG_MAJOR_VERSION 160 |
duke@435 | 331 | #define LOG_MINOR_VERSION 1 |
duke@435 | 332 | |
duke@435 | 333 | void defaultStream::init() { |
duke@435 | 334 | _inited = true; |
duke@435 | 335 | if (LogVMOutput || LogCompilation) { |
duke@435 | 336 | init_log(); |
duke@435 | 337 | } |
duke@435 | 338 | } |
duke@435 | 339 | |
duke@435 | 340 | bool defaultStream::has_log_file() { |
duke@435 | 341 | // lazily create log file (at startup, LogVMOutput is false even |
duke@435 | 342 | // if +LogVMOutput is used, because the flags haven't been parsed yet) |
duke@435 | 343 | // For safer printing during fatal error handling, do not init logfile |
duke@435 | 344 | // if a VM error has been reported. |
duke@435 | 345 | if (!_inited && !is_error_reported()) init(); |
duke@435 | 346 | return _log_file != NULL; |
duke@435 | 347 | } |
duke@435 | 348 | |
duke@435 | 349 | static const char* make_log_name(const char* log_name, const char* force_directory, char* buf) { |
duke@435 | 350 | const char* basename = log_name; |
duke@435 | 351 | char file_sep = os::file_separator()[0]; |
duke@435 | 352 | const char* cp; |
duke@435 | 353 | for (cp = log_name; *cp != '\0'; cp++) { |
duke@435 | 354 | if (*cp == '/' || *cp == file_sep) { |
duke@435 | 355 | basename = cp+1; |
duke@435 | 356 | } |
duke@435 | 357 | } |
duke@435 | 358 | const char* nametail = log_name; |
duke@435 | 359 | |
duke@435 | 360 | strcpy(buf, ""); |
duke@435 | 361 | if (force_directory != NULL) { |
duke@435 | 362 | strcat(buf, force_directory); |
duke@435 | 363 | strcat(buf, os::file_separator()); |
duke@435 | 364 | nametail = basename; // completely skip directory prefix |
duke@435 | 365 | } |
duke@435 | 366 | |
duke@435 | 367 | const char* star = strchr(basename, '*'); |
duke@435 | 368 | int star_pos = (star == NULL) ? -1 : (star - nametail); |
duke@435 | 369 | |
duke@435 | 370 | if (star_pos >= 0) { |
duke@435 | 371 | // convert foo*bar.log to foo123bar.log |
duke@435 | 372 | int buf_pos = (int) strlen(buf); |
duke@435 | 373 | strncpy(&buf[buf_pos], nametail, star_pos); |
duke@435 | 374 | sprintf(&buf[buf_pos + star_pos], "%u", os::current_process_id()); |
duke@435 | 375 | nametail += star_pos + 1; // skip prefix and star |
duke@435 | 376 | } |
duke@435 | 377 | |
duke@435 | 378 | strcat(buf, nametail); // append rest of name, or all of name |
duke@435 | 379 | return buf; |
duke@435 | 380 | } |
duke@435 | 381 | |
duke@435 | 382 | void defaultStream::init_log() { |
duke@435 | 383 | // %%% Need a MutexLocker? |
duke@435 | 384 | const char* log_name = LogFile != NULL ? LogFile : "hotspot.log"; |
duke@435 | 385 | char buf[O_BUFLEN*2]; |
duke@435 | 386 | const char* try_name = make_log_name(log_name, NULL, buf); |
duke@435 | 387 | fileStream* file = new(ResourceObj::C_HEAP) fileStream(try_name); |
duke@435 | 388 | if (!file->is_open()) { |
duke@435 | 389 | // Try again to open the file. |
duke@435 | 390 | char warnbuf[O_BUFLEN*2]; |
duke@435 | 391 | sprintf(warnbuf, "Warning: Cannot open log file: %s\n", try_name); |
duke@435 | 392 | // Note: This feature is for maintainer use only. No need for L10N. |
duke@435 | 393 | jio_print(warnbuf); |
duke@435 | 394 | try_name = make_log_name("hs_pid*.log", os::get_temp_directory(), buf); |
duke@435 | 395 | sprintf(warnbuf, "Warning: Forcing option -XX:LogFile=%s\n", try_name); |
duke@435 | 396 | jio_print(warnbuf); |
duke@435 | 397 | delete file; |
duke@435 | 398 | file = new(ResourceObj::C_HEAP) fileStream(try_name); |
duke@435 | 399 | } |
duke@435 | 400 | if (file->is_open()) { |
duke@435 | 401 | _log_file = file; |
duke@435 | 402 | xmlStream* xs = new(ResourceObj::C_HEAP) xmlStream(file); |
duke@435 | 403 | _outer_xmlStream = xs; |
duke@435 | 404 | if (this == tty) xtty = xs; |
duke@435 | 405 | // Write XML header. |
duke@435 | 406 | xs->print_cr("<?xml version='1.0' encoding='UTF-8'?>"); |
duke@435 | 407 | // (For now, don't bother to issue a DTD for this private format.) |
duke@435 | 408 | jlong time_ms = os::javaTimeMillis() - tty->time_stamp().milliseconds(); |
duke@435 | 409 | // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if |
duke@435 | 410 | // we ever get round to introduce that method on the os class |
duke@435 | 411 | xs->head("hotspot_log version='%d %d'" |
duke@435 | 412 | " process='%d' time_ms='"INT64_FORMAT"'", |
duke@435 | 413 | LOG_MAJOR_VERSION, LOG_MINOR_VERSION, |
duke@435 | 414 | os::current_process_id(), time_ms); |
duke@435 | 415 | // Write VM version header immediately. |
duke@435 | 416 | xs->head("vm_version"); |
duke@435 | 417 | xs->head("name"); xs->text("%s", VM_Version::vm_name()); xs->cr(); |
duke@435 | 418 | xs->tail("name"); |
duke@435 | 419 | xs->head("release"); xs->text("%s", VM_Version::vm_release()); xs->cr(); |
duke@435 | 420 | xs->tail("release"); |
duke@435 | 421 | xs->head("info"); xs->text("%s", VM_Version::internal_vm_info_string()); xs->cr(); |
duke@435 | 422 | xs->tail("info"); |
duke@435 | 423 | xs->tail("vm_version"); |
duke@435 | 424 | // Record information about the command-line invocation. |
duke@435 | 425 | xs->head("vm_arguments"); // Cf. Arguments::print_on() |
duke@435 | 426 | if (Arguments::num_jvm_flags() > 0) { |
duke@435 | 427 | xs->head("flags"); |
duke@435 | 428 | Arguments::print_jvm_flags_on(xs->text()); |
duke@435 | 429 | xs->tail("flags"); |
duke@435 | 430 | } |
duke@435 | 431 | if (Arguments::num_jvm_args() > 0) { |
duke@435 | 432 | xs->head("args"); |
duke@435 | 433 | Arguments::print_jvm_args_on(xs->text()); |
duke@435 | 434 | xs->tail("args"); |
duke@435 | 435 | } |
duke@435 | 436 | if (Arguments::java_command() != NULL) { |
duke@435 | 437 | xs->head("command"); xs->text()->print_cr("%s", Arguments::java_command()); |
duke@435 | 438 | xs->tail("command"); |
duke@435 | 439 | } |
duke@435 | 440 | if (Arguments::sun_java_launcher() != NULL) { |
duke@435 | 441 | xs->head("launcher"); xs->text()->print_cr("%s", Arguments::sun_java_launcher()); |
duke@435 | 442 | xs->tail("launcher"); |
duke@435 | 443 | } |
duke@435 | 444 | if (Arguments::system_properties() != NULL) { |
duke@435 | 445 | xs->head("properties"); |
duke@435 | 446 | // Print it as a java-style property list. |
duke@435 | 447 | // System properties don't generally contain newlines, so don't bother with unparsing. |
duke@435 | 448 | for (SystemProperty* p = Arguments::system_properties(); p != NULL; p = p->next()) { |
duke@435 | 449 | xs->text()->print_cr("%s=%s", p->key(), p->value()); |
duke@435 | 450 | } |
duke@435 | 451 | xs->tail("properties"); |
duke@435 | 452 | } |
duke@435 | 453 | xs->tail("vm_arguments"); |
duke@435 | 454 | // tty output per se is grouped under the <tty>...</tty> element. |
duke@435 | 455 | xs->head("tty"); |
duke@435 | 456 | // All further non-markup text gets copied to the tty: |
duke@435 | 457 | xs->_text = this; // requires friend declaration! |
duke@435 | 458 | } else { |
duke@435 | 459 | delete(file); |
duke@435 | 460 | // and leave xtty as NULL |
duke@435 | 461 | LogVMOutput = false; |
duke@435 | 462 | DisplayVMOutput = true; |
duke@435 | 463 | LogCompilation = false; |
duke@435 | 464 | } |
duke@435 | 465 | } |
duke@435 | 466 | |
duke@435 | 467 | // finish_log() is called during normal VM shutdown. finish_log_on_error() is |
duke@435 | 468 | // called by ostream_abort() after a fatal error. |
duke@435 | 469 | // |
duke@435 | 470 | void defaultStream::finish_log() { |
duke@435 | 471 | xmlStream* xs = _outer_xmlStream; |
duke@435 | 472 | xs->done("tty"); |
duke@435 | 473 | |
duke@435 | 474 | // Other log forks are appended here, at the End of Time: |
duke@435 | 475 | CompileLog::finish_log(xs->out()); // write compile logging, if any, now |
duke@435 | 476 | |
duke@435 | 477 | xs->done("hotspot_log"); |
duke@435 | 478 | xs->flush(); |
duke@435 | 479 | |
duke@435 | 480 | fileStream* file = _log_file; |
duke@435 | 481 | _log_file = NULL; |
duke@435 | 482 | |
duke@435 | 483 | delete _outer_xmlStream; |
duke@435 | 484 | _outer_xmlStream = NULL; |
duke@435 | 485 | |
duke@435 | 486 | file->flush(); |
duke@435 | 487 | delete file; |
duke@435 | 488 | } |
duke@435 | 489 | |
duke@435 | 490 | void defaultStream::finish_log_on_error(char *buf, int buflen) { |
duke@435 | 491 | xmlStream* xs = _outer_xmlStream; |
duke@435 | 492 | |
duke@435 | 493 | if (xs && xs->out()) { |
duke@435 | 494 | |
duke@435 | 495 | xs->done_raw("tty"); |
duke@435 | 496 | |
duke@435 | 497 | // Other log forks are appended here, at the End of Time: |
duke@435 | 498 | CompileLog::finish_log_on_error(xs->out(), buf, buflen); // write compile logging, if any, now |
duke@435 | 499 | |
duke@435 | 500 | xs->done_raw("hotspot_log"); |
duke@435 | 501 | xs->flush(); |
duke@435 | 502 | |
duke@435 | 503 | fileStream* file = _log_file; |
duke@435 | 504 | _log_file = NULL; |
duke@435 | 505 | _outer_xmlStream = NULL; |
duke@435 | 506 | |
duke@435 | 507 | if (file) { |
duke@435 | 508 | file->flush(); |
duke@435 | 509 | |
duke@435 | 510 | // Can't delete or close the file because delete and fclose aren't |
duke@435 | 511 | // async-safe. We are about to die, so leave it to the kernel. |
duke@435 | 512 | // delete file; |
duke@435 | 513 | } |
duke@435 | 514 | } |
duke@435 | 515 | } |
duke@435 | 516 | |
duke@435 | 517 | intx defaultStream::hold(intx writer_id) { |
duke@435 | 518 | bool has_log = has_log_file(); // check before locking |
duke@435 | 519 | if (// impossible, but who knows? |
duke@435 | 520 | writer_id == NO_WRITER || |
duke@435 | 521 | |
duke@435 | 522 | // bootstrap problem |
duke@435 | 523 | tty_lock == NULL || |
duke@435 | 524 | |
duke@435 | 525 | // can't grab a lock or call Thread::current() if TLS isn't initialized |
duke@435 | 526 | ThreadLocalStorage::thread() == NULL || |
duke@435 | 527 | |
duke@435 | 528 | // developer hook |
duke@435 | 529 | !SerializeVMOutput || |
duke@435 | 530 | |
duke@435 | 531 | // VM already unhealthy |
duke@435 | 532 | is_error_reported() || |
duke@435 | 533 | |
duke@435 | 534 | // safepoint == global lock (for VM only) |
duke@435 | 535 | (SafepointSynchronize::is_synchronizing() && |
duke@435 | 536 | Thread::current()->is_VM_thread()) |
duke@435 | 537 | ) { |
duke@435 | 538 | // do not attempt to lock unless we know the thread and the VM is healthy |
duke@435 | 539 | return NO_WRITER; |
duke@435 | 540 | } |
duke@435 | 541 | if (_writer == writer_id) { |
duke@435 | 542 | // already held, no need to re-grab the lock |
duke@435 | 543 | return NO_WRITER; |
duke@435 | 544 | } |
duke@435 | 545 | tty_lock->lock_without_safepoint_check(); |
duke@435 | 546 | // got the lock |
duke@435 | 547 | if (writer_id != _last_writer) { |
duke@435 | 548 | if (has_log) { |
duke@435 | 549 | _log_file->bol(); |
duke@435 | 550 | // output a hint where this output is coming from: |
duke@435 | 551 | _log_file->print_cr("<writer thread='"INTX_FORMAT"'/>", writer_id); |
duke@435 | 552 | } |
duke@435 | 553 | _last_writer = writer_id; |
duke@435 | 554 | } |
duke@435 | 555 | _writer = writer_id; |
duke@435 | 556 | return writer_id; |
duke@435 | 557 | } |
duke@435 | 558 | |
duke@435 | 559 | void defaultStream::release(intx holder) { |
duke@435 | 560 | if (holder == NO_WRITER) { |
duke@435 | 561 | // nothing to release: either a recursive lock, or we scribbled (too bad) |
duke@435 | 562 | return; |
duke@435 | 563 | } |
duke@435 | 564 | if (_writer != holder) { |
duke@435 | 565 | return; // already unlocked, perhaps via break_tty_lock_for_safepoint |
duke@435 | 566 | } |
duke@435 | 567 | _writer = NO_WRITER; |
duke@435 | 568 | tty_lock->unlock(); |
duke@435 | 569 | } |
duke@435 | 570 | |
duke@435 | 571 | |
duke@435 | 572 | // Yuck: jio_print does not accept char*/len. |
duke@435 | 573 | static void call_jio_print(const char* s, size_t len) { |
duke@435 | 574 | char buffer[O_BUFLEN+100]; |
duke@435 | 575 | if (len > sizeof(buffer)-1) { |
duke@435 | 576 | warning("increase O_BUFLEN in ostream.cpp -- output truncated"); |
duke@435 | 577 | len = sizeof(buffer)-1; |
duke@435 | 578 | } |
duke@435 | 579 | strncpy(buffer, s, len); |
duke@435 | 580 | buffer[len] = '\0'; |
duke@435 | 581 | jio_print(buffer); |
duke@435 | 582 | } |
duke@435 | 583 | |
duke@435 | 584 | |
duke@435 | 585 | void defaultStream::write(const char* s, size_t len) { |
duke@435 | 586 | intx thread_id = os::current_thread_id(); |
duke@435 | 587 | intx holder = hold(thread_id); |
duke@435 | 588 | |
duke@435 | 589 | if (DisplayVMOutput && |
duke@435 | 590 | (_outer_xmlStream == NULL || !_outer_xmlStream->inside_attrs())) { |
duke@435 | 591 | // print to output stream. It can be redirected by a vfprintf hook |
duke@435 | 592 | if (s[len] == '\0') { |
duke@435 | 593 | jio_print(s); |
duke@435 | 594 | } else { |
duke@435 | 595 | call_jio_print(s, len); |
duke@435 | 596 | } |
duke@435 | 597 | } |
duke@435 | 598 | |
duke@435 | 599 | // print to log file |
duke@435 | 600 | if (has_log_file()) { |
duke@435 | 601 | int nl0 = _newlines; |
duke@435 | 602 | xmlTextStream::write(s, len); |
duke@435 | 603 | // flush the log file too, if there were any newlines |
duke@435 | 604 | if (nl0 != _newlines){ |
duke@435 | 605 | flush(); |
duke@435 | 606 | } |
duke@435 | 607 | } else { |
duke@435 | 608 | update_position(s, len); |
duke@435 | 609 | } |
duke@435 | 610 | |
duke@435 | 611 | release(holder); |
duke@435 | 612 | } |
duke@435 | 613 | |
duke@435 | 614 | intx ttyLocker::hold_tty() { |
duke@435 | 615 | if (defaultStream::instance == NULL) return defaultStream::NO_WRITER; |
duke@435 | 616 | intx thread_id = os::current_thread_id(); |
duke@435 | 617 | return defaultStream::instance->hold(thread_id); |
duke@435 | 618 | } |
duke@435 | 619 | |
duke@435 | 620 | void ttyLocker::release_tty(intx holder) { |
duke@435 | 621 | if (holder == defaultStream::NO_WRITER) return; |
duke@435 | 622 | defaultStream::instance->release(holder); |
duke@435 | 623 | } |
duke@435 | 624 | |
duke@435 | 625 | void ttyLocker::break_tty_lock_for_safepoint(intx holder) { |
duke@435 | 626 | if (defaultStream::instance != NULL && |
duke@435 | 627 | defaultStream::instance->writer() == holder) { |
duke@435 | 628 | if (xtty != NULL) { |
duke@435 | 629 | xtty->print_cr("<!-- safepoint while printing -->"); |
duke@435 | 630 | } |
duke@435 | 631 | defaultStream::instance->release(holder); |
duke@435 | 632 | } |
duke@435 | 633 | // (else there was no lock to break) |
duke@435 | 634 | } |
duke@435 | 635 | |
duke@435 | 636 | void ostream_init() { |
duke@435 | 637 | if (defaultStream::instance == NULL) { |
duke@435 | 638 | defaultStream::instance = new(ResourceObj::C_HEAP) defaultStream(); |
duke@435 | 639 | tty = defaultStream::instance; |
duke@435 | 640 | |
duke@435 | 641 | // We want to ensure that time stamps in GC logs consider time 0 |
duke@435 | 642 | // the time when the JVM is initialized, not the first time we ask |
duke@435 | 643 | // for a time stamp. So, here, we explicitly update the time stamp |
duke@435 | 644 | // of tty. |
duke@435 | 645 | tty->time_stamp().update_to(1); |
duke@435 | 646 | } |
duke@435 | 647 | } |
duke@435 | 648 | |
duke@435 | 649 | void ostream_init_log() { |
duke@435 | 650 | // For -Xloggc:<file> option - called in runtime/thread.cpp |
duke@435 | 651 | // Note : this must be called AFTER ostream_init() |
duke@435 | 652 | |
duke@435 | 653 | gclog_or_tty = tty; // default to tty |
duke@435 | 654 | if (Arguments::gc_log_filename() != NULL) { |
duke@435 | 655 | fileStream * gclog = new(ResourceObj::C_HEAP) |
duke@435 | 656 | fileStream(Arguments::gc_log_filename()); |
duke@435 | 657 | if (gclog->is_open()) { |
duke@435 | 658 | // now we update the time stamp of the GC log to be synced up |
duke@435 | 659 | // with tty. |
duke@435 | 660 | gclog->time_stamp().update_to(tty->time_stamp().ticks()); |
duke@435 | 661 | gclog_or_tty = gclog; |
duke@435 | 662 | } |
duke@435 | 663 | } |
duke@435 | 664 | |
duke@435 | 665 | // If we haven't lazily initialized the logfile yet, do it now, |
duke@435 | 666 | // to avoid the possibility of lazy initialization during a VM |
duke@435 | 667 | // crash, which can affect the stability of the fatal error handler. |
duke@435 | 668 | defaultStream::instance->has_log_file(); |
duke@435 | 669 | } |
duke@435 | 670 | |
duke@435 | 671 | // ostream_exit() is called during normal VM exit to finish log files, flush |
duke@435 | 672 | // output and free resource. |
duke@435 | 673 | void ostream_exit() { |
duke@435 | 674 | static bool ostream_exit_called = false; |
duke@435 | 675 | if (ostream_exit_called) return; |
duke@435 | 676 | ostream_exit_called = true; |
duke@435 | 677 | if (gclog_or_tty != tty) { |
duke@435 | 678 | delete gclog_or_tty; |
duke@435 | 679 | } |
duke@435 | 680 | { |
duke@435 | 681 | // we temporaly disable PrintMallocFree here |
duke@435 | 682 | // as otherwise it'll lead to using of almost deleted |
duke@435 | 683 | // tty or defaultStream::instance in logging facility |
duke@435 | 684 | // of HeapFree(), see 6391258 |
duke@435 | 685 | DEBUG_ONLY(FlagSetting fs(PrintMallocFree, false);) |
duke@435 | 686 | if (tty != defaultStream::instance) { |
duke@435 | 687 | delete tty; |
duke@435 | 688 | } |
duke@435 | 689 | if (defaultStream::instance != NULL) { |
duke@435 | 690 | delete defaultStream::instance; |
duke@435 | 691 | } |
duke@435 | 692 | } |
duke@435 | 693 | tty = NULL; |
duke@435 | 694 | xtty = NULL; |
duke@435 | 695 | gclog_or_tty = NULL; |
duke@435 | 696 | defaultStream::instance = NULL; |
duke@435 | 697 | } |
duke@435 | 698 | |
duke@435 | 699 | // ostream_abort() is called by os::abort() when VM is about to die. |
duke@435 | 700 | void ostream_abort() { |
duke@435 | 701 | // Here we can't delete gclog_or_tty and tty, just flush their output |
duke@435 | 702 | if (gclog_or_tty) gclog_or_tty->flush(); |
duke@435 | 703 | if (tty) tty->flush(); |
duke@435 | 704 | |
duke@435 | 705 | if (defaultStream::instance != NULL) { |
duke@435 | 706 | static char buf[4096]; |
duke@435 | 707 | defaultStream::instance->finish_log_on_error(buf, sizeof(buf)); |
duke@435 | 708 | } |
duke@435 | 709 | } |
duke@435 | 710 | |
duke@435 | 711 | staticBufferStream::staticBufferStream(char* buffer, size_t buflen, |
duke@435 | 712 | outputStream *outer_stream) { |
duke@435 | 713 | _buffer = buffer; |
duke@435 | 714 | _buflen = buflen; |
duke@435 | 715 | _outer_stream = outer_stream; |
duke@435 | 716 | } |
duke@435 | 717 | |
duke@435 | 718 | void staticBufferStream::write(const char* c, size_t len) { |
duke@435 | 719 | _outer_stream->print_raw(c, (int)len); |
duke@435 | 720 | } |
duke@435 | 721 | |
duke@435 | 722 | void staticBufferStream::flush() { |
duke@435 | 723 | _outer_stream->flush(); |
duke@435 | 724 | } |
duke@435 | 725 | |
duke@435 | 726 | void staticBufferStream::print(const char* format, ...) { |
duke@435 | 727 | va_list ap; |
duke@435 | 728 | va_start(ap, format); |
duke@435 | 729 | size_t len; |
duke@435 | 730 | const char* str = do_vsnprintf(_buffer, _buflen, format, ap, false, len); |
duke@435 | 731 | write(str, len); |
duke@435 | 732 | va_end(ap); |
duke@435 | 733 | } |
duke@435 | 734 | |
duke@435 | 735 | void staticBufferStream::print_cr(const char* format, ...) { |
duke@435 | 736 | va_list ap; |
duke@435 | 737 | va_start(ap, format); |
duke@435 | 738 | size_t len; |
duke@435 | 739 | const char* str = do_vsnprintf(_buffer, _buflen, format, ap, true, len); |
duke@435 | 740 | write(str, len); |
duke@435 | 741 | va_end(ap); |
duke@435 | 742 | } |
duke@435 | 743 | |
duke@435 | 744 | void staticBufferStream::vprint(const char *format, va_list argptr) { |
duke@435 | 745 | size_t len; |
duke@435 | 746 | const char* str = do_vsnprintf(_buffer, _buflen, format, argptr, false, len); |
duke@435 | 747 | write(str, len); |
duke@435 | 748 | } |
duke@435 | 749 | |
duke@435 | 750 | void staticBufferStream::vprint_cr(const char* format, va_list argptr) { |
duke@435 | 751 | size_t len; |
duke@435 | 752 | const char* str = do_vsnprintf(_buffer, _buflen, format, argptr, true, len); |
duke@435 | 753 | write(str, len); |
duke@435 | 754 | } |
duke@435 | 755 | |
never@657 | 756 | bufferedStream::bufferedStream(size_t initial_size, size_t bufmax) : outputStream() { |
duke@435 | 757 | buffer_length = initial_size; |
duke@435 | 758 | buffer = NEW_C_HEAP_ARRAY(char, buffer_length); |
duke@435 | 759 | buffer_pos = 0; |
duke@435 | 760 | buffer_fixed = false; |
never@657 | 761 | buffer_max = bufmax; |
duke@435 | 762 | } |
duke@435 | 763 | |
never@657 | 764 | bufferedStream::bufferedStream(char* fixed_buffer, size_t fixed_buffer_size, size_t bufmax) : outputStream() { |
duke@435 | 765 | buffer_length = fixed_buffer_size; |
duke@435 | 766 | buffer = fixed_buffer; |
duke@435 | 767 | buffer_pos = 0; |
duke@435 | 768 | buffer_fixed = true; |
never@657 | 769 | buffer_max = bufmax; |
duke@435 | 770 | } |
duke@435 | 771 | |
duke@435 | 772 | void bufferedStream::write(const char* s, size_t len) { |
never@657 | 773 | |
never@657 | 774 | if(buffer_pos + len > buffer_max) { |
never@657 | 775 | flush(); |
never@657 | 776 | } |
never@657 | 777 | |
duke@435 | 778 | size_t end = buffer_pos + len; |
duke@435 | 779 | if (end >= buffer_length) { |
duke@435 | 780 | if (buffer_fixed) { |
duke@435 | 781 | // if buffer cannot resize, silently truncate |
duke@435 | 782 | len = buffer_length - buffer_pos - 1; |
duke@435 | 783 | } else { |
duke@435 | 784 | // For small overruns, double the buffer. For larger ones, |
duke@435 | 785 | // increase to the requested size. |
duke@435 | 786 | if (end < buffer_length * 2) { |
duke@435 | 787 | end = buffer_length * 2; |
duke@435 | 788 | } |
duke@435 | 789 | buffer = REALLOC_C_HEAP_ARRAY(char, buffer, end); |
duke@435 | 790 | buffer_length = end; |
duke@435 | 791 | } |
duke@435 | 792 | } |
duke@435 | 793 | memcpy(buffer + buffer_pos, s, len); |
duke@435 | 794 | buffer_pos += len; |
duke@435 | 795 | update_position(s, len); |
duke@435 | 796 | } |
duke@435 | 797 | |
duke@435 | 798 | char* bufferedStream::as_string() { |
duke@435 | 799 | char* copy = NEW_RESOURCE_ARRAY(char, buffer_pos+1); |
duke@435 | 800 | strncpy(copy, buffer, buffer_pos); |
duke@435 | 801 | copy[buffer_pos] = 0; // terminating null |
duke@435 | 802 | return copy; |
duke@435 | 803 | } |
duke@435 | 804 | |
duke@435 | 805 | bufferedStream::~bufferedStream() { |
duke@435 | 806 | if (!buffer_fixed) { |
duke@435 | 807 | FREE_C_HEAP_ARRAY(char, buffer); |
duke@435 | 808 | } |
duke@435 | 809 | } |
duke@435 | 810 | |
duke@435 | 811 | #ifndef PRODUCT |
duke@435 | 812 | |
duke@435 | 813 | #if defined(SOLARIS) || defined(LINUX) |
duke@435 | 814 | #include <sys/types.h> |
duke@435 | 815 | #include <sys/socket.h> |
duke@435 | 816 | #include <netinet/in.h> |
duke@435 | 817 | #include <arpa/inet.h> |
duke@435 | 818 | #endif |
duke@435 | 819 | |
duke@435 | 820 | // Network access |
never@657 | 821 | networkStream::networkStream() : bufferedStream(1024*10, 1024*10) { |
duke@435 | 822 | |
duke@435 | 823 | _socket = -1; |
duke@435 | 824 | |
duke@435 | 825 | hpi::initialize_socket_library(); |
duke@435 | 826 | |
duke@435 | 827 | int result = hpi::socket(AF_INET, SOCK_STREAM, 0); |
duke@435 | 828 | if (result <= 0) { |
duke@435 | 829 | assert(false, "Socket could not be created!"); |
duke@435 | 830 | } else { |
duke@435 | 831 | _socket = result; |
duke@435 | 832 | } |
duke@435 | 833 | } |
duke@435 | 834 | |
duke@435 | 835 | int networkStream::read(char *buf, size_t len) { |
duke@435 | 836 | return hpi::recv(_socket, buf, (int)len, 0); |
duke@435 | 837 | } |
duke@435 | 838 | |
duke@435 | 839 | void networkStream::flush() { |
duke@435 | 840 | if (size() != 0) { |
never@657 | 841 | int result = hpi::raw_send(_socket, (char *)base(), (int)size(), 0); |
never@657 | 842 | assert(result != -1, "connection error"); |
never@657 | 843 | assert(result == (int)size(), "didn't send enough data"); |
duke@435 | 844 | } |
duke@435 | 845 | reset(); |
duke@435 | 846 | } |
duke@435 | 847 | |
duke@435 | 848 | networkStream::~networkStream() { |
duke@435 | 849 | close(); |
duke@435 | 850 | } |
duke@435 | 851 | |
duke@435 | 852 | void networkStream::close() { |
duke@435 | 853 | if (_socket != -1) { |
duke@435 | 854 | flush(); |
duke@435 | 855 | hpi::socket_close(_socket); |
duke@435 | 856 | _socket = -1; |
duke@435 | 857 | } |
duke@435 | 858 | } |
duke@435 | 859 | |
duke@435 | 860 | bool networkStream::connect(const char *ip, short port) { |
duke@435 | 861 | |
duke@435 | 862 | struct sockaddr_in server; |
duke@435 | 863 | server.sin_family = AF_INET; |
duke@435 | 864 | server.sin_port = htons(port); |
duke@435 | 865 | |
duke@435 | 866 | server.sin_addr.s_addr = inet_addr(ip); |
jcoomes@515 | 867 | if (server.sin_addr.s_addr == (uint32_t)-1) { |
duke@435 | 868 | #ifdef _WINDOWS |
duke@435 | 869 | struct hostent* host = hpi::get_host_by_name((char*)ip); |
duke@435 | 870 | #else |
duke@435 | 871 | struct hostent* host = gethostbyname(ip); |
duke@435 | 872 | #endif |
duke@435 | 873 | if (host != NULL) { |
duke@435 | 874 | memcpy(&server.sin_addr, host->h_addr_list[0], host->h_length); |
duke@435 | 875 | } else { |
duke@435 | 876 | return false; |
duke@435 | 877 | } |
duke@435 | 878 | } |
duke@435 | 879 | |
duke@435 | 880 | |
duke@435 | 881 | int result = hpi::connect(_socket, (struct sockaddr*)&server, sizeof(struct sockaddr_in)); |
duke@435 | 882 | return (result >= 0); |
duke@435 | 883 | } |
duke@435 | 884 | |
duke@435 | 885 | #endif |