[TD-91] make monitor work

src/dnode/src/dnodeModule.c

@@ -90,7 +90,7 @@ void dnodeCleanUpModules() {
 int32_t dnodeInitModules() {
   dnodeAllocModules();
 
-  for (int32_t module = 0; module < TSDB_MOD_MAX; ++module) {
+  for (EModuleType module = 0; module < TSDB_MOD_MAX; ++module) {
     if (tsModule[module].initFp) {
       if ((*tsModule[module].initFp)() != 0) {
         dError("failed to init module:%s", tsModule[module].name);
@@ -103,7 +103,7 @@ int32_t dnodeInitModules() {
 }
 
 void dnodeStartModules() {
-  for (int32_t module = 1; module < TSDB_MOD_MAX; ++module) {
+  for (EModuleType module = 1; module < TSDB_MOD_MAX; ++module) {
     if (tsModule[module].enable && tsModule[module].startFp) {
       if ((*tsModule[module].startFp)() != 0) {
         dError("failed to start module:%s", tsModule[module].name);

src/dnode/src/dnodeShell.c

@@ -20,16 +20,17 @@
 #include "taosmsg.h"
 #include "trpc.h"
 #include "tglobal.h"
+#include "http.h"
 #include "dnode.h"
 #include "dnodeLog.h"
 #include "dnodeRead.h"
 #include "dnodeWrite.h"
 #include "dnodeShell.h"
 
-static void (*dnodeProcessShellMsgFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *);
-static void   dnodeProcessMsgFromShell(SRpcMsg *pMsg);
-static int    dnodeRetrieveUserAuthInfo(char *user, char *spi, char *encrypt, char *secret, char *ckey);
-static void  *tsDnodeShellRpc = NULL;
+static void  (*dnodeProcessShellMsgFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *);
+static void    dnodeProcessMsgFromShell(SRpcMsg *pMsg);
+static int     dnodeRetrieveUserAuthInfo(char *user, char *spi, char *encrypt, char *secret, char *ckey);
+static void  * tsDnodeShellRpc = NULL;
 static int32_t tsDnodeQueryReqNum  = 0;
 static int32_t tsDnodeSubmitReqNum = 0;
 
@@ -110,7 +111,7 @@ static int dnodeRetrieveUserAuthInfo(char *user, char *spi, char *encrypt, char
 SDnodeStatisInfo dnodeGetStatisInfo() {
   SDnodeStatisInfo info = {0};
   if (dnodeGetRunStatus() == TSDB_DNODE_RUN_STATUS_RUNING) {
-    //info.httpReqNum   = httpGetReqCount();
+    info.httpReqNum   = httpGetReqCount();
     info.queryReqNum  = atomic_exchange_32(&tsDnodeQueryReqNum, 0);
     info.submitReqNum = atomic_exchange_32(&tsDnodeSubmitReqNum, 0);
   }

src/mnode/src/mgmtSdb.c

@@ -333,7 +333,7 @@ void sdbIncRef(void *handle, void *pRow) {
     SSdbTable *pTable = handle;
     int32_t *  pRefCount = (int32_t *)(pRow + pTable->refCountPos);
     atomic_add_fetch_32(pRefCount, 1);
-    if (1 && strcmp(pTable->tableName, "accounts") == 0) {
+    if (0 && strcmp(pTable->tableName, "accounts") == 0) {
       sdbTrace("table:%s, add ref to record:%s:%s:%d", pTable->tableName, pTable->tableName, sdbGetkeyStr(pTable, pRow),
                *pRefCount);
     }
@@ -345,7 +345,7 @@ void sdbDecRef(void *handle, void *pRow) {
     SSdbTable *pTable = handle;
     int32_t *  pRefCount = (int32_t *)(pRow + pTable->refCountPos);
     int32_t    refCount = atomic_sub_fetch_32(pRefCount, 1);
-    if (1 && strcmp(pTable->tableName, "accounts") == 0) {
+    if (0 && strcmp(pTable->tableName, "accounts") == 0) {
       sdbTrace("table:%s, def ref of record:%s:%s:%d", pTable->tableName, pTable->tableName, sdbGetkeyStr(pTable, pRow),
                *pRefCount);
     }

src/plugins/monitor/inc/monitorSystem.h

@@ -23,17 +23,34 @@ extern "C" {
 #include <stdbool.h>
 #include <stdint.h>
 
-int32_t monitorInitSystem();
-int32_t monitorStartSystem();
-void monitorStopSystem();
-void monitorCleanUpSystem();
-void monitorSaveAcctLog(char *acctId, int64_t currentPointsPerSecond, int64_t maxPointsPerSecond,
-                        int64_t totalTimeSeries, int64_t maxTimeSeries, int64_t totalStorage, int64_t maxStorage,
-                        int64_t totalQueryTime, int64_t maxQueryTime, int64_t totalInbound, int64_t maxInbound,
-                        int64_t totalOutbound, int64_t maxOutbound, int64_t totalDbs, int64_t maxDbs,
-                        int64_t totalUsers, int64_t maxUsers, int64_t totalStreams, int64_t maxStreams,
-                        int64_t totalConns, int64_t maxConns, int8_t accessState);
-void monitorSaveLog(int level, const char *const format, ...);
+typedef struct {
+  char *  acctId;
+  int64_t currentPointsPerSecond;
+  int64_t maxPointsPerSecond;
+  int64_t totalTimeSeries;
+  int64_t maxTimeSeries;
+  int64_t totalStorage;
+  int64_t maxStorage;
+  int64_t totalQueryTime;
+  int64_t maxQueryTime;
+  int64_t totalInbound;
+  int64_t maxInbound;
+  int64_t totalOutbound;
+  int64_t maxOutbound;
+  int64_t totalDbs;
+  int64_t maxDbs;
+  int64_t totalUsers;
+  int64_t maxUsers;
+  int64_t totalStreams;
+  int64_t maxStreams;
+  int64_t totalConns;
+  int64_t maxConns;
+  int8_t  accessState;
+} SAcctMonitorObj;
+
+void monitorSaveAcctLog(SAcctMonitorObj *pMonObj);
+void monitorSaveLog(int32_t level, const char *const format, ...);
+void monitorExecuteSQL(char *sql);
 
 #ifdef __cplusplus
 }