aboutsummaryrefslogtreecommitdiff
path: root/pw_trace_tokenized/trace_rpc_service_nanopb.cc
diff options
context:
space:
mode:
Diffstat (limited to 'pw_trace_tokenized/trace_rpc_service_nanopb.cc')
-rw-r--r--pw_trace_tokenized/trace_rpc_service_nanopb.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/pw_trace_tokenized/trace_rpc_service_nanopb.cc b/pw_trace_tokenized/trace_rpc_service_nanopb.cc
index 38e8d8205..6452163f6 100644
--- a/pw_trace_tokenized/trace_rpc_service_nanopb.cc
+++ b/pw_trace_tokenized/trace_rpc_service_nanopb.cc
@@ -16,22 +16,24 @@
#include "pw_trace_tokenized/trace_rpc_service_nanopb.h"
#include "pw_log/log.h"
-#include "pw_preprocessor/util.h"
#include "pw_trace_tokenized/trace_buffer.h"
#include "pw_trace_tokenized/trace_tokenized.h"
namespace pw::trace {
+TraceService::TraceService(TokenizedTracer& tokenized_tracer)
+ : tokenized_tracer_(tokenized_tracer) {}
+
pw::Status TraceService::Enable(const pw_trace_TraceEnableMessage& request,
pw_trace_TraceEnableMessage& response) {
- TokenizedTrace::Instance().Enable(request.enable);
- response.enable = TokenizedTrace::Instance().IsEnabled();
+ tokenized_tracer_.Enable(request.enable);
+ response.enable = tokenized_tracer_.IsEnabled();
return PW_STATUS_OK;
}
pw::Status TraceService::IsEnabled(const pw_trace_Empty&,
pw_trace_TraceEnableMessage& response) {
- response.enable = TokenizedTrace::Instance().IsEnabled();
+ response.enable = tokenized_tracer_.IsEnabled();
return PW_STATUS_OK;
}
@@ -45,7 +47,7 @@ void TraceService::GetTraceData(
while (trace_buffer->PeekFront(as_writable_bytes(span(buffer.data.bytes)),
&size) != pw::Status::OutOfRange()) {
trace_buffer->PopFront()
- .IgnoreError(); // TODO(b/242598609): Handle Status properly
+ .IgnoreError(); // TODO: b/242598609 - Handle Status properly
buffer.data.size = size;
pw::Status status = writer.Write(buffer);
if (!status.ok()) {
@@ -54,6 +56,6 @@ void TraceService::GetTraceData(
break;
}
}
- writer.Finish().IgnoreError(); // TODO(b/242598609): Handle Status properly
+ writer.Finish().IgnoreError(); // TODO: b/242598609 - Handle Status properly
}
} // namespace pw::trace