lestarch: fixing .start in UTs, docs, templates

nasa · Sep 2, 2021 · 3f6a902 · 3f6a902
1 parent ae37a92
commit 3f6a902
Show file tree

Hide file tree

Showing 26 changed files with 41 additions and 132 deletions.
diff --git a/Autocoders/Python/src/fprime_ac/generators/templates/topology/publicInstanceTopologyCpp.tmpl b/Autocoders/Python/src/fprime_ac/generators/templates/topology/publicInstanceTopologyCpp.tmpl
@@ -43,7 +43,7 @@ void $(name)Init(void) {
 
 void $(name)Start(void) {
     // Active component startup
-    // start(identifier, priority, stack_size)
+    // start()
 #for $startup_template  in $component_startups:
     ${startup_template}
 #end for

diff --git a/Autocoders/Python/src/fprime_ac/generators/templates/topology/publicTopologyCpp.tmpl b/Autocoders/Python/src/fprime_ac/generators/templates/topology/publicTopologyCpp.tmpl
@@ -44,7 +44,7 @@ void construct$(name)Architecture(void) {
 #else:
 ###
     // Active component startup
-    // start(identifier, priority, stack_size)
+    // start()
 #for $startup_template  in $component_startups:
     ${startup_template}
 #end for

diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceTopologyCppVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceTopologyCppVisitor.py
@@ -381,13 +381,9 @@ def publicVisit(self, obj):
             startup_template = ""
             if component["kind"] == "active":
                 if obj.is_ptr:
-                    startup_template = (
-                        """{name}_ptr->start(0, 100, 10 * 1024);""".format(**component)
-                    )
+                    startup_template = """{name}_ptr->start();""".format(**component)
                 else:
-                    startup_template = """{name}.start(0, 100, 10 * 1024);""".format(
-                        **component
-                    )
+                    startup_template = """{name}.start();""".format(**component)
                 c.component_startups.append(startup_template)
         #
 

diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceTopologyHVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceTopologyHVisitor.py
@@ -388,13 +388,9 @@ def publicVisit(self, obj):
             startup_template = ""
             if component["kind"] == "active":
                 if obj.is_ptr:
-                    startup_template = (
-                        """{name}_ptr->start(0, 100, 10 * 1024);""".format(**component)
-                    )
+                    startup_template = """{name}_ptr->start();""".format(**component)
                 else:
-                    startup_template = """{name}.start(0, 100, 10 * 1024);""".format(
-                        **component
-                    )
+                    startup_template = """{name}.start();""".format(**component)
                 c.component_startups.append(startup_template)
         #
 

diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/TopologyCppVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/TopologyCppVisitor.py
@@ -379,13 +379,9 @@ def publicVisit(self, obj):
             startup_template = ""
             if component["kind"] == "active":
                 if obj.is_ptr:
-                    startup_template = (
-                        """{name}_ptr->start(0, 100, 10 * 1024);""".format(**component)
-                    )
+                    startup_template = """{name}_ptr->start();""".format(**component)
                 else:
-                    startup_template = """{name}.start(0, 100, 10 * 1024);""".format(
-                        **component
-                    )
+                    startup_template = """{name}.start();""".format(**component)
                 c.component_startups.append(startup_template)
         #
 

diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/TopologyHVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/TopologyHVisitor.py
@@ -389,13 +389,9 @@ def publicVisit(self, obj):
             startup_template = ""
             if component["kind"] == "active":
                 if obj.is_ptr:
-                    startup_template = (
-                        """{name}_ptr->start(0, 100, 10 * 1024);""".format(**component)
-                    )
+                    startup_template = """{name}_ptr->start();""".format(**component)
                 else:
-                    startup_template = """{name}.start(0, 100, 10 * 1024);""".format(
-                        **component
-                    )
+                    startup_template = """{name}.start();""".format(**component)
                 c.component_startups.append(startup_template)
         #
 

diff --git a/Autocoders/Python/test/app1/DuckAppAcRef.cpp b/Autocoders/Python/test/app1/DuckAppAcRef.cpp
@@ -49,9 +49,9 @@ void constructArchitecture(void) {
 
     // Active component startup
 
-    // start(identifier, stack size, priority)
-    hueyComp_ptr->start(0, 10 * 1024, 100);
-    dueyComp_ptr->start(0, 10 * 1024, 100);
+    // start()
+    hueyComp_ptr->start();
+    dueyComp_ptr->start();
 
     dumparch();
 }

diff --git a/Autocoders/Python/test/app1/ReadMe b/Autocoders/Python/test/app1/ReadMe
diff --git a/Autocoders/Python/test/app1/scons.log b/Autocoders/Python/test/app1/scons.log
diff --git a/Autocoders/Python/test/app2/Top.cpp b/Autocoders/Python/test/app2/Top.cpp
@@ -55,9 +55,9 @@ void constructArchitecture(void) {
 
 	// Active component startup
 
-	// start(identifier, stack size, priority)
-	C1_ptr->start(0, 10 * 1024, 100);
-	C2_ptr->start(0, 10 * 1024, 100);
+	// start()
+	C1_ptr->start();
+	C2_ptr->start();
 
 	dumparch();
 

diff --git a/Autocoders/Python/test/app2/test/ut/Top.cpp b/Autocoders/Python/test/app2/test/ut/Top.cpp
@@ -55,9 +55,9 @@ void constructArchitecture(void) {
 
 	// Active component startup
 
-	// start(identifier, stack size, priority)
-	C1_ptr->start(0, 10 * 1024, 100);
-	C2_ptr->start(0, 10 * 1024, 100);
+	// start()
+	C1_ptr->start();
+	C2_ptr->start();
 
 	dumparch();
 

diff --git a/Autocoders/Python/test/app4/app2AppAcRef.cpp b/Autocoders/Python/test/app4/app2AppAcRef.cpp
@@ -52,8 +52,8 @@ void constructArchitecture(void) {
     hueyComp_ptr->setoutputPort2Msg1OutputPort(0, hub1Comp_ptr->getinputPort2SerializeInputPort(0));
 
     // Active component startup
-    // start(identifier, stack size, priority)
-    hueyComp_ptr->start(0, 10 * 1024, 100);
+    // start()
+    hueyComp_ptr->start();
     dumparch();
 }
 

diff --git a/Autocoders/Python/test/cnt_only/Top.cpp b/Autocoders/Python/test/cnt_only/Top.cpp
@@ -36,8 +36,8 @@ int main(int argc, char* argv[])  {
 	constructArchitecture();
 
         //Start Components
-        Huey_ptr->start(0, 10 * 1024, 100);
-        Duey_ptr->start(0, 10 * 1024, 100);
+        Huey_ptr->start();
+        Duey_ptr->start();
 
 	// Ask for input to huey or duey here.
 	char in[80];

diff --git a/Autocoders/Python/test/cnt_only/test/ut/Top.cpp b/Autocoders/Python/test/cnt_only/test/ut/Top.cpp
@@ -37,8 +37,8 @@ int main(int argc, char* argv[])  {
 	constructDuckArchitecture();
 
         //Start Components
-        Huey.start(0, 10 * 1024, 100);
-        Duey.start(0, 10 * 1024, 100);
+        Huey.start();
+        Duey.start();
 
 	// Ask for input to huey or duey here.
 	char in[80];

diff --git a/Autocoders/Python/test/command_string/main.cpp b/Autocoders/Python/test/command_string/main.cpp
@@ -14,7 +14,7 @@ int main(int argc, char* argv[]) {
 
 	TestCommand1Impl testImpl("TestCmdImpl");
 	testImpl.init(10);
-	testImpl.start(10,10*1024,100);
+	testImpl.start();
 	TestCommandSourceImpl cmdSrc("TestCmdSource");
 	cmdSrc.init();
 

diff --git a/Autocoders/Python/test/partition/Top.cpp b/Autocoders/Python/test/partition/Top.cpp
@@ -66,8 +66,8 @@ void constructArchitecture(void) {
 	partitionComp_ptr->getoutputPort2SerializeOutputPort()->registerSerialPort(hueyComp_ptr->getinputPort3Msg3InputPort());
 
 	// Active component startup
-	// start(identifier, stack size, priority)
-	hueyComp_ptr->start(0, 10 * 1024, 100);
+	// start()
+	hueyComp_ptr->start();
 
 	dumparch();
 

diff --git a/Autocoders/Python/test/passive/Top.cpp b/Autocoders/Python/test/passive/Top.cpp
@@ -51,8 +51,8 @@ void constructArchitecture(void) {
 
 	// Active component startup
 
-	// start(identifier, stack size, priority)
-	C1_ptr->start(0, 10 * 1024, 100);
+	// start()
+	C1_ptr->start();
 
 	dumparch();
 }

diff --git a/Autocoders/Python/test/serial_passive/test/ut/main.cpp b/Autocoders/Python/test/serial_passive/test/ut/main.cpp
@@ -7,7 +7,7 @@ int main(int argc, char* argv[]) {
     serImpl.init(10,100);
     ExampleComponents::ExampleComponentImpl exImpl("ExImpl");
     exImpl.init();
-    serImpl.start(100,100,10*1024);
+    serImpl.start();
 
     // connect ports
     exImpl.set_exampleOutput_OutputPort(0,serImpl.get_SerialInSync_InputPort(0));

diff --git a/Autocoders/Python/test/serialize_template/main.cpp b/Autocoders/Python/test/serialize_template/main.cpp
@@ -27,7 +27,7 @@ int main(int argc, char* argv[]) {
 #endif
 
     comp.init(10);
-    comp.start(10, 10 * 1024, 100);
+    comp.start();
 
     AnotherExample::InputExamplePort* port = comp.getexampleInputExampleInputPort(0);
 

diff --git a/Autocoders/Python/test/serialize_user/main.cpp b/Autocoders/Python/test/serialize_user/main.cpp
@@ -24,7 +24,7 @@ int main(int argc, char* argv[]) {
 #endif
 
     comp.init(10);
-    comp.start(10, 10 * 1024, 100);
+    comp.start();
 
     AnotherExample::InputExamplePort* port = comp.get_exampleInput_InputPort(0);
 

diff --git a/Autocoders/Python/test/stress/main.cpp b/Autocoders/Python/test/stress/main.cpp
@@ -27,7 +27,7 @@ int main(int argc, char* argv[]) {
     ;
 #endif
     testImpl.init(10);
-    testImpl.start(10, 10 * 1024, 100);
+    testImpl.start();
 
     TestCommandSourceImpl cmdSrc
 #if FW_OBJECT_NAMES

diff --git a/Drv/Ip/SocketReadTask.cpp b/Drv/Ip/SocketReadTask.cpp
@@ -32,7 +32,7 @@ void SocketReadTask::startSocketTask(const Fw::StringBase &name,
     FW_ASSERT(not this->m_stop);        // It is a coding error to stop the thread before it is started
     m_reconnect = reconnect;
     // Note: the first step is for the IP socket to open the the port
-    Os::Task::TaskStatus stat = m_task.start(name, SocketReadTask::readTask, this, priority, stack, cpuAffinity, 0);
+    Os::Task::TaskStatus stat = m_task.start(name, SocketReadTask::readTask, this, priority, stack, cpuAffinity);
     FW_ASSERT(Os::Task::TASK_OK == stat, static_cast<NATIVE_INT_TYPE>(stat));
 }
 

diff --git a/Fw/Comp/ActiveComponentBase.cpp b/Fw/Comp/ActiveComponentBase.cpp
@@ -55,8 +55,7 @@ namespace Fw {
                     static_cast<NATIVE_UINT_TYPE>(identifier));
     }
 
-    void ActiveComponentBase::start(NATIVE_UINT_TYPE priority_in, NATIVE_UINT_TYPE stackSize, NATIVE_UINT_TYPE cpuAffinity, NATIVE_UINT_TYPE identifier) {
-        NATIVE_INT_TYPE priority = static_cast<NATIVE_INT_TYPE>(priority_in);
+    void ActiveComponentBase::start(NATIVE_UINT_TYPE priority, NATIVE_UINT_TYPE stackSize, NATIVE_UINT_TYPE cpuAffinity, NATIVE_UINT_TYPE identifier) {
         Os::TaskString taskName;
 
 #if FW_OBJECT_NAMES == 1

diff --git a/Os/test/ut/OsTaskTest.cpp b/Os/test/ut/OsTaskTest.cpp
@@ -22,6 +22,6 @@ void startTestTask(int iters) {
     long localIter = iters;
     testTask = new Os::Task();
     Os::TaskString name("ATestTask");
-    Os::Task::TaskStatus stat = testTask->start(name,12,100,10*1024,someTask,(void*) localIter);
+    Os::Task::TaskStatus stat = testTask->start(name, someTask, (void*)localIter);
     ASSERT_EQ(stat, Os::Task::TASK_OK);
 }
diff --git a/Utils/test/ut/LockGuardTester.cpp b/Utils/test/ut/LockGuardTester.cpp
@@ -58,7 +58,7 @@ namespace Utils {
 
     {
       LockGuard guard(data.mutex);
-      stat = testTask.start(name,12,100,10*1024,taskMethod,(void*) &data);
+      stat = testTask.start(name, taskMethod, (void*) &data);
       ASSERT_EQ(stat, Os::Task::TASK_OK);
       Os::Task::delay(100);
       ASSERT_EQ(data.i, 0);

diff --git a/docs/Tutorials/MathComponent/Tutorial.md b/docs/Tutorials/MathComponent/Tutorial.md
@@ -1871,19 +1871,12 @@ The thread for the active `MathSender` component needs to be started:
 `Ref/Top/Topology.cpp`, line 357:
 
 ```c++
-    pingRcvr.start(0, 100, 10*1024);
+    pingRcvr.start();
 
-    mathSender.start(0,100,10*1024);
+    mathSender.start();
 ```
 
-The arguments to the `start()` function is as follows:
-
-|Argument|Usage|
-|---|---|
-|1|Thread ID, unique value for each thread. Not used for Linux|
-|2|Thread priority. Passed to underlying OS|
-|3|Thread stack size. Passed to underlying OS|
-
+The start call without arguments uses the Os defaults for priority, stack size, etc.
 
 The `MathReceiver` queued component will execute on the thread of the 1Hz rate group, which will be shown later.
 It does not need to to have a thread started, since queued components do not have threads.