Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Belle2016-10-06 09:13:15 +0000
committerJan Belle2016-10-06 09:13:15 +0000
commit45fd4bd2fc91fbc427135303ed8cdb16b319ad97 (patch)
tree3f2488ce3fd0e54defcec01b919e6c8aa5eb6ee5 /runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/SubSystemClassBase.cpp
parente7a667dc6e613fba71c22be5ffaa60fb2ddbb571 (diff)
downloadorg.eclipse.etrice-45fd4bd2fc91fbc427135303ed8cdb16b319ad97.tar.gz
org.eclipse.etrice-45fd4bd2fc91fbc427135303ed8cdb16b319ad97.tar.xz
org.eclipse.etrice-45fd4bd2fc91fbc427135303ed8cdb16b319ad97.zip
[runtime.cpp] Refactored cpp runtime
- Refactored initialization process - Fixed RTObject double deleting children - Sub actors are now static members - Added ReplicatedActorClassBase for replicated Actors [generator.cpp] Modified ActorClassGen and NodeGen to fit the runtime changes Change-Id: I4fc5835c24330a27d00eafbf71dc412a987ec219
Diffstat (limited to 'runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/SubSystemClassBase.cpp')
-rw-r--r--runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/SubSystemClassBase.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/SubSystemClassBase.cpp b/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/SubSystemClassBase.cpp
index 854d6ed8f..d7e33a04a 100644
--- a/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/SubSystemClassBase.cpp
+++ b/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/SubSystemClassBase.cpp
@@ -33,6 +33,7 @@ SubSystemClassBase::SubSystemClassBase(IRTObject* parent, std::string name) :
DebuggingService::getInstance().getAsyncLogger().open();
DebuggingService::getInstance().getSyncLogger().setMSC(name + "_Sync", "log/");
DebuggingService::getInstance().getSyncLogger().open();
+ DebuggingService::getInstance().getSyncLogger().setObjectName("main");
RTServices::getInstance().setSubSystem(this);
}
@@ -48,8 +49,9 @@ void SubSystemClassBase::init() {
// normaly the ports will address the correct target message service directly
// it is just for test purposes
// RTServices::getInstance().getMsgSvcCtrl().connectAll();
-
- instantiateActors();
+ mapThreads();
+ initialize();
+ setProbesActive(true, true);
// std::cout << toStringRecursive() << std::endl;
// initialize all actor instances

Back to the top