Changeset 118 in flair-src
- Timestamp:
- Nov 17, 2016, 11:57:29 AM (8 years ago)
- Location:
- trunk/lib/FlairCore/src
- Files:
-
- 2 edited
- 4 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/FlairCore/src/FrameworkManager_impl.cpp
r67 r118 37 37 #ifdef __XENO__ 38 38 #include <native/task.h> 39 #include <rtdk.h> 39 40 #endif 40 41 … … 119 120 sa.sa_flags = SA_SIGINFO; 120 121 sigaction(SIGDEBUG, &sa, NULL); 121 #else 122 #else //SIGDEBUG 122 123 signal(SIGXCPU, warn_upon_switch); 123 #endif 124 124 #endif //SIGDEBUG 125 125 string task_name = "Framework_" + name; 126 127 // Perform auto-init of rt_print buffers if the task doesn't do so 128 rt_print_auto_init(1); 129 // Initialise the rt_print buffer for this task explicitly 130 rt_print_init(512, task_name.c_str()); 131 126 132 int status = rt_task_shadow(NULL, task_name.c_str(), 10, 0); 127 133 if (status != 0) { -
trunk/lib/FlairCore/src/Thread_impl.cpp
r38 r118 26 26 #ifdef __XENO__ 27 27 #include <rtdk.h> 28 #else 28 #define TH_NAME getFrameworkManager()->ObjectName() + "-" + self->ObjectName() 29 #else//__XENO__ 29 30 #include <sys/resource.h> 30 31 #include <unistd.h> 31 32 #include <sys/syscall.h> 32 #endif 33 #endif//__XENO__ 33 34 34 35 using std::string; … … 61 62 last = 0; 62 63 cpt = 0; 64 65 #ifdef __XENO__ 66 // Perform auto-init of rt_print buffers if the task doesn't do so 67 rt_print_auto_init(1); 68 // Initialise the rt_print buffer for this task explicitly 69 rt_print_init(512, (TH_NAME).c_str()); 70 #endif //__XENO__ 63 71 } 64 72 … … 76 84 77 85 #ifdef __XENO__ 78 string th_name = 79 getFrameworkManager()->ObjectName() + "-" + self->ObjectName(); 86 string th_name =TH_NAME; 80 87 81 88 #ifdef RT_STACK_SIZE … … 99 106 } 100 107 101 // Initialise the rt_print buffer for this task explicitly102 rt_print_init(512, th_name.c_str());103 104 108 #else //__XENO__ 105 109 … … 146 150 void Thread_impl::main_rt(void *arg) { 147 151 Thread_impl *caller = (Thread_impl *)arg; 148 149 // Perform auto-init of rt_print buffers if the task doesn't do so150 rt_print_auto_init(1);151 152 152 153 caller->self->Run();
Note:
See TracChangeset
for help on using the changeset viewer.