Skip to content

Commit 303df7b

Browse files
xengine-qytxengine-qyt
committed
delete:p2p network code
1 parent 3cedb74 commit 303df7b

File tree

6 files changed

+13
-149
lines changed

6 files changed

+13
-149
lines changed

‎XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ using namespace std;
5151
#include "../StorageModule_Session/Session_Error.h"
5252
#include "../StorageModule_Database/Database_Define.h"
5353
#include "../StorageModule_Database/Database_Error.h"
54-
#include "../StorageModule_P2XPPeer/P2XPPeer_Define.h"
55-
#include "../StorageModule_P2XPPeer/P2XPPeer_Error.h"
5654
#include "../StorageModule_Protocol/StorageProtocol_Define.h"
5755
#include "../StorageModule_Protocol/StorageProtocol_Error.h"
5856
#include "../StorageModule_Config/Config_Define.h"
@@ -67,25 +65,21 @@ using namespace std;
6765
#define STORAGE_NETTYPE_HTTPUPLOADER 1
6866
#define STORAGE_NETTYPE_HTTPDOWNLOAD 2
6967
#define STORAGE_NETTYPE_HTTPCENTER 3
70-
#define STORAGE_NETTYPE_TCPP2XP 4
7168

7269
extern BOOL bIsRun;
7370
extern XLOG xhLog;
7471

7572
extern XNETHANDLE xhHBDownload;
7673
extern XNETHANDLE xhHBUPLoader;
7774
extern XNETHANDLE xhHBCenter;
78-
extern XNETHANDLE xhHBP2xp;
7975

8076
extern XNETHANDLE xhNetDownload;
8177
extern XNETHANDLE xhNetUPLoader;
8278
extern XNETHANDLE xhNetCenter;
83-
extern XNETHANDLE xhNetP2xp;
8479

8580
extern XNETHANDLE xhUPPool;
8681
extern XNETHANDLE xhDLPool;
8782
extern XNETHANDLE xhCTPool;
88-
extern XNETHANDLE xhP2XPPool;
8983

9084
extern XHANDLE xhDLSsl;
9185
extern XHANDLE xhUPSsl;
@@ -94,7 +88,6 @@ extern XHANDLE xhLimit;
9488
extern XHANDLE xhUPHttp;
9589
extern XHANDLE xhDLHttp;
9690
extern XHANDLE xhCenterHttp;
97-
extern XHANDLE xhP2XPPacket;
9891

9992
extern SOCKET hBroadSocket;
10093
extern shared_ptr<std::thread> pSTDThread;
@@ -131,14 +124,12 @@ extern XENGINE_LBCONFIG st_LoadbalanceCfg;
131124
#pragma comment(lib,"../x64/Debug/StorageModule_APIHelp.lib")
132125
#pragma comment(lib,"../x64/Debug/StorageModule_Protocol.lib")
133126
#pragma comment(lib,"../x64/Debug/StorageModule_Database.lib")
134-
#pragma comment(lib,"../x64/Debug/StorageModule_P2XPPeer.lib")
135127
#else
136128
#pragma comment(lib,"../x64/Release/StorageModule_Session.lib")
137129
#pragma comment(lib,"../x64/Release/StorageModule_Config.lib")
138130
#pragma comment(lib,"../x64/Release/StorageModule_APIHelp.lib")
139131
#pragma comment(lib,"../x64/Release/StorageModule_Protocol.lib")
140132
#pragma comment(lib,"../x64/Release/StorageModule_Database.lib")
141-
#pragma comment(lib,"../x64/Release/StorageModule_P2XPPeer.lib")
142133
#endif
143134
#else
144135
#ifdef _DEBUG
@@ -147,14 +138,12 @@ extern XENGINE_LBCONFIG st_LoadbalanceCfg;
147138
#pragma comment(lib,"../Debug/StorageModule_APIHelp.lib")
148139
#pragma comment(lib,"../Debug/StorageModule_Protocol.lib")
149140
#pragma comment(lib,"../Debug/StorageModule_Database.lib")
150-
#pragma comment(lib,"../Debug/StorageModule_P2XPPeer.lib")
151141
#else
152142
#pragma comment(lib,"../Release/StorageModule_Session.lib")
153143
#pragma comment(lib,"../Release/StorageModule_Config.lib")
154144
#pragma comment(lib,"../Release/StorageModule_APIHelp.lib")
155145
#pragma comment(lib,"../Release/StorageModule_Protocol.lib")
156146
#pragma comment(lib,"../Release/StorageModule_Database.lib")
157-
#pragma comment(lib,"../Release/StorageModule_P2XPPeer.lib")
158147
#endif
159148
#endif
160149
#endif

