Fix sig verify counters to be unique and tweak perf counters (#1056)

print events and add current events to old value to report

src/counter.rs

@@ -74,11 +74,12 @@ impl Counter {
         if times % lograte == 0 && times > 0 {
             let lastlog = self.lastlog.load(Ordering::Relaxed);
             info!(
-                "COUNTER:{{\"name\": \"{}\", \"counts\": {}, \"samples\": {},  \"now\": {}}}",
+                "COUNTER:{{\"name\": \"{}\", \"counts\": {}, \"samples\": {},  \"now\": {}, \"events\": {}}}",
                 self.name,
-                counts,
+                counts + events,
                 times,
                 timing::timestamp(),
+                events,
             );
             metrics::submit(
                 influxdb::Point::new(&format!("counter-{}", self.name))

src/sigverify.rs

@@ -98,7 +98,7 @@ pub fn ed25519_verify_cpu(batches: &[SharedPackets]) -> Vec<Vec<u8>> {
                 .collect()
         })
         .collect();
-    inc_new_counter_info!("ed25519_verify", count);
+    inc_new_counter_info!("ed25519_verify_cpu", count);
     rv
 }
 
@@ -117,7 +117,7 @@ pub fn ed25519_verify_disabled(batches: &[SharedPackets]) -> Vec<Vec<u8>> {
                 .collect()
         })
         .collect();
-    inc_new_counter_info!("ed25519_verify", count);
+    inc_new_counter_info!("ed25519_verify_disabled", count);
     rv
 }
 
@@ -204,7 +204,7 @@ pub fn ed25519_verify(batches: &[SharedPackets]) -> Vec<Vec<u8>> {
             num += 1;
         }
     }
-    inc_new_counter_info!("ed25519_verify", count);
+    inc_new_counter_info!("ed25519_verify_gpu", count);
     rvs
 }