Changeset e266d13 in rtems


Ignore:
Timestamp:
May 20, 2016, 1:10:27 PM (3 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
bdb3b7f
Parents:
582bb23c
git-author:
Sebastian Huber <sebastian.huber@…> (05/20/16 13:10:27)
git-committer:
Sebastian Huber <sebastian.huber@…> (05/20/16 14:17:00)
Message:

Replace *_Get_interrupt_disable() with *_Get()

Uniformly use *_Get() to get an object by identifier with a lock
context.

Files:
57 edited

Legend:

Unmodified
Added
Removed
  • cpukit/posix/include/rtems/posix/muteximpl.h

    r582bb23c re266d13  
    127127 *  @note: This version of the method uses an interrupt critical section.
    128128 */
    129 POSIX_Mutex_Control *_POSIX_Mutex_Get_interrupt_disable(
     129POSIX_Mutex_Control *_POSIX_Mutex_Get(
    130130  pthread_mutex_t  *mutex,
    131131  ISR_lock_Context *lock_context
  • cpukit/posix/src/cancel.c

    r582bb23c re266d13  
    4646  }
    4747
    48   the_thread = _Thread_Get_interrupt_disable( thread, &lock_context );
     48  the_thread = _Thread_Get( thread, &lock_context );
    4949
    5050  if ( the_thread == NULL ) {
  • cpukit/posix/src/mutexdestroy.c

    r582bb23c re266d13  
    3535  _Objects_Allocator_lock();
    3636
    37   the_mutex = _POSIX_Mutex_Get_interrupt_disable( mutex, &lock_context );
     37  the_mutex = _POSIX_Mutex_Get( mutex, &lock_context );
    3838
    3939  if ( the_mutex != NULL ) {
  • cpukit/posix/src/mutexget.c

    r582bb23c re266d13  
    2222#include <rtems/posix/posixapi.h>
    2323
    24 POSIX_Mutex_Control *_POSIX_Mutex_Get_interrupt_disable(
     24POSIX_Mutex_Control *_POSIX_Mutex_Get(
    2525  pthread_mutex_t  *mutex,
    2626  ISR_lock_Context *lock_context
  • cpukit/posix/src/mutexgetprioceiling.c

    r582bb23c re266d13  
    3838  }
    3939
    40   the_mutex = _POSIX_Mutex_Get_interrupt_disable( mutex, &lock_context );
     40  the_mutex = _POSIX_Mutex_Get( mutex, &lock_context );
    4141
    4242  if ( the_mutex == NULL ) {
  • cpukit/posix/src/mutexlocksupp.c

    r582bb23c re266d13  
    3333  Thread_Control      *executing;
    3434
    35   the_mutex = _POSIX_Mutex_Get_interrupt_disable( mutex, &lock_context );
     35  the_mutex = _POSIX_Mutex_Get( mutex, &lock_context );
    3636
    3737  if ( the_mutex == NULL ) {
  • cpukit/posix/src/mutexsetprioceiling.c

    r582bb23c re266d13  
    5858   *        bad Id case is handled by the switch.
    5959   */
    60   the_mutex = _POSIX_Mutex_Get_interrupt_disable( mutex, &lock_context );
     60  the_mutex = _POSIX_Mutex_Get( mutex, &lock_context );
    6161
    6262  if ( the_mutex == NULL ) {
  • cpukit/posix/src/mutexunlock.c

    r582bb23c re266d13  
    3535  ISR_lock_Context     lock_context;
    3636
    37   the_mutex = _POSIX_Mutex_Get_interrupt_disable( mutex, &lock_context );
     37  the_mutex = _POSIX_Mutex_Get( mutex, &lock_context );
    3838
    3939  if ( the_mutex == NULL ) {
  • cpukit/posix/src/pthreaddetach.c

    r582bb23c re266d13  
    3535  Per_CPU_Control  *cpu_self;
    3636
    37   the_thread = _Thread_Get_interrupt_disable( thread, &lock_context );
     37  the_thread = _Thread_Get( thread, &lock_context );
    3838
    3939  if ( the_thread == NULL ) {
  • cpukit/posix/src/pthreadequal.c

    r582bb23c re266d13  
    4646  Thread_Control   *thread_2;
    4747
    48   thread_1 = _Thread_Get_interrupt_disable( t1, &lock_context_1 );
    49   thread_2 = _Thread_Get_interrupt_disable( t2, &lock_context_2 );
     48  thread_1 = _Thread_Get( t1, &lock_context_1 );
     49  thread_2 = _Thread_Get( t2, &lock_context_2 );
    5050  _ISR_lock_ISR_enable( &lock_context_2 );
    5151  _ISR_lock_ISR_enable( &lock_context_1 );
  • cpukit/posix/src/pthreadgetaffinitynp.c

    r582bb23c re266d13  
    4646  }
    4747
    48   the_thread = _Thread_Get_interrupt_disable( thread, &lock_context );
     48  the_thread = _Thread_Get( thread, &lock_context );
    4949
    5050  if ( the_thread == NULL ) {
  • cpukit/posix/src/pthreadgetattrnp.c

    r582bb23c re266d13  
    3939  }
    4040
    41   the_thread = _Thread_Get_interrupt_disable( thread, &lock_context );
     41  the_thread = _Thread_Get( thread, &lock_context );
    4242
    4343  if ( the_thread == NULL ) {
  • cpukit/posix/src/pthreadgetschedparam.c

    r582bb23c re266d13  
    4343  }
    4444
    45   the_thread = _Thread_Get_interrupt_disable( thread, &lock_context );
     45  the_thread = _Thread_Get( thread, &lock_context );
    4646
    4747  if ( the_thread == NULL ) {
  • cpukit/posix/src/pthreadjoin.c

    r582bb23c re266d13  
    3838  void              *value;
    3939
    40   the_thread = _Thread_Get_interrupt_disable( thread, &lock_context );
     40  the_thread = _Thread_Get( thread, &lock_context );
    4141
    4242  if ( the_thread == NULL ) {
  • cpukit/posix/src/pthreadkill.c

    r582bb23c re266d13  
    4040  }
    4141
    42   the_thread = _Thread_Get_interrupt_disable( thread, &lock_context );
     42  the_thread = _Thread_Get( thread, &lock_context );
    4343
    4444  if ( the_thread == NULL ) {
  • cpukit/posix/src/pthreadsetaffinitynp.c

    r582bb23c re266d13  
    4646  }
    4747
    48   the_thread = _Thread_Get_interrupt_disable( thread, &lock_context );
     48  the_thread = _Thread_Get( thread, &lock_context );
    4949
    5050  if ( the_thread == NULL ) {
  • cpukit/posix/src/pthreadsetschedparam.c

    r582bb23c re266d13  
    6666  }
    6767
    68   the_thread = _Thread_Get_interrupt_disable( thread, &lock_context );
     68  the_thread = _Thread_Get( thread, &lock_context );
    6969
    7070  if ( the_thread == NULL ) {
  • cpukit/rtems/include/rtems/rtems/messageimpl.h

    r582bb23c re266d13  
    102102}
    103103
    104 RTEMS_INLINE_ROUTINE Message_queue_Control *
    105 _Message_queue_Get_interrupt_disable(
     104RTEMS_INLINE_ROUTINE Message_queue_Control * _Message_queue_Get(
    106105  Objects_Id         id,
    107106  ISR_lock_Context  *lock_context
  • cpukit/rtems/include/rtems/rtems/semimpl.h

    r582bb23c re266d13  
    135135}
    136136
    137 RTEMS_INLINE_ROUTINE Semaphore_Control *_Semaphore_Get_interrupt_disable(
     137RTEMS_INLINE_ROUTINE Semaphore_Control *_Semaphore_Get(
    138138  Objects_Id         id,
    139139  ISR_lock_Context  *lock_context
  • cpukit/rtems/src/eventsend.c

    r582bb23c re266d13  
    3232  ISR_lock_Context   lock_context;
    3333
    34   the_thread = _Thread_Get_interrupt_disable( id, &lock_context );
     34  the_thread = _Thread_Get( id, &lock_context );
    3535
    3636  if ( the_thread == NULL ) {
  • cpukit/rtems/src/msgqbroadcast.c

    r582bb23c re266d13  
    4040  }
    4141
    42   the_message_queue = _Message_queue_Get_interrupt_disable(
    43     id,
    44     &lock_context
    45   );
     42  the_message_queue = _Message_queue_Get( id, &lock_context );
    4643
    4744  if ( the_message_queue == NULL ) {
  • cpukit/rtems/src/msgqdelete.c

    r582bb23c re266d13  
    3030
    3131  _Objects_Allocator_lock();
    32   the_message_queue = _Message_queue_Get_interrupt_disable( id, &lock_context );
     32  the_message_queue = _Message_queue_Get( id, &lock_context );
    3333
    3434  if ( the_message_queue == NULL ) {
  • cpukit/rtems/src/msgqflush.c

    r582bb23c re266d13  
    3333  }
    3434
    35   the_message_queue = _Message_queue_Get_interrupt_disable(
    36     id,
    37     &lock_context
    38   );
     35  the_message_queue = _Message_queue_Get( id, &lock_context );
    3936
    4037  if ( the_message_queue == NULL ) {
  • cpukit/rtems/src/msgqgetnumberpending.c

    r582bb23c re266d13  
    3333  }
    3434
    35   the_message_queue = _Message_queue_Get_interrupt_disable(
    36     id,
    37     &lock_context
    38   );
     35  the_message_queue = _Message_queue_Get( id, &lock_context );
    3936
    4037  if ( the_message_queue == NULL ) {
  • cpukit/rtems/src/msgqreceive.c

    r582bb23c re266d13  
    4848  }
    4949
    50   the_message_queue = _Message_queue_Get_interrupt_disable(
    51     id,
    52     &lock_context
    53   );
     50  the_message_queue = _Message_queue_Get( id, &lock_context );
    5451
    5552  if ( the_message_queue == NULL ) {
  • cpukit/rtems/src/msgqsend.c

    r582bb23c re266d13  
    3535  }
    3636
    37   the_message_queue = _Message_queue_Get_interrupt_disable(
    38     id,
    39     &lock_context
    40   );
     37  the_message_queue = _Message_queue_Get( id, &lock_context );
    4138
    4239  if ( the_message_queue == NULL ) {
  • cpukit/rtems/src/msgqurgent.c

    r582bb23c re266d13  
    3535  }
    3636
    37   the_message_queue = _Message_queue_Get_interrupt_disable(
    38     id,
    39     &lock_context
    40   );
     37  the_message_queue = _Message_queue_Get( id, &lock_context );
    4138
    4239  if ( the_message_queue == NULL ) {
  • cpukit/rtems/src/semdelete.c

    r582bb23c re266d13  
    3131
    3232  _Objects_Allocator_lock();
    33   the_semaphore = _Semaphore_Get_interrupt_disable( id, &lock_context );
     33  the_semaphore = _Semaphore_Get( id, &lock_context );
    3434
    3535  if ( the_semaphore == NULL ) {
  • cpukit/rtems/src/semflush.c

    r582bb23c re266d13  
    2828  rtems_attribute    attribute_set;
    2929
    30   the_semaphore = _Semaphore_Get_interrupt_disable( id, &lock_context );
     30  the_semaphore = _Semaphore_Get( id, &lock_context );
    3131
    3232  if ( the_semaphore == NULL ) {
  • cpukit/rtems/src/semobtain.c

    r582bb23c re266d13  
    4646  bool               wait;
    4747
    48   the_semaphore = _Semaphore_Get_interrupt_disable( id, &lock_context );
     48  the_semaphore = _Semaphore_Get( id, &lock_context );
    4949
    5050  if ( the_semaphore == NULL ) {
  • cpukit/rtems/src/semrelease.c

    r582bb23c re266d13  
    3333  ISR_lock_Context       lock_context;
    3434
    35   the_semaphore = _Semaphore_Get_interrupt_disable( id, &lock_context );
     35  the_semaphore = _Semaphore_Get( id, &lock_context );
    3636
    3737  if ( the_semaphore == NULL ) {
  • cpukit/rtems/src/semsetpriority.c

    r582bb23c re266d13  
    104104  }
    105105
    106   the_semaphore = _Semaphore_Get_interrupt_disable(
    107     semaphore_id,
    108     &lock_context
    109   );
     106  the_semaphore = _Semaphore_Get( semaphore_id, &lock_context );
    110107
    111108  if ( the_semaphore == NULL ) {
  • cpukit/rtems/src/signalsend.c

    r582bb23c re266d13  
    3939  }
    4040
    41   the_thread = _Thread_Get_interrupt_disable( id, &lock_context );
     41  the_thread = _Thread_Get( id, &lock_context );
    4242
    4343  if ( the_thread == NULL ) {
  • cpukit/rtems/src/systemeventsend.c

    r582bb23c re266d13  
    3838  ISR_lock_Context   lock_context;
    3939
    40   the_thread = _Thread_Get_interrupt_disable( id, &lock_context );
     40  the_thread = _Thread_Get( id, &lock_context );
    4141
    4242  if ( the_thread == NULL ) {
  • cpukit/rtems/src/taskdelete.c

    r582bb23c re266d13  
    3131  Per_CPU_Control  *cpu_self;
    3232
    33   the_thread = _Thread_Get_interrupt_disable( id, &lock_context );
     33  the_thread = _Thread_Get( id, &lock_context );
    3434
    3535  if ( the_thread == NULL ) {
  • cpukit/rtems/src/taskgetaffinity.c

    r582bb23c re266d13  
    4141  }
    4242
    43   the_thread = _Thread_Get_interrupt_disable( id, &lock_context );
     43  the_thread = _Thread_Get( id, &lock_context );
    4444
    4545  if ( the_thread == NULL ) {
  • cpukit/rtems/src/taskgetscheduler.c

    r582bb23c re266d13  
    3333  }
    3434
    35   the_thread = _Thread_Get_interrupt_disable( task_id, &lock_context );
     35  the_thread = _Thread_Get( task_id, &lock_context );
    3636
    3737  if ( the_thread == NULL ) {
  • cpukit/rtems/src/taskissuspended.c

    r582bb23c re266d13  
    2828  States_Control    current_state;
    2929
    30   the_thread = _Thread_Get_interrupt_disable( id, &lock_context );
     30  the_thread = _Thread_Get( id, &lock_context );
    3131
    3232  if ( the_thread == NULL ) {
  • cpukit/rtems/src/taskrestart.c

    r582bb23c re266d13  
    3232  bool                      ok;
    3333
    34   the_thread = _Thread_Get_interrupt_disable( id, &lock_context );
     34  the_thread = _Thread_Get( id, &lock_context );
    3535
    3636  if ( the_thread == NULL ) {
  • cpukit/rtems/src/taskresume.c

    r582bb23c re266d13  
    3131  States_Control    previous_state;
    3232
    33   the_thread = _Thread_Get_interrupt_disable( id, &lock_context );
     33  the_thread = _Thread_Get( id, &lock_context );
    3434
    3535  if ( the_thread == NULL ) {
  • cpukit/rtems/src/tasksetaffinity.c

    r582bb23c re266d13  
    4141  }
    4242
    43   the_thread = _Thread_Get_interrupt_disable( id, &lock_context );
     43  the_thread = _Thread_Get( id, &lock_context );
    4444
    4545  if ( the_thread == NULL ) {
  • cpukit/rtems/src/tasksetpriority.c

    r582bb23c re266d13  
    3939    return RTEMS_INVALID_ADDRESS;
    4040
    41   the_thread = _Thread_Get_interrupt_disable( id, &lock_context );
     41  the_thread = _Thread_Get( id, &lock_context );
    4242
    4343  if ( the_thread == NULL ) {
  • cpukit/rtems/src/tasksetscheduler.c

    r582bb23c re266d13  
    3737  }
    3838
    39   the_thread = _Thread_Get_interrupt_disable( task_id, &lock_context );
     39  the_thread = _Thread_Get( task_id, &lock_context );
    4040
    4141  if ( the_thread == NULL ) {
  • cpukit/rtems/src/taskstart.c

    r582bb23c re266d13  
    4141  bool              ok;
    4242
    43   the_thread = _Thread_Get_interrupt_disable( id, &lock_context );
     43  the_thread = _Thread_Get( id, &lock_context );
    4444
    4545  if ( the_thread == NULL ) {
  • cpukit/rtems/src/tasksuspend.c

    r582bb23c re266d13  
    3131  States_Control    previous_state;
    3232
    33   the_thread = _Thread_Get_interrupt_disable( id, &lock_context );
     33  the_thread = _Thread_Get( id, &lock_context );
    3434
    3535  if ( the_thread == NULL ) {
  • cpukit/score/include/rtems/score/threadimpl.h

    r582bb23c re266d13  
    583583 * @see _Objects_Get().
    584584 */
    585 Thread_Control *_Thread_Get_interrupt_disable(
     585Thread_Control *_Thread_Get(
    586586  Objects_Id         id,
    587587  ISR_lock_Context  *lock_context
  • cpukit/score/src/mpci.c

    r582bb23c re266d13  
    296296  Thread_Control   *the_thread;
    297297
    298   the_thread = _Thread_Get_interrupt_disable( the_packet->id, &lock_context );
     298  the_thread = _Thread_Get( the_packet->id, &lock_context );
    299299  _Assert( the_thread != NULL );
    300300
  • cpukit/score/src/schedulercbsattachthread.c

    r582bb23c re266d13  
    4646  }
    4747
    48   the_thread = _Thread_Get_interrupt_disable( task_id, &lock_context );
     48  the_thread = _Thread_Get( task_id, &lock_context );
    4949
    5050  if ( the_thread == NULL ) {
  • cpukit/score/src/schedulercbsdetachthread.c

    r582bb23c re266d13  
    4747  }
    4848
    49   the_thread = _Thread_Get_interrupt_disable( task_id, &lock_context );
     49  the_thread = _Thread_Get( task_id, &lock_context );
    5050
    5151  if ( the_thread == NULL ) {
  • cpukit/score/src/schedulercbsgetexecutiontime.c

    r582bb23c re266d13  
    4848  }
    4949
    50   the_thread = _Thread_Get_interrupt_disable( server->task_id, &lock_context );
     50  the_thread = _Thread_Get( server->task_id, &lock_context );
    5151
    5252  if ( the_thread != NULL ) {
  • cpukit/score/src/schedulercbsgetremainingbudget.c

    r582bb23c re266d13  
    4646  }
    4747
    48   the_thread = _Thread_Get_interrupt_disable( server->task_id, &lock_context );
     48  the_thread = _Thread_Get( server->task_id, &lock_context );
    4949
    5050  if ( the_thread != NULL ) {
  • cpukit/score/src/threadget.c

    r582bb23c re266d13  
    2222#include <rtems/score/threadimpl.h>
    2323
    24 Thread_Control *_Thread_Get_interrupt_disable(
     24Thread_Control *_Thread_Get(
    2525  Objects_Id         id,
    2626  ISR_lock_Context  *lock_context
  • testsuites/smptests/smpmigration02/init.c

    r582bb23c re266d13  
    122122  Thread_Control *thread;
    123123
    124   thread = _Thread_Get_interrupt_disable(task_id, &lock_context);
     124  thread = _Thread_Get(task_id, &lock_context);
    125125  rtems_test_assert(thread != NULL);
    126126  _ISR_lock_ISR_enable(&lock_context);
  • testsuites/smptests/smpscheduler03/init.c

    r582bb23c re266d13  
    104104  Thread_Control *thread;
    105105
    106   thread = _Thread_Get_interrupt_disable(task_id, &lock_context);
     106  thread = _Thread_Get(task_id, &lock_context);
    107107  rtems_test_assert(thread != NULL);
    108108  _ISR_lock_ISR_enable(&lock_context);
  • testsuites/sptests/spintrcritical22/init.c

    r582bb23c re266d13  
    3737  Semaphore_Control *sem;
    3838
    39   sem = _Semaphore_Get_interrupt_disable(id, &lock_context);
     39  sem = _Semaphore_Get(id, &lock_context);
    4040  rtems_test_assert(sem != NULL);
    4141  _ISR_lock_ISR_enable(&lock_context);
  • testsuites/sptests/spintrcritical23/init.c

    r582bb23c re266d13  
    4646  Thread_Control *tcb;
    4747
    48   tcb = _Thread_Get_interrupt_disable(id, &lock_context);
     48  tcb = _Thread_Get(id, &lock_context);
    4949  rtems_test_assert(tcb != NULL);
    5050  _ISR_lock_ISR_enable(&lock_context);
  • testsuites/tmtests/tm26/task1.c

    r582bb23c re266d13  
    507507  benchmark_timer_initialize();
    508508    for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
    509       (void) _Thread_Get_interrupt_disable( task_id, &lock_context );
     509      (void) _Thread_Get( task_id, &lock_context );
    510510      _ISR_lock_ISR_enable( &lock_context );
    511511    }
     
    514514  benchmark_timer_initialize();
    515515    for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
    516       (void) _Semaphore_Get_interrupt_disable(
    517         Semaphore_id,
    518         &lock_context
    519       );
     516      (void) _Semaphore_Get( Semaphore_id, &lock_context );
    520517      _ISR_lock_ISR_enable( &lock_context );
    521518    }
     
    524521  benchmark_timer_initialize();
    525522    for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
    526       (void) _Thread_Get_interrupt_disable( 0x3, &lock_context );
     523      (void) _Thread_Get( 0x3, &lock_context );
    527524      _ISR_lock_ISR_enable( &lock_context );
    528525    }
     
    688685
    689686  put_time(
    690     "rtems internal: _Thread_Get_interrupt_disable",
     687    "rtems internal: _Thread_Get",
    691688    thread_get_time,
    692689    OPERATION_COUNT,
     
    696693
    697694  put_time(
    698     "rtems internal: _Semaphore_Get_interrupt_disable",
     695    "rtems internal: _Semaphore_Get",
    699696    semaphore_get_time,
    700697    OPERATION_COUNT,
     
    704701
    705702  put_time(
    706     "rtems internal: _Thread_Get_interrupt_disable: invalid id",
     703    "rtems internal: _Thread_Get: invalid id",
    707704    thread_get_invalid_time,
    708705    OPERATION_COUNT,
Note: See TracChangeset for help on using the changeset viewer.