‎XEngine_Source/XEngine_StorageApp/StorageApp_Network.cpp‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -130,28 +130,6 @@ void CALLBACK XEngine_Callback_CenterLeave(LPCTSTR lpszClientAddr, SOCKET hSocke
130130
XEngine_Net_CloseClient(lpszClientAddr, STORAGE_LEAVETYPE_BYSELF, STORAGE_NETTYPE_HTTPCENTER);
131131
}
132132
//////////////////////////////////////////////////////////////////////////
133-
BOOL CALLBACK XEngine_Callback_P2xpLogin(LPCTSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam)
134-
{
135-
HelpComponents_Datas_CreateEx(xhP2XPPacket, lpszClientAddr, 0);
136-
SocketOpt_HeartBeat_InsertAddrEx(xhHBP2xp, lpszClientAddr);
137-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("P2XP客户端：%s，进入了服务器"), lpszClientAddr);
138-
return TRUE;
139-
}
140-
void CALLBACK XEngine_Callback_P2xpRecv(LPCTSTR lpszClientAddr, SOCKET hSocket, LPCTSTR lpszRecvMsg, int nMsgLen, LPVOID lParam)
141-
{
142-
if (!HelpComponents_Datas_PostEx(xhP2XPPacket, lpszClientAddr, lpszRecvMsg, nMsgLen))
143-
{
144-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("P2XP客户端：%s，投递数据失败,大小:%d,错误;%lX"), lpszClientAddr, nMsgLen, HttpServer_GetLastError());
145-
return;
146-
}
147-
SocketOpt_HeartBeat_ActiveAddrEx(xhHBP2xp, lpszClientAddr);
148-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _T("P2XP客户端：%s，投递包成功，大小：%d"), lpszClientAddr, nMsgLen);
149-
}
150-
void CALLBACK XEngine_Callback_P2xpLeave(LPCTSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam)
151-
{
152-
XEngine_Net_CloseClient(lpszClientAddr, STORAGE_LEAVETYPE_BYSELF, STORAGE_NETTYPE_TCPP2XP);
153-
}
154-
//////////////////////////////////////////////////////////////////////////
155133
void CALLBACK XEngine_Callback_HBDownload(LPCTSTR lpszClientAddr, SOCKET hSocket, int nStatus, LPVOID lParam)
156134
{
157135
XEngine_Net_CloseClient(lpszClientAddr, STORAGE_LEAVETYPE_HEARTBEAT, STORAGE_NETTYPE_HTTPDOWNLOAD);
@@ -164,10 +142,6 @@ void CALLBACK XEngine_Callback_HBCenter(LPCTSTR lpszClientAddr, SOCKET hSocket,
164142
{
165143
XEngine_Net_CloseClient(lpszClientAddr, STORAGE_LEAVETYPE_HEARTBEAT, STORAGE_NETTYPE_HTTPCENTER);
166144
}
167-
void CALLBACK XEngine_Callback_HBP2xp(LPCTSTR lpszClientAddr, SOCKET hSocket, int nStatus, LPVOID lParam)
168-
{
169-
XEngine_Net_CloseClient(lpszClientAddr, STORAGE_LEAVETYPE_HEARTBEAT, STORAGE_NETTYPE_TCPP2XP);
170-
}
171145
//////////////////////////////////////////////////////////////////////////
172146
BOOL XEngine_Net_CloseClient(LPCTSTR lpszClientAddr, int nLeaveType, int nClientType)
173147
{
@@ -243,29 +217,6 @@ BOOL XEngine_Net_CloseClient(LPCTSTR lpszClientAddr, int nLeaveType, int nClient
243217
RfcComponents_HttpServer_CloseClinetEx(xhCenterHttp, lpszClientAddr);
244218
OPenSsl_Server_CloseClientEx(xhCHSsl, lpszClientAddr);
245219
}
246-
else
247-
{
248-
m_StrClient = _T("P2XP客户端");
249-
if (STORAGE_LEAVETYPE_HEARTBEAT == nLeaveType)
250-
{
251-
lpszLeaveMsg = _T("心跳超时");
252-
NetCore_TCPXCore_CloseForClientEx(xhNetP2xp, lpszClientAddr);
253-
}
254-
else if (STORAGE_LEAVETYPE_BYSELF == nLeaveType)
255-
{
256-
lpszLeaveMsg = _T("被动断开");
257-
SocketOpt_HeartBeat_DeleteAddrEx(xhHBP2xp, lpszClientAddr);
258-
}
259-
else
260-
{
261-
lpszLeaveMsg = _T("主动关闭");
262-
263-
NetCore_TCPXCore_CloseForClientEx(xhNetP2xp, lpszClientAddr);
264-
SocketOpt_HeartBeat_DeleteAddrEx(xhHBP2xp, lpszClientAddr);
265-
}
266-
HelpComponents_Datas_DeleteEx(xhP2XPPacket, lpszClientAddr);
267-
P2XPPeer_Manage_Delete(lpszClientAddr);
268-
}
269220
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("%s：%s，与服务器断开，原因：%s"), m_StrClient.c_str(), lpszClientAddr, lpszLeaveMsg);
270221
return TRUE;
271222
}
@@ -334,14 +285,6 @@ BOOL XEngine_Net_SendMsg(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int nMsg
334285
SocketOpt_HeartBeat_ActiveAddrEx(xhHBCenter, lpszClientAddr);
335286
}
336287
}
337-
else if (STORAGE_NETTYPE_TCPP2XP == nType)
338-
{
339-
bRet = NetCore_TCPXCore_SendEx(xhNetP2xp, lpszClientAddr, lpszMsgBuffer, nMsgLen);
340-
if (bRet && st_ServiceCfg.st_XTime.bHBTime)
341-
{
342-
SocketOpt_HeartBeat_ActiveAddrEx(xhHBP2xp, lpszClientAddr);
343-
}
344-
}
345288
if (!bRet)
346289
{
347290
DWORD dwRet = NetCore_GetLastError();

‎XEngine_Source/XEngine_StorageApp/StorageApp_Network.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,10 @@ void CALLBACK XEngine_Callback_UPLoaderLeave(LPCTSTR lpszClientAddr, SOCKET hSoc
99
BOOL CALLBACK XEngine_Callback_CenterLogin(LPCTSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam);
1010
void CALLBACK XEngine_Callback_CenterRecv(LPCTSTR lpszClientAddr, SOCKET hSocket, LPCTSTR lpszRecvMsg, int nMsgLen, LPVOID lParam);
1111
void CALLBACK XEngine_Callback_CenterLeave(LPCTSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam);
12-
BOOL CALLBACK XEngine_Callback_P2xpLogin(LPCTSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam);
13-
void CALLBACK XEngine_Callback_P2xpRecv(LPCTSTR lpszClientAddr, SOCKET hSocket, LPCTSTR lpszRecvMsg, int nMsgLen, LPVOID lParam);
14-
void CALLBACK XEngine_Callback_P2xpLeave(LPCTSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam);
1512

1613
void CALLBACK XEngine_Callback_HBDownload(LPCTSTR lpszClientAddr, SOCKET hSocket, int nStatus, LPVOID lParam);
1714
void CALLBACK XEngine_Callback_HBUPLoader(LPCTSTR lpszClientAddr, SOCKET hSocket, int nStatus, LPVOID lParam);
1815
void CALLBACK XEngine_Callback_HBCenter(LPCTSTR lpszClientAddr, SOCKET hSocket, int nStatus, LPVOID lParam);
19-
void CALLBACK XEngine_Callback_HBP2xp(LPCTSTR lpszClientAddr, SOCKET hSocket, int nStatus, LPVOID lParam);
2016

2117
BOOL XEngine_Net_CloseClient(LPCTSTR lpszClientAddr, int nLeaveType, int nClientType = STORAGE_NETTYPE_HTTPDOWNLOAD);
2218
BOOL XEngine_Net_SendMsg(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int nMsgLen, int nType = STORAGE_NETTYPE_HTTPDOWNLOAD);

‎XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp‎

Lines changed: 13 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@ XLOG xhLog = NULL;
66
XNETHANDLE xhHBDownload = 0;
77
XNETHANDLE xhHBUPLoader = 0;
88
XNETHANDLE xhHBCenter = 0;
9-
XNETHANDLE xhHBP2xp = 0;
109

1110
XNETHANDLE xhNetDownload = 0;
1211
XNETHANDLE xhNetUPLoader = 0;
1312
XNETHANDLE xhNetCenter = 0;
14-
XNETHANDLE xhNetP2xp = 0;
1513

1614
XNETHANDLE xhUPPool = 0;
1715
XNETHANDLE xhDLPool = 0;
1816
XNETHANDLE xhCTPool = 0;
19-
XNETHANDLE xhP2XPPool = 0;
2017

2118
XHANDLE xhDLSsl = NULL;
2219
XHANDLE xhUPSsl = NULL;
@@ -25,7 +22,6 @@ XHANDLE xhLimit = NULL;
2522
XHANDLE xhUPHttp = NULL;
2623
XHANDLE xhDLHttp = NULL;
2724
XHANDLE xhCenterHttp = NULL;
28-
XHANDLE xhP2XPPacket = 0;
2925

3026
SOCKET hBroadSocket = 0;
3127
shared_ptr<std::thread> pSTDThread = NULL;
@@ -43,7 +39,6 @@ void ServiceApp_Stop(int signo)
4339
RfcComponents_HttpServer_DestroyEx(xhUPHttp);
4440
RfcComponents_HttpServer_DestroyEx(xhDLHttp);
4541
RfcComponents_HttpServer_DestroyEx(xhCenterHttp);
46-
HelpComponents_Datas_Destory(xhP2XPPacket);
4742

4843
OPenSsl_Server_StopEx(xhDLSsl);
4944
OPenSsl_Server_StopEx(xhUPSsl);
@@ -52,17 +47,14 @@ void ServiceApp_Stop(int signo)
5247
NetCore_TCPXCore_DestroyEx(xhNetDownload);
5348
NetCore_TCPXCore_DestroyEx(xhNetUPLoader);
5449
NetCore_TCPXCore_DestroyEx(xhNetCenter);
55-
NetCore_TCPXCore_DestroyEx(xhNetP2xp);
5650

5751
SocketOpt_HeartBeat_DestoryEx(xhHBDownload);
5852
SocketOpt_HeartBeat_DestoryEx(xhHBUPLoader);
5953
SocketOpt_HeartBeat_DestoryEx(xhHBCenter);
60-
SocketOpt_HeartBeat_DestoryEx(xhHBP2xp);
6154

6255
ManagePool_Thread_NQDestroy(xhUPPool);
6356
ManagePool_Thread_NQDestroy(xhDLPool);
6457
ManagePool_Thread_NQDestroy(xhCTPool);
65-
ManagePool_Thread_NQDestroy(xhP2XPPool);
6658

6759
Algorithm_Calculation_Close(xhLimit);
6860
HelpComponents_XLog_Destroy(xhLog);
@@ -129,7 +121,6 @@ int main(int argc, char** argv)
129121
THREADPOOL_PARAMENT** ppSt_ListUPThread;
130122
THREADPOOL_PARAMENT** ppSt_ListDLThread;
131123
THREADPOOL_PARAMENT** ppSt_ListCTThread;
132-
THREADPOOL_PARAMENT** ppSt_ListP2xpThread;
133124

134125
memset(&st_XLogConfig, '\0', sizeof(HELPCOMPONENTS_XLOG_CONFIGURE));
135126
memset(&st_ServiceCfg, '\0', sizeof(XENGINE_SERVERCONFIG));
@@ -204,13 +195,6 @@ int main(int argc, char** argv)
204195
goto XENGINE_EXITAPP;
205196
}
206197
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，初始化业务管理服务成功，句柄：%llu,时间:%d,次数:%d"), xhHBUPLoader, st_ServiceCfg.st_XTime.nCenterTimeOut, st_ServiceCfg.st_XTime.nTimeCheck);
207-
208-
if (!SocketOpt_HeartBeat_InitEx(&xhHBP2xp, st_ServiceCfg.st_XTime.nP2XPTimeOut, st_ServiceCfg.st_XTime.nTimeCheck, XEngine_Callback_HBP2xp))
209-
{
210-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，初始化P2XP心跳管理服务失败，错误：%lX"), NetCore_GetLastError());
211-
goto XENGINE_EXITAPP;
212-
}
213-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，初始化P2XP心跳管理服务成功，句柄：%llu,时间:%d,次数:%d"), xhHBP2xp, st_ServiceCfg.st_XTime.nP2XPTimeOut, st_ServiceCfg.st_XTime.nTimeCheck);
214198
}
215199
else
216200
{
@@ -409,62 +393,26 @@ int main(int argc, char** argv)
409393
}
410394
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动HTTP业务任务处理线程池成功,线程池个数:%d"), st_ServiceCfg.st_XMax.nCenterThread);
411395
}
412-
//启动P2P服务
413-
if (st_ServiceCfg.nP2XPPort > 0)
396+
//默认为假才是客户端,才能启用P2P
397+
if (!st_ServiceCfg.st_XSql.bEnable)
414398
{
415-
xhP2XPPacket = HelpComponents_Datas_Init(st_ServiceCfg.st_XMax.nMaxQueue, st_ServiceCfg.st_XMax.nP2XPThread);
416-
if (NULL == xhP2XPPacket)
417-
{
418-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，初始化P2XP包管理器失败，错误：%lX"), Packets_GetLastError());
419-
goto XENGINE_EXITAPP;
420-
}
421-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动P2XP组包器成功"));
422-
423-
if (!NetCore_TCPXCore_StartEx(&xhNetP2xp, st_ServiceCfg.nP2XPPort, st_ServiceCfg.st_XMax.nMaxClient, st_ServiceCfg.st_XMax.nP2XPThread, FALSE, st_ServiceCfg.bReuseraddr))
399+
if (!NetCore_BroadCast_RecvInit(&hBroadSocket, st_ServiceCfg.st_P2xp.nRVPort))
424400
{
425-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，启动P2XP网络服务失败,端口:%d，错误：%lX"), st_ServiceCfg.nP2XPPort, NetCore_GetLastError());
401+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，启动P2P存储广播服务失败，错误：%d"), errno);
426402
goto XENGINE_EXITAPP;
427403
}
428-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动P2XP网络服务成功，句柄：%llu，端口：%d,IO线程个数:%d"), xhNetP2xp, st_ServiceCfg.nP2XPPort, st_ServiceCfg.st_XMax.nP2XPThread);
429-
NetCore_TCPXCore_RegisterCallBackEx(xhNetP2xp, XEngine_Callback_P2xpLogin, XEngine_Callback_P2xpRecv, XEngine_Callback_P2xpLeave);
430-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，注册P2XP网络服务事件成功！"));
431-
432-
BaseLib_OperatorMemory_Malloc((XPPPMEM)&ppSt_ListP2xpThread, st_ServiceCfg.st_XMax.nP2XPThread, sizeof(THREADPOOL_PARAMENT));
433-
for (int i = 0; i < st_ServiceCfg.st_XMax.nP2XPThread; i++)
434-
{
435-
int* pInt_Pos = new int;
436-
*pInt_Pos = i;
437-
438-
ppSt_ListP2xpThread[i]->lParam = pInt_Pos;
439-
ppSt_ListP2xpThread[i]->fpCall_ThreadsTask = XEngine_P2XP_TCPThread;
440-
}
441-
if (!ManagePool_Thread_NQCreate(&xhP2XPPool, &ppSt_ListP2xpThread, st_ServiceCfg.st_XMax.nP2XPThread))
404+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动P2P存储广播服务成功,端口:%d"), st_ServiceCfg.st_P2xp.nRVPort);
405+
pSTDThread = make_shared<std::thread>(XEngine_Task_P2PThread);
406+
if (!pSTDThread->joinable())
442407
{
443-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，启动P2XP处理线程池失败，错误：%d"), errno);
408+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，启动P2P存储广播服务线程失败，错误：%d"), errno);
444409
goto XENGINE_EXITAPP;
445410
}
446-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动P2XP任务处理线程池成功,线程池个数:%d"), st_ServiceCfg.st_XMax.nP2XPThread);
447-
//默认为假才是客户端,才能启用P2P
448-
if (!st_ServiceCfg.st_XSql.bEnable)
449-
{
450-
if (!NetCore_BroadCast_RecvInit(&hBroadSocket, st_ServiceCfg.st_P2xp.nRVPort))
451-
{
452-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，启动P2P存储广播服务失败，错误：%d"), errno);
453-
goto XENGINE_EXITAPP;
454-
}
455-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动P2P存储广播服务成功,端口:%d"), st_ServiceCfg.st_P2xp.nRVPort);
456-
pSTDThread = make_shared<std::thread>(XEngine_Task_P2PThread);
457-
if (!pSTDThread->joinable())
458-
{
459-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，启动P2P存储广播服务线程失败，错误：%d"), errno);
460-
goto XENGINE_EXITAPP;
461-
}
462-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动P2P存储广播服务线程成功"));
463-
}
464-
else
465-
{
466-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("启动服务中，P2P存储服务配置为不启动"));
467-
}
411+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动P2P存储广播服务线程成功"));
412+
}
413+
else
414+
{
415+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("启动服务中，P2P存储服务配置为不启动"));
468416
}
469417

