From c39832c0ee6ad7a9abbc98c47ce34e9e7b6cae06 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 27 Oct 2014 23:34:39 +0100 Subject: [PATCH] Added counter for total restarts MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- contrib/chash/chash.php | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/contrib/chash/chash.php b/contrib/chash/chash.php index 7db1f73a..acba7c98 100644 --- a/contrib/chash/chash.php +++ b/contrib/chash/chash.php @@ -13,6 +13,9 @@ $GLOBALS['restart_search_time'] = 1800; // Hashes per call $GLOBALS['hash_cycles'] = 3; +// Total restarts +$GLOBALS['total_restarts'] = 0; + // Found hashes $GLOBALS['found_hashes'] = array(0 => array()); @@ -213,6 +216,7 @@ function flushCheckPointFile ($hash) { $GLOBALS['total_reward'] . ':' . $GLOBALS['total_hashes'] . ':' . $GLOBALS['total_found'] . ':' . + $GLOBALS['total_restarts'] . ':' . $GLOBALS['hash_cycles'] . ':' . base64_encode($GLOBALS['nonce']) . ':' . $hash . ':' . @@ -351,17 +355,18 @@ if (is_readable(CHECK_POINT)) { $data = explode(':', $checkPoint); // Assert on count - assert(count($data) == 9); + assert(count($data) == 10); // 1st element is nonce, 2nd hash, 3rd found hashes - $GLOBALS['total_blocks'] = $data[0]; - $GLOBALS['total_reward'] = $data[1]; - $GLOBALS['total_hashes'] = $data[2]; - $GLOBALS['total_found'] = $data[3]; - $GLOBALS['hash_cycles'] = intval($data[4]); - $GLOBALS['nonce'] = base64_decode($data[5]); - $GLOBALS['root_hash'] = $data[7]; - $GLOBALS['found_hashes'] = unserialize(gzuncompress(base64_decode($data[8]))); + $GLOBALS['total_blocks'] = $data[0]; + $GLOBALS['total_reward'] = $data[1]; + $GLOBALS['total_hashes'] = $data[2]; + $GLOBALS['total_found'] = $data[3]; + $GLOBALS['total_restarts'] = $data[4]; + $GLOBALS['hash_cycles'] = intval($data[5]); + $GLOBALS['nonce'] = base64_decode($data[7]); + $GLOBALS['root_hash'] = $data[8]; + $GLOBALS['found_hashes'] = unserialize(gzuncompress(base64_decode($data[9]))); // Set modula hash setModulaHash($data[6]); @@ -442,6 +447,12 @@ while (TRUE) { // Is the last found time to far away? if ($testTime >= $GLOBALS['restart_search_time']) { + // Count up restart + $GLOBALS['total_restarts']++; + + // Output message + print('total_restarts=' . $GLOBALS['total_restarts'] . ' - Restarting ...'); + // Count all root (genesis) hashes $rootHashes = array(); foreach ($GLOBALS['found_hashes'] as $block) { -- 2.30.2