_collect should not fail due to VMDeath after profiler start

Author: Baraa-Hasheesh

src/arguments.cpp

@@ -488,6 +488,9 @@ Error Arguments::parse(const char* args) {
             CASE("inverted")
                 _inverted = true;
 
+            CASE("_collect")
+                _collect = true;
+
             DEFAULT()
                 if (_unknown_arg == NULL) _unknown_arg = arg;
         }

src/arguments.h

@@ -207,6 +207,7 @@ class Arguments {
     bool _nostop;
     bool _alluser;
     bool _fdtransfer;
+    bool _collect;
     const char* _fdtransfer_path;
     int _target_cpu;
     int _style;
@@ -269,6 +270,7 @@ class Arguments {
         _alluser(false),
         _fdtransfer(false),
         _fdtransfer_path(NULL),
+        _collect(false),
         _target_cpu(-1),
         _style(0),
         _features{1, 1, 1, 1, 1, 1},

src/main/main.cpp

@@ -601,7 +601,7 @@ int main(int argc, const char** argv) {
         signal(SIGINT, SIG_DFL);
         // Do not reset SIGTERM handler to allow graceful shutdown
 
-        run_jattach(pid, String("stop,file=") << file << "," << output << format << ",log=" << logfile);
+        run_jattach(pid, String("stop,_collect,file=") << file << "," << output << format << ",log=" << logfile);
     } else {
         if (action == "start" || action == "resume") run_fdtransfer(pid, fdtransfer);
         run_jattach(pid, String(action) << ",file=" << file << "," << output << format << params << ",log=" << logfile);

src/profiler.cpp

@@ -1368,7 +1368,9 @@ Error Profiler::flushJfr() {
 
 Error Profiler::dump(Writer& out, Arguments& args) {
     MutexLocker ml(_state_lock);
-    if (_state != IDLE && _state != RUNNING) {
+    if (args._collect && _state == TERMINATED) {
+        return Error::OK;
+    } else if (_state != IDLE && _state != RUNNING) {
         return Error("Profiler has not started");
     }