From d276b664d0626c8b73b3ac9985d9bc74c81a65c5 Mon Sep 17 00:00:00 2001
From: zhengchao <zhengchao@iie.ac.cn>
Date: Sun, 10 Sep 2017 19:02:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=B8=AD=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E7=BA=BF=E7=A8=8BID=EF=BC=8C=E6=96=B9=E4=BE=BF=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/entry/Maat_command.cpp     |  2 +-
 src/entry/Maat_rule.cpp        | 16 ++++++++++++++--
 src/entry/Maat_rule_internal.h |  3 +++
 src/entry/config_monitor.cpp   |  5 ++++-
 src/entry/json2iris.cpp        |  3 ++-
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/entry/Maat_command.cpp b/src/entry/Maat_command.cpp
index 5afd085..2d27866 100644
--- a/src/entry/Maat_command.cpp
+++ b/src/entry/Maat_command.cpp
@@ -9,7 +9,7 @@
 #include <pthread.h>
 #include <assert.h>
 
-const char* maat_redis_monitor="MAAT_REDIS_MONITOR";
+#define maat_redis_monitor	(module_name_str("MAAT_REDIS_MONITOR"))
 const char* maat_redis_command="MAAT_REDIS_COMMAND";
 
 const char* rm_key_prefix[2]={"OBSOLETE_RULE","EFFECTIVE_RULE"};
diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp
index e2115c4..bf5f9d4 100644
--- a/src/entry/Maat_rule.cpp
+++ b/src/entry/Maat_rule.cpp
@@ -10,6 +10,8 @@
 #include <unistd.h>
 #include <time.h>
 #include <sys/prctl.h>
+#include <sys/syscall.h>
+
 #include <MESA/MESA_htable.h>
 #include <MESA/MESA_list_queue.h>
 #include <MESA/MESA_handle_logger.h>
@@ -28,11 +30,21 @@
 #include "stream_fuzzy_hash.h"
 #include "gram_index_engine.h"
 
-int MAAT_FRAME_VERSION_2_0_20170831=1;
-const char *maat_module="MAAT Frame";
+int MAAT_FRAME_VERSION_2_0_20170910=1;
 
 const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin",
 							"unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""};
+pid_t gettid()
+{
+	return syscall(SYS_gettid);
+}
+const char*	module_name_str(const char*name)
+{
+	static __thread char module[64];
+	snprintf(module,sizeof(module),"%s(%d)", name, gettid());
+	return module;
+}
+
 int converHextoint(char srctmp)
 {
 	if(isdigit(srctmp))
diff --git a/src/entry/Maat_rule_internal.h b/src/entry/Maat_rule_internal.h
index 0678507..4f93488 100644
--- a/src/entry/Maat_rule_internal.h
+++ b/src/entry/Maat_rule_internal.h
@@ -463,6 +463,9 @@ void redis_monitor_traverse(unsigned int version,redisContext *c,
 							void* u_para,
 							const unsigned char* dec_key,
 							_Maat_feather_t* feather);
+const char*	module_name_str(const char*name);
+#define maat_module	(module_name_str("MAAT_Frame"))
+
 
 #endif
 
diff --git a/src/entry/config_monitor.cpp b/src/entry/config_monitor.cpp
index 643e5d9..b32c48d 100644
--- a/src/entry/config_monitor.cpp
+++ b/src/entry/config_monitor.cpp
@@ -1,11 +1,14 @@
 #include "MESA_handle_logger.h"
 #include "config_monitor.h"
+#include "Maat_rule_internal.h"
 #include <dirent.h> 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <openssl/evp.h>
-const char*	module_config_monitor="CONFIG_MONITOR";
+
+#define module_config_monitor (module_name_str("CONFIG_MONITOR"))
+
 
 #define	CM_UPDATE_TYPE_ERR	-1
 #define	CM_UPDATE_TYPE_NONE	0
diff --git a/src/entry/json2iris.cpp b/src/entry/json2iris.cpp
index 1e042a2..b0ecf3b 100644
--- a/src/entry/json2iris.cpp
+++ b/src/entry/json2iris.cpp
@@ -12,7 +12,8 @@
 #include "cJSON.h"
 #include "map_str2int.h"
 #include "Maat_rule_internal.h"
-const char* maat_json="MAAT JSON";
+#define maat_json (module_name_str("MAAT_JSON"))
+
 const char* untitled_group_name="Untitled";
 const int json_version=1;
 #define	MAX_PATH_LINE	256