diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-04-11 13:47:50 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-04-12 09:44:44 +0200 |
| commit | e97b7c9a7af2f4e19a8bdeaf13033617f8c4c2b6 (patch) | |
| tree | 579598cfce50f24f2d7450e0c54f1eea6de0a023 /cpukit/posix | |
| parent | score: Add _ISR_lock_Set_name() (diff) | |
| download | rtems-e97b7c9a7af2f4e19a8bdeaf13033617f8c4c2b6.tar.bz2 | |
score: Use an ISR lock for Per_CPU_Control::Lock
The use of a hand crafted lock for Per_CPU_Control::Lock was necessary
at some point in the SMP support development, but it is no longer
justified.
Diffstat (limited to 'cpukit/posix')
| -rw-r--r-- | cpukit/posix/src/pspinlock.c | 11 | ||||
| -rw-r--r-- | cpukit/posix/src/pspinunlock.c | 13 |
2 files changed, 16 insertions, 8 deletions
diff --git a/cpukit/posix/src/pspinlock.c b/cpukit/posix/src/pspinlock.c index 9bacd367b6..f505768426 100644 --- a/cpukit/posix/src/pspinlock.c +++ b/cpukit/posix/src/pspinlock.c @@ -58,20 +58,17 @@ int pthread_spin_lock( pthread_spinlock_t *spinlock ) POSIX_Spinlock_Control *the_spinlock; ISR_Level level; #if defined(RTEMS_SMP) && defined(RTEMS_PROFILING) - Per_CPU_Control *cpu_self; + SMP_lock_Stats unused_stats; + SMP_lock_Stats_context unused_context; #endif the_spinlock = _POSIX_Spinlock_Get( spinlock ); _ISR_Local_disable( level ); #if defined(RTEMS_SMP) -#if defined(RTEMS_PROFILING) - /* The lock statistics are incorrect in case of nested pthread spinlocks */ - cpu_self = _Per_CPU_Get(); -#endif _SMP_ticket_lock_Acquire( &the_spinlock->Lock, - &cpu_self->Lock_stats, - &cpu_self->Lock_stats_context + &unused_stats, + &unused_context ); #endif the_spinlock->interrupt_state = level; diff --git a/cpukit/posix/src/pspinunlock.c b/cpukit/posix/src/pspinunlock.c index 74baa7cad7..bcbb2108ef 100644 --- a/cpukit/posix/src/pspinunlock.c +++ b/cpukit/posix/src/pspinunlock.c @@ -28,13 +28,24 @@ int pthread_spin_unlock( pthread_spinlock_t *lock ) { POSIX_Spinlock_Control *the_spinlock; ISR_Level level; +#if defined(RTEMS_SMP) && defined(RTEMS_PROFILING) + SMP_lock_Stats unused_stats; + SMP_lock_Stats_context unused_context; +#endif the_spinlock = _POSIX_Spinlock_Get( lock ); level = the_spinlock->interrupt_state; #if defined(RTEMS_SMP) +#if defined(RTEMS_PROFILING) + /* This is a hack to get around the lock profiling statistics */ + unused_stats.total_section_time = 0; + unused_stats.max_section_time = 0; + unused_context.stats = &unused_stats; + unused_context.acquire_instant = 0; +#endif _SMP_ticket_lock_Release( &the_spinlock->Lock, - &_Per_CPU_Get()->Lock_stats_context + &unused_context ); #endif _ISR_Local_enable( level ); |