delete useless code

2025-04-29 15:05:36 +08:00
parent 2a8f2c996c
commit 59079da4be
22 changed files with 1140 additions and 12715 deletions
--- a/mms/rdb_client.c
+++ b/mms/rdb_client.c
@@ -25,17 +25,17 @@ extern int g_front_seg_num;

 #include "../include/rocketmq/SimpleProducer.h"
 #include "../cfg_parse/custom_printf.h"//lnk20250225
+
 ////////////////////////////////////////////
 #ifdef DEBUG_SISCO
 SD_CONST static ST_CHAR* SD_CONST thisFileName = __FILE__;
 #endif

 extern RPT_TYPEIDS g_rpt_typeids;
-//ied_info_t  *my_info;

 extern apr_pool_t* g_root_pool;
 uint8_t             set_mx_q;
-//rdb_t			*g_rdb  = NULL;
+
 node_t* g_node = NULL;
 extern char 	g_my_conf_fname[256];
 apr_pool_t* g_init_pool;
@@ -51,19 +51,10 @@ uint8_t             set_mx_q;

 pt61850app_t* g_pt61850app;

-//application_t	g_sysfile_app;                  //ϵͳ<CFB5>ļ<EFBFBD><C4BC><EFBFBD>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD>Ϣ<EFBFBD>ṹ
-//int				g_sysfile_appid = -1;
-//char			*g_sysfile_filedir;
-//byte_t          g_Master;
-//byte_t			g_protect_file;			//0:<3A><><EFBFBD>ٻ<EFBFBD><D9BB><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><C2BC><EFBFBD>ļ<EFBFBD> 1:<3A>ٻ<EFBFBD><D9BB><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><C2BC><EFBFBD>ļ<EFBFBD>
-//apr_time_t		g_file_valid_time;		//ֻ<>ٻ<EFBFBD>ָ<EFBFBD><D6B8>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD>е<EFBFBD><D0B5>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӣ<EFBFBD>
-//byte_t			g_file_name_len;		//<2F>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>洢<EFBFBD><E6B4A2><EFBFBD><EFBFBD><EFBFBD>󳤶ȣ<F3B3A4B6>Ĭ<EFBFBD><C4AC>Ϊ40<34><30><EFBFBD><EFBFBD>Ϊ0ʱ<30><CAB1>ʾ<EFBFBD><CABE><EFBFBD>ⳤ<EFBFBD><E2B3A4>
-//byte_t			g_file_time_from;		//<2F>ļ<EFBFBD><C4BC><EFBFBD>Чʱ<D0A7><CAB1>ȡֵ<C8A1>δ<EFBFBD><CEB4><EFBFBD>0<EFBFBD><30><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD>1ȡϵͳʱ<CDB3><CAB1>

 static void* APR_THREAD_FUNC rtdb_worker(apr_thread_t* thd, void* data);

 static apr_status_t pt61850app_init();
-//static apr_status_t app_process_command(command_t *cmd);

 /////////////////////////////////////////////////////////////////////////////// 
 extern int		three_secs_enabled;
@@ -145,7 +136,7 @@ static apr_status_t read_DEV_idx_from_db()
 	for (iedno = 0; iedno < g_node->n_clients; iedno++) {
 		ied = g_node->clients[iedno];
 		ied_usr = GET_IEDEXT_ADDR(ied);
-		//read_DEV_Index_from_db(ied->channel[0].addr, &ied_usr->dev_idx);
+
 		for (cpuno = 0; cpuno < ied->cpucount; cpuno++) {
 			LD_info = &(ied_usr->LD_info[cpuno]);
 			if (LD_info->LD_name == NULL)
@@ -153,12 +144,12 @@ static apr_status_t read_DEV_idx_from_db()
 			len = strlen(LD_info->LD_name);
 			tmp = LD_info->LD_name[len - 1] - '0';
 			LD_info->line_id = ied_usr->dev_idx * 10 + tmp;
-			//ret = read_line_infos_from_db(LD_info->line_id, &LD_info->SubV_Index,&LD_info->Dev_Index,&LD_info->Sub_Index,&LD_info->GD_Index);
+
 			if (ret != TRUE)
 				LD_info->line_id = -1;
 			if (LD_info->loginfo) {
 				loginfo = LD_info->loginfo[0];
-				//read_updatetime_from_db(ied->channel[0].addr, &loginfo->start_time);
+
 			}
 		}
 	}
