summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorisanae <14251494+isanae@users.noreply.github.com>2021-02-10 10:01:39 -0500
committerisanae <14251494+isanae@users.noreply.github.com>2021-02-10 10:01:39 -0500
commitd179ad01c8d618a33b2dea3d731a67a62226c7c3 (patch)
tree23e42ee766a5c038d252b6e1e61a71b2c259786f
parent7d36bc20d0a6c327079141149a7f138c0f7726ac (diff)
maxIds was local to the loop, not doubled
handle ERROR_MORE_DATA, it seems to sometimes happen, not sure why added more logging, a user actually got that error
-rw-r--r--src/envmodule.cpp26
1 files changed, 21 insertions, 5 deletions
diff --git a/src/envmodule.cpp b/src/envmodule.cpp
index 81cbad8a..dc6608d7 100644
--- a/src/envmodule.cpp
+++ b/src/envmodule.cpp
@@ -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 {};
}