diff --git a/include/HTConst.h b/include/HTConst.h index e80f62d..a8ae8e7 100644 --- a/include/HTConst.h +++ b/include/HTConst.h @@ -37,6 +37,10 @@ #define MAX_PATH 260 #endif +#ifndef _MAX_DIR +#define _MAX_DIR 256 +#endif + // use buffer size define #define DEF_BUFFER_32 32 #define DEF_BUFFER_64 64 diff --git a/include/HTDataStruct.h b/include/HTDataStruct.h index 8c6093f..dd8cb3b 100644 --- a/include/HTDataStruct.h +++ b/include/HTDataStruct.h @@ -171,7 +171,7 @@ typedef struct { time_t iLastTime; // 最近一次链接时间 time_t iLastActionTime;// 最近一次活动时间 time_t iLastAlaarmTime; // 最近一次链接告警时间 - IedModel *IedModel; // 模型句柄 + IedModel *tIedModel; // 模型句柄 }ST_IED_CONN_HANDLE; // iec61850 录播文件属性定义 diff --git a/include/HTLogger.h b/include/HTLogger.h index 0712545..e2023be 100644 --- a/include/HTLogger.h +++ b/include/HTLogger.h @@ -39,7 +39,7 @@ extern "C" { #ifdef LOG_DEBUG #undef LOG_DEBUG #endif -#define __LOG_DEBUG 0 // 跟踪日志 +#define __LOG_DEBUG 1 // 跟踪日志 #define LOG_DEBUG __LINE__, _FILE_, __LOG_DEBUG #ifdef LOG_WARNG diff --git a/src/HTBusiDatabase.cpp b/src/HTBusiDatabase.cpp index 972a57a..b9e33a8 100644 --- a/src/HTBusiDatabase.cpp +++ b/src/HTBusiDatabase.cpp @@ -545,7 +545,7 @@ void vSetIedDevicesWarnMesg(char *Ied_ip, int port, time_t altime) return; } vTranHostTimeFmt(altime, szTime); - _snprintf(szSql, sizeof(szSql), "INSERT INTO busi_warning(id,sub_id,warn_time,warn_type,load_type,warn_desc,warn_level,state) " + snprintf(szSql, sizeof(szSql), "INSERT INTO busi_warning(id,sub_id,warn_time,warn_type,load_type,warn_desc,warn_level,state) " "VALUES(guuid(), '%s', '%s','1', '1','%s:%d,Ied链接异常断开,请检查!', '0','1')", "", szTime, Ied_ip, port); vPrtLogMsg(LOG_DEBUG, RET_OK, "insert Warning: %s", szSql); @@ -563,7 +563,7 @@ void vDelIedDevicesWarnMesg(char *Ied_ip, int port, time_t altime) return; } vTranHostTimeFmt(altime, szTime); - _snprintf(szSql, sizeof(szSql), "update busi_warning set process='network check', process_time=sysdate()," + snprintf(szSql, sizeof(szSql), "update busi_warning set process='network check', process_time=sysdate()," "process_user='system' where warn_type='1' and warn_level='0' and state = '1' and warn_time='%s' " "warn_desc = '%s:%d,Ied链接异常断开,请检查!' ", szTime, Ied_ip, port); vPrtLogMsg(LOG_DEBUG, RET_OK, "update Warning: %s", szSql); @@ -585,7 +585,7 @@ void vSetRealDevicesMoniMesg(ST_DB_BODY *pData) vTranHostTimeFmt(pData->dtime, szTime); // 1:振动装置 2 : 噪声装置 3 : 中心点装置 if (pData->szDevType == 1) { - _snprintf(szSql, sizeof(szSql), "insert into busi_ampli_real(id, file_id,main_id,sub_id,side,phase,in_out," + snprintf(szSql, sizeof(szSql), "insert into busi_ampli_real(id, file_id,main_id,sub_id,side,phase,in_out," "frequency,max_amplitude,ins_time) " "values(guuid(), '%s', '%s', '%s', '%c', '%c', '%c', '%s', '%.4f', '%s') ", pData->file_id, pData->m_id, pData->s_id, pData->side, pData->phase, pData->in_out, @@ -593,12 +593,12 @@ void vSetRealDevicesMoniMesg(ST_DB_BODY *pData) vPrtLogMsg(LOG_DEBUG, RET_OK, "insert busi_ampli_real: %s", szSql); } else if (pData->szDevType == 2) { - _snprintf(szSql, sizeof(szSql), "insert into busi_noise_real(id, main_id,max_amplitude,ins_time) " + snprintf(szSql, sizeof(szSql), "insert into busi_noise_real(id, main_id,max_amplitude,ins_time) " "values(guuid(), '%s','%.4f', '%s') ", pData->m_id, pData->value, szTime); } else if (pData->szDevType == 3) { - _snprintf(szSql, sizeof(szSql), "insert into busi_center_real(id, main_id,max_amplitude,ins_time) " + snprintf(szSql, sizeof(szSql), "insert into busi_center_real(id, main_id,max_amplitude,ins_time) " "values(guuid(), '%s','%.4f', '%s') ", pData->m_id, pData->value, szTime); } @@ -617,7 +617,7 @@ void vSetRealDevicesWarnMesg(ST_DB_WARN &stWarn) return; } vTranHostTimeFmt(stWarn.almtime, szTime); - _snprintf(szSql, sizeof(szSql), "INSERT INTO busi_warning(id,sub_id,warn_time,warn_type,warn_desc,warn_level,state,sample_value,value_unit) " + snprintf(szSql, sizeof(szSql), "INSERT INTO busi_warning(id,sub_id,warn_time,warn_type,warn_desc,warn_level,state,sample_value,value_unit) " "VALUES(guuid(), '%s', '%s','%d', '%s', '%d','%d','%.4f','%s')", "", stWarn.s_id, szTime, stWarn.warn_type, stWarn.szDesc,stWarn.level,stWarn.state,stWarn.value,stWarn.valunit); vPrtLogMsg(LOG_DEBUG, RET_OK, "insert Warning: %s", szSql); diff --git a/src/HTIEC61850.cpp b/src/HTIEC61850.cpp index c28c968..d3a219c 100644 --- a/src/HTIEC61850.cpp +++ b/src/HTIEC61850.cpp @@ -74,7 +74,7 @@ IedModel *LoadModelConfigFile(char *icd_file) // } // pNodeSpl = pNodeSpl->sibling; //} - printf_s("Node:%s\n", szNodeStr.c_str()); + printf("Node:%s\n", szNodeStr.c_str()); printf((const char*)"Node: %s\n", szNodeStr.c_str()); printf("Node: %s\n", szSipl.c_str()); }//IedModel_getModelNodeByObjectReference(model, iedModel_MONT); @@ -319,8 +319,8 @@ void setComtradeFile(IedConnection con, const char *filename) char szFileName[MAX_PATH] = { 0 }; char szRemotePath[260]; - char* dirc = _strdup(filename); - char* basec = _strdup(filename); + char* dirc =strdup(filename); + char* basec = strdup(filename); char* localDirName = getDirName(dirc, szDirName); char* localFileName = getBaseName(basec, szFileName); @@ -383,7 +383,7 @@ void getComtradeFile(IedConnection con) vPrtLogMsg(LOG_DEBUG, 0, "getComtradeFiles file_count= %d", g_list_comtrad_files.size()); memcpy(&stFiles, &(*ptr), sizeof(ST_FILES_ATTRIB)); - char* bname = _strdup((const char*)stFiles.szFileName); + char* bname = strdup((const char*)stFiles.szFileName); char* localFilename = getBaseName(bname, szLocalFile); strcpy(szFilePath, g_TConfig.getComtradePath()); strcat(szFilePath, "/"); @@ -649,10 +649,10 @@ void vIedFreeIedEvent(ST_IED_CONN_HANDLE &stIedHandle) IedConnection_destroy(stIedHandle.hConnHandle); } stIedHandle.hConnHandle = NULL; - if (stIedHandle.IedModel) { - IedModel_destroy(stIedHandle.IedModel); + if (stIedHandle.tIedModel) { + IedModel_destroy(stIedHandle.tIedModel); } - stIedHandle.IedModel = NULL; + stIedHandle.tIedModel = NULL; } // 鏍规嵁icd鑺傜偣鍚嶇О锛岃幏鍙栦紶鎰熷櫒缁戝畾鍏崇郴 @@ -1211,4 +1211,4 @@ void vGetDataSetList(IedConnection conn) ClientReportControlBlock_destroy(rcb); #endif -} \ No newline at end of file +} diff --git a/src/HTIEC61850Thread.cpp b/src/HTIEC61850Thread.cpp index 551690a..d378dec 100644 --- a/src/HTIEC61850Thread.cpp +++ b/src/HTIEC61850Thread.cpp @@ -129,9 +129,9 @@ void *thread_iec61850_manager_proc(void *arg) mutex_unlock(g_MapIedConn_mutex); } mutex_lock(g_MapIedConn_mutex); - if (!(*m_pIter).second.IedModel) { - (*m_pIter).second.IedModel = LoadModelConfigFile(g_TConfig.getIEDModelConfigFile()); - if ((*m_pIter).second.IedModel == NULL) { + if (!(*m_pIter).second.tIedModel) { + (*m_pIter).second.tIedModel = LoadModelConfigFile(g_TConfig.getIEDModelConfigFile()); + if ((*m_pIter).second.tIedModel == NULL) { vPrtLogMsg(LOG_ERROR, 0, "Load model config failed,model_file=%s", g_TConfig.getIEDModelConfigFile()); mutex_unlock(g_MapIedConn_mutex); return NULL; diff --git a/src/HTMmslite.cpp b/src/HTMmslite.cpp index bb0c32d..9cd035d 100644 --- a/src/HTMmslite.cpp +++ b/src/HTMmslite.cpp @@ -13,6 +13,7 @@ ****************************************************************************/ #include "HTGlobal.h" #include "HTMmsMapping.h" +#include "mms/mmslite/glbtypes.h" static const char *_FILE_ = "HTMmslite.cpp"; diff --git a/src/HTSLVService.cpp b/src/HTSLVService.cpp index f7cc7e5..68fbfed 100644 --- a/src/HTSLVService.cpp +++ b/src/HTSLVService.cpp @@ -29,10 +29,10 @@ static void cancel_thread_work(void) } vPrtLogMsg(LOG_DEBUG, RET_OK, "thread_handle_modbus_recv shutdown."); - if (thread_handle_iec61850_recv) { - pthread_cancel(thread_handle_iec61850_recv); - pthread_join(thread_handle_iec61850_recv, NULL); - pthread_kill(thread_handle_iec61850_recv, SIGURG); + if (thread_handle_iec61850_manager_proc) { + pthread_cancel(thread_handle_iec61850_manager_proc); + pthread_join(thread_handle_iec61850_manager_proc, NULL); + pthread_kill(thread_handle_iec61850_manager_proc, SIGURG); } vPrtLogMsg(LOG_DEBUG, RET_OK, "thread_handle_iec61850_recv shutdown."); @@ -167,7 +167,7 @@ static void task_kill() int main(int argc, char* argv[]) { printf("鍗曚綅:[%s]\n", "mm/s虏"); - printf_s("鍗曚綅:[%s]\n", "mm/s虏"); + printf("鍗曚綅:[%s]\n", "mm/s虏"); cout << "鍗曚綅:" << "mm / s虏" << endl; if (argc != 2) { diff --git a/src/makefile b/src/makefile index 232866e..39b6d7a 100644 --- a/src/makefile +++ b/src/makefile @@ -9,14 +9,14 @@ CC = g++ -MYSQL_PATH = /usr/local/mysql-5.5.43 -MYSQL_LIB_FILE = mysqlclient +MYSQL_PATH = /usr/include/mysql +MYSQL_LIB_FILE = /usr/lib64/mysql #CFLAGS = -c -Werror -g -D_REENTRANT -Wformat -Wsign-compare -O3 -ansi -CFLAGS = -c -Werror -g -Dlinux -D_DEBUG -D_REENTRANT -DDEBUG_SISCO -DMOSI -DLEAN_T -DTP0_ENABLED -DMMS_LITE -DMVL_UCA -Wformat -Wsign-compare -O3 -ansi -LIBS = -L$(MYSQL_PATH)/lib -l$(MYSQL_LIB_FILE) `pkg-config --libs libmodbus` -lnsl -luuid -lpthread -lm -lc -l../libs/cosmos_ld -lstdc++ +CFLAGS = -c -g -Dlinux -D_DEBUG -D_REENTRANT -DDEBUG_SISCO -DMOSI -DLEAN_T -DTP0_ENABLED -DMMS_LITE -DMVL_UCA -Wformat -Wsign-compare -O3 -ansi #-fpermissive +LIBS = -L$(MYSQL_PATH)/lib -L$(MYSQL_LIB_FILE) -L../libs `pkg-config --libs libmodbus`-lmysqlclient -lnsl -luuid -lpthread -lm -lc -lstdc++ -liec61850 -INCPATH = -I../include -I../include/sntp -I../include/sisco -I$(MYSQL_PATH)/include `pkg-config --cflags libmodbus` +INCPATH = -I../include -I../include/sntp -I../include/sisco -I$(MYSQL_PATH) `pkg-config --cflags libmodbus` -I../libiec61850-1.4.2.1/include -I../scl_tool # global file OBJS_PATH = ../obj @@ -26,9 +26,8 @@ OBJS = $(OBJS_PATH)/HTSLVService.o $(OBJS_PATH)/HTGlobal.o \ $(OBJS_PATH)/HTDatabase.o $(OBJS_PATH)/HTStrConvert.o \ $(OBJS_PATH)/HTConfig.o $(OBJS_PATH)/HTUnit.o \ $(OBJS_PATH)/HTXmlMethod.o $(OBJS_PATH)/HTModbus.o \ - $(OBJS_PATH)/HTMmslite.o $(OBJS_PATH)/HTBusiDatabase.o \ - $(OBJS_PATH)/HTTcpSocket.o $(OBJS_PATH)/HTNtptime.o \ - $(OBJS_PATH)/HTSntpc.o $(OBJS_PATH)/HTSntpd.o + $(OBJS_PATH)/HTBusiDatabase.o $(OBJS_PATH)/HTTcpSocket.o \ + $(OBJS_PATH)/HTIEC61850.o $(OBJS_PATH)/HTIEC61850Thread.o TARGET = ../bin/slvser