From 51d2e32c36981eb19f4a8366fab8f9e5e6c6383d Mon Sep 17 00:00:00 2001 From: Mike Rostermund Date: Thu, 7 Jan 2016 12:04:51 -0800 Subject: [PATCH 1/2] Print runtimes for each individual polling and discovery module. --- includes/discovery/functions.inc.php | 3 +++ includes/polling/functions.inc.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php index 309998f0f..5a449850c 100644 --- a/includes/discovery/functions.inc.php +++ b/includes/discovery/functions.inc.php @@ -120,7 +120,10 @@ function discover_device($device, $options=null) { else { foreach ($config['discovery_modules'] as $module => $module_status) { if ($attribs['discover_'.$module] || ( $module_status && !isset($attribs['discover_'.$module]))) { + $module_start = utime(); include 'includes/discovery/'.$module.'.inc.php'; + $module_time = utime() - $module_start; + echo "Runtime for discovery module '$module': $module_time\n"; } else if (isset($attribs['discover_'.$module]) && $attribs['discover_'.$module] == '0') { echo "Module [ $module ] disabled on host.\n"; diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php index 628ab8ed3..387194ef5 100644 --- a/includes/polling/functions.inc.php +++ b/includes/polling/functions.inc.php @@ -215,7 +215,10 @@ function poll_device($device, $options) { foreach ($config['poller_modules'] as $module => $module_status) { if ($attribs['poll_'.$module] || ( $module_status && !isset($attribs['poll_'.$module]))) { // TODO per-module polling stats + $module_start = utime(); include 'includes/polling/'.$module.'.inc.php'; + $module_time = utime() - $module_start; + echo "Runtime for polling module '$module': $module_time\n"; } else if (isset($attribs['poll_'.$module]) && $attribs['poll_'.$module] == '0') { echo "Module [ $module ] disabled on host.\n"; From a1261a0aeb7366ced5d4eb09da6fb8a9f839eb3d Mon Sep 17 00:00:00 2001 From: Mike Rostermund Date: Fri, 8 Jan 2016 08:41:12 +0100 Subject: [PATCH 2/2] Replace utime() for microtime(true) --- includes/discovery/functions.inc.php | 4 ++-- includes/polling/functions.inc.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php index 5a449850c..0e63d2dcc 100644 --- a/includes/discovery/functions.inc.php +++ b/includes/discovery/functions.inc.php @@ -120,9 +120,9 @@ function discover_device($device, $options=null) { else { foreach ($config['discovery_modules'] as $module => $module_status) { if ($attribs['discover_'.$module] || ( $module_status && !isset($attribs['discover_'.$module]))) { - $module_start = utime(); + $module_start = microtime(true); include 'includes/discovery/'.$module.'.inc.php'; - $module_time = utime() - $module_start; + $module_time = microtime(true) - $module_start; echo "Runtime for discovery module '$module': $module_time\n"; } else if (isset($attribs['discover_'.$module]) && $attribs['discover_'.$module] == '0') { diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php index 387194ef5..3d7b26702 100644 --- a/includes/polling/functions.inc.php +++ b/includes/polling/functions.inc.php @@ -215,9 +215,9 @@ function poll_device($device, $options) { foreach ($config['poller_modules'] as $module => $module_status) { if ($attribs['poll_'.$module] || ( $module_status && !isset($attribs['poll_'.$module]))) { // TODO per-module polling stats - $module_start = utime(); + $module_start = microtime(true); include 'includes/polling/'.$module.'.inc.php'; - $module_time = utime() - $module_start; + $module_time = microtime(true) - $module_start; echo "Runtime for polling module '$module': $module_time\n"; } else if (isset($attribs['poll_'.$module]) && $attribs['poll_'.$module] == '0') {