update:x-engine v9 version supported

xengine-qyt · xengine-qyt · commit fb961309c3f4 · 2024-12-20T14:14:56.000+08:00
diff --git a/XEngine_APPClient/APPClient_HTTP2Example/APPClient_HTTP2Example.cpp b/XEngine_APPClient/APPClient_HTTP2Example/APPClient_HTTP2Example.cpp
@@ -40,7 +40,7 @@ int main()
 		return 0;
 	}
 	printf("接受到数据,大小:%d,内容:%s\n", nLen, ptszMsgBuffer);
-	BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
+	BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
 
 #ifdef _MSC_BUILD
 	WSACleanup();
diff --git a/XEngine_APPClient/APPClient_HTTPExample/APPClient_HTTPExample.cpp b/XEngine_APPClient/APPClient_HTTPExample/APPClient_HTTPExample.cpp
@@ -36,7 +36,7 @@ int main()
 		return 0;
 	}
 	printf("接受到数据,大小:%d,内容:%s\n", nLen, ptszMsgBuffer);
-	BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
+	BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
 
 #ifdef _MSC_BUILD
 	WSACleanup();
diff --git a/XEngine_APPClient/APPClient_TCPExample/APPClient_TCPExample.cpp b/XEngine_APPClient/APPClient_TCPExample/APPClient_TCPExample.cpp
@@ -108,7 +108,7 @@ int main(int argc, char** argv)
 		{
 			printf("接受服务器返回数据,结果:%d,大小:%d,内容:%s\n", st_ProtocolHdr.wReserve, nLen, ptszMSGBuffer);
 			//释放内存并且关闭客户端
-			BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMSGBuffer);
+			BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMSGBuffer);
 		}
 	}
 
diff --git a/XEngine_Source/XEngine_Depend b/XEngine_Source/XEngine_Depend
@@ -1 +1 @@
-Subproject commit d1d1ee7952a0a93a1beb183a8dee281d9231ff3d
+Subproject commit ad2a0b8a8c487cc4aa1e5830141f024419f2d87f
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_CenterApp/XEngine_CenterApp.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_CenterApp/XEngine_CenterApp.cpp
@@ -153,7 +153,7 @@ int main(int argc, char** argv)
 		NetCore_TCPXCore_RegisterCallBackEx(xhCenterSocket, Network_Callback_CenterLogin, Network_Callback_CenterRecv, Network_Callback_CenterLeave);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,注册业务网络事件成功"));
 		//启动任务池
-		BaseLib_OperatorMemory_Malloc((XPPPMEM)&ppSt_ListCenterParam, st_ServiceConfig.st_XMax.nThread, sizeof(THREADPOOL_PARAMENT));
+		BaseLib_Memory_Malloc((XPPPMEM)&ppSt_ListCenterParam, st_ServiceConfig.st_XMax.nThread, sizeof(THREADPOOL_PARAMENT));
 		for (int i = 0; i < st_ServiceConfig.st_XMax.nThread; i++)
 		{
 			int* pInt_Pos = new int;
@@ -175,7 +175,7 @@ int main(int argc, char** argv)
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中,业务消息服务没有被启用"));
 	}
 	
-	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数;%d。。。"), BaseLib_OperatorVer_XNumberStr(), BaseLib_OperatorVer_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());
+	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数;%d。。。"), BaseLib_Version_XNumberStr(), BaseLib_Version_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());
 
 	while (true)
 	{
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_CenterApp/XEngine_CenterTask.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_CenterApp/XEngine_CenterTask.cpp
@@ -43,11 +43,11 @@ XHTHREAD CALLBACK XEngine_CenterTask_Thread(XPVOID lParam)
 					//在另外一个函数里面处理数据
 					XEngine_CenterTask_Handle(&st_ProtocolHdr, ppSst_ListAddr[i]->tszClientAddr, ptszMsgBuffer, nMsgLen);
 					//释放内存
-					BaseLib_OperatorMemory_FreeCStyle((VOID**)&ptszMsgBuffer);
+					BaseLib_Memory_FreeCStyle((VOID**)&ptszMsgBuffer);
 				}
 			}
 		}
