🦄 refactor(Remove obsolete code): makefile and dictator

2 files changed, 0 insertions, 30 deletions

diff --git a/src/sapp_dev/sapp_global_val.c b/src/sapp_dev/sapp_global_val.c
index 4613f44..7fd3902 100644
--- a/src/sapp_dev/sapp_global_val.c
+++ b/src/sapp_dev/sapp_global_val.c
@@ -224,9 +224,6 @@ void sapp_gval_init(void)
 {
 	int tseq;
 
-	/* ��һ�����ж��Ƿ�ʹ��dictator,��ֵӰ��������ڴ����  ����,��������sapp_mem_xxϵ�к����޷����� */
-	tomlc99_wrap_load_int_def(g_cmd_args_main_cfg_file, (char *)"MEM", (char *)"dictator_enable", (int *)&g_sapp_mem_use_dictator, 1);
-
 	/* �ڴ�ͳ�Ƶ������������Ǵ洢��ȫ�ֱ�����, �������м��������е�������, �˴�ֱ����ϵͳ��calloc, �������� */
 	sapp_global_val = (sapp_global_t *)calloc(1, sizeof(sapp_global_t));
 	g_sapp_global_mem_used_block++;
diff --git a/src/sapp_dev/sapp_init.c b/src/sapp_dev/sapp_init.c
index cfc2150..528cb78 100644
--- a/src/sapp_dev/sapp_init.c
+++ b/src/sapp_dev/sapp_init.c
@@ -25,7 +25,6 @@ extern void sesame_open_door(const char *lock_path, const char *lock_name);
 /* (0:pag,1:pcap,2:dumpfile,3:pfring,4:DPDK,5:ppf,6:NPacket,7:qnf,8:N95,9:pcap-dumpfile-list, 10:topsec) */
 //int cap_mode = 2;
 //int top_mode = 0;
-//extern int G_DICTATOR_SW;
 extern struct global_stream **G_MESA_GLOBAL_STREAM;
 //static int __times = 0;
 //int g_timestamp_record_sw = 0;
@@ -75,27 +74,6 @@ static void forbid_call_exit_in_running_state(void)
 	
 }
 
-/* 2016-09-22 lijia add, dictator�ڵ�һ�α�����ʱ�г�ʼ������, ��ֹ���߳������ͻ, ƽ̨�ȵ���һ�� */
-static void sapp_dictator_init(void)
-{
-#if USE_MEMPOOL
-	void *tmp;
-	if(G_DICTATOR_SW){
-		tmp =  __wrap_malloc(1);
-		assert(tmp != NULL);
-		__wrap_free(tmp);
-
-		tmp = malloc(1);
-		assert(tmp != NULL);
-		free(tmp);
-	}else{
-		sapp_printf("\033[33m[Warning]dictator is not enable, maybe slow down performance, please check 'sapp.toml -> dictator_enable'.\033[0m\n");
-	}
-#else
-	sapp_printf("\033[33m[Warning]sapp is compiled without dictator.\033[0m\n");
-#endif	
-}
-
 static void sapp_platform_finish_up(void)
 {
 	/* 
@@ -139,11 +117,6 @@ int MESA_platform_init(int argc, char *argv[])
 	ABBR_CURRENT_TIME = time(NULL);
 	ABBR_SAPP_START_TIME = time(NULL);
 
-	/* 2016-09-22 lijia add, dictator�ڵ�һ�α�����ʱ�г�ʼ������, ��ֹ���߳������ͻ, ƽ̨�ȵ���һ��, ��Ҫ��ȡ�����ļ����� */
-	//MESA_load_profile_int_def("conf/main.conf","Module", "dictator_switch", &G_DICTATOR_SW, 1);	
-	sapp_dictator_init();
-
-
 	ipv4_frag_init(g_iThreadNum, 1024 * 512);
 	ipv6_frag_init(g_iThreadNum, 1024 * 256);
 	tcp_set_stream_num(max_tcp_stream_num*3,max_tcp_stream_num,max_tcp_stream_num*2);