lnk/microser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delete useless code

Browse Source
This commit is contained in:
lnk
2025-04-29 15:05:36 +08:00
parent 2a8f2c996c
commit 59079da4be
22 changed files with 1140 additions and 12715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
mms/mmscli_log.c
View File

@@ -73,28 +73,22 @@ static ST_VOID log_var_jou_data (ST_INT var_type_id,VAR_ACC_DATA *var ,MMS_DECOD
ST_INT data_size; /* size of data element */
type_ctrl = mvl_type_ctrl_find (var_type_id);
//char doname[32];
//strcpy(doname, dom_name);
//type_ctrl = (MVL_TYPE_CTRL*)(sel_mvl_type_ctrl(doname));
//printf ("\naddress: %p \n", type_ctrl);
if (type_ctrl)
{
num_rt = type_ctrl->num_rt;
rt = type_ctrl->rt;
data_size = type_ctrl->data_size;
//printf ("\nTYPE: %d %d %d\n", num_rt, data_size, rt->el_size);
/* If the TDL produced is longer than max_tdl_len, this function */
/* "gracefully" fails (i.e. returns 0). */
if (ms_runtime_to_tdl (rt, num_rt, tdl_buf, sizeof(tdl_buf))>0)
;//SLOGCALWAYS1 (" TYPE: %s", tdl_buf);
;
else
echo_warn (" TYPE: unknown");
//printf("\nrt %p and rt_num: %d \n", &type_ctrl->rt,type_ctrl->num_rt);
//printf ("\nTYPE: %s \n", tdl_buf);
va_data_size = data_size;
temp_data_buf = (ST_CHAR*)malloc( va_data_size);
rc = ms_asn1_to_local (rt, num_rt, var->data, var->len, temp_data_buf);
//printf("type_ctrl->num_rt %d %x %x \n", type_ctrl->num_rt , &data, &(var->data));
my_local_to_data (temp_data_buf,rt,num_rt, data);
if (data->item_num==0) {
echo_warn("!!!!!!!!!!!!!!!!!!!data num is 0 !!!!!!!!!!!!!!!!\n");
@@ -151,8 +145,7 @@ static ST_RET process_jou_entry(loginfo_t *loginfo,apr_time_t t,
do_name = strstr(jou_entry->ef.data.list_of_var[j].var_tag, "/");
do_name++;
}
//printf("do_name =====%s=====\n", do_name);
//start = sGetMsTime();
printf("\nbrf if");
if (sel_mvl_type_ctrl_flag(do_name) == -1)
{
@@ -162,20 +155,13 @@ static ST_RET process_jou_entry(loginfo_t *loginfo,apr_time_t t,
char doname[32];
strcpy(doname, do_name);
add_mvl_type_ctrl(doname, var_type_id);
//printf("create var_type_id =====%d=====%p======\n", var_type_id, &doname);
}
printf("\nbrf var_type_id");
var_type_id = sel_mvl_type_ctrl_flag(do_name);
printf("\nafter var_type_id");
//end = sGetMsTime();
//last_check_recall_config_time = last_check_recall_config_time + end - start;
//printf("jou_entry->ef.data.num_of_var =====%d===== =====%d=====\n", jou_entry->ef.data.num_of_var, var_type_id);
/*var_type_id = mms_var_type_id_create(clientNetInfo, DOM_SPEC,
dom_name, do_name, iTimeout);*/
//printf("var_type_id =====%d=====\n", var_type_id);
if (var_type_id < 0) {
//return SD_FAILURE;
continue;
}
log_var_jou_data(var_type_id,&(jou_entry->ef.data.list_of_var[j].value_spec),&mms_dec_data, do_name);
@@ -336,10 +322,10 @@ static ST_RET process_jou_entry(loginfo_t *loginfo,apr_time_t t,
v = (double)mms_dec_data.data_item[ii].u.data_uint64;
else if (mms_dec_data.data_item[ii].type==DATA_DOUBLE_TYPE)
v = mms_dec_data.data_item[ii].u.data_double;
//printf("%s %s = %f \n",jou_entry->ef.data.list_of_var[j].var_tag, mms_dec_data.data_item[ii].comp_name,v);
apr_snprintf(mms_ref,sizeof(mms_ref),"%s$%s",do_name,mms_dec_data.data_item[ii].comp_name);
if ( (strstr(mms_ref,"]")==NULL) || (strstr(mms_ref,"0]")) )
//printf("\nlog read: %s=%f\n",mms_ref,v);
if (j==0 && ii==0) {
printf("\n ----------------------------------------------------------------log read: %s=%f--------------------------------------------------------------\n",mms_ref,v);
if ( strstr(mms_ref,"QVVR") ) {
@@ -356,31 +342,22 @@ static ST_RET process_jou_entry(loginfo_t *loginfo,apr_time_t t,
}
if ( ( (loginfo->need_steady==0) &&(log_data_type == STEADY_DATA))
|| ( (loginfo->need_voltage==0) &&(log_data_type != STEADY_DATA)) ){
//mvl_type_id_destroy(var_type_id);
return SD_SUCCESS;
}
if ( log_data_type == QVVR_DATA ) {
processQVVR_start(loginfo->LD_info);
//processQVVR_time(loginfo->LD_info,t/1000);
}
else if ( log_data_type == RDRE_DATA ) {
processRDRE_start(loginfo->LD_info);
}
else {
/*ied_t* ied;
ied = find_ied_from_dev_code(loginfo->LD_info->terminal_code);
ied_usr_t* ied_usr = (ied_usr_t*)ied->usr_ext;
json_block_create_start( loginfo->LD_info->voltage_level, loginfo->LD_info->mp_id,0, ied_usr->dev_type);*/
//json_block_create_time(loginfo->LD_info->line_id,t/1000);
}
}
//set_db_value(LOG_IDX,mms_ref,v,FALSE);
length_FCDA = strlen( mms_ref );
if ( ('$'==mms_ref[length_FCDA-2]) && ('q'==mms_ref[length_FCDA-1]) ) {
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>lnk20250307
//printf("going q");
if(not_set_log_q_this && ( log_data_type == STEADY_DATA )) {
int quality = 0;
@@ -400,7 +377,6 @@ static ST_RET process_jou_entry(loginfo_t *loginfo,apr_time_t t,
printf("quality = 1 continue");
continue;
}
//set_log_QualityFlag(quality);
if (log_data_steady_type == 0) {
json_block_create_flag(loginfo->LD_info->mp_id, quality, 0);
}
@@ -415,9 +391,6 @@ static ST_RET process_jou_entry(loginfo_t *loginfo,apr_time_t t,
}
else if ( ('$'==mms_ref[length_FCDA-2]) && ('t'==mms_ref[length_FCDA-1]) ) {
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>lnk20250307
//printf("going t");
if (not_set_log_t_this) {
apr_time_t t = convert_btime6_to_apr_time(&(mms_dec_data.data_item[ii].u.data_bTime6));
if ( log_data_type == QVVR_DATA ) {
@@ -445,8 +418,6 @@ static ST_RET process_jou_entry(loginfo_t *loginfo,apr_time_t t,
}
}
else {
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>lnk20250307
//printf("going v");
if ( log_data_type == QVVR_DATA ){
processQVVR_data(loginfo->LD_info,mms_ref,v);
@@ -471,7 +442,6 @@ static ST_RET process_jou_entry(loginfo_t *loginfo,apr_time_t t,
}
//mvl_type_id_destroy(var_type_id);
}
printf("\naft for");
if ( log_data_type == QVVR_DATA ) {
@@ -481,10 +451,9 @@ static ST_RET process_jou_entry(loginfo_t *loginfo,apr_time_t t,
processRDRE_end(loginfo->LD_info);
}
else {
//json_block_create_end(loginfo->LD_info->mp_id,0);
}
printf("\nend process_jou_entry");
//printf("process_jou_entry ==============%.2f================\n", last_check_recall_config_time);
return ret;
}
@@ -550,7 +519,7 @@ ST_RET mms_jread (loginfo_t *loginfo,MVL_NET_INFO *clientNetInfo, ST_CHAR *dom_n
int cpuno = 0;
chnl_usr = g_pt61850app->chnl_usr[i];
//printf("\n chnl_usr->m_state ===== %d\n", chnl_usr->m_state);
if (strstr(chnl_usr->ip_str, ip) != NULL)
{
printf("\nSame Ip %s : %s", chnl_usr->ip_str, ip);
@@ -614,25 +583,21 @@ ST_RET mms_jread (loginfo_t *loginfo,MVL_NET_INFO *clientNetInfo, ST_CHAR *dom_n
if( (last_occur_time.day!=jou_entry->occur_time.day)||(last_occur_time.ms!=jou_entry->occur_time.ms) ) {
last_occur_time=jou_entry->occur_time;
//append_db_records(LOG_IDX);
}
printf("\nbrf convert_btod_to_apr_time");
t = convert_btod_to_apr_time(&jou_entry->occur_time);
//set_log_TimeID(convert_btod_to_apr_time(&jou_entry->occur_time));
if (jou_entry->entry_form_tag == 2)
{
printf("\nbrf jou_entry->ef.data.list_of_var_pres");
if (jou_entry->ef.data.list_of_var_pres)
{
//for (j = 0; j < jou_entry->ef.data.num_of_var; j++)
//{
// printf ("\n Var # %d: var_tag = %s", j, jou_entry->ef.data.list_of_var[j].var_tag);
// printf ("\n Var # %d: value_spec.len = %d", j,jou_entry->ef.data.list_of_var[j].value_spec.len);
//}
start = sGetMsTime();
printf("\nbrf process_jou_entry");
process_jou_entry(loginfo,t,jou_entry, clientNetInfo, dom_name, iTimeout) ;
//start = sGetMsTime();
if ( jread_resp->more_follows == 0 && ((i + 1) == jread_resp->num_of_jou_entry)) {
printf("\njread_resp->more_follows == 0 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
//lnk2024-8-16<31><36><EFBFBD>ӽ<EFBFBD><D3BD>߲<EFBFBD><DFB2><EFBFBD>
@@ -650,14 +615,11 @@ ST_RET mms_jread (loginfo_t *loginfo,MVL_NET_INFO *clientNetInfo, ST_CHAR *dom_n
end = sGetMsTime();
}
last_check_recall_config_time = last_check_recall_config_time + end - start;
//printf("jread_resp->more_follows = 0 ==============%.2f================\n", last_check_recall_config_time);
}
else {
printf ("\n annotation = %s", jou_entry->ef.annotation);
}
//apr_time_exp_t newTime;
//apr_time_exp_gmt(&newTime, t);
printf("\nstart timecheck");
apr_time_exp_t newTime;
apr_time_exp_gmt(&newTime, process_jou_entry_t);
@@ -677,10 +639,6 @@ ST_RET mms_jread (loginfo_t *loginfo,MVL_NET_INFO *clientNetInfo, ST_CHAR *dom_n
}
mvl_free_req_ctrl (reqCtrl); /* CRITICAL: */
} while (more_follows);
//mvl_type_id_destroy(1);
//del_mvl_type_ctrl();
//printf("do while ==============%.2f================\n", last_check_recall_config_time);
//append_db_records(LOG_IDX);
return (ret);
}