-		BaseLib_OperatorMemory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);
+		BaseLib_Memory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);
 	}
 	return 0;
 }
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_HTTP2App/XEngine_HTTP2App.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_HTTP2App/XEngine_HTTP2App.cpp
@@ -157,7 +157,7 @@ int main(int argc, char** argv)
 	NetCore_TCPXCore_RegisterCallBackEx(xhHTTP2Socket, Network_Callback_HTTPLogin, Network_Callback_HTTPRecv, Network_Callback_HTTPLeave);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,注册HTTP2网络事件成功"));
 	//HTTP任务池
-	BaseLib_OperatorMemory_Malloc((XPPPMEM)&ppSt_ListHTTPParam, st_ServiceConfig.st_XMax.nThread, sizeof(THREADPOOL_PARAMENT));
+	BaseLib_Memory_Malloc((XPPPMEM)&ppSt_ListHTTPParam, st_ServiceConfig.st_XMax.nThread, sizeof(THREADPOOL_PARAMENT));
 	for (int i = 0; i < st_ServiceConfig.st_XMax.nThread; i++)
 	{
 		int* pInt_Pos = new int;
@@ -174,7 +174,7 @@ int main(int argc, char** argv)
 	}
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,启动HTTP2线程池服务成功,启动个数:%d"), st_ServiceConfig.st_XMax.nThread);
 
-	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数;%d。。。"), BaseLib_OperatorVer_XNumberStr(), BaseLib_OperatorVer_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());
+	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数;%d。。。"), BaseLib_Version_XNumberStr(), BaseLib_Version_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());
 
 	while (true)
 	{
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_HTTP2App/XEngine_HTTP2Task.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_HTTP2App/XEngine_HTTP2Task.cpp
@@ -50,15 +50,15 @@ XHTHREAD CALLBACK XEngine_HTTP2Task_Thread(XPVOID lParam)
 						//释放内存
 						if (nMsgLen > 0)
 						{
-							BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
+							BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
 						}
-						BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListHdr, nHdrCount);
+						BaseLib_Memory_Free((XPPPMEM)&ppSt_ListHdr, nHdrCount);
 					}
 				}
 			}
-			BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_PKTStream, nStreamCount);
+			BaseLib_Memory_Free((XPPPMEM)&ppSt_PKTStream, nStreamCount);
 		}
-		BaseLib_OperatorMemory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);
+		BaseLib_Memory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);
 	}
 	return 0;
 }
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HTTPTask.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HTTPTask.cpp
@@ -46,12 +46,12 @@ XHTHREAD CALLBACK XEngine_HTTPTask_Thread(XPVOID lParam)
 					//在另外一个函数里面处理数据
 					XEngine_HTTPTask_Handle(&st_HTTPReqparam, ppSst_ListAddr[i]->tszClientAddr, ptszMsgBuffer, nMsgLen, ppszHdrList, nHdrCount);
 					//释放内存
-					BaseLib_OperatorMemory_FreeCStyle((VOID**)&ptszMsgBuffer);
-					BaseLib_OperatorMemory_Free((XPPPMEM)&ppszHdrList, nHdrCount);
+					BaseLib_Memory_FreeCStyle((VOID**)&ptszMsgBuffer);
+					BaseLib_Memory_Free((XPPPMEM)&ppszHdrList, nHdrCount);
 				}
 			}
 		}
-		BaseLib_OperatorMemory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);
+		BaseLib_Memory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);
 	}
 	return 0;
 }
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HttpApp.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HttpApp.cpp
@@ -154,7 +154,7 @@ int main(int argc, char** argv)
 		NetCore_TCPXCore_RegisterCallBackEx(xhHTTPSocket, Network_Callback_HTTPLogin, Network_Callback_HTTPRecv, Network_Callback_HTTPLeave);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,注册HTTP网络事件成功"));
 		//HTTP任务池
