From 7bb0b15ffdfd8338b6b61d28893fdcd7181ad1f4 Mon Sep 17 00:00:00 2001
From: Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch>
Date: Mon, 12 Mar 2018 16:36:22 +0100
Subject: [PATCH] Simplify flow logic in WmiQueryCpuLoad.
---
ATxDiagnostics/ATxDiagnostics.cs | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/ATxDiagnostics/ATxDiagnostics.cs b/ATxDiagnostics/ATxDiagnostics.cs
index 68219ed..3ddd8c8 100644
--- a/ATxDiagnostics/ATxDiagnostics.cs
+++ b/ATxDiagnostics/ATxDiagnostics.cs
@@ -58,23 +58,20 @@ namespace ATxDiagnostics
var searcher = new ManagementObjectSearcher("", queryString, opts);
Int32 usageInt32 = -1;
-
var managementObjects = searcher.Get();
- if (managementObjects.Count == 0) {
- Log.Error("No objects returned from WMI!");
- watch.Stop();
- Log.Debug("WMI query took {0} ms.", watch.ElapsedMilliseconds);
- return -1;
- }
- Log.Trace("WMI query returned {0} objects.", managementObjects.Count);
- foreach (var mo in managementObjects) {
- var obj = (ManagementObject)mo;
- var usage = obj["PercentProcessorTime"];
- var name = obj["Name"];
-
- usageInt32 = Convert.ToInt32(usage);
- Log.Trace("CPU usage {1}: {0}", usageInt32, name);
+ if (managementObjects.Count > 0) {
+ Log.Debug("WMI query returned {0} objects.", managementObjects.Count);
+ foreach (var mo in managementObjects) {
+ var obj = (ManagementObject)mo;
+ var usage = obj["PercentProcessorTime"];
+ var name = obj["Name"];
+ usageInt32 = Convert.ToInt32(usage);
+ Log.Debug("CPU usage {1}: {0}", usageInt32, name);
+
+ }
+ } else {
+ Log.Error("No objects returned from WMI!");
}
managementObjects.Dispose();
--
GitLab