diff options
Diffstat (limited to 'pw_trace_tokenized/trace_test.cc')
| -rw-r--r-- | pw_trace_tokenized/trace_test.cc | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/pw_trace_tokenized/trace_test.cc b/pw_trace_tokenized/trace_test.cc index 72457ab96..8a74e2ca0 100644 --- a/pw_trace_tokenized/trace_test.cc +++ b/pw_trace_tokenized/trace_test.cc @@ -54,27 +54,25 @@ class TraceTestInterface { } }; - TraceTestInterface() { + TraceTestInterface() : callbacks_(pw::trace::GetCallbacks()) { PW_TRACE_SET_ENABLED(true); EXPECT_EQ(pw::OkStatus(), - pw::trace::Callbacks::Instance().RegisterSink(TraceSinkStartBlock, - TraceSinkAddBytes, - TraceSinkEndBlock, - this, - &sink_handle_)); + callbacks_.RegisterSink(TraceSinkStartBlock, + TraceSinkAddBytes, + TraceSinkEndBlock, + this, + &sink_handle_)); EXPECT_EQ(pw::OkStatus(), - pw::trace::Callbacks::Instance().RegisterEventCallback( + callbacks_.RegisterEventCallback( TraceEventCallback, - pw::trace::CallbacksImpl::kCallOnlyWhenEnabled, + pw::trace::Callbacks::kCallOnlyWhenEnabled, this, &event_callback_handle_)); } ~TraceTestInterface() { + EXPECT_EQ(pw::OkStatus(), callbacks_.UnregisterSink(sink_handle_)); EXPECT_EQ(pw::OkStatus(), - pw::trace::Callbacks::Instance().UnregisterSink(sink_handle_)); - EXPECT_EQ(pw::OkStatus(), - pw::trace::Callbacks::Instance().UnregisterEventCallback( - event_callback_handle_)); + callbacks_.UnregisterEventCallback(event_callback_handle_)); } // ActionOnEvent will perform a specific action within the callback when an // event matches one of the characteristics of event_match_. @@ -162,8 +160,9 @@ class TraceTestInterface { size_t sink_block_size_; size_t sink_bytes_received_; std::deque<TraceInfo> buffer_; - pw::trace::CallbacksImpl::SinkHandle sink_handle_; - pw::trace::CallbacksImpl::EventCallbackHandle event_callback_handle_; + pw::trace::Callbacks& callbacks_; + pw::trace::Callbacks::SinkHandle sink_handle_; + pw::trace::Callbacks::EventCallbackHandle event_callback_handle_; }; } // namespace |