470418
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("所有服务成功启动，存储中心服务运行中，发行版本次数:%d,当前运行版本：%s。。。"), st_ServiceCfg.st_XVer.pStl_ListStorage->size(), st_ServiceCfg.st_XVer.pStl_ListStorage->front().c_str());
@@ -484,7 +432,6 @@ int main(int argc, char** argv)
484432
RfcComponents_HttpServer_DestroyEx(xhUPHttp);
485433
RfcComponents_HttpServer_DestroyEx(xhDLHttp);
486434
RfcComponents_HttpServer_DestroyEx(xhCenterHttp);
487-
HelpComponents_Datas_Destory(xhP2XPPacket);
488435

489436
OPenSsl_Server_StopEx(xhDLSsl);
490437
OPenSsl_Server_StopEx(xhUPSsl);
@@ -493,17 +440,14 @@ int main(int argc, char** argv)
493440
NetCore_TCPXCore_DestroyEx(xhNetDownload);
494441
NetCore_TCPXCore_DestroyEx(xhNetUPLoader);
495442
NetCore_TCPXCore_DestroyEx(xhNetCenter);
496-
NetCore_TCPXCore_DestroyEx(xhNetP2xp);
497443

498444
SocketOpt_HeartBeat_DestoryEx(xhHBDownload);
499445
SocketOpt_HeartBeat_DestoryEx(xhHBUPLoader);
500446
SocketOpt_HeartBeat_DestoryEx(xhHBCenter);
501-
SocketOpt_HeartBeat_DestoryEx(xhHBP2xp);
502447

