From 3c89cdf9ca2aae9e0a602997ed0245692ddf976a Mon Sep 17 00:00:00 2001 From: Sascha Philipp Date: Mon, 6 Oct 2014 13:07:48 +0200 Subject: Change daemon state handling to have all traces in online trace even when offline trace is active Change-Id: Ic212c4956582b18e05739d593bf5c792d60d9c00 Signed-off-by: Sascha Philipp --- src/daemon/dlt_daemon_client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/daemon/dlt_daemon_client.c') diff --git a/src/daemon/dlt_daemon_client.c b/src/daemon/dlt_daemon_client.c index fe75d90..00ad5b9 100644 --- a/src/daemon/dlt_daemon_client.c +++ b/src/daemon/dlt_daemon_client.c @@ -96,7 +96,10 @@ int dlt_daemon_client_send(int sock,DltDaemon *daemon,DltDaemonLocal *daemon_loc } /* write message to offline trace */ - if ((sock!=DLT_DAEMON_SEND_FORCE) && (daemon->state == DLT_DAEMON_STATE_SEND_DIRECT) && !control) + // In the SEND_BUFFER state we must skip offline tracing because the offline traces + // are going without buffering directly to the offline trace. Thus we have to filter out + // the traces that are coming from the buffer. + if ((sock!=DLT_DAEMON_SEND_FORCE) && (daemon->state != DLT_DAEMON_STATE_SEND_BUFFER)) { if(((daemon->mode == DLT_USER_MODE_INTERNAL) || (daemon->mode == DLT_USER_MODE_BOTH)) && daemon_local->flags.offlineTraceDirectory[0]) -- cgit v1.2.1