summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-13 14:07:23 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-20 07:49:39 +0200
commit33829ce155069462ba410d396da431386369ed08 (patch)
treebd4d700e4a567280c6b2aa3e8f43c3997d20d9e7 /cpukit
parent54550e048d3a49435912797d2024f80671e93267 (diff)
downloadrtems-33829ce155069462ba410d396da431386369ed08.tar.bz2
score: Avoid Giant lock for _Thread_Start()
Update #2555.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/posix/src/pthreadcreate.c8
-rw-r--r--cpukit/rtems/src/taskstart.c58
-rw-r--r--cpukit/score/include/rtems/score/statesimpl.h2
-rw-r--r--cpukit/score/include/rtems/score/threadimpl.h18
-rw-r--r--cpukit/score/src/mpci.c6
-rw-r--r--cpukit/score/src/threadstart.c27
6 files changed, 42 insertions, 77 deletions
diff --git a/cpukit/posix/src/pthreadcreate.c b/cpukit/posix/src/pthreadcreate.c
index 1fe3fe4465..33fae37776 100644
--- a/cpukit/posix/src/pthreadcreate.c
+++ b/cpukit/posix/src/pthreadcreate.c
@@ -229,12 +229,11 @@ int pthread_create(
api->schedpolicy = schedpolicy;
api->schedparam = schedparam;
- _Thread_Disable_dispatch();
-
/*
* POSIX threads are allocated and started in one operation.
*/
- status = _Thread_Start( the_thread, &entry );
+ _ISR_lock_ISR_disable( &lock_context );
+ status = _Thread_Start( the_thread, &entry, &lock_context );
#if defined(RTEMS_DEBUG)
/*
@@ -244,7 +243,6 @@ int pthread_create(
* thread while we are creating it.
*/
if ( !status ) {
- _Thread_Enable_dispatch();
_POSIX_Threads_Free( the_thread );
_Objects_Allocator_unlock();
return EINVAL;
@@ -261,8 +259,6 @@ int pthread_create(
_ISR_lock_ISR_enable( &lock_context );
}
- _Thread_Enable_dispatch();
-
/*
* Return the id and indicate we successfully created the thread
*/
diff --git a/cpukit/rtems/src/taskstart.c b/cpukit/rtems/src/taskstart.c
index 416c2dfad2..172979bde3 100644
--- a/cpukit/rtems/src/taskstart.c
+++ b/cpukit/rtems/src/taskstart.c
@@ -21,27 +21,10 @@
#include <rtems/rtems/tasks.h>
#include <rtems/score/threadimpl.h>
-/*
- * rtems_task_start
- *
- * This directive readies the thread identified by the "id"
- * based on its current priorty, to await execution. A thread
- * can be started only from the dormant state.
- *
- * Input parameters:
- * id - thread id
- * entry_point - start execution address of thread
- * argument - thread argument
- *
- * Output parameters:
- * RTEMS_SUCCESSFUL - if successful
- * error code - if unsuccessful
- */
-
rtems_status_code rtems_task_start(
- rtems_id id,
- rtems_task_entry entry_point,
- rtems_task_argument argument
+ rtems_id id,
+ rtems_task_entry entry_point,
+ rtems_task_argument argument
)
{
Thread_Entry_information entry = {
@@ -53,36 +36,23 @@ rtems_status_code rtems_task_start(
}
}
};
- Thread_Control *the_thread;
- Objects_Locations location;
- bool successfully_started;
-
- if ( entry_point == NULL )
- return RTEMS_INVALID_ADDRESS;
+ Thread_Control *the_thread;
+ ISR_lock_Context lock_context;
+ bool ok;
- the_thread = _Thread_Get( id, &location );
- switch ( location ) {
-
- case OBJECTS_LOCAL:
- successfully_started = _Thread_Start( the_thread, &entry );
-
- _Objects_Put( &the_thread->Object );
-
- if ( successfully_started ) {
- return RTEMS_SUCCESSFUL;
- } else {
- return RTEMS_INCORRECT_STATE;
- }
+ the_thread = _Thread_Get_interrupt_disable( id, &lock_context );
+ if ( the_thread == NULL ) {
#if defined(RTEMS_MULTIPROCESSING)
- case OBJECTS_REMOTE:
- _Thread_Dispatch();
+ if ( _Thread_MP_Is_remote( id ) ) {
return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
+ }
#endif
- case OBJECTS_ERROR:
- break;
+ return RTEMS_INVALID_ID;
}
- return RTEMS_INVALID_ID;
+ ok = _Thread_Start( the_thread, &entry, &lock_context );
+
+ return ok ? RTEMS_SUCCESSFUL : RTEMS_INCORRECT_STATE;
}
diff --git a/cpukit/score/include/rtems/score/statesimpl.h b/cpukit/score/include/rtems/score/statesimpl.h
index 54052e2b74..596246c422 100644
--- a/cpukit/score/include/rtems/score/statesimpl.h
+++ b/cpukit/score/include/rtems/score/statesimpl.h
@@ -123,7 +123,7 @@ extern "C" {
STATES_WAITING_FOR_SYSTEM_EVENT | \
STATES_INTERRUPTIBLE_BY_SIGNAL )
-/** All state bits set to one (provided for _Thread_Ready()) */
+/** All state bits set to one (provided for _Thread_Start()) */
#define STATES_ALL_SET 0xffffffff
/**
diff --git a/cpukit/score/include/rtems/score/threadimpl.h b/cpukit/score/include/rtems/score/threadimpl.h
index cdd7f9b300..6f97ca9866 100644
--- a/cpukit/score/include/rtems/score/threadimpl.h
+++ b/cpukit/score/include/rtems/score/threadimpl.h
@@ -187,7 +187,8 @@ bool _Thread_Initialize(
*/
bool _Thread_Start(
Thread_Control *the_thread,
- const Thread_Entry_information *entry
+ const Thread_Entry_information *entry,
+ ISR_lock_Context *lock_context
);
void _Thread_Restart_self(
@@ -288,21 +289,6 @@ States_Control _Thread_Set_state(
);
/**
- * @brief Clears all thread states.
- *
- * In case the previous state is a non-ready state, then the thread is
- * unblocked by the scheduler.
- *
- * @param[in] the_thread The thread.
- */
-RTEMS_INLINE_ROUTINE void _Thread_Ready(
- Thread_Control *the_thread
-)
-{
- _Thread_Clear_state( the_thread, STATES_ALL_SET );
-}
-
-/**
* @brief Initializes enviroment for a thread.
*
* This routine initializes the context of @a the_thread to its
diff --git a/cpukit/score/src/mpci.c b/cpukit/score/src/mpci.c
index 57eb5f3991..8eec2782c0 100644
--- a/cpukit/score/src/mpci.c
+++ b/cpukit/score/src/mpci.c
@@ -134,7 +134,8 @@ static void _MPCI_Create_server( void )
}
}
};
- Objects_Name name;
+ ISR_lock_Context lock_context;
+ Objects_Name name;
if ( !_System_state_Is_multiprocessing )
@@ -164,7 +165,8 @@ static void _MPCI_Create_server( void )
name
);
- _Thread_Start( _MPCI_Receive_server_tcb, &entry );
+ _ISR_lock_ISR_disable( &lock_context );
+ _Thread_Start( _MPCI_Receive_server_tcb, &entry, &lock_context );
}
static void _MPCI_Initialization( void )
diff --git a/cpukit/score/src/threadstart.c b/cpukit/score/src/threadstart.c
index 0cdf2bc85a..676e34da49 100644
--- a/cpukit/score/src/threadstart.c
+++ b/cpukit/score/src/threadstart.c
@@ -25,17 +25,28 @@
bool _Thread_Start(
Thread_Control *the_thread,
- const Thread_Entry_information *entry
+ const Thread_Entry_information *entry,
+ ISR_lock_Context *lock_context
)
{
- if ( _States_Is_dormant( the_thread->current_state ) ) {
- the_thread->Start.Entry = *entry;
- _Thread_Load_environment( the_thread );
- _Thread_Ready( the_thread );
- _User_extensions_Thread_start( the_thread );
+ Per_CPU_Control *cpu_self;
- return true;
+ _Thread_State_acquire_critical( the_thread, lock_context );
+
+ if ( !_States_Is_dormant( the_thread->current_state ) ) {
+ _Thread_State_release( the_thread, lock_context );
+ return false;
}
- return false;
+ the_thread->Start.Entry = *entry;
+ _Thread_Load_environment( the_thread );
+ _Thread_Clear_state_locked( the_thread, STATES_ALL_SET );
+
+ cpu_self = _Thread_Dispatch_disable_critical( lock_context );
+ _Thread_State_release( the_thread, lock_context );
+
+ _User_extensions_Thread_start( the_thread );
+
+ _Thread_Dispatch_enable( cpu_self );
+ return true;
}