Merge pull request #10 from ThijsRay/merge_crates

Merge crates

Author: ThijsRay

Cargo.toml

@@ -6,20 +6,16 @@ description = "Coppers is a custom test harnass that measures the energy usage o
 license = "Apache-2.0"
 repository = "https://github.com/ThijsRay/coppers"
 
-[lib]
-name = "coppers"
-path = "coppers_test_runner/lib.rs"
-
 [workspace]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-coppers_sensors = { path = "coppers_sensors"}
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 git2 = "0.14.2"
 hex = "0.4.3"
+regex = "1"
 pyo3 = { version = "0.16", optional = true, features = ["auto-initialize"] }
 
 [features]

README.md

@@ -114,6 +114,9 @@ error. This can be solved in one of two ways:
     2. `cargo test`
     3. `sudo chmod o-r /sys/devices/virtual/powercap/intel-rapl/intel-rapl:0/energy_uj`
 
+### ModuleNotFoundError
+If you run with the [`visualization` feature](#visualization) enabled, then you also need to install the required Python packages. This can be done by installing the packages defined in this
+repositories [`requirements.txt`](/requirements.txt) with `pip install -r requirements.txt`.
 
 ## About
 This project was done in the context of the [2022 edition of Sustainable Software Engineering course at Delft University of Technology](https://luiscruz.github.io/course_sustainableSE/2022/). We chose the name "Coppers" because our project relates to both green software and Rust, and oxidized copper has a green-ish color.

coppers_sensors/Cargo.toml

@@ -22,6 +22,7 @@
 // information.
 extern crate test;
 
+mod sensors;
 mod test_runner;
 
 // Export the runner funcion so crates that depend on this crate can use it

coppers_sensors/tests/sensors.rs

@@ -146,6 +146,7 @@ impl RAPLSensor {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use std::thread::sleep;
 
     #[test]
     fn raplsensor_convert_read_string_to_u128_zero() {
@@ -178,4 +179,15 @@ mod tests {
         ));
         assert_eq!(result, 12345678901234567890123456789);
     }
+    #[test]
+    fn test_rapl_sensor() {
+        let mut sensor = RAPLSensor::new(String::from(
+            "/sys/devices/virtual/powercap/intel-rapl/intel-rapl:0",
+        ))
+        .unwrap();
+        sensor.start_measuring();
+        sleep(Duration::new(2, 0));
+        sensor.stop_measuring();
+        println!("measured {}uJ", sensor.get_measured_uj());
+    }
 }

coppers_test_runner/lib.rs src/lib.rscoppers_test_runner/lib.rs renamed to src/lib.rs

@@ -15,7 +15,7 @@
 // Note that this is heavily inspired by libtest that is part of the Rust language.
 
 use self::json::write_to_json;
-use coppers_sensors::{RAPLSensor, Sensor};
+use super::sensors::{RAPLSensor, Sensor};
 use std::any::Any;
 use std::io::{self, Write};
 use std::panic::{catch_unwind, AssertUnwindSafe};