Make access to LauncherSocket thread safe

Instead of returning a pointer to LauncherSocket instance,
which might get deleted in meantime of just after,
route all calls to the LauncherSocket through the LauncherInterface.
Make all calls to LauncherInterface secured by the
instance mutex.

Change-Id: I751228de5f4263112471098ee08cc73a5245147e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

1 files changed, 15 insertions, 3 deletions

diff --git a/src/libs/utils/launcherinterface.h b/src/libs/utils/launcherinterface.h
index 226792499ce..971525f7506 100644
--- a/src/libs/utils/launcherinterface.h
+++ b/src/libs/utils/launcherinterface.h
@@ -27,13 +27,17 @@
 
 #include "utils_global.h"
 
+#include "processutils.h"
+
 #include <QObject>
 #include <QThread>
 
 namespace Utils {
 namespace Internal {
-class LauncherSocket;
+class CallerHandle;
+class LauncherHandle;
 class LauncherInterfacePrivate;
+class ProcessLauncherImpl;
 }
 
 class QTCREATOR_UTILS_EXPORT LauncherInterface : public QObject
@@ -42,13 +46,21 @@ class QTCREATOR_UTILS_EXPORT LauncherInterface : public QObject
 public:
     static void startLauncher(const QString &pathToLauncher = {});
     static void stopLauncher();
-    static Internal::LauncherSocket *socket();
-    static bool isStarted();
 
 signals:
     void errorOccurred(const QString &error);
 
 private:
+    friend class Utils::Internal::CallerHandle;
+    friend class Utils::Internal::LauncherHandle;
+    friend class Utils::Internal::ProcessLauncherImpl;
+
+    static bool isStarted();
+    static bool isReady();
+    static void sendData(const QByteArray &data);
+    static Utils::Internal::CallerHandle *registerHandle(quintptr token, ProcessMode mode);
+    static void unregisterHandle(quintptr token);
+
     LauncherInterface();
     ~LauncherInterface() override;