6818264: Heap dumper unexpectedly adds .hprof suffix
Restore old behaviour wrt HeapDumpPath; first dump goes to <file>, <n>th dump goes to <file>.<n-1>, with default value of <file> the same as before.
Reviewed-by: alanb, jcoomes, tonyp
diff --git a/hotspot/src/share/vm/services/heapDumper.cpp b/hotspot/src/share/vm/services/heapDumper.cpp
index 49e3430..5bc0d2f 100644
--- a/hotspot/src/share/vm/services/heapDumper.cpp
+++ b/hotspot/src/share/vm/services/heapDumper.cpp
@@ -1913,8 +1913,9 @@
if (use_default_filename) {
char fn[32];
sprintf(fn, "java_pid%d", os::current_process_id());
- assert(strlen(base_path) + strlen(fn) < sizeof(base_path), "HeapDumpPath too long");
+ assert(strlen(base_path) + strlen(fn) + strlen(".hprof") < sizeof(base_path), "HeapDumpPath too long");
strcat(base_path, fn);
+ strcat(base_path, ".hprof");
}
assert(strlen(base_path) < sizeof(my_path), "Buffer too small");
strcpy(my_path, base_path);
@@ -1927,8 +1928,6 @@
strcat(my_path, fn);
}
dump_file_seq++; // increment seq number for next time we dump
- assert(strlen(".hprof") + strlen(my_path) < sizeof(my_path), "HeapDumpPath too long");
- strcat(my_path, ".hprof");
HeapDumper dumper(false /* no GC before heap dump */,
true /* send to tty */);
