better handling of fdtransfer

Author: Baraa-Hasheesh

src/profiler.cpp

@@ -1059,6 +1059,21 @@ Error Profiler::start(Arguments& args, bool reset) {
         VM::tryAttach();
     }
 
+    if (args._fdtransfer) {
+        if (!FdTransferClient::connectToServer(args._fdtransfer_path)) {
+            return Error("Failed to initialize FdTransferClient");
+        }
+    }
+
+    Error error = startInternal(args, reset);
+    if (error) {
+        FdTransferClient::closePeer();
+    }
+
+    return error;
+}
+
+Error Profiler::startInternal(Arguments& args, bool reset) {
     Error error = checkJvmCapabilities();
     if (error) {
         return error;
@@ -1195,13 +1210,6 @@ Error Profiler::start(Arguments& args, bool reset) {
         }
     }
 
-    if (args._fdtransfer) {
-        if (!FdTransferClient::connectToServer(args._fdtransfer_path)) {
-            error = Error("Failed to initialize FdTransferClient");
-            goto error1;
-        }
-    }
-
     error = _engine->start(args);
     if (error) {
         goto error1;
@@ -1287,7 +1295,6 @@ Error Profiler::start(Arguments& args, bool reset) {
     _jfr.stop();
     unlockAll();
 
-    FdTransferClient::closePeer();
     return error;
 }
 

src/profiler.h

@@ -196,6 +196,7 @@ class Profiler {
     void shutdown(Arguments& args);
     Error check(Arguments& args);
     Error start(Arguments& args, bool reset);
+    Error startInternal(Arguments& args, bool reset);
     Error stop(bool restart = false);
     Error flushJfr();
     Error dump(Writer& out, Arguments& args);