gfwleak/tango-maat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改进在redhat 7.2和glibc2.12以下的编译问题。

Browse Source
This commit is contained in:
zhengchao
2017-01-11 14:39:28 +08:00
parent 9ee4a7a5ea
commit bad140f8df
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/entry/Maat_rule.cpp
View File

@@ -28,7 +28,7 @@
#include "mesa_fuzzy.h" #include "mesa_fuzzy.h"
#include "great_index_engine.h" #include "great_index_engine.h"
int MAAT_FRAME_VERSION_1_8_20161228=1; int MAAT_FRAME_VERSION_1_8_20170111=1;
const char *maat_module="MAAT Frame"; const char *maat_module="MAAT Frame";
const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin", const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin",
@@ -2976,8 +2976,9 @@ void *thread_rule_monitor(void *arg)
{ {
snprintf(maat_name,sizeof(maat_name),"MAAT"); snprintf(maat_name,sizeof(maat_name),"MAAT");
} }
//ret=prctl(PR_SET_NAME,(unsigned long long)maat_name,NULL,NULL,NULL); ret=prctl(PR_SET_NAME,(unsigned long long)maat_name,NULL,NULL,NULL);
ret=pthread_setname_np(pthread_self(),maat_name); //pthread_setname_np are introduced in glibc2.12
//ret=pthread_setname_np(pthread_self(),maat_name);
assert(ret>=0); assert(ret>=0);
while(feather->still_working) while(feather->still_working)
{ {

2
test/Makefile
View File

@@ -1,7 +1,7 @@
LIBS=../lib/libmaatframe.so LIBS=../lib/libmaatframe.so
INC=-I../inc/ -I/usr/include/MESA/ INC=-I../inc/ -I/usr/include/MESA/
all: all:
g++ -o maat_test -g -Wall maat_test.cpp $(INC) $(LIBS) g++ -o maat_test -g -Wall maat_test.cpp $(INC) $(LIBS) -lMESA_handle_logger
g++ -o digest_gen -g digest_gen.c $(INC) $(LIBS) g++ -o digest_gen -g digest_gen.c $(INC) $(LIBS)
clean: clean:
rm maat_test test.log* -f rm maat_test test.log* -f

2
test/maat_test.cpp
View File

@@ -472,6 +472,8 @@ int main(int argc,char* argv[])
void *logger=MESA_create_runtime_log_handle(log_file,0); void *logger=MESA_create_runtime_log_handle(log_file,0);
feather=Maat_feather(g_iThreadNum, table_info_path, logger); feather=Maat_feather(g_iThreadNum, table_info_path, logger);
Maat_set_feather_opt(feather,MAAT_OPT_INSTANCE_NAME,"demo", strlen("demo")+1);
if(argc>1&&0==strcmp(argv[1],"update")) if(argc>1&&0==strcmp(argv[1],"update"))
{ {
Maat_set_feather_opt(feather, MAAT_OPT_FULL_CFG_DIR, ful_cfg_dir, strlen(ful_cfg_dir)+1); Maat_set_feather_opt(feather, MAAT_OPT_FULL_CFG_DIR, ful_cfg_dir, strlen(ful_cfg_dir)+1);