Report data structures size

Author: Cecca

danny/src/experiment.rs

@@ -3,7 +3,7 @@ use chrono::prelude::*;
 use rusqlite::*;
 use std::path::{Path, PathBuf};
 use std::{collections::HashMap, time::Duration};
-use crate::sysmonitor::SystemUsage;
+use crate::sysmonitor::{DATASTRUCTURES_BYTES, SystemUsage};
 
 pub struct Experiment {
     db_path: PathBuf,
@@ -199,10 +199,12 @@ impl Experiment {
                     speedup,
 
                     profile_frequency,
-                    dry_run
+                    dry_run,
+
+                    datastructures_bytes
                 )
                  VALUES (
-                     ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17, ?18, ?19, ?20, ?21, ?22, ?23, ?24, ?25
+                     ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17, ?18, ?19, ?20, ?21, ?22, ?23, ?24, ?25, ?26
                  )",
                 params![
                     env!("VERGEN_SHA_SHORT"),
@@ -230,7 +232,8 @@ impl Experiment {
                     recall,
                     speedup,
                     self.config.profile.unwrap_or(0),
-                    self.config.dry_run
+                    self.config.dry_run,
+                    DATASTRUCTURES_BYTES.load(std::sync::atomic::Ordering::SeqCst) as i64
                 ],
             )
             .expect("error inserting into main table");
@@ -456,6 +459,11 @@ fn db_migrate(conn: &Connection) {
         conn.execute_batch(include_str!("migrations/v10.sql"))
             .expect("error applying version 10");
     }
+    if version < 11 {
+        info!("Applying migration v11");
+        conn.execute_batch(include_str!("migrations/v11.sql"))
+            .expect("error applying version 11");
+    }
 
     info!("Database migration completed!");
 }

danny/src/lsh/algorithms/local_lsh.rs

@@ -15,7 +15,6 @@ use serde::de::Deserialize;
 use std::clone::Clone;
 use std::collections::HashMap;
 use std::fmt::Debug;
-use std::mem::size_of;
 use std::sync::Arc;
 use std::time::Instant;
 use timely::communication::Allocator;
@@ -292,7 +291,7 @@ where
                             vectors.entry(t.time().clone()).or_insert_with(HashMap::new);
                         let data = data.replace(Vec::new());
                         DATASTRUCTURES_BYTES
-                            .fetch_add(data.deep_size_of(), std::sync::atomic::Ordering::SeqCst);
+                            .fetch_add(dbg!(data.deep_size_of()), std::sync::atomic::Ordering::SeqCst);
                         for (subproblem_key, marker, (k, (v, p, s))) in data {
                             subproblems
                                 .entry(subproblem_key)

danny/src/migrations/v11.sql

@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE result ADD COLUMN datastructures_bytes INTEGER;
+
+PRAGMA user_version = 11;
+
+END TRANSACTION;