diff options
Diffstat (limited to 'cpukit/libmisc/capture/capture_user_extension.c')
| -rw-r--r-- | cpukit/libmisc/capture/capture_user_extension.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/cpukit/libmisc/capture/capture_user_extension.c b/cpukit/libmisc/capture/capture_user_extension.c index 6e42fd7c87..ea8d55dbaa 100644 --- a/cpukit/libmisc/capture/capture_user_extension.c +++ b/cpukit/libmisc/capture/capture_user_extension.c @@ -78,7 +78,7 @@ static const rtems_extensions_table capture_extensions = { .thread_terminate = rtems_capture_terminated_task }; -static inline void rtems_capture_record (rtems_tcb* tcb, uint32_t events) +static inline void capture_record (rtems_tcb* tcb, uint32_t events) { rtems_capture_record_lock_context rec_context; @@ -140,10 +140,10 @@ rtems_capture_create_task (rtems_tcb* ct, */ rtems_capture_initialize_task (nt); - if (rtems_capture_trigger (ct, nt, RTEMS_CAPTURE_CREATE)) + if (rtems_capture_trigger_fired (ct, nt, RTEMS_CAPTURE_CREATE)) { - rtems_capture_record (ct, RTEMS_CAPTURE_CREATED_BY_EVENT); - rtems_capture_record (nt, RTEMS_CAPTURE_CREATED_EVENT); + capture_record (ct, RTEMS_CAPTURE_CREATED_BY_EVENT); + capture_record (nt, RTEMS_CAPTURE_CREATED_EVENT); } return 1 == 1; @@ -167,10 +167,10 @@ rtems_capture_start_task (rtems_tcb* ct, if (st != NULL) rtems_capture_initialize_task (st); - if (rtems_capture_trigger (ct, st, RTEMS_CAPTURE_START)) + if (rtems_capture_trigger_fired (ct, st, RTEMS_CAPTURE_START)) { - rtems_capture_record (ct, RTEMS_CAPTURE_STARTED_BY_EVENT); - rtems_capture_record (st, RTEMS_CAPTURE_STARTED_EVENT); + capture_record (ct, RTEMS_CAPTURE_STARTED_BY_EVENT); + capture_record (st, RTEMS_CAPTURE_STARTED_EVENT); } } @@ -191,10 +191,10 @@ rtems_capture_restart_task (rtems_tcb* ct, if (!rtems_capture_task_initialized (rt)) rtems_capture_initialize_task (rt); - if (rtems_capture_trigger (ct, rt, RTEMS_CAPTURE_RESTART)) + if (rtems_capture_trigger_fired (ct, rt, RTEMS_CAPTURE_RESTART)) { - rtems_capture_record (ct, RTEMS_CAPTURE_RESTARTED_BY_EVENT); - rtems_capture_record (rt, RTEMS_CAPTURE_RESTARTED_EVENT); + capture_record (ct, RTEMS_CAPTURE_RESTARTED_BY_EVENT); + capture_record (rt, RTEMS_CAPTURE_RESTARTED_EVENT); } } @@ -211,10 +211,10 @@ rtems_capture_delete_task (rtems_tcb* ct, if (!rtems_capture_task_initialized (dt)) rtems_capture_initialize_task (dt); - if (rtems_capture_trigger (ct, dt, RTEMS_CAPTURE_DELETE)) + if (rtems_capture_trigger_fired (ct, dt, RTEMS_CAPTURE_DELETE)) { - rtems_capture_record (ct, RTEMS_CAPTURE_DELETED_BY_EVENT); - rtems_capture_record (dt, RTEMS_CAPTURE_DELETED_EVENT); + capture_record (ct, RTEMS_CAPTURE_DELETED_BY_EVENT); + capture_record (dt, RTEMS_CAPTURE_DELETED_EVENT); } } @@ -232,8 +232,8 @@ rtems_capture_begin_task (rtems_tcb* bt) if (!rtems_capture_task_initialized (bt)) rtems_capture_initialize_task (bt); - if (rtems_capture_trigger (NULL, bt, RTEMS_CAPTURE_BEGIN)) - rtems_capture_record (bt, RTEMS_CAPTURE_BEGIN_EVENT); + if (rtems_capture_trigger_fired (NULL, bt, RTEMS_CAPTURE_BEGIN)) + capture_record (bt, RTEMS_CAPTURE_BEGIN_EVENT); } /* @@ -251,8 +251,8 @@ rtems_capture_exitted_task (rtems_tcb* et) if (!rtems_capture_task_initialized (et)) rtems_capture_initialize_task (et); - if (rtems_capture_trigger (NULL, et, RTEMS_CAPTURE_EXITTED)) - rtems_capture_record (et, RTEMS_CAPTURE_EXITTED_EVENT); + if (rtems_capture_trigger_fired (NULL, et, RTEMS_CAPTURE_EXITTED)) + capture_record (et, RTEMS_CAPTURE_EXITTED_EVENT); } /* @@ -269,8 +269,8 @@ rtems_capture_terminated_task (rtems_tcb* tt) if (!rtems_capture_task_initialized (tt)) rtems_capture_initialize_task (tt); - if (rtems_capture_trigger (NULL, tt, RTEMS_CAPTURE_TERMINATED)) - rtems_capture_record (tt, RTEMS_CAPTURE_TERMINATED_EVENT); + if (rtems_capture_trigger_fired (NULL, tt, RTEMS_CAPTURE_TERMINATED)) + capture_record (tt, RTEMS_CAPTURE_TERMINATED_EVENT); } /* @@ -288,7 +288,7 @@ rtems_capture_switch_task (rtems_tcb* ct, */ if (flags & RTEMS_CAPTURE_ON) { - rtems_capture_time_t time; + rtems_capture_time time; if (!rtems_capture_task_initialized (ct)) rtems_capture_initialize_task (ct); @@ -301,10 +301,10 @@ rtems_capture_switch_task (rtems_tcb* ct, */ rtems_capture_get_time (&time); - if (rtems_capture_trigger (ct, ht, RTEMS_CAPTURE_SWITCH)) + if (rtems_capture_trigger_fired (ct, ht, RTEMS_CAPTURE_SWITCH)) { - rtems_capture_record (ct, RTEMS_CAPTURE_SWITCHED_OUT_EVENT); - rtems_capture_record (ht, RTEMS_CAPTURE_SWITCHED_IN_EVENT); + capture_record (ct, RTEMS_CAPTURE_SWITCHED_OUT_EVENT); + capture_record (ht, RTEMS_CAPTURE_SWITCHED_IN_EVENT); } } } |