diff options
| author | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2013-08-07 14:10:15 +0200 |
|---|---|---|
| committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2013-08-07 14:27:01 +0200 |
| commit | 8d4f2daabf66cd9c84dae02adb5a16dd8c18ba4d (patch) | |
| tree | 31074b1f4354776ca12371bc21d4987be05e8ddc | |
| parent | d7f3cce7b39d567380a3cf8630a9312c3b5689a8 (diff) | |
| download | DLT-daemon-8d4f2daabf66cd9c84dae02adb5a16dd8c18ba4d.tar.gz | |
Changes after review.
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
| -rw-r--r-- | src/daemon/dlt-daemon.c | 2 | ||||
| -rw-r--r-- | src/lib/dlt_user.c | 16 | ||||
| -rwxr-xr-x | src/shared/dlt_user_shared.h | 2 |
3 files changed, 13 insertions, 7 deletions
diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c index a44d028..53a1ae6 100644 --- a/src/daemon/dlt-daemon.c +++ b/src/daemon/dlt-daemon.c @@ -1619,7 +1619,7 @@ int dlt_daemon_send_message_overflow(DltDaemon *daemon, DltDaemonLocal *daemon_l } /* if */ } /* for */ - /* message was not sent, so store it in ringbuffer */ + /* message was not sent, so report to caller that sending failed */ if (sent==0) { return -1; diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c index 7482948..36dac77 100644 --- a/src/lib/dlt_user.c +++ b/src/lib/dlt_user.c @@ -1113,6 +1113,7 @@ int dlt_forward_msg(void *msgdata,size_t size) { dlt_log(LOG_ERR,"Buffer full! First message discarded!\n"); } + ret = DLT_RETURN_BUFFER_FULL; } DLT_SEM_FREE(); @@ -1125,10 +1126,15 @@ int dlt_forward_msg(void *msgdata,size_t size) switch (ret) { + case DLT_RETURN_BUFFER_FULL: + { + /* Buffer full */ + dlt_user.overflow_counter += 1; + return -1; + } case DLT_RETURN_PIPE_FULL: { /* data could not be written */ - dlt_user.overflow_counter += 1; return -1; } case DLT_RETURN_PIPE_ERROR: @@ -2207,7 +2213,7 @@ void dlt_user_trace_network_segmented_thread(void *unused) // Requeue if still not empty if ( dlt_user_queue_resend() < 0 ) { - ;//dlt_log(LOG_WARNING, "Failed to queue resending in dlt_user_trace_network_segmented_thread.\n"); + //dlt_log(LOG_WARNING, "Failed to queue resending in dlt_user_trace_network_segmented_thread.\n"); } } free(data); @@ -2747,7 +2753,7 @@ int dlt_user_log_init(DltContext *handle, DltContextData *log) int dlt_user_queue_resend(void) { - static unsigned int dlt_user_queue_resend_error_counter = 0; + static unsigned char dlt_user_queue_resend_error_counter = 0; if(dlt_user.dlt_log_handle < 0) { @@ -2777,7 +2783,7 @@ int dlt_user_queue_resend(void) // log error only when problem occurred first time dlt_log(LOG_ERR, "NWTSegmented: Could not open queue.\n"); } - dlt_user_queue_resend_error_counter++; + dlt_user_queue_resend_error_counter = 1; free(resend_data); return -1; } @@ -2791,7 +2797,7 @@ int dlt_user_queue_resend(void) snprintf(str,254,"Could not request resending.: %s \n",strerror(errno)); dlt_log(LOG_CRIT, str); } - dlt_user_queue_resend_error_counter++; + dlt_user_queue_resend_error_counter = 1; free(resend_data); return -1; } diff --git a/src/shared/dlt_user_shared.h b/src/shared/dlt_user_shared.h index 24941a7..5132a74 100755 --- a/src/shared/dlt_user_shared.h +++ b/src/shared/dlt_user_shared.h @@ -183,7 +183,7 @@ typedef struct } PACKED DltUserControlMsgLogState;
/**
- * This is the internal message content to get the lnumber of lost messages reported to the daemon.
+ * This is the internal message content to get the number of lost messages reported to the daemon.
*/
typedef struct
{
|