40 update demo project (#43)

aregtech · web-flow · commit 9c1608e11590 · 2025-10-26T13:53:14.000+01:00
* Updated demo project

* Update demo to adapt to the new changes of areg-sdk

* Update submodule after bug fix.

* update demo and areg-sdk submodules
diff --git a/demo/01_minimalrpc/src/main.cpp b/demo/01_minimalrpc/src/main.cpp
@@ -68,14 +68,14 @@ constexpr char const _modelName[]{ "ServiceModel" };
 // Describe model, register the service and the client in 2 different threads "Thread1" and "Thread2"
 BEGIN_MODEL(_modelName)
     // Thread 1 without watchdog, contains a service provider
-    BEGIN_REGISTER_THREAD( "Thread1", NECommon::WATCHDOG_IGNORE )
+    BEGIN_REGISTER_THREAD( "Thread1" )
         BEGIN_REGISTER_COMPONENT( "ServiceProvider", ServiceProvider )
             REGISTER_IMPLEMENT_SERVICE( NEHelloService::ServiceName, NEHelloService::InterfaceVersion )
         END_REGISTER_COMPONENT( "ServiceProvider" )
     END_REGISTER_THREAD( "Thread1" )
 
     // Thread 2 without watchdog, contains a service consumer
-    BEGIN_REGISTER_THREAD( "Thread2", NECommon::WATCHDOG_IGNORE )
+    BEGIN_REGISTER_THREAD( "Thread2" )
         BEGIN_REGISTER_COMPONENT( "ServiceClient", ServiceConsumer )
             REGISTER_DEPENDENCY( "ServiceProvider" ) /* dependency reference to the remote service*/
         END_REGISTER_COMPONENT( "ServiceClient" )
diff --git a/demo/02_minimalipc/src/consumeripc.cpp b/demo/02_minimalipc/src/consumeripc.cpp
@@ -62,7 +62,7 @@ constexpr char const _modelName[]{ "ServiceModel" };
 // Describe model, register the service and the client in 2 different threads "Thread1" and "Thread2"
 BEGIN_MODEL(_modelName)
     // Thread 1 without watchdog, contains a service consumer
-    BEGIN_REGISTER_THREAD( "Thread1", NECommon::WATCHDOG_IGNORE )
+    BEGIN_REGISTER_THREAD( "Thread1" )
         BEGIN_REGISTER_COMPONENT( "ServiceClient", ServiceConsumer )
             REGISTER_DEPENDENCY( "ServiceProvider" ) /* dependency reference to the remote service*/
         END_REGISTER_COMPONENT( "ServiceClient" )
diff --git a/demo/02_minimalipc/src/provideripc.cpp b/demo/02_minimalipc/src/provideripc.cpp
@@ -53,7 +53,7 @@ constexpr char const _modelName[]{ "ServiceModel" };
 // Describe model, register the service and the client in 2 different threads "Thread1" and "Thread2"
 BEGIN_MODEL(_modelName)
     // Thread 1, provides a service
-    BEGIN_REGISTER_THREAD( "Thread1", NECommon::WATCHDOG_IGNORE )
+    BEGIN_REGISTER_THREAD( "Thread1" )
         BEGIN_REGISTER_COMPONENT( "ServiceProvider", ServiceProvider )
             REGISTER_IMPLEMENT_SERVICE( NEHelloService::ServiceName, NEHelloService::InterfaceVersion )
         END_REGISTER_COMPONENT( "ServiceProvider" )
diff --git a/demo/03_helloservice/multiprocess/clientproc/src/main.cpp b/demo/03_helloservice/multiprocess/clientproc/src/main.cpp
@@ -26,7 +26,7 @@ const String _client(NEUtilities::generateName("ServiceClient"));
 // Describe model, register the service consumer (client)
 BEGIN_MODEL(_modelName)
 
-    BEGIN_REGISTER_THREAD( "Thread1", NECommon::WATCHDOG_IGNORE)
+    BEGIN_REGISTER_THREAD( "Thread1" )
         BEGIN_REGISTER_COMPONENT( _client, ClientComponent )
             REGISTER_DEPENDENCY( "ServiceComponent" ) /* reference to the service*/
         END_REGISTER_COMPONENT( _client )
diff --git a/demo/03_helloservice/multiprocess/serviceproc/src/main.cpp b/demo/03_helloservice/multiprocess/serviceproc/src/main.cpp
@@ -21,7 +21,7 @@ constexpr char const _modelName[]{ "ServiceModel" };
 // Describe model, register the provided service in this model
 BEGIN_MODEL(_modelName)
 
-    BEGIN_REGISTER_THREAD( "Thread1", NECommon::WATCHDOG_IGNORE )
+    BEGIN_REGISTER_THREAD( "Thread1" )
         BEGIN_REGISTER_COMPONENT( "ServiceComponent", ServiceComponent )
             REGISTER_IMPLEMENT_SERVICE( NEHelloService::ServiceName, NEHelloService::InterfaceVersion )
         END_REGISTER_COMPONENT( "ServiceComponent" )
diff --git a/demo/03_helloservice/onethread/src/main.cpp b/demo/03_helloservice/onethread/src/main.cpp
@@ -22,7 +22,7 @@ constexpr char const _modelName[]{ "ServiceModel" };
 // Describe model, register the service and the client in one thread "Thread1"
 BEGIN_MODEL(_modelName)
 
-    BEGIN_REGISTER_THREAD( "Thread1", NECommon::WATCHDOG_IGNORE )
+    BEGIN_REGISTER_THREAD( "Thread1" )
         // register service in the thread
         BEGIN_REGISTER_COMPONENT("ServiceComponent", ServiceComponent )
             REGISTER_IMPLEMENT_SERVICE( NEHelloService::ServiceName, NEHelloService::InterfaceVersion )
diff --git a/demo/03_helloservice/twothreads/src/main.cpp b/demo/03_helloservice/twothreads/src/main.cpp
@@ -22,14 +22,14 @@ constexpr char const _modelName[]{ "ServiceModel" };
 // Describe model, register the service and the client in 2 different threads "Thread1" and "Thread2"
 BEGIN_MODEL(_modelName)
     // Thread 1, provides a service
-    BEGIN_REGISTER_THREAD( "Thread1", NECommon::WATCHDOG_IGNORE )
+    BEGIN_REGISTER_THREAD( "Thread1" )
         BEGIN_REGISTER_COMPONENT( "ServiceComponent", ServiceComponent )
             REGISTER_IMPLEMENT_SERVICE( NEHelloService::ServiceName, NEHelloService::InterfaceVersion )
         END_REGISTER_COMPONENT( "ServiceComponent" )
     END_REGISTER_THREAD( "Thread1" )
 
     // Thread 2, is a service client.
-    BEGIN_REGISTER_THREAD( "Thread2", NECommon::WATCHDOG_IGNORE )
+    BEGIN_REGISTER_THREAD( "Thread2" )
         BEGIN_REGISTER_COMPONENT( "ServiceClient", ClientComponent )
             REGISTER_DEPENDENCY( "ServiceComponent" ) /* reference to the service*/
         END_REGISTER_COMPONENT( "ServiceClient" )
diff --git a/demo/13_locsvc/locservice/src/main.cpp b/demo/13_locsvc/locservice/src/main.cpp
@@ -36,7 +36,7 @@ constexpr char const _roleName[]    { "TestServiceComponent" }; //!< Service rol
 BEGIN_MODEL(_modelName)
 
     // define component thread
-    BEGIN_REGISTER_THREAD( "TestServiceThread", NECommon::WATCHDOG_IGNORE)
+    BEGIN_REGISTER_THREAD( "TestServiceThread" )
         // define component, set role name. This will trigger default 'create' and 'delete' methods of component
         BEGIN_REGISTER_COMPONENT(_roleName, ServicingComponent )
             // register HelloWorld service implementation.
@@ -53,7 +53,7 @@ BEGIN_MODEL(_modelName)
     //////////////////////////////////////////////////////////////////////////
 
     // define component thread
-    BEGIN_REGISTER_THREAD( "TestClientThread", NECommon::WATCHDOG_IGNORE)
+    BEGIN_REGISTER_THREAD( "TestClientThread" )
         // define component, set role name. This will trigger default 'create' and 'delete' methods of component
         BEGIN_REGISTER_COMPONENT( "TestServiceClient", ServiceClient )
             REGISTER_DEPENDENCY( "TestServiceComponent" )
diff --git a/demo/15_pubsvc/pubclient/src/main.cpp b/demo/15_pubsvc/pubclient/src/main.cpp
@@ -38,7 +38,7 @@ const String     _serviceClient  = NEUtilities::generateName("ServiceClient"); /
 BEGIN_MODEL(_modelName)
 
     // define component thread
-    BEGIN_REGISTER_THREAD( "TestServiceThread", NECommon::WATCHDOG_IGNORE)
+    BEGIN_REGISTER_THREAD( "TestServiceThread" )
         // define component, set role name. This will trigger default 'create' and 'delete' methods of component
         BEGIN_REGISTER_COMPONENT( _serviceClient.getString(), ServiceClient )
             // register service dependency
diff --git a/demo/15_pubsvc/pubservice/src/main.cpp b/demo/15_pubsvc/pubservice/src/main.cpp
@@ -34,7 +34,7 @@ constexpr char const _serviceName[]{ "HelloService" };  //!< The name of provide
 BEGIN_MODEL(_modelName)
 
     // define component thread
-    BEGIN_REGISTER_THREAD( "TestServiceThread", NECommon::WATCHDOG_IGNORE)
+    BEGIN_REGISTER_THREAD( "TestServiceThread" )
         // define component, set role name. This will trigger default 'create' and 'delete' methods of component
         BEGIN_REGISTER_COMPONENT(_serviceName, ServicingComponent )
             // register HelloWorld service implementation.
diff --git a/demo/19_pubfsm/pubclient/src/main.cpp b/demo/19_pubfsm/pubclient/src/main.cpp
@@ -44,7 +44,7 @@ static const char* const _compName  = NEUtilities::generateName(NECommon::Serivc
 BEGIN_MODEL(_modelName)
 
     // define component thread
-    BEGIN_REGISTER_THREAD( _threadName, NECommon::WATCHDOG_IGNORE)
+    BEGIN_REGISTER_THREAD( _threadName )
         // define component, set role name. This will trigger default 'create' and 'delete' methods of component
         BEGIN_REGISTER_COMPONENT( _compName, TrafficLightClient )
             // register TrafficController dependency.
diff --git a/demo/19_pubfsm/pubservice/src/main.cpp b/demo/19_pubfsm/pubservice/src/main.cpp
@@ -40,7 +40,7 @@ constexpr char const _threadName[] { "TestSimpleTrafficThread" };	// The name of
 BEGIN_MODEL(_modelName)
 
     // define component thread
-    BEGIN_REGISTER_THREAD( _threadName, NECommon::WATCHDOG_IGNORE)
+    BEGIN_REGISTER_THREAD( _threadName )
         // define component, set role name. This will trigger default 'create' and 'delete' methods of component
         BEGIN_REGISTER_COMPONENT( NECommon::ServiceLightController, TrafficLightService )
             // register PowerManager and TrafficController service implementation, and the dependencies (client runs in the same thread).
diff --git a/demo/20_winchat/chatter/services/ConnectionService.cpp b/demo/20_winchat/chatter/services/ConnectionService.cpp
@@ -16,7 +16,7 @@
 
 BEGIN_MODEL(NECommon::MODEL_NAME_DISTRIBUTED_CLIENT)
 
-    BEGIN_REGISTER_THREAD( NEDistributedApp::THREAD_DISTRIBUTED, NECommon::WATCHDOG_IGNORE)
+    BEGIN_REGISTER_THREAD( NEDistributedApp::THREAD_DISTRIBUTED )
         BEGIN_REGISTER_COMPONENT( NECommon::COMP_NAME_DISTRIBUTED_CLIENT, ConnectionService )
             REGISTER_DEPENDENCY( NECommon::COMP_NAME_CENTRAL_SERVER )
         END_REGISTER_COMPONENT( NECommon::COMP_NAME_DISTRIBUTED_CLIENT )
diff --git a/demo/20_winchat/register/services/ConnectionManager.cpp b/demo/20_winchat/register/services/ConnectionManager.cpp
@@ -26,7 +26,7 @@ DEF_LOG_SCOPE( centralapp_ConnectionManager_requestKeyTyping );
 
 BEGIN_MODEL(NECommon::MODEL_NAME_CENTRAL_SERVER)
 
-    BEGIN_REGISTER_THREAD( NECentralApp::THREAD_CENTRAL, NECommon::WATCHDOG_IGNORE)
+    BEGIN_REGISTER_THREAD( NECentralApp::THREAD_CENTRAL )
         BEGIN_REGISTER_COMPONENT( NECommon::COMP_NAME_CENTRAL_SERVER, ConnectionManager )
             REGISTER_IMPLEMENT_SERVICE( NEConnectionManager::ServiceName, NEConnectionManager::InterfaceVersion )
             REGISTER_IMPLEMENT_SERVICE( NECentralMessager::ServiceName, NECentralMessager::InterfaceVersion )
diff --git a/demo/22_pubwatchdog/pubclient/src/main.cpp b/demo/22_pubwatchdog/pubclient/src/main.cpp
@@ -39,7 +39,7 @@ const String     _serviceClient  = NEUtilities::generateName("ServiceClient"); /
 BEGIN_MODEL(_modelName)
 
     // define component thread
-    BEGIN_REGISTER_THREAD( "TestServiceThread", NECommon::WATCHDOG_IGNORE)
+    BEGIN_REGISTER_THREAD( "TestServiceThread" )
         // define component, set role name. This will trigger default 'create' and 'delete' methods of component
         BEGIN_REGISTER_COMPONENT( _serviceClient, ServiceClient )
             // register service dependency
diff --git a/demo/22_pubwatchdog/pubservice/src/main.cpp b/demo/22_pubwatchdog/pubservice/src/main.cpp
@@ -35,7 +35,7 @@ constexpr char const _modelName[]  { "ServiceModel" };   //!< The name of model
 BEGIN_MODEL(_modelName)
 
     // define component thread
-    BEGIN_REGISTER_THREAD( "TestServiceThread", NEHelloWatchdog::TimeoutWatchdog)
+    BEGIN_REGISTER_THREAD_EX( "TestServiceThread", NEHelloWatchdog::TimeoutWatchdog)
         // define component, set role name. This will trigger default 'create' and 'delete' methods of component
         BEGIN_REGISTER_COMPONENT( NECommon::ServiceRoleName, ServicingComponent )
             // register HelloWorld service implementation.
diff --git a/demo/24_pubunblock/pubclient/src/main.cpp b/demo/24_pubunblock/pubclient/src/main.cpp
@@ -37,7 +37,7 @@ const String     _serviceClient  = NEUtilities::generateName("ServiceClient"); /
 BEGIN_MODEL(_modelName)
 
     // define component thread
-    BEGIN_REGISTER_THREAD( "TestServiceThread", NECommon::WATCHDOG_IGNORE)
+    BEGIN_REGISTER_THREAD( "TestServiceThread" )
         // define component, set role name. This will trigger default 'create' and 'delete' methods of component
         BEGIN_REGISTER_COMPONENT( _serviceClient, ServiceClient )
             // register service dependency
diff --git a/demo/24_pubunblock/pubservice/src/main.cpp b/demo/24_pubunblock/pubservice/src/main.cpp
@@ -32,7 +32,7 @@ constexpr char const _serviceName[]{ "UnblockRequestService" }; //!< The name of
 BEGIN_MODEL( _modelName )
 
     // define component thread
-    BEGIN_REGISTER_THREAD( "TestServiceThread", NECommon::WATCHDOG_IGNORE )
+    BEGIN_REGISTER_THREAD( "TestServiceThread" )
         // define component, set role name. This will trigger default 'create' and 'delete' methods of component
         BEGIN_REGISTER_COMPONENT( _serviceName, ServiceComponent )
             // register HelloWorld service implementation.
diff --git a/demo/26_pubsubmix/pubsubctrl/src/main.cpp b/demo/26_pubsubmix/pubsubctrl/src/main.cpp
@@ -46,7 +46,7 @@ namespace
 BEGIN_MODEL( _modelName )
 
     // define component thread
-    BEGIN_REGISTER_THREAD( "TestServiceThread1", NECommon::WATCHDOG_IGNORE )
+    BEGIN_REGISTER_THREAD( "TestServiceThread1" )
         // define component, set role name. This will trigger default 'create' and 'delete' methods of component
         BEGIN_REGISTER_COMPONENT(NECommon::ContollerPublisher, PubSubController )
             // register HelloWorld service implementation.
@@ -58,7 +58,7 @@ BEGIN_MODEL( _modelName )
     END_REGISTER_THREAD( "TestServiceThread1" )
 
     // define component thread
-    BEGIN_REGISTER_THREAD( "TestServiceThread2", NECommon::WATCHDOG_IGNORE )
+    BEGIN_REGISTER_THREAD( "TestServiceThread2" )
         // define component, set role name. This will trigger default 'create' and 'delete' methods of component
         BEGIN_REGISTER_COMPONENT(SecondRole, PubSubMixed)
             // register HelloWorld service implementation.
diff --git a/demo/26_pubsubmix/pubsubdyn/src/main.cpp b/demo/26_pubsubmix/pubsubdyn/src/main.cpp
@@ -43,7 +43,7 @@ namespace
 BEGIN_MODEL(_modelName)
 
     // define component thread
-    BEGIN_REGISTER_THREAD( "DynPubSubThread1", NECommon::WATCHDOG_IGNORE)
+    BEGIN_REGISTER_THREAD( "DynPubSubThread1" )
         // define component, set role name. This will trigger default 'create' and 'delete' methods of component
         BEGIN_REGISTER_COMPONENT( SecondRole, PubSubMixed)
             // register HelloWorld service implementation.
@@ -57,7 +57,7 @@ BEGIN_MODEL(_modelName)
     END_REGISTER_THREAD( "DynPubSubThread1" )
 
     // define component thread
-    BEGIN_REGISTER_THREAD( "DynPubSubThread2", NECommon::WATCHDOG_IGNORE)
+    BEGIN_REGISTER_THREAD( "DynPubSubThread2" )
         // define component, set role name. This will trigger default 'create' and 'delete' methods of component
         BEGIN_REGISTER_COMPONENT(ThirddRole, PubSubMixed)
             // register HelloWorld service implementation.
diff --git a/thirdparty/areg-sdk b/thirdparty/areg-sdk
@@ -1 +1 @@
-Subproject commit cf8773529a9b2b78545756267c409d2ff3ae024c
+Subproject commit 3a69d0bc1f628348738f091a72a21868fc7ce188