-		BaseLib_OperatorMemory_Malloc((XPPPMEM)&ppSt_ListHTTPParam, st_ServiceConfig.st_XMax.nThread, sizeof(THREADPOOL_PARAMENT));
+		BaseLib_Memory_Malloc((XPPPMEM)&ppSt_ListHTTPParam, st_ServiceConfig.st_XMax.nThread, sizeof(THREADPOOL_PARAMENT));
 		for (int i = 0; i < st_ServiceConfig.st_XMax.nThread; i++)
 		{
 			int* pInt_Pos = new int;
@@ -176,7 +176,7 @@ int main(int argc, char** argv)
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中,HTTP消息服务没有被启用"));
 	}
 
-	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数;%d。。。"), BaseLib_OperatorVer_XNumberStr(), BaseLib_OperatorVer_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());
+	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数;%d。。。"), BaseLib_Version_XNumberStr(), BaseLib_Version_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());
 
 	while (true)
 	{
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_WebSocketApp/XEngine_WSTask.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_WebSocketApp/XEngine_WSTask.cpp
@@ -39,10 +39,10 @@ XHTHREAD CALLBACK XEngine_WSTask_Thread(XPVOID lParam)
 				//释放内存
 				if (nMsgLen > 0)
 				{
-					BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
+					BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
 				}
 			}
-			BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListClient, nListCount);
+			BaseLib_Memory_Free((XPPPMEM)&ppSt_ListClient, nListCount);
 		}
 	}
 	return 0;
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_WebSocketApp/XEngine_WebSocketApp.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_WebSocketApp/XEngine_WebSocketApp.cpp
@@ -149,7 +149,7 @@ int main(int argc, char** argv)
 	NetCore_TCPXCore_RegisterCallBackEx(xhWSSocket, Network_Callback_WSLogin, Network_Callback_WSRecv, Network_Callback_WSLeave);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,注册WEBSOCKET网络事件成功"));
 	//HTTP任务池
-	BaseLib_OperatorMemory_Malloc((XPPPMEM)&ppSt_ListHTTPParam, st_ServiceConfig.st_XMax.nThread, sizeof(THREADPOOL_PARAMENT));
+	BaseLib_Memory_Malloc((XPPPMEM)&ppSt_ListHTTPParam, st_ServiceConfig.st_XMax.nThread, sizeof(THREADPOOL_PARAMENT));
 	for (int i = 0; i < st_ServiceConfig.st_XMax.nThread; i++)
 	{
 		int* pInt_Pos = new int;
@@ -166,7 +166,7 @@ int main(int argc, char** argv)
 	}
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,启动WEBSOCKET线程池服务成功,启动个数:%d"), st_ServiceConfig.st_XMax.nThread);
 
