Merge branch 'master' into MAAT_REDIS

# Conflicts: # src/entry/Maat_rule.cpp
2017-08-07 16:30:08 +08:00
parent 84a75c4494 d9af8ba6ff
commit f3a763d9a3
3 changed files with 253 additions and 439 deletions
--- a/src/entry/Maat_rule_internal.h
+++ b/src/entry/Maat_rule_internal.h
@@ -182,7 +182,7 @@ struct _Maat_group_inner_t
 	char* group_name;
 	dynamic_array_t *regions;
 	void* compile_shortcut;
-	pthread_mutex_t mutex;
+	pthread_rwlock_t rwlock;
 };
 struct _Maat_compile_inner_t
 {