Merge pull request #28 from intel-innersource/fix/process-target-crash

Fixing stale process selection crash in release

Author: markgalvan-intel

IntelPresentMon/AppCef/Web/src/App.vue

@@ -127,6 +127,7 @@ export default Vue.extend({
   async created() {
     Api.registerPresentmonInitFailedHandler(this.handlePresentmonInitFailed);
     Api.registerOverlayDiedHandler(this.handleOverlayDied);
+    Api.registerStalePidHandler(this.handleStalePid);
     await Api.launchKernel();
     await Metrics.load();
     await Hotkey.refreshOptions();
@@ -178,6 +179,11 @@ export default Vue.extend({
     handleTargetLost(pid: number) {
       PrefStore.setPid(null);
     },
+    handleStalePid() {
+      PrefStore.setPid(null);
+      Notifications.notify({text: 'Selected process has already exited.'});
+      console.warn('selected pid was stale');
+    },
     async handleHotkeyFired(action: Action) {
       if (action === Action.ToggleCapture) {
         if (this.pid !== null) {

IntelPresentMon/AppCef/Web/src/core/api.ts

@@ -140,4 +140,7 @@ export class Api {
     static registerTargetLostHandler(callback: (pid: number) => void) {
         this.core.registerSignalHandler('targetLost', callback);
     }
+    static registerStalePidHandler(callback: () => void) {
+        this.core.registerSignalHandler('stalePid', callback);
+    }
 }

IntelPresentMon/AppCef/source/DataBindAccessor.cpp

@@ -27,6 +27,10 @@ namespace p2c::client::cef
         {
             CefPostTask(TID_RENDERER, base::BindOnce(&DBAKernelHandler::PresentmonInitFailedTask_, base::Unretained(this)));
         }
+        void OnStalePidSelected() override
+        {
+            CefPostTask(TID_RENDERER, base::BindOnce(&DBAKernelHandler::StalePidTask_, base::Unretained(this)));
+        }
     private:
         // functions needed for CefPostTask (which cannot handle lambdas)
         void TargetLostTask_(uint32_t pid_)
@@ -41,6 +45,10 @@ namespace p2c::client::cef
         {
             pSignals->SignalPresentmonInitFailed();
         }
+        void StalePidTask_()
+        {
+            pSignals->SignalStalePid();
+        }
         // data
         util::SignalManager* pSignals;
     };

IntelPresentMon/AppCef/source/util/SignalManager.cpp

@@ -57,4 +57,9 @@ namespace p2c::client::util
 	{
 		ImplementSignal_(Keys::overlayDied());
 	}
+	// stalePid()
+	void SignalManager::SignalStalePid()
+	{
+		ImplementSignal_(Keys::stalePid());
+	}
 }

IntelPresentMon/AppCef/source/util/SignalManager.h

@@ -11,7 +11,8 @@
 	X_(targetLost) \
 	X_(hotkeyFired) \
 	X_(presentmonInitFailed) \
-	X_(overlayDied)
+	X_(overlayDied) \
+	X_(stalePid)
 
 
 namespace p2c::client::util
@@ -44,6 +45,7 @@ namespace p2c::client::util
 		void SignalHotkeyFired(uint32_t action); // hotkeyFired(action:number)
 		void SignalPresentmonInitFailed(); // presentmonInitFailed()
 		void SignalOverlayDied(); // overlayDied()
+		void SignalStalePid(); // stalePid()
 	private:
 		// functions
 		template<typename... Ts>

IntelPresentMon/Core/source/kernel/Kernel.cpp

@@ -161,12 +161,14 @@ namespace p2c::kern
                 }
                 catch (const TargetLostException&)
                 {
-                    if (pOverlayContainer)
-                    {
+                    if (pOverlayContainer) {
                         pHandler->OnTargetLost(pOverlayContainer->GetProcess().pid);
                         pOverlayContainer.reset();
                         pPushedSpec.reset();
                     }
+                    else {
+                        pHandler->OnStalePidSelected();
+                    }
                 }
                 catch (...)
                 {

IntelPresentMon/Core/source/kernel/KernelHandler.h

@@ -13,5 +13,6 @@ namespace p2c::kern
 		virtual void OnTargetLost(uint32_t pid) = 0;
 		virtual void OnOverlayDied() = 0;
 		virtual void OnPresentmonInitFailed() = 0;
+		virtual void OnStalePidSelected() = 0;
 	};
 }

IntelPresentMon/Core/source/kernel/OverlayContainer.cpp

@@ -56,7 +56,8 @@ namespace p2c::kern
         }
         else
         {
-            p2clog.warn(L"spec-specified pid not in process map").ex(TargetLostException{}).commit();
+            p2clog.warn(L"spec-specified pid not in process map").commit();
+            throw TargetLostException{};
         }
     }
     void OverlayContainer::RebuildDocument(std::shared_ptr<OverlaySpec> pSpec_)