modify:wait time From millisecond to Microseconds

Author: xengine-qyt

XEngine_Source/StorageModule_Session/Session_Stroage/Session_DLStroage.cpp

@@ -411,18 +411,21 @@ BOOL CSession_DLStroage::Session_DLStroage_GetCount(int nPool, list<string>* pSt
 		//是否需要等待恢复
 		if (stl_ListIterator->st_DynamicRate.ullTimeWait > 0)
 		{
+			XENGINE_VALTIME st_TimeVal;
 			time_t nTimeNow = time(NULL);
-			ULONGLONG ullTimeNow = BaseLib_OperatorTime_GetTickCount();
-			if (((ullTimeNow - stl_ListIterator->st_DynamicRate.ullTimeSend) > stl_ListIterator->st_DynamicRate.ullTimeWait) && ((nTimeNow - stl_ListIterator->st_DynamicRate.nTimeError) > 1))
+
+			memset(&st_TimeVal, '\0', sizeof(XENGINE_VALTIME));
+			BaseLib_OperatorTime_GetTimeOfday(&st_TimeVal);
+			if (((st_TimeVal.tv_value - stl_ListIterator->st_DynamicRate.ullTimeSend) > stl_ListIterator->st_DynamicRate.ullTimeWait) && ((nTimeNow - stl_ListIterator->st_DynamicRate.nTimeError) > 1))
 			{
 				//等待时间超过,可以加入
 				pStl_ListClient->push_back(stl_ListIterator->tszClientAddr);
-				stl_ListIterator->st_DynamicRate.ullTimeSend = BaseLib_OperatorTime_GetTickCount();
+				stl_ListIterator->st_DynamicRate.ullTimeSend = st_TimeVal.tv_value;
 			}
 			//速率恢复测算
 			if ((stl_ListIterator->st_DynamicRate.nAutoNumber <= m_nTryAuto) && ((nTimeNow - stl_ListIterator->st_DynamicRate.nTimeError) > (stl_ListIterator->st_DynamicRate.nErrorCount * stl_ListIterator->st_DynamicRate.nAutoNumber)))
 			{
-				printf("2-m_bAutoSpeed:%d,ullTimeNow:%llu - nTimeError:%llu nErrorCount:%lu\n", m_nTryAuto, nTimeNow, stl_ListIterator->st_DynamicRate.nTimeError, stl_ListIterator->st_DynamicRate.nErrorCount * 2);
+				//printf("2-m_bAutoSpeed:%d,ullTimeNow:%lu - nTimeError:%lu nErrorCount:%d\n", m_nTryAuto, nTimeNow, stl_ListIterator->st_DynamicRate.nTimeError, stl_ListIterator->st_DynamicRate.nErrorCount * 2);
 				stl_ListIterator->st_DynamicRate.nAutoNumber++;
 				stl_ListIterator->st_DynamicRate.nErrorCount--;
 				stl_ListIterator->st_DynamicRate.ullTimeWait -= XENGINE_STOREAGE_SESSION_DOWNLOAD_SENDTIME;

XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp

@@ -204,12 +204,12 @@ BOOL XEngine_Task_SendDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 
 		if (Session_DLStorage_SetSeek(lpszClientAddr, -nMsgLen, TRUE, &st_StorageRate))
 		{
-			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("下载客户端:%s,正在发送文件数据,发送失败,移动指针:%d,错误次数:%d,等待时间:%llu 毫秒,恢复次数:%d"), lpszClientAddr, -nMsgLen, st_StorageRate.nErrorCount, st_StorageRate.ullTimeWait, st_StorageRate.nAutoNumber);
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("下载客户端:%s,正在发送文件数据,发送失败,移动指针:%d,错误次数:%d,等待时间:%llu 微妙,恢复次数:%d"), lpszClientAddr, -nMsgLen, st_StorageRate.nErrorCount, st_StorageRate.ullTimeWait, st_StorageRate.nAutoNumber);
 		}
 		else
 		{
 			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);
+			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 TRUE;