modify:Adjust the waiting time calculation method

Author: xengine-qyt

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -37,7 +37,7 @@
   },
   "XStorage": {
     "nHashMode": 2,
-    "nSendMode": 1,
+    "nSendMode": 2,
     "bRename": 0,
     "tszFileDir": "/home/ubuntu/桌面/XEngine_Storage/XEngine_Source/Debug/XEngine_File"
   },
@@ -82,4 +82,4 @@
       "1.0.0.1001 Build20210501"
     ]
   }
-}
+}

XEngine_Source/StorageModule_Session/Session_Stroage/Session_DLStroage.cpp

@@ -429,7 +429,7 @@ BOOL CSession_DLStroage::Session_DLStroage_GetCount(int nPool, list<string>* pSt
 				//printf("nAutoNumber:%d <= m_nTryAuto:%d,nTimeNow:%lu - nTimeError:%lu nErrorCount:%d\n", stl_ListIterator->st_DynamicRate.nAutoNumber, m_nTryAuto, nTimeNow, stl_ListIterator->st_DynamicRate.nTimeError, stl_ListIterator->st_DynamicRate.nErrorCount * stl_ListIterator->st_DynamicRate.nAutoNumber);
 				stl_ListIterator->st_DynamicRate.nAutoNumber++;
 				stl_ListIterator->st_DynamicRate.nErrorCount--;
-				stl_ListIterator->st_DynamicRate.ullTimeWait -= XENGINE_STOREAGE_SESSION_DOWNLOAD_SENDTIME;
+				stl_ListIterator->st_DynamicRate.ullTimeWait -= (XENGINE_STOREAGE_SESSION_DOWNLOAD_SENDTIME * stl_ListIterator->st_DynamicRate.nTimeError);
 				if (0 == stl_ListIterator->st_DynamicRate.nErrorCount)
 				{
 					stl_ListIterator->st_DynamicRate.nTimeError = 0;
@@ -499,7 +499,7 @@ BOOL CSession_DLStroage::Session_DLStorage_SetSeek(LPCTSTR lpszClientAddr, int n
 					{
 						stl_ListIterator->st_DynamicRate.nErrorCount++;
 						stl_ListIterator->st_DynamicRate.nTimeError = time(NULL);
-						stl_ListIterator->st_DynamicRate.ullTimeWait += XENGINE_STOREAGE_SESSION_DOWNLOAD_SENDTIME;
+						stl_ListIterator->st_DynamicRate.ullTimeWait += (XENGINE_STOREAGE_SESSION_DOWNLOAD_SENDTIME * stl_ListIterator->st_DynamicRate.nTimeError);
 					}
 					if (NULL != pSt_StorageRate)
 					{

XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp

@@ -256,11 +256,7 @@ BOOL XEngine_Task_HttpDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 }
 BOOL XEngine_Task_SendDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int nMsgLen)
 {
-	if (XEngine_Net_SendMsg(lpszClientAddr, lpszMsgBuffer, nMsgLen, STORAGE_NETTYPE_HTTPDOWNLOAD))
-	{
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _T("下载客户端:%s,正在发送文件数据,大小:%d"), lpszClientAddr, nMsgLen);
-	}
-	else
+	if (!XEngine_Net_SendMsg(lpszClientAddr, lpszMsgBuffer, nMsgLen, STORAGE_NETTYPE_HTTPDOWNLOAD))
 	{
 		SESSION_STORAGEDYNAMICRATE st_StorageRate;
 		memset(&st_StorageRate, '\0', sizeof(SESSION_STORAGEDYNAMICRATE));
@@ -274,6 +270,8 @@ BOOL XEngine_Task_SendDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 			XEngine_Net_CloseClient(lpszClientAddr, STORAGE_LEAVETYPE_CLOSE, STORAGE_NETTYPE_HTTPDOWNLOAD);
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("下载客户端:%s,正在发送文件数据,大小:%d,发送超过重试次数,无法继续,移除发送队列,错误次数:%d,等待时间:%llu 微妙,恢复次数:%d"), lpszClientAddr, nMsgLen, st_StorageRate.nErrorCount, st_StorageRate.ullTimeWait, st_StorageRate.nAutoNumber);
 		}
+		return FALSE;
 	}
+	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _T("下载客户端:%s,正在发送文件数据,大小:%d"), lpszClientAddr, nMsgLen);
 	return TRUE;
 }

XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp

@@ -107,7 +107,7 @@ static int ServiceApp_Deamon(int wait)
 
 int main(int argc, char** argv)
 {
-#if (XENGINE_VERSION_KERNEL < 7) && (XENGINE_VERSION_MAIN < 19)
+#if (XENGINE_VERSION_KERNEL < 7) && (XENGINE_VERSION_MAIN < 21)
 	printf("XEngine版本过低,无法继续\n");
 #endif
 #ifdef _WINDOWS