[checkmk-commits] fixed a bug introduced in 2f0d9872ab8232ab6e0c1a92a6a2c7f2cfe961ec, causing missing memory info in ps section

Module: check_mk Branch: master Commit: 99652b77cd35ad18f6773c6812f39774653dba5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99652b77cd35ad… Author: Sebastian Herbord &lt;sh(a)mathias-kettner.de&gt; Date: Wed Nov 25 16:58:00 2015 +0100 fixed a bug introduced in 2f0d9872ab8232ab6e0c1a92a6a2c7f2cfe961ec, causing missing memory info in ps section --- agents/windows/Makefile | 3 ++- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 5881061 -> 5939364 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 5881061 -> 5939364 bytes agents/windows/check_mk_agent.cc | 8 ++++++-- agents/windows/check_mk_agent.exe | Bin 4657243 -> 4700679 bytes agents/windows/check_mk_agent.msi | Bin 10869248 -> 10972160 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 4657243 -> 4700679 bytes agents/windows/install_agent-64.exe | Bin 1390774 -> 1401623 bytes agents/windows/install_agent.exe | Bin 1265926 -> 1272825 bytes agents/windows/wmitest.exe | Bin 1448856 -> 0 bytes 11 files changed, 9 insertions(+), 4 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 51d40ca..c46113a 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -124,6 +124,7 @@ check_mk_agent-64.exe.versioned: %.exe: %.unversioned.exe %.exe.versioned + true # ----------------------------------------------------------------------------- # NSIS installer will be removed and replaced by multiarch MSI installer @@ -156,7 +157,7 @@ nowin.exe: nowin.cc $(CXX) -o $@ $< clean: - rm -f *.o *~ svn-*.tmp *.rc *.res obj/*.o obj64/*.o + rm -f *.o *.exe *~ svn-*.tmp *.rc *.res obj/*.o obj64/*.o make -C msibuild clean mrproper: clean diff --git a/agents/windows/build_version b/agents/windows/build_version index a5b667a..2da17b6 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -675 +677 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index d8eb90d..22226f9 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index d707d11..cbeff7b 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 14401a2..1047595 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1120,7 +1120,7 @@ bool ExtractProcessOwner(HANDLE hProcess_i, string& csOwner_o) process_entry_t get_process_perfdata() { - map<ULONGLONG, process_entry> process_info; + process_entry_t process_info; PerfCounterObject counterObject(230); // process base number @@ -1132,7 +1132,7 @@ process_entry_t get_process_perfdata() std::vector<process_entry> entries(instances.size()); // one instance = one process - // output counters + // gather counters for (const PerfCounter &counter : counterObject.counters()) { std::vector<ULONGLONG> values = counter.values(instances); for (std::size_t i = 0; i < values.size(); ++i) { @@ -1148,6 +1148,10 @@ process_entry_t get_process_perfdata() } } } + + for (const process_entry &entry : entries) { + process_info[entry.process_id] = entry; + } } return process_info; } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 5edcf77..02df19d 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index b835efd..e8ce49b 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 9ca668c..65aa652 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 4cead7c..488dc08 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 9baa705..1ed96ae 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/wmitest.exe b/agents/windows/wmitest.exe deleted file mode 100755 index ce6fc2b..0000000 Binary files a/agents/windows/wmitest.exe and /dev/null differ