From 42e243813eb4dfb76419273c5191e5013e70bbb0 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 4 Mar 2022 15:30:50 +0800 Subject: [PATCH] minor changes --- source/libs/monitor/inc/monInt.h | 10 +++++----- source/libs/monitor/src/monitor.c | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source/libs/monitor/inc/monInt.h b/source/libs/monitor/inc/monInt.h index ca5aaf0a38..65e47ef90c 100644 --- a/source/libs/monitor/inc/monInt.h +++ b/source/libs/monitor/inc/monInt.h @@ -34,11 +34,11 @@ typedef struct SMonInfo { } SMonInfo; typedef struct { - pthread_rwlock_t rwlock; - SArray *logs; // array of SMonLogItem - int32_t maxLogs; - const char *server; - uint16_t port; + pthread_mutex_t lock; + SArray *logs; // array of SMonLogItem + int32_t maxLogs; + const char *server; + uint16_t port; } SMonitor; #ifdef __cplusplus diff --git a/source/libs/monitor/src/monitor.c b/source/libs/monitor/src/monitor.c index a50b8c3e90..f278a41534 100644 --- a/source/libs/monitor/src/monitor.c +++ b/source/libs/monitor/src/monitor.c @@ -23,7 +23,7 @@ static SMonitor tsMonitor = {0}; void monRecordLog(int64_t ts, ELogLevel level, const char *content) { - pthread_rwlock_rdlock(&tsMonitor.rwlock); + pthread_mutex_lock(&tsMonitor.lock); int32_t size = taosArrayGetSize(tsMonitor.logs); if (size >= tsMonitor.maxLogs) { uInfo("too many logs for monitor"); @@ -34,7 +34,7 @@ void monRecordLog(int64_t ts, ELogLevel level, const char *content) { tstrncpy(pItem->content, content, sizeof(item.content)); } } - pthread_rwlock_unlock(&tsMonitor.rwlock); + pthread_mutex_unlock(&tsMonitor.lock); } int32_t monInit(const SMonCfg *pCfg) { @@ -48,14 +48,14 @@ int32_t monInit(const SMonCfg *pCfg) { tsMonitor.server = pCfg->server; tsMonitor.port = pCfg->port; tsLogFp = monRecordLog; - pthread_rwlock_init(&tsMonitor.rwlock, NULL); + pthread_mutex_init(&tsMonitor.lock, NULL); return 0; } void monCleanup() { taosArrayDestroy(tsMonitor.logs); tsMonitor.logs = NULL; - pthread_rwlock_wrlock(&tsMonitor.rwlock); + pthread_mutex_destroy(&tsMonitor.lock); } SMonInfo *monCreateMonitorInfo() { @@ -65,10 +65,10 @@ SMonInfo *monCreateMonitorInfo() { return NULL; } - pthread_rwlock_wrlock(&tsMonitor.rwlock); + pthread_mutex_lock(&tsMonitor.lock); pMonitor->logs = taosArrayDup(tsMonitor.logs); taosArrayClear(tsMonitor.logs); - pthread_rwlock_unlock(&tsMonitor.rwlock); + pthread_mutex_unlock(&tsMonitor.lock); pMonitor->pJson = tjsonCreateObject(); if (pMonitor->pJson == NULL || pMonitor->logs == NULL) {