Changeset 118 in flair-src for trunk/lib/FlairCore/src

Timestamp:

Nov 17, 2016, 11:57:29 AM (8 years ago)

Author:

Sanahuja Guillaume

Message:

aded semaphore
resolved bug for rt_printf before thread is started

Location:

trunk/lib/FlairCore/src

Files:

• FrameworkManager_impl.cpp (modified) (2 diffs)
• Semaphore.cpp (copied) (copied from branches/semaphore/lib/FlairCore/src/Semaphore.cpp )
• Semaphore.h (copied) (copied from branches/semaphore/lib/FlairCore/src/Semaphore.h )
• Semaphore_impl.cpp (copied) (copied from branches/semaphore/lib/FlairCore/src/Semaphore_impl.cpp )
• Thread_impl.cpp (modified) (5 diffs)
• unexported/Semaphore_impl.h (copied) (copied from branches/semaphore/lib/FlairCore/src/unexported/Semaphore_impl.h )

trunk/lib/FlairCore/src/FrameworkManager_impl.cpp

@@ -37 +37 @@
 #ifdef __XENO__
 #include <native/task.h>
+#include <rtdk.h>
 #endif
 
@@ -119 +120 @@
   sa.sa_flags = SA_SIGINFO;
   sigaction(SIGDEBUG, &sa, NULL);
-#else
+#else //SIGDEBUG
   signal(SIGXCPU, warn_upon_switch);
-#endif
-
+#endif //SIGDEBUG
   string task_name = "Framework_" + name;
+
+  // Perform auto-init of rt_print buffers if the task doesn't do so
+  rt_print_auto_init(1);
+  // Initialise the rt_print buffer for this task explicitly
+  rt_print_init(512, task_name.c_str());
+
   int status = rt_task_shadow(NULL, task_name.c_str(), 10, 0);
   if (status != 0) {

trunk/lib/FlairCore/src/Thread_impl.cpp

@@ -26 +26 @@
 #ifdef __XENO__
 #include <rtdk.h>
-#else
+#define TH_NAME getFrameworkManager()->ObjectName() + "-" + self->ObjectName()
+#else//__XENO__
 #include <sys/resource.h>
 #include <unistd.h>
 #include <sys/syscall.h>
-#endif
+#endif//__XENO__
 
 using std::string;
@@ -61 +62 @@
   last = 0;
   cpt = 0;
+
+#ifdef __XENO__
+  // Perform auto-init of rt_print buffers if the task doesn't do so
+  rt_print_auto_init(1);
+    // Initialise the rt_print buffer for this task explicitly
+  rt_print_init(512, (TH_NAME).c_str());
+#endif //__XENO__
 }
 
@@ -76 +84 @@
 
 #ifdef __XENO__
-  string th_name =
-      getFrameworkManager()->ObjectName() + "-" + self->ObjectName();
+  string th_name =TH_NAME;
 
 #ifdef RT_STACK_SIZE
@@ -99 +106 @@
   }
 
-  // Initialise the rt_print buffer for this task explicitly
-  rt_print_init(512, th_name.c_str());
-
 #else //__XENO__
 
@@ -146 +150 @@
 void Thread_impl::main_rt(void *arg) {
   Thread_impl *caller = (Thread_impl *)arg;
-
-  // Perform auto-init of rt_print buffers if the task doesn't do so
-  rt_print_auto_init(1);
 
   caller->self->Run();