From bdbfceaec7cf986fdde80d16e77e8eea9eb2a192 Mon Sep 17 00:00:00 2001
From: DongHyun Song <dh81.song@samsung.com>
Date: Fri, 3 Dec 2021 11:26:23 +0900
Subject: [PATCH] [Service] Terminate service apps one by one

When 2 apps are terminated at the same time, we faced lots of thread
safety issues.
This patch will terminate service apps one by one.

Change-Id: I96d91213b1b06968f598b01660d86cdaa11e8dd6
Signed-off-by: DongHyun Song <dh81.song@samsung.com>
---
 wrt_app/service/service_manager.ts | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/wrt_app/service/service_manager.ts b/wrt_app/service/service_manager.ts
index fe3fd77..c639eba 100644
--- a/wrt_app/service/service_manager.ts
+++ b/wrt_app/service/service_manager.ts
@@ -6,12 +6,24 @@ interface WorkerMap {
   [id: string]: any;
 }
 let workers: WorkerMap = {};
+let dyingWorkerQueue: WorkerMap = {};
 
 Object.defineProperty(global, 'serviceType', {
   value: wrt.getServiceModel(),
   writable: false
 });
 
+function checkDyingWorker() {
+  let dyingWorkers = Object.keys(dyingWorkerQueue);
+  if (dyingWorkers.length) {
+    let workerId = dyingWorkers[0];
+    if (dyingWorkerQueue[workerId] === 'will-terminate') {
+      dyingWorkerQueue[workerId] = 'terminated';
+      workers[workerId].terminate();
+    }
+  }
+}
+
 function createWorker(id: string, startService: string, filename: string) {
   if (workers[id]) {
     workers[id].postMessage({ type: 'wake' });
@@ -27,14 +39,17 @@ function createWorker(id: string, startService: string, filename: string) {
   });
   workers[id].on('message', (message: string) => {
     if (message === 'will-terminate') {
-      workers[id].terminate();
+      dyingWorkerQueue[id] = message;
+      checkDyingWorker();
     }
   });
   workers[id].on('exit', (code: number) => {
     wrt.tv?.serviceUmount(id);
+    delete dyingWorkerQueue[id];
     delete workers[id];
     let runningServices = Object.keys(workers);
-    console.debug(`exit code(${code}), remain services(${runningServices})`);
+    console.debug(`${id} terminated, remain services(${runningServices})`);
+    checkDyingWorker();
   });
 }
 
-- 
2.7.4