mo2/modorganizer
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/modorganizer.git synced 2026-07-27 13:58:24 -07:00
Code Issues Packages Projects Releases Wiki Activity

maxIds was local to the loop, not doubled

Browse Source 
handle ERROR_MORE_DATA, it seems to sometimes happen, not sure why
added more logging, a user actually got that error
This commit is contained in:
isanae
2021-02-10 10:01:39 -05:00
parent 7d36bc20d0
commit d179ad01c8
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/envmodule.cpp
+21 -5
View File
@@ -603,9 +603,16 @@ Process getProcessTreeFromProcess(HANDLE h)
std::vector<DWORD> processesInJob(HANDLE h)
{
for (int tries=0; tries<5; ++tries) {
DWORD maxIds = 100;
const int MaxTries = 5;
// doubled MaxTries times on failure
DWORD maxIds = 100;
// for logging
DWORD lastCount=0, lastAssigned=0;
for (int tries=0; tries<MaxTries; ++tries) {
const DWORD idsSize = sizeof(ULONG_PTR) * maxIds;
const DWORD bufferSize = sizeof(JOBOBJECT_BASIC_PROCESS_ID_LIST) + idsSize;
@@ -617,8 +624,10 @@ std::vector<DWORD> processesInJob(HANDLE h)
if (!r) {
const auto e = GetLastError();
log::error("failed to get process ids in job, {}", formatSystemMessage(e));
return {};
if (e != ERROR_MORE_DATA) {
log::error("failed to get process ids in job, {}", formatSystemMessage(e));
return {};
}
}
if (ids->NumberOfProcessIdsInList >= ids->NumberOfAssignedProcesses) {
@@ -632,9 +641,16 @@ std::vector<DWORD> processesInJob(HANDLE h)
// try again with a larger buffer
maxIds *= 2;
// for logging
lastCount = ids->NumberOfProcessIdsInList;
lastAssigned = ids->NumberOfAssignedProcesses;
}
log::error("failed to get processes in job, can't get a buffer large enough");
log::error(
"failed to get processes in job, can't get a buffer large enough, "
"{}/{} ids", lastCount, lastAssigned);
return {};
}