-	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数;%d。。。"), BaseLib_OperatorVer_XNumberStr(), BaseLib_OperatorVer_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());
+	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数;%d。。。"), BaseLib_Version_XNumberStr(), BaseLib_Version_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());
 
 	while (true)
 	{

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ int main()`
`40`	`40`	`return 0;`
`41`	`41`	`}`
`42`	`42`	`printf("接受到数据,大小:%d,内容:%s\n", nLen, ptszMsgBuffer);`
`43`		`- BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);`
	`43`	`+ BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);`
`44`	`44`
`45`	`45`	`#ifdef _MSC_BUILD`
`46`	`46`	`WSACleanup();`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ int main()`
`36`	`36`	`return 0;`
`37`	`37`	`}`
`38`	`38`	`printf("接受到数据,大小:%d,内容:%s\n", nLen, ptszMsgBuffer);`
`39`		`- BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);`
	`39`	`+ BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);`
`40`	`40`
`41`	`41`	`#ifdef _MSC_BUILD`
`42`	`42`	`WSACleanup();`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ int main(int argc, char** argv)`
`108`	`108`	`{`
`109`	`109`	`printf("接受服务器返回数据,结果:%d,大小:%d,内容:%s\n", st_ProtocolHdr.wReserve, nLen, ptszMSGBuffer);`
`110`	`110`	`//释放内存并且关闭客户端`
`111`		`- BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMSGBuffer);`
	`111`	`+ BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMSGBuffer);`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ int main(int argc, char** argv)`
`153`	`153`	`NetCore_TCPXCore_RegisterCallBackEx(xhCenterSocket, Network_Callback_CenterLogin, Network_Callback_CenterRecv, Network_Callback_CenterLeave);`
`154`	`154`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,注册业务网络事件成功"));`
`155`	`155`	`//启动任务池`
`156`		`- BaseLib_OperatorMemory_Malloc((XPPPMEM)&ppSt_ListCenterParam, st_ServiceConfig.st_XMax.nThread, sizeof(THREADPOOL_PARAMENT));`
	`156`	`+ BaseLib_Memory_Malloc((XPPPMEM)&ppSt_ListCenterParam, st_ServiceConfig.st_XMax.nThread, sizeof(THREADPOOL_PARAMENT));`
`157`	`157`	`for (int i = 0; i < st_ServiceConfig.st_XMax.nThread; i++)`
`158`	`158`	`{`
`159`	`159`	`int* pInt_Pos = new int;`
`@@ -175,7 +175,7 @@ int main(int argc, char** argv)`
`175`	`175`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中,业务消息服务没有被启用"));`
`176`	`176`	`}`
`177`	`177`
`178`		`- XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数;%d。。。"), BaseLib_OperatorVer_XNumberStr(), BaseLib_OperatorVer_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());`
	`178`	`+ XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数;%d。。。"), BaseLib_Version_XNumberStr(), BaseLib_Version_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());`
`179`	`179`
`180`	`180`	`while (true)`
`181`	`181`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,11 +43,11 @@ XHTHREAD CALLBACK XEngine_CenterTask_Thread(XPVOID lParam)`
`43`	`43`	`//在另外一个函数里面处理数据`
`44`	`44`	`XEngine_CenterTask_Handle(&st_ProtocolHdr, ppSst_ListAddr[i]->tszClientAddr, ptszMsgBuffer, nMsgLen);`
`45`	`45`	`//释放内存`
`46`		`- BaseLib_OperatorMemory_FreeCStyle((VOID**)&ptszMsgBuffer);`
	`46`	`+ BaseLib_Memory_FreeCStyle((VOID**)&ptszMsgBuffer);`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`}`
`50`		`- BaseLib_OperatorMemory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);`
	`50`	`+ BaseLib_Memory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);`
`51`	`51`	`}`
`52`	`52`	`return 0;`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ int main(int argc, char** argv)`
`157`	`157`	`NetCore_TCPXCore_RegisterCallBackEx(xhHTTP2Socket, Network_Callback_HTTPLogin, Network_Callback_HTTPRecv, Network_Callback_HTTPLeave);`
`158`	`158`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,注册HTTP2网络事件成功"));`
`159`	`159`	`//HTTP任务池`
`160`		`- BaseLib_OperatorMemory_Malloc((XPPPMEM)&ppSt_ListHTTPParam, st_ServiceConfig.st_XMax.nThread, sizeof(THREADPOOL_PARAMENT));`
	`160`	`+ BaseLib_Memory_Malloc((XPPPMEM)&ppSt_ListHTTPParam, st_ServiceConfig.st_XMax.nThread, sizeof(THREADPOOL_PARAMENT));`
`161`	`161`	`for (int i = 0; i < st_ServiceConfig.st_XMax.nThread; i++)`
`162`	`162`	`{`
`163`	`163`	`int* pInt_Pos = new int;`
`@@ -174,7 +174,7 @@ int main(int argc, char** argv)`
`174`	`174`	`}`
`175`	`175`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,启动HTTP2线程池服务成功,启动个数:%d"), st_ServiceConfig.st_XMax.nThread);`
`176`	`176`
`177`		`- XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数;%d。。。"), BaseLib_OperatorVer_XNumberStr(), BaseLib_OperatorVer_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());`
	`177`	`+ XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数;%d。。。"), BaseLib_Version_XNumberStr(), BaseLib_Version_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());`
`178`	`178`
`179`	`179`	`while (true)`
`180`	`180`	`{`
Original file line number	Diff line number	Diff line change
`@@ -50,15 +50,15 @@ XHTHREAD CALLBACK XEngine_HTTP2Task_Thread(XPVOID lParam)`
`50`	`50`	`//释放内存`
`51`	`51`	`if (nMsgLen > 0)`
`52`	`52`	`{`
`53`		`- BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);`
	`53`	`+ BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);`
`54`	`54`	`}`
`55`		`- BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListHdr, nHdrCount);`
	`55`	`+ BaseLib_Memory_Free((XPPPMEM)&ppSt_ListHdr, nHdrCount);`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`
`59`		`- BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_PKTStream, nStreamCount);`
	`59`	`+ BaseLib_Memory_Free((XPPPMEM)&ppSt_PKTStream, nStreamCount);`
`60`	`60`	`}`
`61`		`- BaseLib_OperatorMemory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);`
	`61`	`+ BaseLib_Memory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);`
`62`	`62`	`}`
`63`	`63`	`return 0;`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,12 @@ XHTHREAD CALLBACK XEngine_HTTPTask_Thread(XPVOID lParam)`
`46`	`46`	`//在另外一个函数里面处理数据`
`47`	`47`	`XEngine_HTTPTask_Handle(&st_HTTPReqparam, ppSst_ListAddr[i]->tszClientAddr, ptszMsgBuffer, nMsgLen, ppszHdrList, nHdrCount);`
`48`	`48`	`//释放内存`
`49`		`- BaseLib_OperatorMemory_FreeCStyle((VOID**)&ptszMsgBuffer);`
`50`		`- BaseLib_OperatorMemory_Free((XPPPMEM)&ppszHdrList, nHdrCount);`
	`49`	`+ BaseLib_Memory_FreeCStyle((VOID**)&ptszMsgBuffer);`
	`50`	`+ BaseLib_Memory_Free((XPPPMEM)&ppszHdrList, nHdrCount);`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`}`
