intermediate release 2.1-M3-35
authorVictor Kirhenshtein <victor@netxms.org>
Wed, 12 Apr 2017 09:50:10 +0000 (12:50 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Wed, 12 Apr 2017 09:50:10 +0000 (12:50 +0300)
src/agent/install/nxagent-x64.iss
src/agent/install/nxagent.iss
src/agent/install/setup.iss
src/agent/subagents/winnt/cpu.cpp
src/install/windows/netxms-x64-minimal.iss
src/install/windows/setup.iss

index 3fc17cf..cdb36d4 100644 (file)
@@ -3,7 +3,7 @@
 
 [Setup]
 #include "setup.iss"
-OutputBaseFilename=nxagent-2.1-M3-x64
+OutputBaseFilename=nxagent-2.1-M3-35-x64
 ArchitecturesInstallIn64BitMode=x64
 ArchitecturesAllowed=x64
 
index efb3fb6..3f0e7f2 100644 (file)
@@ -3,7 +3,7 @@
 
 [Setup]
 #include "setup.iss"
-OutputBaseFilename=nxagent-2.1-M3
+OutputBaseFilename=nxagent-2.1-M3-35
 
 [Files]
 Source: "..\..\..\Release\libnetxms.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
index b2b804b..e4cca03 100644 (file)
@@ -1,6 +1,6 @@
 AppName=NetXMS Agent
-AppVerName=NetXMS Agent 2.1-M3
-AppVersion=2.1-M3
+AppVerName=NetXMS Agent 2.1-M3-35
+AppVersion=2.1-M3-35
 AppPublisher=Raden Solutions
 AppPublisherURL=http://www.radensolutions.com
 AppSupportURL=http://www.netxms.org
index ec359aa..5071fc3 100644 (file)
@@ -1,6 +1,6 @@
 /*
 ** NetXMS platform subagent for Windows
-** Copyright (C) 2003-2016 Victor Kirhenshtein
+** Copyright (C) 2003-2017 Victor Kirhenshtein
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -73,6 +73,11 @@ static THREAD_RESULT THREAD_CALL CPUStatCollector(void *arg)
          UINT64 interrupt = curr[i].Reserved1[1].QuadPart - prev[i].Reserved1[1].QuadPart;
          UINT64 total = kernel + user;  // kernel time includes idle time
 
+         // There were reports of agent reporting extremely high CPU usage
+         // That could happen when idle count is greater than total count
+         if (idle > kernel)
+            idle = kernel;
+
          s_interruptCount[i] = curr[i].Reserved2;
          s_interruptCount[s_cpuCount] += curr[i].Reserved2;
 
index 0b5e99a..78afa2e 100644 (file)
@@ -1,7 +1,7 @@
 ; Installation script for NetXMS Server / Windows x64
 
 #include "setup.iss"
-OutputBaseFilename=netxms-2.1-M3-27-x64-minimal
+OutputBaseFilename=netxms-2.1-M3-35-x64-minimal
 ArchitecturesInstallIn64BitMode=x64
 ArchitecturesAllowed=x64
 
index 35e1f0d..248ca32 100644 (file)
@@ -1,7 +1,7 @@
 [Setup]
 AppName=NetXMS
-AppVerName=NetXMS 2.1-M3-27
-AppVersion=2.1-M3-27
+AppVerName=NetXMS 2.1-M3-35
+AppVersion=2.1-M3-35
 AppPublisher=Raden Solutions
 AppPublisherURL=http://www.radensolutions.com
 AppSupportURL=http://www.netxms.org