Also display iterations per second.

[core.git] / contrib / chash / chash.php

diff --git a/contrib/chash/chash.php b/contrib/chash/chash.php
index fe490dbba2018f3dc85aade908aaf42c27e136bf..7401dfe6d6a95916ddd48856f79dfffd7710fd6f 100644 (file)
--- a/contrib/chash/chash.php
+++ b/contrib/chash/chash.php
@@ -2,8 +2,8 @@
 error_reporting(E_ALL | E_STRICT);
 
 define('HASH_ALGO', MHASH_RIPEMD320);
-define('BLOCK_SIZE', 1000);
-define('NONCE_INCREMENT', 0.1);
+define('BLOCK_SIZE', 100);
+define('NONCE_INCREMENT', 0.0000000001);
 define('START_TIME', microtime(TRUE));
 
 /**
@@ -253,9 +253,6 @@ while (TRUE) {
        $timeBadHashes = 0;
 
        while ($hashesPerBlock <= BLOCK_SIZE) {
-               // Init counter
-               $iter = 0;
-
                // Create hash from modulaHash ("genesis hash") and nonce
                $nonceHash = doubleHashString($modulaHash . $nonce);
 
@@ -263,21 +260,41 @@ while (TRUE) {
                $sumNonce  = calculateSumFromHash($nonceHash);
                $sumModula = calculateSumFromHash($modulaHash);
 
+               // Init counter
+               $iter = 0;
+               $iterSecond = 0;
+
                // Now start the "mining" ...
                $timeHash = microtime(TRUE);
-               while ($sumNonce <= $sumModula) {
-                       // Calculate sums
-                       $sumNonce  = calculateSumFromHash($nonceHash);
-                       $sumModula = calculateSumFromHash($modulaHash);
-
+               while ($sumNonce >= $sumModula) {
                        // Calculate new nonce
                        $nonce = calculateNonce($nonce);
 
                        // And hash again
                        $nonceHash = doubleHashString($modulaHash . $nonce);
 
+                       // Calculate sums
+                       $sumNonce  = calculateSumFromHash($nonceHash);
+
+                       // Time spend in loop
+                       $testTime = abs(microtime(TRUE) - $timeDisplay);
+
+                       // Calculate hashrate/sec
+                       $hashrate = 1 / $testTime * $iterSecond * 2;
+
+                       // Only every second
+                       if ($testTime >= 1) {
+                               // Display hash rate
+                               print ('hashrate=' . $hashrate . ' hashes/sec,iterSecond=' . $iterSecond . ' iterations/sec' . PHP_EOL);
+
+                               // Reset timer
+                               $timeDisplay = microtime(TRUE);
+                               $iterSecond  = 0;
+                       } // END - if
+
                        // Next round
                        $iter++;
+                       $iterSecond++;
                        //print ('nonce=' . $nonce . ',iter=' . $iter . PHP_EOL);
                        //print ('nonceHash=' . $nonceHash . PHP_EOL);
                        //print ('sumNonce=' . $sumNonce . PHP_EOL);
@@ -289,32 +306,22 @@ while (TRUE) {
                        // Bad block found
                        $timeBadHashes += abs(microtime(TRUE) - $timeHash);
 
+                       // And next round
+                       //print('bad:nonce=' . $nonce . PHP_EOL);
+
                        // Nothing found, so calculate new nonce
                        $nonce = calculateNonce($nonce);
-
-                       // And next round
                        continue;
                } // END - if
 
                // Add amount of hashes to block (double-hash)
                $hashesPerBlock += $iter * 2 + 2;
 
-               // Time spend in loop
-               $testTime = abs(microtime(TRUE) - $timeDisplay);
-
-               // Only every second
-               if ($testTime >= 1) {
-                       // Calculate hashrate/sec
-                       $timeHash = abs(microtime(TRUE) - $timeHash);
-                       $hashrate = 1 / $timeHash * $iter * 2 + 2;
-                       print ('hashesPerBlock=' . $hashesPerBlock . ',hashrate=' . $hashrate . ' hashes/sec.' . PHP_EOL);
-
-                       // Reset timer
-                       $timeDisplay = microtime(TRUE); 
-               } // END - if
-
                // Found hash:
-               //print ('nonceHash=' . $nonceHash .',iter=' . $iter . PHP_EOL);
+               print ('FOUND: nonceHash=' . $nonceHash .',iter=' . $iter . PHP_EOL);
+
+               // Use nonceHash as next modula hash
+               $modulaHash = $nonceHash;
        } // END - while
 
        // Time taken for one block
@@ -322,24 +329,15 @@ while (TRUE) {
        //print ('calculateSumFromHash(modulaHash)=' . calculateSumFromHash($modulaHash) . PHP_EOL);
        //print ('calculateSumFromHash(nonceHash)=' . calculateSumFromHash($nonceHash) . PHP_EOL);
 
-       // Is the hash rate unset?
-       if ($hashrate == 0) {
-               // Then calculate it again
-               $hashrate = 1 / $timeBlock * $iter * 2 + 2;
-       } // END - if
-
        // Calculate reward
        $reward = abs($timeBlock - $timeBadHashes) / $hashrate * $hashesPerBlock / BLOCK_SIZE * 1000;
-       print ('timeBlock=' . $timeBlock . ',timeBadHashes=' . $timeBadHashes . ',hashesPerBlock=' . $hashesPerBlock .',reward=' . $reward . PHP_EOL);
+       //print ('timeBlock=' . $timeBlock . ',timeBadHashes=' . $timeBadHashes . ',hashesPerBlock=' . $hashesPerBlock .',reward=' . $reward . PHP_EOL);
 
        // Block completed
        $totalHashes += $hashesPerBlock;
        $totalBlocks++;
        $hashesPerBlock = 0;
 
-       // Use nonceHash as next modula hash
-       $modulaHash = $nonceHash;
-
        // Calculate new nonce
        $nonce = calculateNonce($nonce);