[Misc] Fix logging tags

This patch fixes logging tags.

Signed-off-by: Dongju Chae <dongju.chae@samsung.com>

diff --git a/src/core/ne-profiler.cc b/src/core/ne-profiler.cc
index b53af9c12194739cfdc67e074e458f18530b9362..68c0ed0339d2ff8d3c9b6ed5312d37027d3213d7 100644 (file)
--- a/src/core/ne-profiler.cc
+++ b/src/core/ne-profiler.cc
@@ -13,6 +13,8 @@
 
 #include "ne-profiler.h"
 
+#define TAG _N10
+
 ModelProfiler::ModelProfiler (const DriverAPI *api) : api_ (api) {}
 
 ModelProfiler::~ModelProfiler () {

diff --git a/src/core/utils/ne-utils.cc b/src/core/utils/ne-utils.cc
index 2aede95655356cd2db31ea9624be89e15225ad81..e7c3f2da99698ef2f92eb7da652ed31e0a3b2577 100644 (file)
--- a/src/core/utils/ne-utils.cc
+++ b/src/core/utils/ne-utils.cc
@@ -35,15 +35,17 @@ static const char *loglevelstr[NPU_LOG_END] = {
 };
 
 /**
- * @brief Module Name String in 8 characters
+ * @brief Module Name String
  */
 static const char *modulestr[_NEND] = {
-    [_N1] = "N1/CommPl",  [_N11] = "N11/IP   ", [_N2] = "N2/Handlr",  [_N21] = "N21/Host ",
-    [_N3] = "N3/Sched ",  [_N4] = "N4/InputC",  [_N41] = "N41/HWrec", [_N42] = "N42/Host ",
-    [_N5] = "N5/ThPool",  [_N6] = "N6/Mem   ",  [_N61] = "N61/MemDe", [_N62] = "N62/MemPl",
-    [_N7] = "N7/HWmem ",  [_N71] = "N71/Model", [_N72] = "N72/Buff ", [_N73] = "N72/Segt ",
-    [_N8] = "N8/HWmemI",  [_N9] = "N9/NPUdrv",  [_N91] = "N91/TRIV ", [_N92] = "N92/TRIV2",
-    [_N93] = "N93/TRIA ", [_N94] = "N94/Emul ",
+    [_N0] = "N0/HostAPI",   [_N1] = "N1/CommPlugin",  [_N11] = "N11/CommIP",
+    [_N2] = "N2/Handler",   [_N3] = "N3/Scheduler",   [_N4] = "N4/InputService",
+    [_N41] = "N41/InputHW", [_N42] = "N42/InputHost", [_N5] = "N5/ThreadPool",
+    [_N6] = "N6/Memory",    [_N61] = "N61/MemDef",    [_N62] = "N62/MemPool",
+    [_N7] = "N7/HWmem",     [_N71] = "N71/Model",     [_N72] = "N72/Buff",
+    [_N73] = "N73/Segt",    [_N8] = "N8/HWmemImpl",   [_N9] = "N9/NPUdrv",
+    [_N91] = "N91/TRIV",    [_N92] = "N92/TRIV2",     [_N93] = "N93/TRIA",
+    [_N94] = "N94/Emul",    [_N10] = "N10/Profiler",
 };
 
 /** @brief singleton instance */
@@ -95,7 +97,6 @@ Logger::logwrite (npu_loglevel l, module m, const char *format, ...) {
 int
 Logger::logwrite_args (npu_loglevel l, const char *tag, const char *format, va_list args) {
   std::unique_lock<std::mutex> lock (m_);
-
   time_t ltime = time (nullptr);
   char *time_str;
 
@@ -108,7 +109,7 @@ Logger::logwrite_args (npu_loglevel l, const char *tag, const char *format, va_l
   time_str[strcspn (time_str, "\n")] = '\x00';
 
   char log_msg[MAX_LOG_MSG];
-  int log_len = snprintf (log_msg, MAX_LOG_MSG, "[%s][%s][%s] ", loglevelstr[l], tag, time_str);
+  int log_len = snprintf (log_msg, MAX_LOG_MSG, "[%s][%s][%s] ", loglevelstr[l], time_str, tag);
 
   log_len += vsnprintf (log_msg + log_len, MAX_LOG_MSG - log_len, format, args);
 

diff --git a/src/core/utils/ne-utils.h b/src/core/utils/ne-utils.h
index ee56a62d55ee030edec99fa8444247e09c416e93..e53acb9db0f23ba39e618e4c15cdceeeb95668c6 100644 (file)
--- a/src/core/utils/ne-utils.h
+++ b/src/core/utils/ne-utils.h
@@ -59,10 +59,10 @@
  * @todo need to fix this after revising the class diagram
  */
 typedef enum {
-  _N1 = 0,
+  _N0 = 0,
+  _N1,
   _N11,
   _N2,
-  _N21,
   _N3,
   _N4,
   _N41,
@@ -81,6 +81,7 @@ typedef enum {
   _N92,
   _N93,
   _N94,
+  _N10,
   _NEND,
 } module;
 

diff --git a/src/host/ne-host.cc b/src/host/ne-host.cc
index a600fc3cd8458c0b9f3ecc7792c768d462d74291..edc3f2704994629b42231b08097727a1bb13c5df 100644 (file)
--- a/src/host/ne-host.cc
+++ b/src/host/ne-host.cc
@@ -16,7 +16,7 @@
 #include <ne-handler.h>
 #include <ne-conf.h>
 
-#define TAG _N2
+#define TAG _N0
 
 #define INIT_HOST_HANDLER(handler, dev)           \
   Device *tdev = static_cast<Device *> (dev);     \