@@ -168,7 +159,7 @@ static apr_status_t read_DEV_idx_from_db()
 apr_status_t init_rdb()
 {
 	apr_status_t	rv;
-	//	driver_t*	driver;
+
 	rv = apr_pool_create(&g_init_pool, g_root_pool);
 	if (rv != APR_SUCCESS) {
 		return rv;
@@ -186,50 +177,28 @@ apr_status_t init_rdb()
 	if (rv != APR_SUCCESS) {
 		return rv;
 	}
-	//my_info = apr_pcalloc(g_run_pool,sizeof(ied_info_t));
+
 	rv = pt61850app_init();
 	if (rv != APR_SUCCESS) {
 		return rv;
 	}

-	/*rv = parse_json_cfg();
-	if ( rv != APR_SUCCESS) {
-		echo_errg("Failed to parse json define xml file! \n");
-		return rv;
-	}*/
-
 	init_config();
 	GetServerIndexFromDB();
-/*lnk10-10*/
-	//<2F><><EFBFBD>Ӳ<EFBFBD><D3B2><EFBFBD>web<65>ӿ<EFBFBD>
-	//rv = parse_device_web_test_ext();
-	//rv = parse_device_web_test_dev();
-	//rv = parse_device_web_test_front_read();
-	//rv = parse_device_web_test_front_write();
+
 	rv = parse_device_cfg_web();

-	//rv = parse_device_cfg();
-	//rv = parse_device_cfg_json();
-    //rv = parse_device_cfg_pg();
 	if (rv != APR_SUCCESS) {
 		echo_errg("Parsed device config xml file with error,try to run! \n");
 		return rv;
 	}
-/*lnk10-10*/
-	//rv = parse_line_cfg_web(); <20>ϲ<EFBFBD><CFB2><EFBFBD><EFBFBD>ն<EFBFBD>̨<EFBFBD><CCA8>

-	//rv = parse_line_cfg();
-	//rv = parse_line_cfg_pg();
-	
-	/*lnk10-10*/
 	rv = parse_model_cfg_web();
 	if (rv != APR_SUCCESS) {
 		echo_errg("Parsed model with error,try to run! \n");
 		return rv;
 	}

-
-	//OTL_Select_xmlModel(); //xmlģ<6C><C4A3><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>ȡ
 	Set_xml_nodeinfo();//<2F><><EFBFBD><EFBFBD>xmlģ<6C><C4A3>

 	rv = parse_rpt_log_ini();//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC>
@@ -253,7 +222,7 @@ apr_status_t run_protocol()
 {
 	apr_status_t	rv;
 	apr_thread_t* rtdb_thread;
-	//	apr_thread_t*	mms_thread;
+
 	static apr_threadattr_t* worker_attr = NULL;

 	//lnk20250214//<2F><><EFBFBD><EFBFBD>ģʽ<C4A3><CABD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͨ<EFBFBD><CDA8><EFBFBD><EFBFBD><EFBFBD>̺<EFBFBD>0<EFBFBD><30>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>̨<EFBFBD>ˣ<EFBFBD>Ȼ<EFBFBD><C8BB><EFBFBD>ٸ<EFBFBD><D9B8><EFBFBD><EFBFBD>Լ<EFBFBD><D4BC>Ľ<EFBFBD><C4BD>̺<EFBFBD>
@@ -366,16 +335,6 @@ apr_status_t run_protocol()

 	}

-//lnkɾ<6B><C9BE><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF>߳<EFBFBD>
-#if 0
-	if (1 == g_iOTLFlag) {
-		printf("try_start_sql_thread \n");
-		try_start_sql_thread();
-	}
-	else
-		printf("sql_thread ignore \n");
-#endif
-
 	printf("try_start_ontimer_thread \n");
 	try_start_ontimer_thread();

@@ -387,44 +346,23 @@ extern uint32_t	g_thread_blocked_times;
 /*---------------------------    <20><><EFBFBD><EFBFBD>ʵʱ<CAB5><CAB1><EFBFBD>߳<EFBFBD>   -----------------------------------*/
 static void* APR_THREAD_FUNC rtdb_worker(apr_thread_t* thd, void* data)
 {
-	//    apr_event_t event;
-	//	command_t		cmd[1];
-	//	int			i =0;

-		/* Maintenance the clients request */
 	while (1) {

-		//pthread_mutex_lock(&mtx);	printf("work hold lock !!!!!!!!!!!");
-		
-		//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-		//printf("check error4 !!!!!!!!!!!!!!\n");
-
 		doCommService();//<2F><><EFBFBD><EFBFBD>61850<35><30>Ϣ

 		check_3s_config();//3<><33><EFBFBD><EFBFBD><EFBFBD>ݽ<EFBFBD><DDBD>̶<EFBFBD>ȡ3<C8A1>봥<EFBFBD><EBB4A5>

-		//pthread_mutex_lock(&mtx);	printf("check connect hold lock !!!!!!!!!!!");
 		CheckNextNotConnectedChannel();//<2F><><EFBFBD>г<EFBFBD><D0B3><EFBFBD><EFBFBD>ӽ<EFBFBD><D3BD><EFBFBD><EFBFBD>ж<EFBFBD><D0B6><EFBFBD><EFBFBD><EFBFBD>״̬
-		//pthread_mutex_unlock(&mtx); printf("check connect free lock !!!!!!!!!!!");

-		//pthread_mutex_lock(&mtx);  printf("check prt hold lock !!!!!!!!!!!");
 		CheckAllConnectedChannel();//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>桢<EFBFBD><E6A1A2>־<EFBFBD><D6BE><EFBFBD>١<EFBFBD><D9A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-		//pthread_mutex_unlock(&mtx); printf("check prt free lock !!!!!!!!!!!");

-		//check_recall_config();//<2F><><EFBFBD>ٽ<EFBFBD><D9BD>̶<EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
 		create_recall_xml();//<2F><><EFBFBD>ɴ<EFBFBD><C9B4><EFBFBD><EFBFBD><EFBFBD>xml<6D>ļ<EFBFBD>

-		pthread_mutex_lock(&mtx);	//printf("work hold lock !!!!!!!!!!!");
-
+		pthread_mutex_lock(&mtx);
 		check_ledger_update();//lnk20250113<31><33>ȡ̨<C8A1>˸<EFBFBD><CBB8>£<EFBFBD><C2A3><EFBFBD><EFBFBD><EFBFBD>̨<EFBFBD>˸<EFBFBD><CBB8><EFBFBD>
+		pthread_mutex_unlock(&mtx);

-		pthread_mutex_unlock(&mtx); //printf("work free lock !!!!!!!!!!!");
-
-		//Check_Recall_Config();
-		/*if ((g_protect_file) && (g_pt61850app->initNum>=MIN_INIT_NUM) ) {
-			tryCallWaveList_in_AllIeds();
-		}*/
-		//clear_old_comtrade_files();
 		check_disk_quota();//<2F>жϴ<D0B6><CFB4>̿ռ<CCBF>

 		apr_pool_clear(g_pt61850app->tmp_pool);//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>
@@ -436,7 +374,6 @@ static void* APR_THREAD_FUNC rtdb_worker(apr_thread_t* thd, void* data)
 	echo_msg("rtdb worker thread terminated...");
 }

-////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////

 void Set_val_from_61850rpt(element_t* elem, double v)
@@ -453,7 +390,6 @@ int Set_q_from_61850rpt(char* q)
 	else
 		quality = 1;
 	return quality;
-	//set_rpt_QualityFlag(quality);
 }

 #define TIME_T_2036	(66*365* SECONDS_PER_DAY)	
@@ -481,9 +417,6 @@ apr_time_t convert_btime6_to_apr_time(MMS_BTIME6* bTime6)
 	return ticks;
 }

-
-
-
 /*
 61850
 λ	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	ֵ
@@ -594,8 +527,3 @@ byte_t get_pulse_q_from_61850(char* q_61850)
 	else
 		return 0;
 }
-
-
-///////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////