Move Bank to its own crate

Also:
* counters.rs to solana_metrics
* genesis_block.rs to solana_sdk

metrics/src/counter.rs

@@ -0,0 +1,206 @@
+use crate::{influxdb, submit};
+use log::{info, log_enabled};
+use solana_sdk::timing;
+use std::env;
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+const DEFAULT_LOG_RATE: usize = 1000;
+
+pub struct Counter {
+    pub name: &'static str,
+    /// total accumulated value
+    pub counts: AtomicUsize,
+    pub times: AtomicUsize,
+    /// last accumulated value logged
+    pub lastlog: AtomicUsize,
+    pub lograte: AtomicUsize,
+    pub point: Option<influxdb::Point>,
+}
+
+#[macro_export]
+macro_rules! create_counter {
+    ($name:expr, $lograte:expr) => {
+        Counter {
+            name: $name,
+            counts: std::sync::atomic::AtomicUsize::new(0),
+            times: std::sync::atomic::AtomicUsize::new(0),
+            lastlog: std::sync::atomic::AtomicUsize::new(0),
+            lograte: std::sync::atomic::AtomicUsize::new($lograte),
+            point: None,
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! inc_counter {
+    ($name:expr, $level:expr, $count:expr) => {
+        unsafe { $name.inc($level, $count) };
+    };
+}
+
+#[macro_export]
+macro_rules! inc_new_counter {
+    ($name:expr, $count:expr, $level:expr, $lograte:expr) => {{
+        static mut INC_NEW_COUNTER: Counter = create_counter!($name, $lograte);
+        static INIT_HOOK: std::sync::Once = std::sync::ONCE_INIT;
+        unsafe {
+            INIT_HOOK.call_once(|| {
+                INC_NEW_COUNTER.init();
+            });
+        }
+        inc_counter!(INC_NEW_COUNTER, $level, $count);
+    }};
+}
+
+#[macro_export]
+macro_rules! inc_new_counter_info {
+    ($name:expr, $count:expr) => {{
+        inc_new_counter!($name, $count, Level::Info, 0);
+    }};
+    ($name:expr, $count:expr, $lograte:expr) => {{
+        inc_new_counter!($name, $count, Level::Info, $lograte);
+    }};
+}
+
+impl Counter {
+    fn default_log_rate() -> usize {
+        let v = env::var("SOLANA_DEFAULT_LOG_RATE")
+            .map(|x| x.parse().unwrap_or(DEFAULT_LOG_RATE))
+            .unwrap_or(DEFAULT_LOG_RATE);
+        if v == 0 {
+            DEFAULT_LOG_RATE
+        } else {
+            v
+        }
+    }
+    pub fn init(&mut self) {
+        self.point = Some(
+            influxdb::Point::new(&format!("counter-{}", self.name))
+                .add_field("count", influxdb::Value::Integer(0))
+                .to_owned(),
+        );
+    }
+    pub fn inc(&mut self, level: log::Level, events: usize) {
+        let counts = self.counts.fetch_add(events, Ordering::Relaxed);
+        let times = self.times.fetch_add(1, Ordering::Relaxed);
+        let mut lograte = self.lograte.load(Ordering::Relaxed);
+        if lograte == 0 {
+            lograte = Counter::default_log_rate();
+            self.lograte.store(lograte, Ordering::Relaxed);
+        }
+        if times % lograte == 0 && times > 0 && log_enabled!(level) {
+            info!(
+                "COUNTER:{{\"name\": \"{}\", \"counts\": {}, \"samples\": {},  \"now\": {}, \"events\": {}}}",
+                self.name,
+                counts + events,
+                times,
+                timing::timestamp(),
+                events,
+            );
+        }
+        let lastlog = self.lastlog.load(Ordering::Relaxed);
+        let prev = self
+            .lastlog
+            .compare_and_swap(lastlog, counts, Ordering::Relaxed);
+        if prev == lastlog {
+            if let Some(ref mut point) = self.point {
+                point
+                    .fields
+                    .entry("count".to_string())
+                    .and_modify(|v| *v = influxdb::Value::Integer(counts as i64 - lastlog as i64))
+                    .or_insert(influxdb::Value::Integer(0));
+            }
+            if let Some(ref mut point) = self.point {
+                submit(point.to_owned());
+            }
+        }
+    }
+}
+#[cfg(test)]
+mod tests {
+    use crate::counter::{Counter, DEFAULT_LOG_RATE};
+    use log::Level;
+    use std::env;
+    use std::sync::atomic::Ordering;
+    use std::sync::{Once, RwLock, ONCE_INIT};
+
+    fn get_env_lock() -> &'static RwLock<()> {
+        static mut ENV_LOCK: Option<RwLock<()>> = None;
+        static INIT_HOOK: Once = ONCE_INIT;
+
+        unsafe {
+            INIT_HOOK.call_once(|| {
+                ENV_LOCK = Some(RwLock::new(()));
+            });
+            &ENV_LOCK.as_ref().unwrap()
+        }
+    }
+
+    #[test]
+    fn test_counter() {
+        let _readlock = get_env_lock().read();
+        static mut COUNTER: Counter = create_counter!("test", 1000);
+        let count = 1;
+        inc_counter!(COUNTER, Level::Info, count);
+        unsafe {
+            assert_eq!(COUNTER.counts.load(Ordering::Relaxed), 1);
+            assert_eq!(COUNTER.times.load(Ordering::Relaxed), 1);
+            assert_eq!(COUNTER.lograte.load(Ordering::Relaxed), 1000);
+            assert_eq!(COUNTER.lastlog.load(Ordering::Relaxed), 0);
+            assert_eq!(COUNTER.name, "test");
+        }
+        for _ in 0..199 {
+            inc_counter!(COUNTER, Level::Info, 2);
+        }
+        unsafe {
+            assert_eq!(COUNTER.lastlog.load(Ordering::Relaxed), 397);
+        }
+        inc_counter!(COUNTER, Level::Info, 2);
+        unsafe {
+            assert_eq!(COUNTER.lastlog.load(Ordering::Relaxed), 399);
+        }
+    }
+    #[test]
+    fn test_inc_new_counter() {
+        let _readlock = get_env_lock().read();
+        //make sure that macros are syntactically correct
+        //the variable is internal to the macro scope so there is no way to introspect it
+        inc_new_counter_info!("counter-1", 1);
+        inc_new_counter_info!("counter-2", 1, 2);
+    }
+    #[test]
+    fn test_lograte() {
+        let _readlock = get_env_lock().read();
+        assert_eq!(
+            Counter::default_log_rate(),
+            DEFAULT_LOG_RATE,
+            "default_log_rate() is {}, expected {}, SOLANA_DEFAULT_LOG_RATE environment variable set?",
+            Counter::default_log_rate(),
+            DEFAULT_LOG_RATE,
+        );
+        static mut COUNTER: Counter = create_counter!("test_lograte", 0);
+        inc_counter!(COUNTER, Level::Info, 2);
+        unsafe {
+            assert_eq!(COUNTER.lograte.load(Ordering::Relaxed), DEFAULT_LOG_RATE);
+        }
+    }
+
+    #[test]
+    fn test_lograte_env() {
+        assert_ne!(DEFAULT_LOG_RATE, 0);
+        let _writelock = get_env_lock().write();
+        static mut COUNTER: Counter = create_counter!("test_lograte_env", 0);
+        env::set_var("SOLANA_DEFAULT_LOG_RATE", "50");
+        inc_counter!(COUNTER, Level::Info, 2);
+        unsafe {
+            assert_eq!(COUNTER.lograte.load(Ordering::Relaxed), 50);
+        }
+
+        static mut COUNTER2: Counter = create_counter!("test_lograte_env", 0);
+        env::set_var("SOLANA_DEFAULT_LOG_RATE", "0");
+        inc_counter!(COUNTER2, Level::Info, 2);
+        unsafe {
+            assert_eq!(COUNTER2.lograte.load(Ordering::Relaxed), DEFAULT_LOG_RATE);
+        }
+    }
+}

metrics/src/lib.rs

@@ -1,3 +1,6 @@
+#[macro_use]
+pub mod counter;
+
 mod metrics;
 
 pub use crate::metrics::flush;