summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2015-05-06 14:25:09 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2015-05-19 12:00:47 +0200
commit80f376db6c32bb4d01c93f5a2d7044798262d359 (patch)
tree3c13d3bc5f5e5aa3ac2553a6d8aa296f81bf8678
parentscore: Rework _Thread_Change_priority() (diff)
downloadrtems-80f376db6c32bb4d01c93f5a2d7044798262d359.tar.bz2
score: Remove Giant lock in rtems_clock_tick()
Update #2307.
-rw-r--r--cpukit/rtems/src/clocktick.c11
-rw-r--r--testsuites/sptests/sp37/init.c4
2 files changed, 1 insertions, 14 deletions
diff --git a/cpukit/rtems/src/clocktick.c b/cpukit/rtems/src/clocktick.c
index a026b44494..fe49e9a059 100644
--- a/cpukit/rtems/src/clocktick.c
+++ b/cpukit/rtems/src/clocktick.c
@@ -26,23 +26,14 @@
rtems_status_code rtems_clock_tick( void )
{
-#if defined( RTEMS_SMP )
- _Thread_Disable_dispatch();
-#endif
-
_TOD_Tickle_ticks();
_Watchdog_Tickle_ticks();
_Scheduler_Tick();
-#if defined( RTEMS_SMP )
- _Thread_Enable_dispatch();
-#else
- if ( _Thread_Is_context_switch_necessary() &&
- _Thread_Dispatch_is_enabled() )
+ if ( _Thread_Dispatch_is_enabled() )
_Thread_Dispatch();
-#endif
return RTEMS_SUCCESSFUL;
}
diff --git a/testsuites/sptests/sp37/init.c b/testsuites/sptests/sp37/init.c
index aaaf68426b..647485e555 100644
--- a/testsuites/sptests/sp37/init.c
+++ b/testsuites/sptests/sp37/init.c
@@ -431,11 +431,7 @@ rtems_timer_service_routine test_unblock_task(
_Thread_Disable_dispatch();
status = rtems_task_resume( blocked_task_id );
_Thread_Unnest_dispatch();
-#if defined( RTEMS_SMP )
- directive_failed_with_level( status, "rtems_task_resume", 1 );
-#else
directive_failed( status, "rtems_task_resume" );
-#endif
}
rtems_task Init(