Changeset 0fd6f255 in rtems

Timestamp:

Jul 8, 2016, 2:58:48 PM (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

ba5de753

Parents:

3ae199a

git-author:

Sebastian Huber <sebastian.huber@…> (07/08/16 14:58:48)

git-committer:

Sebastian Huber <sebastian.huber@…> (07/25/16 06:40:14)

Message:

score: Relax thread begin extension environment

Update #2752.

Files:

• cpukit/score/src/threadhandler.c (modified) (2 diffs)
• testsuites/sptests/spextensions01/init.c (modified) (30 diffs)

cpukit/score/src/threadhandler.c

@@ -60 +60 @@
 
   /*
-   * Take care that 'begin' extensions get to complete before
-   * 'switch' extensions can run.  This means must keep dispatch
-   * disabled until all 'begin' extensions complete.
-   */
-  _User_extensions_Thread_begin( executing );
-
-  /*
    * Do not use the level of the thread control block, since it has a
    * different format.
@@ -85 +78 @@
    */
   _Thread_Do_dispatch( cpu_self, level );
+
+  /*
+   * Invoke the thread begin extensions in the context of the thread entry
+   * function with thread dispatching enabled.  This enables use of dynamic
+   * memory allocation, creation of POSIX keys and use of C++ thread local
+   * storage.  Blocking synchronization primitives are allowed also.
+   */
+  _User_extensions_Thread_begin( executing );
 
   /*

testsuites/sptests/spextensions01/init.c

@@ -26 +26 @@
 #include <bsp.h>
 
+#include <rtems/score/apimutex.h>
+#include <rtems/score/sysstate.h>
+#include <rtems/score/threaddispatch.h>
+
 const char rtems_test_name[] = "SPEXTENSIONS 1";
 
@@ -33 +37 @@
 
 static rtems_id master_task;
+
+static bool before_multitasking(void)
+{
+  return _System_state_Is_before_multitasking(_System_state_Get());
+}
+
+static bool life_protected(void)
+{
+  Thread_Control *executing;
+
+  executing = _Thread_Get_executing();
+
+  return (executing->Life.state & THREAD_LIFE_PROTECTED) != 0;
+}
+
+static void assert_normal_thread_context(void)
+{
+  assert(_Thread_Dispatch_is_enabled());
+  assert(!_RTEMS_Allocator_is_owner());
+  assert(!life_protected());
+}
+
+static void assert_life_protected_thread_context(void)
+{
+  assert(_Thread_Dispatch_is_enabled() || before_multitasking());
+  assert(!_RTEMS_Allocator_is_owner());
+  assert(life_protected() || before_multitasking());
+}
+
+static void assert_allocator_protected_thread_context(void)
+{
+  assert(_Thread_Dispatch_is_enabled() || before_multitasking());
+  assert(_RTEMS_Allocator_is_owner());
+  assert(life_protected() || before_multitasking());
+}
+
+static void assert_thread_dispatch_disabled_context(void)
+{
+  assert(!_Thread_Dispatch_is_enabled());
+  assert(!_RTEMS_Allocator_is_owner());
+  assert(!life_protected());
+}
 
 static void assert_static_order(int index)
@@ -55 +101 @@
 {
   assert_static_order(0);
+  assert_allocator_protected_thread_context();
   return true;
 }
@@ -61 +108 @@
 {
   assert_static_order(0);
+  assert_thread_dispatch_disabled_context();
 }
 
@@ -66 +114 @@
 {
   assert_static_order(0);
+  assert_life_protected_thread_context();
 }
 
@@ -71 +120 @@
 {
   assert_static_order(0);
+  assert_allocator_protected_thread_context();
 }
 
@@ -81 +131 @@
 {
   assert_static_order(0);
+  assert_normal_thread_context();
 }
 
@@ -86 +137 @@
 {
   assert_static_order(0);
+  assert_normal_thread_context();
 }
 
@@ -102 +154 @@
 {
   assert_static_order(0);
+  assert_life_protected_thread_context();
 }
 
@@ -107 +160 @@
 {
   assert_static_order(1);
+  assert_allocator_protected_thread_context();
   return true;
 }
@@ -113 +167 @@
 {
   assert_static_order(1);
+  assert_thread_dispatch_disabled_context();
 }
 
@@ -118 +173 @@
 {
   assert_static_order(1);
+  assert_life_protected_thread_context();
 }
 
@@ -123 +179 @@
 {
   assert_static_order(1);
+  assert_allocator_protected_thread_context();
 }
 
@@ -133 +190 @@
 {
   assert_static_order(1);
+  assert_normal_thread_context();
 }
 
@@ -138 +196 @@
 {
   assert_static_order(1);
+  assert_normal_thread_context();
 }
 
@@ -154 +213 @@
 {
   assert_static_order(1);
+  assert_life_protected_thread_context();
 }
 
@@ -159 +219 @@
 {
   assert_forward_order(2);
+  assert_allocator_protected_thread_context();
   return true;
 }
@@ -165 +226 @@
 {
   assert_forward_order(2);
+  assert_thread_dispatch_disabled_context();
 }
 
@@ -170 +232 @@
 {
   assert_static_order(2);
+  assert_life_protected_thread_context();
 }
 
@@ -175 +238 @@
 {
   assert_reverse_order(2);
+  assert_allocator_protected_thread_context();
 }
 
@@ -185 +249 @@
 {
   assert_forward_order(2);
+  assert_normal_thread_context();
 }
 
@@ -190 +255 @@
 {
   assert_forward_order(2);
+  assert_normal_thread_context();
 }
 
@@ -208 +274 @@
 {
   assert_forward_order(2);
+  assert_life_protected_thread_context();
 }
 
@@ -213 +280 @@
 {
   assert_forward_order(3);
+  assert_allocator_protected_thread_context();
   return true;
 }
@@ -219 +287 @@
 {
   assert_forward_order(3);
+  assert_thread_dispatch_disabled_context();
 }
 
@@ -224 +293 @@
 {
   assert_static_order(3);
+  assert_life_protected_thread_context();
 }
 
@@ -229 +299 @@
 {
   assert_reverse_order(3);
+  assert_allocator_protected_thread_context();
 }
 
@@ -239 +310 @@
 {
   assert_forward_order(3);
+  assert_normal_thread_context();
 }
 
@@ -244 +316 @@
 {
   assert_forward_order(3);
+  assert_normal_thread_context();
 }
 
@@ -260 +333 @@
 {
   assert_forward_order(3);
+  assert_life_protected_thread_context();
 }