michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: Add dropping of expired messages

Browse source 
Log message get timestamp when being added to shell log message queue.
When adding to log message queue timeouts then all messages added
before timeout are dropped.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2018-12-18 14:48:56 +01:00 • committed by Carles Cufí
commit b467de5849
2 changed files with 39 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/shell/shell_log_backend.h
View file

@ -40,6 +40,12 @@ struct shell_log_backend {
u32_t timeout; u32_t timeout;
}; };
/** @brief Shell log backend message structure. */
struct shell_log_backend_msg {
struct log_msg *msg;
u32_t timestamp;
};
/** @brief Prototype of function outputing processed data. */ /** @brief Prototype of function outputing processed data. */
int shell_log_backend_output_func(u8_t *data, size_t length, void *ctx); int shell_log_backend_output_func(u8_t *data, size_t length, void *ctx);
@ -61,7 +67,7 @@ int shell_log_backend_output_func(u8_t *data, size_t length, void *ctx);
#if CONFIG_LOG #if CONFIG_LOG
#define SHELL_LOG_BACKEND_DEFINE(_name, _buf, _size, _queue_size, _timeout) \ #define SHELL_LOG_BACKEND_DEFINE(_name, _buf, _size, _queue_size, _timeout) \
LOG_BACKEND_DEFINE(_name##_backend, log_backend_shell_api, false); \ LOG_BACKEND_DEFINE(_name##_backend, log_backend_shell_api, false); \
K_MSGQ_DEFINE(_name##_msgq, sizeof(void *), \ K_MSGQ_DEFINE(_name##_msgq, sizeof(struct shell_log_backend_msg), \
_queue_size, sizeof(void *)); \ _queue_size, sizeof(void *)); \
LOG_OUTPUT_DEFINE(_name##_log_output, shell_log_backend_output_func, \ LOG_OUTPUT_DEFINE(_name##_log_output, shell_log_backend_output_func, \
_buf, _size); \ _buf, _size); \

47
subsys/shell/shell_log_backend.c
View file

@ -26,12 +26,12 @@ void shell_log_backend_enable(const struct shell_log_backend *backend,
static struct log_msg *msg_from_fifo(const struct shell_log_backend *backend) static struct log_msg *msg_from_fifo(const struct shell_log_backend *backend)
{ {
struct log_msg *msg; struct shell_log_backend_msg msg;
int err; int err;
err = k_msgq_get(backend->msgq, &msg, K_NO_WAIT); err = k_msgq_get(backend->msgq, &msg, K_NO_WAIT);
return (err == 0) ? msg : NULL; return (err == 0) ? msg.msg : NULL;
} }
static void fifo_flush(const struct shell_log_backend *backend) static void fifo_flush(const struct shell_log_backend *backend)
@ -44,12 +44,40 @@ static void fifo_flush(const struct shell_log_backend *backend)
} }
} }
static void flush_expired_messages(const struct shell *shell)
{
int err;
struct shell_log_backend_msg msg;
struct k_msgq *msgq = shell->log_backend->msgq;
u32_t timeout = shell->log_backend->timeout;
u32_t now = k_uptime_get_32();
while (1) {
err = k_msgq_peek(msgq, &msg);
if (err == 0 && ((now - msg.timestamp) > timeout)) {
(void)k_msgq_get(msgq, &msg, K_NO_WAIT);
log_msg_put(msg.msg);
if (IS_ENABLED(CONFIG_SHELL_STATS)) {
shell->stats->log_lost_cnt++;
}
} else {
break;
}
}
}
static void msg_to_fifo(const struct shell *shell, static void msg_to_fifo(const struct shell *shell,
struct log_msg *msg) struct log_msg *msg)
{ {
int err; int err;
struct shell_log_backend_msg t_msg = {
.msg = msg,
.timestamp = k_uptime_get_32()
};
err = k_msgq_put(shell->log_backend->msgq, &msg, err = k_msgq_put(shell->log_backend->msgq, &t_msg,
shell->log_backend->timeout); shell->log_backend->timeout);
switch (err) { switch (err) {
@ -58,18 +86,7 @@ static void msg_to_fifo(const struct shell *shell,
case -EAGAIN: case -EAGAIN:
case -ENOMSG: case -ENOMSG:
{ {
struct log_msg *old_msg; flush_expired_messages(shell);
/* drop one message */
old_msg = msg_from_fifo(shell->log_backend);
if (old_msg) {
log_msg_put(old_msg);
if (IS_ENABLED(CONFIG_SHELL_STATS)) {
shell->stats->log_lost_cnt++;
}
}
err = k_msgq_put(shell->log_backend->msgq, &msg, K_NO_WAIT); err = k_msgq_put(shell->log_backend->msgq, &msg, K_NO_WAIT);
if (err) { if (err) {