summaryrefslogtreecommitdiffstats
path: root/testsuites
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-18 08:03:05 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-20 07:50:34 +0200
commit4b04cb61552dbaa1a42a64e2f7b823708127e488 (patch)
tree700d7664a80736281f4d266413c4a020ff2a996c /testsuites
parentscore: _Thread_Dispatch_increment_disable_level() (diff)
downloadrtems-4b04cb61552dbaa1a42a64e2f7b823708127e488.tar.bz2
score: Rename _ISR_Disable_without_giant()
Rename _ISR_Disable_without_giant() into _ISR_Local_disable(). Rename _ISR_Enable_without_giant() into _ISR_Local_enable(). This is a preparation to remove the Giant lock. Update #2555.
Diffstat (limited to 'testsuites')
-rw-r--r--testsuites/smptests/smpcache01/init.c4
-rw-r--r--testsuites/smptests/smpload01/init.c4
-rw-r--r--testsuites/smptests/smpthreadlife01/init.c8
-rw-r--r--testsuites/tmtests/tm26/task1.c12
-rw-r--r--testsuites/tmtests/tm27/task1.c4
5 files changed, 16 insertions, 16 deletions
diff --git a/testsuites/smptests/smpcache01/init.c b/testsuites/smptests/smpcache01/init.c
index 52ee997fa5..b8a7b711ae 100644
--- a/testsuites/smptests/smpcache01/init.c
+++ b/testsuites/smptests/smpcache01/init.c
@@ -158,11 +158,11 @@ static void call_tests_isr_disabled( size_t set_size,
for (i = 0; i < RTEMS_ARRAY_SIZE( test_cases ); ++i) {
ISR_Level isr_level;
- _ISR_Disable_without_giant( isr_level );
+ _ISR_Local_disable( isr_level );
call_test( set_size, cpu_set, bs, i );
- _ISR_Enable_without_giant( isr_level );
+ _ISR_Local_enable( isr_level );
}
}
diff --git a/testsuites/smptests/smpload01/init.c b/testsuites/smptests/smpload01/init.c
index 2a4e9553d7..d4c303dd38 100644
--- a/testsuites/smptests/smpload01/init.c
+++ b/testsuites/smptests/smpload01/init.c
@@ -225,7 +225,7 @@ static void get_obtain_delay_estimate(test_context *ctx)
_SMP_lock_Initialize(&lock, "test");
- _ISR_Disable_without_giant(level);
+ _ISR_Local_disable(level);
for (i = 0; i < n; ++i) {
SMP_lock_Context lock_context;
@@ -240,7 +240,7 @@ static void get_obtain_delay_estimate(test_context *ctx)
t[i] = rtems_counter_difference(b, a);
}
- _ISR_Enable_without_giant(level);
+ _ISR_Local_enable(level);
_SMP_lock_Destroy(&lock);
diff --git a/testsuites/smptests/smpthreadlife01/init.c b/testsuites/smptests/smpthreadlife01/init.c
index 5bfa3bceb4..2867be75c5 100644
--- a/testsuites/smptests/smpthreadlife01/init.c
+++ b/testsuites/smptests/smpthreadlife01/init.c
@@ -200,7 +200,7 @@ static void delay_ipi_task(rtems_task_argument variant)
test_context *ctx = &test_instance;
ISR_Level level;
- _ISR_Disable_without_giant(level);
+ _ISR_Local_disable(level);
/* (C) */
barrier(ctx, &ctx->worker_barrier_state);
@@ -215,7 +215,7 @@ static void delay_ipi_task(rtems_task_argument variant)
_Thread_Dispatch_disable();
}
- _ISR_Enable_without_giant(level);
+ _ISR_Local_enable(level);
/*
* We get deleted as a side effect of enabling the thread life protection or
@@ -267,7 +267,7 @@ static void delay_switch_task(rtems_task_argument arg)
rtems_status_code sc;
ISR_Level level;
- _ISR_Disable_without_giant(level);
+ _ISR_Local_disable(level);
(void) level;
ctx->delay_switch_for_executing = _Thread_Get_executing();
@@ -403,7 +403,7 @@ static void op_worker_task(rtems_task_argument arg)
test_op op = arg;
ISR_Level level;
- _ISR_Disable_without_giant(level);
+ _ISR_Local_disable(level);
(void) level;
/* (E) */
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
index 0eb7554c97..8463cd3c5a 100644
--- a/testsuites/tmtests/tm26/task1.c
+++ b/testsuites/tmtests/tm26/task1.c
@@ -94,7 +94,7 @@ static void set_thread_dispatch_necessary( bool dispatch_necessary )
#if defined( PREVENT_SMP_ASSERT_FAILURES )
ISR_Level level;
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
#endif
_Thread_Dispatch_necessary = dispatch_necessary;
@@ -104,7 +104,7 @@ static void set_thread_dispatch_necessary( bool dispatch_necessary )
}
#if defined( PREVENT_SMP_ASSERT_FAILURES )
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
#endif
}
@@ -113,13 +113,13 @@ static void set_thread_heir( Thread_Control *thread )
#if defined( PREVENT_SMP_ASSERT_FAILURES )
ISR_Level level;
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
#endif
_Thread_Heir = thread;
#if defined( PREVENT_SMP_ASSERT_FAILURES )
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
#endif
}
@@ -128,13 +128,13 @@ static void set_thread_executing( Thread_Control *thread )
#if defined( PREVENT_SMP_ASSERT_FAILURES )
ISR_Level level;
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
#endif
_Thread_Executing = thread;
#if defined( PREVENT_SMP_ASSERT_FAILURES )
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
#endif
}
diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c
index cae778fb26..aba835c93b 100644
--- a/testsuites/tmtests/tm27/task1.c
+++ b/testsuites/tmtests/tm27/task1.c
@@ -188,7 +188,7 @@ rtems_task Task_1(
*/
#if defined(RTEMS_SMP)
- _ISR_Disable_without_giant(level);
+ _ISR_Local_disable(level);
#endif
_Thread_Executing =
@@ -197,7 +197,7 @@ rtems_task Task_1(
_Thread_Dispatch_necessary = 1;
#if defined(RTEMS_SMP)
- _ISR_Enable_without_giant(level);
+ _ISR_Local_enable(level);
#endif
Interrupt_occurred = 0;