Display khs. Optimizations to hex encoding/decoding.

Author: bogdanadnan

common/common.cpp

@@ -52,3 +52,10 @@ string format_seconds(uint64_t seconds) {
 	ss << std::setw(2) << std::setfill('0') << hours << ":" << std::setw(2) << std::setfill('0') << minutes << ":" << std::setw(2) << std::setfill('0') << reminder;
 	return ss.str();
 }
+
+string format_hashrate(int hashrate) {
+    double khs = (double)hashrate / 1000.0;
+    char buff[20];
+    sprintf(buff, "%.1fk", khs);
+    return string(buff);
+}

common/common.h

@@ -58,5 +58,6 @@ DLLEXPORT vector<string> get_files(string folder);
 DLLEXPORT bool is_number(const string &s);
 DLLEXPORT string generate_uid(size_t length);
 DLLEXPORT string format_seconds(uint64_t seconds);
+DLLEXPORT string format_hashrate(int hashrate);
 
 #endif //IXIMINER_COMMON_H

crypt/hex.cpp

@@ -7,22 +7,24 @@
 #include "hex.h"
 
 void hex::encode(const unsigned char *input, int input_size, char *output) {
-    for(int i=0; i<input_size; i++) {
-        sprintf(output, "%02x", input[i]);
-        output+=2;
+    for ( int i=0; i<input_size; i++ ) {
+        char b1= *input >> 4;   // hi nybble
+        char b2= *input & 0x0f; // lo nybble
+        b1+='0'; if (b1>'9') b1 += 7;  // gap between '9' and 'A'
+        b2+='0'; if (b2>'9') b2 += 7;
+        *(output++)= b1;
+        *(output++) = b2;
+        input++;
     }
+    *output = 0;
 }
 
 int hex::decode(const char *input, unsigned char *output, int output_size) {
-    char buff[3];
-    size_t input_size = strlen(input);
-    if(output_size < input_size / 2)
-        return -1;
-
-    for(int i=0; i<input_size; i+=2) {
-        strncpy(buff, &input[i], 2);
-        output[i/2] = strtoul(buff, NULL, 16);
+    size_t in_len = strlen(input);
+    for ( int i=0; i<in_len; i+=2 ) {
+        unsigned char b1= input[i] -'0'; if (b1>9) b1 -= 7;
+        unsigned char b2= input[i+1] -'0'; if (b2>9) b2 -= 7;
+        *(output++) = (b1<<4) + b2;  // <<4 multiplies by 16
     }
-
-    return input_size / 2;
+    return in_len / 2;
 }

miner/miner.cpp

@@ -268,17 +268,17 @@ bool miner::__display_report() {
         hash_count += (*it)->get_hash_count();
     }
 
-    header << "|TotalHR";
-    log << "|" << setw(7) << (int)hash_rate;
+    header << "| TotalHR";
+    log << "|" << setw(8) << format_hashrate((int)hash_rate);
     for (vector<hasher *>::iterator it = hashers.begin(); it != hashers.end(); ++it) {
         map<int, device_info> devices = (*it)->get_device_infos();
         for(map<int, device_info>::iterator d = devices.begin(); d != devices.end(); ++d) {
-            header << "|" << ((d->first < 10) ? " " : "") << (*it)->get_type() << d->first;
-            log << "|" << setw(5) << (int)(d->second.hashrate);
+            header << "|" << ((d->first < 10) ? "  " : " ") << (*it)->get_type() << d->first;
+            log << "|" << setw(6) << format_hashrate((int)(d->second.hashrate));
         }
     }
-    header << "|Avg   |     Time|Acc   |Rej   |Block|";
-    log << "|" << setw(6) << (int)avg_hash_rate
+    header << "|    Avg|     Time|Acc   |Rej   |Block|";
+    log << "|" << setw(7) << format_hashrate((int)avg_hash_rate)
             << "|" << setw(9) << format_seconds(total_time)
             << "|" << setw(6) << __confirmed
             << "|" << setw(6) << __rejected