Merge pull request #147 from Geson-anko/BaseApp/Awake

Base app/awake
Geson-anko · May 22, 2022 · 87c6803 · 87c6803
2 parents f8e57bb + bba4734
commit 87c6803
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 3 deletions.
diff --git a/JarvisEngine/apps/base_app.py b/JarvisEngine/apps/base_app.py
@@ -57,6 +57,8 @@ class BaseApp(object):
     Override methods
     - Init()  
         called at end of `__init__`
+    - Awake()
+        Called at the begin of process/thread.
     """
 
 
@@ -364,6 +366,8 @@ def _launch(self, process_shared_values:FolderDict_withLock) -> None:
         Launch all applications as other threads or processes.
         """
         self.logger.info("launch")
+        self.Awake()
+
         self.process_shared_values = process_shared_values
         self.prepare_for_launching_thread_apps()
         self.launch_child_apps()
@@ -380,3 +384,5 @@ def launch(self, process_shared_values:FolderDict_withLock) -> None:
             self.logger.exception(e)
 
 
+    def Awake(self) -> None:
+        """Called at begin of process/thread."""
diff --git a/TestEngineProject/App0/app.py b/TestEngineProject/App0/app.py
@@ -12,3 +12,9 @@ def RegisterProcessSharedValues(self, sync_manager) -> None:
     def RegisterThreadSharedValues(self) -> None:
         super().RegisterThreadSharedValues()
         self.addThreadSharedValue("set_obj", {"number"})
+
+    def Awake(self) -> None:
+        self.logger.info("Awake")
+        assert self.process_shared_values == None
+
+
diff --git a/TestEngineProject/App1/App1_1/app.py b/TestEngineProject/App1/App1_1/app.py
@@ -12,4 +12,8 @@ def RegisterProcessSharedValues(self, sync_manager) -> None:
 
     def RegisterThreadSharedValues(self) -> None:
         super().RegisterThreadSharedValues()
-        self.addThreadSharedValue("tuple_obj",(True,False))
+        self.addThreadSharedValue("tuple_obj",(True,False))
+
+    def Awake(self) -> None:
+        self.logger.info("Awake")
+        assert self.process_shared_values == None
diff --git a/TestEngineProject/App1/App1_2/app.py b/TestEngineProject/App1/App1_2/app.py
@@ -11,4 +11,8 @@ def RegisterProcessSharedValues(self, sync_manager) -> None:
 
     def RegisterThreadSharedValues(self) -> None:
         super().RegisterThreadSharedValues()
-        self.addThreadSharedValue("list_obj", [1,2,3])
+        self.addThreadSharedValue("list_obj", [1,2,3])
+
+    def Awake(self) -> None:
+        self.logger.info("Awake")
+        assert self.process_shared_values == None
diff --git a/TestEngineProject/App1/app.py b/TestEngineProject/App1/app.py
@@ -13,4 +13,8 @@ def RegisterProcessSharedValues(self, sync_manager) -> None:
 
     def RegisterThreadSharedValues(self) -> None:
         super().RegisterThreadSharedValues()
-        self.addThreadSharedValue("range_obj",range(10))
+        self.addThreadSharedValue("range_obj",range(10))
+
+    def Awake(self) -> None:
+        self.logger.info("Awake")
+        assert self.process_shared_values == None
diff --git a/tests/apps/test_base_app_launch.py b/tests/apps/test_base_app_launch.py
@@ -35,11 +35,18 @@ def test_launch(caplog):
         time.sleep(0.1)
         rec_tup = caplog.record_tuples
 
+        # launch
         assert ("MAIN", INFO, "launch") in rec_tup
         assert ("MAIN.App0", INFO, "launch") in rec_tup
         assert ("MAIN.App1", INFO, "launch") in rec_tup
         assert ("MAIN.App1.App1_1", INFO, "launch") in rec_tup
         assert ("MAIN.App1.App1_2", INFO, "launch") in rec_tup
 
+        # Awake
+        assert ("MAIN.App0", INFO, "Awake") in rec_tup
+        assert ("MAIN.App1", INFO, "Awake") in rec_tup
+        assert ("MAIN.App1.App1_1", INFO, "Awake") in rec_tup
+        assert ("MAIN.App1.App1_2", INFO, "Awake") in rec_tup
+
     for record in caplog.records:
         assert record.levelno < WARNING, record.message