summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarmink <[email protected]>2021-05-19 18:17:37 +0800
committerarmink <[email protected]>2021-05-19 18:17:37 +0800
commite0b9987508e6c9daecee2af2a30f57ba82a49dbc (patch)
tree54846e79e879166d269d0cc57a8e7bb6585a7a95
parent5ba96109c60c4b1a66ffcc39a42de2fc28fcd75e (diff)
[ulog] Add output locker enabled API
Signed-off-by: armink <[email protected]>
-rw-r--r--components/utilities/ulog/ulog.c13
-rw-r--r--components/utilities/ulog/ulog.h1
2 files changed, 14 insertions, 0 deletions
diff --git a/components/utilities/ulog/ulog.c b/components/utilities/ulog/ulog.c
index 9dd2ed2fd0..c36fc6ff26 100644
--- a/components/utilities/ulog/ulog.c
+++ b/components/utilities/ulog/ulog.c
@@ -77,6 +77,7 @@
struct rt_ulog
{
rt_bool_t init_ok;
+ rt_bool_t output_lock_enabled;
struct rt_semaphore output_locker;
/* all backends */
rt_slist_t backend_list;
@@ -186,6 +187,9 @@ size_t ulog_ultoa(char *s, unsigned long int n)
static void output_unlock(void)
{
+ if (!ulog.output_lock_enabled)
+ return;
+
/* is in thread context */
if (rt_interrupt_get_nest() == 0)
{
@@ -201,6 +205,9 @@ static void output_unlock(void)
static void output_lock(void)
{
+ if (!ulog.output_lock_enabled)
+ return;
+
/* is in thread context */
if (rt_interrupt_get_nest() == 0)
{
@@ -214,6 +221,11 @@ static void output_lock(void)
}
}
+void ulog_output_lock_enabled(rt_bool_t enabled)
+{
+ ulog.output_lock_enabled = enabled;
+}
+
static char *get_log_buf(void)
{
/* is in thread context */
@@ -1392,6 +1404,7 @@ int ulog_init(void)
return 0;
rt_sem_init(&ulog.output_locker, "ulog lock", 1, RT_IPC_FLAG_FIFO);
+ ulog.output_lock_enabled = RT_TRUE;
rt_slist_init(&ulog.backend_list);
#ifdef ULOG_USING_FILTER
diff --git a/components/utilities/ulog/ulog.h b/components/utilities/ulog/ulog.h
index 3754828e56..1e139222aa 100644
--- a/components/utilities/ulog/ulog.h
+++ b/components/utilities/ulog/ulog.h
@@ -25,6 +25,7 @@ extern "C" {
*/
int ulog_init(void);
int ulog_async_init(void);
+void ulog_output_lock_enabled(rt_bool_t enabled);
void ulog_deinit(void);
/*