Changeset f11d18b in rtems-tools for linkers/rtld-trace-buffer.ini


Ignore:
Timestamp:
Oct 15, 2015, 10:05:29 AM (4 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, master
Children:
2f11c36
Parents:
e3df129
Message:

Change to use the task implemenation interface.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • linkers/rtld-trace-buffer.ini

    re3df129 rf11d18b  
    2626header = "#include <stdint.h>"
    2727header = "#include <rtems.h>"
     28header = "#include <rtems/rtems/tasksimpl.h>"
    2829
    2930[trace-buffer-tracers]
     
    6667volatile bool __rtld_tbg_finished;
    6768volatile bool __rtld_tbg_triggered;
    68 rtems_interrupt_lock __rtld_tbg_lock = RTEMS_INTERRUPT_LOCK_INITIALIZER("rtld-trace-buffer");
     69/*
     70 * Lock the access.
     71 */
     72RTEMS_INTERRUPT_LOCK_DEFINE(static, __rtld_tbg_lock, "rtld-trace-buffer");
    6973
    7074static inline uint32_t __rtld_tbg_in_irq(void)
    7175{
    72   return _ISR_Nest_level ? (1 << 31) : 0;
     76  return rtems_interrupt_is_in_progress() ? (1 << 31) : 0;
    7377}
    7478
    7579static inline uint32_t __rtld_tbg_executing_id(void)
    7680{
    77   return _Thread_Executing->Object.id;
     81  return _Thread_Get_executing()->Object.id;
    7882}
    7983
     
    8185{
    8286  /* @fixme Add the current CPU for SMP. */
    83   return (_Thread_Executing->current_priority << 8) | _Thread_Executing->real_priority;
     87  struct Thread_Control* tc = _Thread_Get_executing();
     88  return (tc->current_priority << 8) | tc->real_priority;
    8489}
    8590
    8691static inline uint32_t __rtld_tbg_executing_state(void)
    8792{
    88   return _Thread_Executing->current_state;
     93  return _Thread_Get_executing()->current_state;
    8994}
    9095
Note: See TracChangeset for help on using the changeset viewer.