RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

posix: Simplify _POSIX_Mutex_Get_interrupt_disable

Browse Source 
Remove superfluous location parameter.
This commit is contained in:
Sebastian Huber
2016-04-18 17:21:43 +02:00
parent beba41b504
commit b8bdced14d
5 changed files with 65 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cpukit/posix/include/rtems/posix/muteximpl.h
View File

@@ -15,13 +15,14 @@
* http://www.rtems.org/license/LICENSE.
*/
#ifndef _RTEMS_POSIX_MUTEXIMPL_H
#define _RTEMS_POSIX_MUTEXIMPL_H
#include <rtems/posix/mutex.h>
#include <rtems/score/coremuteximpl.h>
#include <errno.h>
#ifndef _RTEMS_POSIX_MUTEXIMPL_H
#define _RTEMS_POSIX_MUTEXIMPL_H
#include <pthread.h>
#ifdef __cplusplus
extern "C" {
@@ -139,9 +140,8 @@ POSIX_Mutex_Control *_POSIX_Mutex_Get (
*
* @note: This version of the method uses an interrupt critical section.
*/
POSIX_Mutex_Control *_POSIX_Mutex_Get_interrupt_disable (
POSIX_Mutex_Control *_POSIX_Mutex_Get_interrupt_disable(
pthread_mutex_t *mutex,
Objects_Locations *location,
ISR_lock_Context *lock_context
);

9
cpukit/posix/src/mutexget.c
View File

@@ -68,20 +68,21 @@ POSIX_Mutex_Control *_POSIX_Mutex_Get (
_Objects_Get( &_POSIX_Mutex_Information, (Objects_Id) *mutex, location );
}
POSIX_Mutex_Control *_POSIX_Mutex_Get_interrupt_disable (
POSIX_Mutex_Control *_POSIX_Mutex_Get_interrupt_disable(
pthread_mutex_t *mutex,
Objects_Locations *location,
ISR_lock_Context *lock_context
)
{
if ( !_POSIX_Mutex_Check_id_and_auto_init( mutex, location ) ) {
Objects_Locations location;
if ( !_POSIX_Mutex_Check_id_and_auto_init( mutex, &location ) ) {
return NULL;
}
return (POSIX_Mutex_Control *) _Objects_Get_isr_disable(
&_POSIX_Mutex_Information,
(Objects_Id) *mutex,
location,
&location,
lock_context
);
}

37
cpukit/posix/src/mutexlocksupp.c
View File

@@ -18,25 +18,10 @@
#include "config.h"
#endif
#include <errno.h>
#include <pthread.h>
#include <rtems/system.h>
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/score/threadimpl.h>
#include <rtems/posix/muteximpl.h>
#include <rtems/posix/priorityimpl.h>
THREAD_WAIT_QUEUE_OBJECT_ASSERT( POSIX_Mutex_Control, Mutex.Wait_queue );
/*
* _POSIX_Mutex_Lock_support
*
* A support routine which implements guts of the blocking, non-blocking, and
* timed wait version of mutex lock.
*/
int _POSIX_Mutex_Lock_support(
pthread_mutex_t *mutex,
bool blocking,
@@ -44,18 +29,15 @@ int _POSIX_Mutex_Lock_support(
)
{
POSIX_Mutex_Control *the_mutex;
Objects_Locations location;
ISR_lock_Context lock_context;
Thread_Control *executing;
the_mutex = _POSIX_Mutex_Get_interrupt_disable(
mutex,
&location,
&lock_context
);
switch ( location ) {
the_mutex = _POSIX_Mutex_Get_interrupt_disable( mutex, &lock_context );
if ( the_mutex == NULL ) {
return EINVAL;
}
case OBJECTS_LOCAL:
executing = _Thread_Executing;
_CORE_mutex_Seize(
&the_mutex->Mutex,
@@ -67,13 +49,4 @@ int _POSIX_Mutex_Lock_support(
return _POSIX_Mutex_Translate_core_mutex_return_code(
(CORE_mutex_Status) executing->Wait.return_code
);
#if defined(RTEMS_MULTIPROCESSING)
case OBJECTS_REMOTE:
#endif
case OBJECTS_ERROR:
break;
}
return EINVAL;
}

31
cpukit/posix/src/mutexsetprioceiling.c
View File

@@ -18,14 +18,7 @@
#include "config.h"
#endif
#include <errno.h>
#include <pthread.h>
#include <rtems/system.h>
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/posix/muteximpl.h>
#include <rtems/posix/priorityimpl.h>
/*
* 13.6.2 Change the Priority Ceiling of a Mutex, P1003.1c/Draft 10, p. 131
@@ -38,7 +31,6 @@ int pthread_mutex_setprioceiling(
)
{
register POSIX_Mutex_Control *the_mutex;
Objects_Locations location;
Priority_Control the_priority;
ISR_lock_Context lock_context;
@@ -64,18 +56,17 @@ int pthread_mutex_setprioceiling(
* NOTE: This makes it easier to get 100% binary coverage since the
* bad Id case is handled by the switch.
*/
the_mutex = _POSIX_Mutex_Get_interrupt_disable(
mutex,
&location,
&lock_context
);
switch ( location ) {
the_mutex = _POSIX_Mutex_Get_interrupt_disable( mutex, &lock_context );
if ( the_mutex == NULL ) {
return EINVAL;
}
case OBJECTS_LOCAL:
*old_ceiling = _POSIX_Priority_From_core(
the_mutex->Mutex.Attributes.priority_ceiling
);
the_mutex->Mutex.Attributes.priority_ceiling = the_priority;
/*
* We are required to unlock the mutex before we return.
*/
@@ -85,15 +76,5 @@ int pthread_mutex_setprioceiling(
0,
&lock_context
);
return 0;
#if defined(RTEMS_MULTIPROCESSING)
case OBJECTS_REMOTE: /* impossible to get here */
#endif
case OBJECTS_ERROR:
break;
}
return EINVAL;
}

31
cpukit/posix/src/mutexunlock.c
View File

@@ -18,14 +18,7 @@
#include "config.h"
#endif
#include <errno.h>
#include <pthread.h>
#include <rtems/system.h>
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/posix/muteximpl.h>
#include <rtems/posix/priorityimpl.h>
/*
* 11.3.3 Locking and Unlocking a Mutex, P1003.1c/Draft 10, p. 93
@@ -37,19 +30,16 @@ int pthread_mutex_unlock(
pthread_mutex_t *mutex
)
{
register POSIX_Mutex_Control *the_mutex;
Objects_Locations location;
POSIX_Mutex_Control *the_mutex;
CORE_mutex_Status status;
ISR_lock_Context lock_context;
the_mutex = _POSIX_Mutex_Get_interrupt_disable(
mutex,
&location,
&lock_context
);
switch ( location ) {
the_mutex = _POSIX_Mutex_Get_interrupt_disable( mutex, &lock_context );
if ( the_mutex == NULL ) {
return EINVAL;
}
case OBJECTS_LOCAL:
status = _CORE_mutex_Surrender(
&the_mutex->Mutex,
NULL,
@@ -57,13 +47,4 @@ int pthread_mutex_unlock(
&lock_context
);
return _POSIX_Mutex_Translate_core_mutex_return_code( status );
#if defined(RTEMS_MULTIPROCESSING)
case OBJECTS_REMOTE:
#endif
case OBJECTS_ERROR:
break;
}
return EINVAL;
}