Skip to content

Commit a7f36f1

Browse files
xengine-qytxengine-qyt
committed
added:get use and left size when start log
1 parent 692d150 commit a7f36f1

File tree

7 files changed

+72
-45
lines changed

7 files changed

+72
-45
lines changed

‎XEngine_Source/StorageModule_APIHelp/APIHelp_Define.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,20 @@ extern "C" bool APIHelp_Distributed_UPStorage(list<XENGINE_STORAGEBUCKET>* pStl_
166166
备注：
167167
*********************************************************************/
168168
extern "C" bool APIHelp_Distributed_GetPathKey(list<XENGINE_STORAGEBUCKET>* pStl_ListBucket, LPCXSTR lpszBuckKey, XCHAR* ptszFilePath);
169+
/********************************************************************
170+
函数名称：APIHelp_Distributed_GetSize
171+
函数功能：获取存储设置大小
172+
参数.一：lpszMsgBuffer
173+
In/Out：In
174+
类型：常量字符指针
175+
可空：N
176+
意思：输入要获取的缓冲区
177+
返回值
178+
类型：整数型
179+
意思：获取到的大小字节
180+
备注：
181+
*********************************************************************/
182+
extern "C" __int64u APIHelp_Distributed_GetSize(LPCXSTR lpszMsgBuffer);
169183
/************************************************************************/
170184
/* 帮助函数 */
171185
/************************************************************************/

‎XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,50 @@ bool CAPIHelp_Distributed::APIHelp_Distributed_GetPathKey(list<XENGINE_STORAGEBU
479479
}
480480
return true;
481481
}
482+
/********************************************************************
483+
函数名称：APIHelp_Distributed_GetSize
484+
函数功能：获取存储设置大小
485+
参数.一：lpszMsgBuffer
486+
In/Out：In
487+
类型：常量字符指针
488+
可空：N
489+
意思：输入要获取的缓冲区
490+
返回值
491+
类型：整数型
492+
意思：获取到的大小字节
493+
备注：
494+
*********************************************************************/
495+
__int64u CAPIHelp_Distributed::APIHelp_Distributed_GetSize(LPCXSTR lpszMsgBuffer)
496+
{
497+
APIHelp_IsErrorOccur = false;
498+
499+
XCHAR tszSizeStr[64];
500+
XCHAR tszUnitStr[4];
501+
502+
memset(tszSizeStr, '\0', sizeof(tszSizeStr));
503+
memset(tszUnitStr, '\0', sizeof(tszUnitStr));
504+
//分别得到数字和单位
505+
memcpy(tszSizeStr, lpszMsgBuffer, _tcsxlen(lpszMsgBuffer) - 2);
506+
tszUnitStr[0] = lpszMsgBuffer[_tcsxlen(lpszMsgBuffer) - 2];
507+
tszUnitStr[1] = lpszMsgBuffer[_tcsxlen(lpszMsgBuffer) - 1];
508+
509+
__int64u nllSize = _ttxoll(tszSizeStr);
510+
//得到单位大小
511+
if (0 == _tcsxncmp(tszUnitStr, _X("KB"), 2))
512+
{
513+
nllSize = nllSize * 1024;
514+
}
515+
else if (0 == _tcsxncmp(tszUnitStr, _X("MB"), 2))
516+
{
517+
nllSize = nllSize * 1024 * 1024;
518+
}
519+
else if (0 == _tcsxncmp(tszUnitStr, _X("GB"), 2))
520+
{
521+
nllSize = nllSize * 1024 * 1024 * 1024;
522+
}
523+
524+
return nllSize;
525+
}
482526
//////////////////////////////////////////////////////////////////////////
483527
// 保护函数
484528
//////////////////////////////////////////////////////////////////////////
@@ -538,48 +582,4 @@ bool CAPIHelp_Distributed::APIHelp_Distributed_FileListParse(LPCXSTR lpszMsgBuff
538582
break;
539583
}
540584
return true;
541-
}
542-
/********************************************************************
543-
函数名称：APIHelp_Distributed_GetSize
544-
函数功能：获取存储设置大小
545-
参数.一：lpszMsgBuffer
546-
In/Out：In
547-
类型：常量字符指针
548-
可空：N
549-
意思：输入要获取的缓冲区
550-
返回值
551-
类型：整数型
552-
意思：获取到的大小字节
553-
备注：
554-
*********************************************************************/
555-
__int64u CAPIHelp_Distributed::APIHelp_Distributed_GetSize(LPCXSTR lpszMsgBuffer)
556-
{
557-
APIHelp_IsErrorOccur = false;
558-
559-
XCHAR tszSizeStr[64];
560-
XCHAR tszUnitStr[4];
561-
562-
memset(tszSizeStr, '\0', sizeof(tszSizeStr));
563-
memset(tszUnitStr, '\0', sizeof(tszUnitStr));
564-
//分别得到数字和单位
565-
memcpy(tszSizeStr, lpszMsgBuffer, _tcsxlen(lpszMsgBuffer) - 2);
566-
tszUnitStr[0] = lpszMsgBuffer[_tcsxlen(lpszMsgBuffer) - 2];
567-
tszUnitStr[1] = lpszMsgBuffer[_tcsxlen(lpszMsgBuffer) - 1];
568-
569-
__int64u nllSize = _ttxoll(tszSizeStr);
570-
//得到单位大小
571-
if (0 == _tcsxncmp(tszUnitStr, _X("KB"), 2))
572-
{
573-
nllSize = nllSize * 1024;
574-
}
575-
else if (0 == _tcsxncmp(tszUnitStr, _X("MB"), 2))
576-
{
577-
nllSize = nllSize * 1024 * 1024;
578-
}
579-
else if (0 == _tcsxncmp(tszUnitStr, _X("GB"), 2))
580-
{
581-
nllSize = nllSize * 1024 * 1024 * 1024;
582-
}
583-
584-
return nllSize;
585585
}

