Changeset f11d18b in rtems-tools

Timestamp:

10/15/15 10:05:29 (7 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.10, 5, master

Children:

2f11c36

Parents:

e3df129

Message:

Change to use the task implemenation interface.

File:

• linkers/rtld-trace-buffer.ini (modified) (3 diffs)

linkers/rtld-trace-buffer.ini

@@ -26 +26 @@
 header = "#include <stdint.h>"
 header = "#include <rtems.h>"
+header = "#include <rtems/rtems/tasksimpl.h>"
 
 [trace-buffer-tracers]
@@ -66 +67 @@
 volatile bool __rtld_tbg_finished;
 volatile bool __rtld_tbg_triggered;
-rtems_interrupt_lock __rtld_tbg_lock = RTEMS_INTERRUPT_LOCK_INITIALIZER("rtld-trace-buffer");
+/*
+ * Lock the access.
+ */
+RTEMS_INTERRUPT_LOCK_DEFINE(static, __rtld_tbg_lock, "rtld-trace-buffer");
 
 static inline uint32_t __rtld_tbg_in_irq(void)
 {
-  return _ISR_Nest_level ? (1 << 31) : 0;
+  return rtems_interrupt_is_in_progress() ? (1 << 31) : 0;
 }
 
 static inline uint32_t __rtld_tbg_executing_id(void)
 {
-  return _Thread_Executing->Object.id;
+  return _Thread_Get_executing()->Object.id;
 }
 
@@ -81 +85 @@
 {
   /* @fixme Add the current CPU for SMP. */
-  return (_Thread_Executing->current_priority << 8) | _Thread_Executing->real_priority;
+  struct Thread_Control* tc = _Thread_Get_executing();
+  return (tc->current_priority << 8) | tc->real_priority;
 }
 
 static inline uint32_t __rtld_tbg_executing_state(void)
 {
-  return _Thread_Executing->current_state;
+  return _Thread_Get_executing()->current_state;
 }