jdk-sandbox: comparison hotspot/src/share/vm/utilities/ostream.cpp

equal deleted inserted replaced

-:64752e56d721
+:be27e1b6a4b9
 rotatingFileStream::~rotatingFileStream() {
 if (_file != NULL) {
 if (_need_close) fclose(_file);
 _file      = NULL;
-FREE_C_HEAP_ARRAY(char, _file_name);
+FREE_C_HEAP_ARRAY(char, _file_name, mtInternal);
 _file_name = NULL;
 }
 }
 rotatingFileStream::rotatingFileStream(const char* file_name) {
 _cur_file_num = 0;
 _bytes_writen = 0L;
-_file_name = NEW_C_HEAP_ARRAY(char, strlen(file_name)+10);
+_file_name = NEW_C_HEAP_ARRAY(char, strlen(file_name)+10, mtInternal);
 jio_snprintf(_file_name, strlen(file_name)+10, "%s.%d", file_name, _cur_file_num);
 _file = fopen(_file_name, "w");
 _need_close = true;
 }
 rotatingFileStream::rotatingFileStream(const char* file_name, const char* opentype) {
 _cur_file_num = 0;
 _bytes_writen = 0L;
-_file_name = NEW_C_HEAP_ARRAY(char, strlen(file_name)+10);
+_file_name = NEW_C_HEAP_ARRAY(char, strlen(file_name)+10, mtInternal);
 jio_snprintf(_file_name, strlen(file_name)+10, "%s.%d", file_name, _cur_file_num);
 _file = fopen(_file_name, opentype);
 _need_close = true;
 }
 jio_snprintf(pid, sizeof(pid), "%u", os::current_process_id());
 buffer_length += strlen(pid);
 }
 // Create big enough buffer.
-char *buf = NEW_C_HEAP_ARRAY(char, buffer_length);
+char *buf = NEW_C_HEAP_ARRAY(char, buffer_length, mtInternal);
 strcpy(buf, "");
 if (force_directory != NULL) {
 strcat(buf, force_directory);
 strcat(buf, os::file_separator());
 void defaultStream::init_log() {
 // %%% Need a MutexLocker?
 const char* log_name = LogFile != NULL ? LogFile : "hotspot.log";
 const char* try_name = make_log_name(log_name, NULL);
-fileStream* file = new(ResourceObj::C_HEAP) fileStream(try_name);
+fileStream* file = new(ResourceObj::C_HEAP, mtInternal) fileStream(try_name);
 if (!file->is_open()) {
 // Try again to open the file.
 char warnbuf[O_BUFLEN*2];
 jio_snprintf(warnbuf, sizeof(warnbuf),
 "Warning:  Cannot open log file: %s\n", try_name);
 // Note:  This feature is for maintainer use only.  No need for L10N.
 jio_print(warnbuf);
-FREE_C_HEAP_ARRAY(char, try_name);
+FREE_C_HEAP_ARRAY(char, try_name, mtInternal);
 try_name = make_log_name("hs_pid%p.log", os::get_temp_directory());
 jio_snprintf(warnbuf, sizeof(warnbuf),
 "Warning:  Forcing option -XX:LogFile=%s\n", try_name);
 jio_print(warnbuf);
 delete file;
-file = new(ResourceObj::C_HEAP) fileStream(try_name);
+file = new(ResourceObj::C_HEAP, mtInternal) fileStream(try_name);
-FREE_C_HEAP_ARRAY(char, try_name);
+FREE_C_HEAP_ARRAY(char, try_name, mtInternal);
 }
 if (file->is_open()) {
 _log_file = file;
-xmlStream* xs = new(ResourceObj::C_HEAP) xmlStream(file);
+xmlStream* xs = new(ResourceObj::C_HEAP, mtInternal) xmlStream(file);
 _outer_xmlStream = xs;
 if (this == tty)  xtty = xs;
 // Write XML header.
 xs->print_cr("<?xml version='1.0' encoding='UTF-8'?>");
 // (For now, don't bother to issue a DTD for this private format.)
 // (else there was no lock to break)
 }
 void ostream_init() {
 if (defaultStream::instance == NULL) {
-defaultStream::instance = new(ResourceObj::C_HEAP) defaultStream();
+defaultStream::instance = new(ResourceObj::C_HEAP, mtInternal) defaultStream();
 tty = defaultStream::instance;
 // We want to ensure that time stamps in GC logs consider time 0
 // the time when the JVM is initialized, not the first time we ask
 // for a time stamp. So, here, we explicitly update the time stamp
 // Note : this must be called AFTER ostream_init()
 gclog_or_tty = tty; // default to tty
 if (Arguments::gc_log_filename() != NULL) {
 fileStream * gclog  = UseGCLogFileRotation ?
-new(ResourceObj::C_HEAP)
+new(ResourceObj::C_HEAP, mtInternal)
 rotatingFileStream(Arguments::gc_log_filename()) :
-new(ResourceObj::C_HEAP)
+new(ResourceObj::C_HEAP, mtInternal)
 fileStream(Arguments::gc_log_filename());
 if (gclog->is_open()) {
 // now we update the time stamp of the GC log to be synced up
 // with tty.
 gclog->time_stamp().update_to(tty->time_stamp().ticks());
 write(str, len);
 }
 bufferedStream::bufferedStream(size_t initial_size, size_t bufmax) : outputStream() {
 buffer_length = initial_size;
-buffer        = NEW_C_HEAP_ARRAY(char, buffer_length);
+buffer        = NEW_C_HEAP_ARRAY(char, buffer_length, mtInternal);
 buffer_pos    = 0;
 buffer_fixed  = false;
 buffer_max    = bufmax;
 }
 // For small overruns, double the buffer.  For larger ones,
 // increase to the requested size.
 if (end < buffer_length * 2) {
 end = buffer_length * 2;
 }
-buffer = REALLOC_C_HEAP_ARRAY(char, buffer, end);
+buffer = REALLOC_C_HEAP_ARRAY(char, buffer, end, mtInternal);
 buffer_length = end;
 }
 }
 memcpy(buffer + buffer_pos, s, len);
 buffer_pos += len;
 return copy;
 }
 bufferedStream::~bufferedStream() {
 if (!buffer_fixed) {
-FREE_C_HEAP_ARRAY(char, buffer);
+FREE_C_HEAP_ARRAY(char, buffer, mtInternal);
 }
 }
 #ifndef PRODUCT

changeset 13195	be27e1b6a4b9
parent 11256	025cd1741566
child 13476	471200fb94fd