‎XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class CAPIHelp_Distributed
2424
bool APIHelp_Distributed_CTStorage(LPCXSTR lpszMsgBuffer, list<XENGINE_STORAGEBUCKET>* pStl_ListBucket, XENGINE_STORAGEBUCKET* pSt_StorageBucket);
2525
bool APIHelp_Distributed_UPStorage(list<XENGINE_STORAGEBUCKET>* pStl_ListBucket, XENGINE_STORAGEBUCKET* pSt_StorageBucket, int nMode);
2626
bool APIHelp_Distributed_GetPathKey(list<XENGINE_STORAGEBUCKET>* pStl_ListBucket, LPCXSTR lpszBuckKey, XCHAR* ptszFilePath);
27+
__int64u APIHelp_Distributed_GetSize(LPCXSTR lpszMsgBuffer);
2728
protected:
2829
bool APIHelp_Distributed_FileListParse(LPCXSTR lpszMsgBuffer, int nMsgLen, XSTORAGECORE_DBFILE* pSt_DBFile);
29-
__int64u APIHelp_Distributed_GetSize(LPCXSTR lpszMsgBuffer);
3030
private:
3131
};

‎XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.def‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ EXPORTS
99
APIHelp_Distributed_CTStorage
1010
APIHelp_Distributed_UPStorage
1111
APIHelp_Distributed_GetPathKey
12+
APIHelp_Distributed_GetSize
1213

1314
APIHelp_Api_RangeFile
1415
APIHelp_Api_VerHash

‎XEngine_Source/StorageModule_APIHelp/pch.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ extern "C" bool APIHelp_Distributed_GetPathKey(list<XENGINE_STORAGEBUCKET>*pStl_
5555
{
5656
return m_APIDistributed.APIHelp_Distributed_GetPathKey(pStl_ListBucket, lpszBuckKey, ptszFilePath);
5757
}
58+
extern "C" __int64u APIHelp_Distributed_GetSize(LPCXSTR lpszMsgBuffer)
59+
{
60+
return m_APIDistributed.APIHelp_Distributed_GetSize(lpszMsgBuffer);
61+
}
5862
/************************************************************************/
5963
/* 帮助函数 */
6064
/************************************************************************/

‎XEngine_Source/StorageModule_Config/Config_Define.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ typedef struct
130130
XCHAR tszFileName[XPATH_MAX];
131131
XCHAR tszBuckKey[128];
132132
XCHAR tszBuckSize[64];
133+
__int64u nBuckSize; //临时统计
133134
int nLevel;
134135
bool bEnable;
135136
struct

‎XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,13 @@ int main(int argc, char** argv)
572572
{
573573
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中，转录动作没有启用"));
574574
}
575+
//统计大小
576+
for (auto stl_ListIterator = st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket->begin(); stl_ListIterator != st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket->end(); stl_ListIterator++)
577+
{
578+
__int64u nSetSize = APIHelp_Distributed_GetSize(stl_ListIterator->tszBuckSize);
579+
APIHelp_Api_GetDIRSize(stl_ListIterator->tszFilePath, &stl_ListIterator->nBuckSize);
580+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，检查文件目录:%s,名称;%s,可用大小:%lld,使用大小:%lld,剩余大小:%lld"), stl_ListIterator->tszFilePath, stl_ListIterator->tszBuckKey, nSetSize, stl_ListIterator->nBuckSize, nSetSize - stl_ListIterator->nBuckSize);
581+
}
575582
#ifndef _DEBUG
576583
//发送信息报告
577584
if (st_ServiceCfg.st_XReport.bEnable && !bIsTest)

0 commit comments

Comments
 (0)