xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-06 15:14:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

15.10

Browse Source
This commit is contained in:
Igor Pavlov
2015-11-03 00:00:00 +00:00
committed by Kornel Lesiński
parent a663a6deb7
commit 7c8a265a15
51 changed files with 877 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
CPP/7zip/UI/GUI/BenchmarkDialog.cpp
View File

@@ -71,11 +71,13 @@ static const LPCTSTR kMB = TEXT(" MB");
static const LPCTSTR kMIPS = TEXT(" MIPS");
static const LPCTSTR kKBs = TEXT(" KB/s");
#ifdef UNDER_CE
static const int kMinDicLogSize = 20;
#else
static const int kMinDicLogSize = 21;
#endif
static const unsigned kMinDicLogSize =
#ifdef UNDER_CE
20;
#else
21;
#endif
static const UInt32 kMinDicSize = (1 << kMinDicLogSize);
static const UInt32 kMaxDicSize =
#ifdef MY_CPU_64BIT
@@ -185,29 +187,28 @@ bool CBenchmarkDialog::OnInit()
if (Sync.DictionarySize == (UInt32)(Int32)-1)
{
int dicSizeLog;
unsigned dicSizeLog;
for (dicSizeLog = 25; dicSizeLog > kBenchMinDicLogSize; dicSizeLog--)
if (GetBenchMemoryUsage(Sync.NumThreads, ((UInt32)1 << dicSizeLog)) + (8 << 20) <= ramSize)
break;
Sync.DictionarySize = (1 << dicSizeLog);
}
if (Sync.DictionarySize < kMinDicSize)
Sync.DictionarySize = kMinDicSize;
if (Sync.DictionarySize > kMaxDicSize)
Sync.DictionarySize = kMaxDicSize;
if (Sync.DictionarySize < kMinDicSize) Sync.DictionarySize = kMinDicSize;
if (Sync.DictionarySize > kMaxDicSize) Sync.DictionarySize = kMaxDicSize;
for (int i = kMinDicLogSize; i <= 30; i++)
for (int j = 0; j < 2; j++)
for (unsigned i = kMinDicLogSize; i <= 30; i++)
for (unsigned j = 0; j < 2; j++)
{
UInt32 dictionary = (1 << i) + (j << (i - 1));
if (dictionary > kMaxDicSize)
UInt32 dict = (1 << i) + (j << (i - 1));
if (dict > kMaxDicSize)
continue;
TCHAR s[16];
ConvertUInt32ToString((dictionary >> 20), s);
ConvertUInt32ToString((dict >> 20), s);
lstrcat(s, kMB);
int index = (int)m_Dictionary.AddString(s);
m_Dictionary.SetItemData(index, dictionary);
if (dictionary <= Sync.DictionarySize)
m_Dictionary.SetItemData(index, dict);
if (dict <= Sync.DictionarySize)
cur = index;
}
m_Dictionary.SetCurSel(cur);
@@ -265,14 +266,14 @@ UInt32 CBenchmarkDialog::GetNumberOfThreads()
UInt32 CBenchmarkDialog::OnChangeDictionary()
{
UInt32 dictionary = (UInt32)m_Dictionary.GetItemData_of_CurSel();
UInt64 memUsage = GetBenchMemoryUsage(GetNumberOfThreads(), dictionary);
UInt32 dict = (UInt32)m_Dictionary.GetItemData_of_CurSel();
UInt64 memUsage = GetBenchMemoryUsage(GetNumberOfThreads(), dict);
memUsage = (memUsage + (1 << 20) - 1) >> 20;
TCHAR s[40];
ConvertUInt64ToString(memUsage, s);
lstrcat(s, kMB);
SetItemText(IDT_BENCH_MEMORY_VAL, s);
return dictionary;
return dict;
}
static const UInt32 g_IDs[] =
@@ -303,7 +304,7 @@ static const UInt32 g_IDs[] =
void CBenchmarkDialog::OnChangeSettings()
{
EnableItem(IDB_STOP, true);
UInt32 dictionary = OnChangeDictionary();
UInt32 dict = OnChangeDictionary();
for (int i = 0; i < ARRAY_SIZE(g_IDs); i++)
SetItemText(g_IDs[i], kProcessingString);
@@ -311,7 +312,7 @@ void CBenchmarkDialog::OnChangeSettings()
PrintTime();
NWindows::NSynchronization::CCriticalSectionLock lock(Sync.CS);
Sync.Init();
Sync.DictionarySize = dictionary;
Sync.DictionarySize = dict;
Sync.Changed = true;
Sync.NumThreads = GetNumberOfThreads();
}