`54`		`- BaseLib_OperatorMemory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);`
	`54`	`+ BaseLib_Memory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);`
`55`	`55`	`}`
`56`	`56`	`return 0;`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ int main(int argc, char** argv)`
`154`	`154`	`NetCore_TCPXCore_RegisterCallBackEx(xhHTTPSocket, Network_Callback_HTTPLogin, Network_Callback_HTTPRecv, Network_Callback_HTTPLeave);`
`155`	`155`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,注册HTTP网络事件成功"));`
`156`	`156`	`//HTTP任务池`
`157`		`- BaseLib_OperatorMemory_Malloc((XPPPMEM)&ppSt_ListHTTPParam, st_ServiceConfig.st_XMax.nThread, sizeof(THREADPOOL_PARAMENT));`
	`157`	`+ BaseLib_Memory_Malloc((XPPPMEM)&ppSt_ListHTTPParam, st_ServiceConfig.st_XMax.nThread, sizeof(THREADPOOL_PARAMENT));`
`158`	`158`	`for (int i = 0; i < st_ServiceConfig.st_XMax.nThread; i++)`
`159`	`159`	`{`
`160`	`160`	`int* pInt_Pos = new int;`
`@@ -176,7 +176,7 @@ int main(int argc, char** argv)`
`176`	`176`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中,HTTP消息服务没有被启用"));`
`177`	`177`	`}`
`178`	`178`
`179`		`- XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数;%d。。。"), BaseLib_OperatorVer_XNumberStr(), BaseLib_OperatorVer_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());`
	`179`	`+ XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数;%d。。。"), BaseLib_Version_XNumberStr(), BaseLib_Version_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());`
`180`	`180`
`181`	`181`	`while (true)`
`182`	`182`	`{`