503448
ManagePool_Thread_NQDestroy(xhUPPool);
504449
ManagePool_Thread_NQDestroy(xhDLPool);
505450
ManagePool_Thread_NQDestroy(xhCTPool);
506-
ManagePool_Thread_NQDestroy(xhP2XPPool);
507451

508452
Algorithm_Calculation_Close(xhLimit);
509453
HelpComponents_XLog_Destroy(xhLog);

‎XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.vcxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@
160160
<ClCompile Include="Storage_APPTask\Storage_TaskManage.cpp" />
161161
<ClCompile Include="Storage_APPTask\Storage_TaskP2p.cpp" />
162162
<ClCompile Include="Storage_APPTask\Storage_TaskPass.cpp" />
163-
<ClCompile Include="StorageApp_P2XPNet.cpp" />
164163
<ClCompile Include="XEngine_StorageApp.cpp" />
165164
</ItemGroup>
166165
<ItemGroup>
@@ -169,7 +168,6 @@
169168
<ClInclude Include="StorageApp_Download.h" />
170169
<ClInclude Include="StorageApp_Hdr.h" />
171170
<ClInclude Include="StorageApp_Network.h" />
172-
<ClInclude Include="StorageApp_P2XPNet.h" />
173171
<ClInclude Include="StorageApp_UPLoader.h" />
174172
<ClInclude Include="Storage_APPTask\Storage_TaskManage.h" />
175173
<ClInclude Include="Storage_APPTask\Storage_TaskP2p.h" />

‎XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.vcxproj.filters‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@
4242
<ClCompile Include="Storage_APPTask\Storage_TaskPass.cpp">
4343
<Filter>源文件\Storage_APPTask</Filter>
4444
</ClCompile>
45-
<ClCompile Include="StorageApp_P2XPNet.cpp">
46-
<Filter>源文件</Filter>
47-
</ClCompile>
4845
<ClCompile Include="Storage_APPTask\Storage_TaskP2p.cpp">
4946
<Filter>源文件\Storage_APPTask</Filter>
5047
</ClCompile>
@@ -74,9 +71,6 @@
7471
<ClInclude Include="Storage_APPTask\Storage_TaskPass.h">
7572
<Filter>头文件\Storage_APPTask</Filter>
7673
</ClInclude>
77-
<ClInclude Include="StorageApp_P2XPNet.h">
78-
<Filter>头文件</Filter>
79-
</ClInclude>
8074
<ClInclude Include="Storage_APPTask\Storage_TaskP2p.h">
8175
<Filter>头文件\Storage_APPTask</Filter>
8276
</ClInclude>

0 commit comments

Comments
 (0)