Skip to content

Commit 25c3623

Browse files
bpetitbpetit
authored
Merge pull request #412 from JJ/main
Fix typo
2 parents a06d6fc + b868a1d commit 25c3623

8 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎docs_src/troubleshooting.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Then run scaphandre. If it does not work, the issue is somewhere else.
1414

1515
It can mean that your cpu doesn't support RAPL. Please refer to the [compatibility](compatibility.md) section to be sure.
1616

17-
### I can't mount the required kernel modules, getting a `Could'nt find XXX modules` error
17+
### I can't mount the required kernel modules, getting a `Couldn't find XXX modules` error
1818

1919
If you are in a situation comparable to [this one](https://github.com/hubblo-org/scaphandre/issues/59), you may need to install additional packages.
2020

‎src/exporters/qemu.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ impl QemuExporter {
8787
}
8888
Err(err) => {
8989
error!(
90-
"Could'nt edit {}. Please check file permissions : {}",
90+
"Couldn't edit {}. Please check file permissions : {}",
9191
complete_path, err
9292
);
9393
}

‎src/exporters/stdout.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ impl StdoutExporter {
185185
}
186186
println!("{to_print}\n");
187187
} else {
188-
println!("{to_print} Could'nt get per-domain metrics.\n");
188+
println!("{to_print} Couldn't get per-domain metrics.\n");
189189
}
190190
}
191191

‎src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ fn my_service_main(_arguments: Vec<OsString>) {
192192
}
193193
Err(e) => {
194194
panic!(
195-
"Could'nt set Stop status on scaphandre service: {:?}",
195+
"Couldn't set Stop status on scaphandre service: {:?}",
196196
e
197197
);
198198
}

‎src/sensors/mod.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl RecordGenerator for Topology {
7272
}
7373
Err(e) => {
7474
warn!(
75-
"Could'nt read record from {}, error was : {:?}",
75+
"Couldn't read record from {}, error was : {:?}",
7676
self._sensor_data
7777
.get("source_file")
7878
.unwrap_or(&String::from("SRCFILENOTKNOWN")),
@@ -468,7 +468,7 @@ impl Topology {
468468
}
469469
Err(e) => {
470470
warn!(
471-
"Could'nt get previous_microjoules - value : '{}' - error : {:?}",
471+
"Couldn't get previous_microjoules - value : '{}' - error : {:?}",
472472
previous_record.value, e
473473
);
474474
}
@@ -992,7 +992,7 @@ impl RecordGenerator for CPUSocket {
992992
}
993993
Err(e) => {
994994
warn!(
995-
"Could'nt read record from {}, error was: {:?}",
995+
"Couldn't read record from {}, error was: {:?}",
996996
self.sensor_data
997997
.get("source_file")
998998
.unwrap_or(&String::from("SRCFILENOTKNOWN")),
@@ -1365,7 +1365,7 @@ impl RecordGenerator for Domain {
13651365
}
13661366
Err(e) => {
13671367
warn!(
1368-
"Could'nt read record from {}. Error was : {:?}.",
1368+
"Couldn't read record from {}. Error was : {:?}.",
13691369
self.sensor_data
13701370
.get("source_file")
13711371
.unwrap_or(&String::from("SRCFILENOTKNOWN")),

‎src/sensors/msr_rapl.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ impl RecordReader for CPUSocket {
296296
}),
297297
Err(e) => {
298298
error!(
299-
"Could'nt get MSR value for {}: {}",
299+
"Couldn't get MSR value for {}: {}",
300300
MSR_PKG_ENERGY_STATUS, e
301301
);
302302
Ok(Record {
@@ -338,7 +338,7 @@ impl RecordReader for Domain {
338338
value: rec.value,
339339
}),
340340
Err(e) => {
341-
error!("Could'nt get MSR value for {}: {}", msr_addr, e);
341+
error!("Couldn't get MSR value for {}: {}", msr_addr, e);
342342
Ok(Record {
343343
timestamp: current_system_time_since_epoch(),
344344
value: String::from("0"),
@@ -388,7 +388,7 @@ impl Sensor for MsrRAPLSensor {
388388
}
389389
}
390390
None => {
391-
panic!("Could'nt get cpuid data.");
391+
panic!("Couldn't get cpuid data.");
392392
}
393393
}
394394
let mut i: u16 = 0;
@@ -531,7 +531,7 @@ impl Sensor for MsrRAPLSensor {
531531
}
532532
}
533533
None => {
534-
panic!("Could'nt get core ids from core_affinity.");
534+
panic!("Couldn't get core ids from core_affinity.");
535535
}
536536
}
537537
if let Some(info) = CpuId::new().get_extended_topology_info() {
@@ -542,7 +542,7 @@ impl Sensor for MsrRAPLSensor {
542542
}
543543
}
544544
} else {
545-
error!("Could'nt set thread affinity !");
545+
error!("Couldn't set thread affinity !");
546546
let last_error = GetLastError();
547547
panic!("Error was : {:?}", last_error);
548548
}
@@ -637,7 +637,7 @@ impl Sensor for MsrRAPLSensor {
637637
))
638638
}
639639
Err(e) => {
640-
warn!("Could'nt add Dram domain: {}", e);
640+
warn!("Couldn't add Dram domain: {}", e);
641641
}
642642
}
643643
match get_msr_value(core_id as usize, MSR_PP0_ENERGY_STATUS as u64, &sensor_data) {
@@ -657,7 +657,7 @@ impl Sensor for MsrRAPLSensor {
657657
))
658658
}
659659
Err(e) => {
660-
warn!("Could'nt add Core domain: {}", e);
660+
warn!("Couldn't add Core domain: {}", e);
661661
}
662662
}
663663
match get_msr_value(core_id as usize, MSR_PP1_ENERGY_STATUS as u64, &sensor_data) {
@@ -677,14 +677,14 @@ impl Sensor for MsrRAPLSensor {
677677
))
678678
}
679679
Err(e) => {
680-
warn!("Could'nt add Uncore domain: {}", e);
680+
warn!("Couldn't add Uncore domain: {}", e);
681681
}
682682
}
683683
//match get_msr_value(core_id as usize, MSR_PLATFORM_ENERGY_STATUS as u64, &sensor_data) {
684684
// Ok(rec) => {
685685
// },
686686
// Err(e) => {
687-
// error!("Could'nt find Platform/PSYS domain.");
687+
// error!("Couldn't find Platform/PSYS domain.");
688688
// }
689689
//}
690690
}
@@ -699,7 +699,7 @@ impl Sensor for MsrRAPLSensor {
699699
.insert(String::from("psys"), String::from(""));
700700
}
701701
Err(e) => {
702-
warn!("Could'nt add Uncore domain: {}", e);
702+
warn!("Couldn't add Uncore domain: {}", e);
703703
}
704704
}
705705
}
@@ -740,7 +740,7 @@ pub unsafe fn get_msr_value(
740740
if thread_affinity_res.as_bool() {
741741
debug!("Thread affinity found : {:?}", thread_group_affinity);
742742
} else {
743-
error!("Could'nt get thread group affinity");
743+
error!("Couldn't get thread group affinity");
744744
}
745745
let mut process_group_array: [u16; 8] = [0, 0, 0, 0, 0, 0, 0, 0];
746746
let mut process_group_array_len = 8;
@@ -752,7 +752,7 @@ pub unsafe fn get_msr_value(
752752
if process_affinity_res.as_bool() {
753753
debug!("Process affinity found: {:?}", process_group_array);
754754
} else {
755-
error!("Could'nt get process group affinity");
755+
error!("Couldn't get process group affinity");
756756
error!("Error was : {:?}", GetLastError());
757757
}
758758
debug!("Core ID requested to the driver : {}", core_id);

‎src/sensors/powercap_rapl.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ impl RecordReader for Topology {
8888
total += val;
8989
}
9090
Err(e) => {
91-
warn!("could'nt convert {} to i128: {}", r.value.trim(), e);
91+
warn!("Couldn't convert {} to i128: {}", r.value.trim(), e);
9292
}
9393
}
9494
}
@@ -100,7 +100,7 @@ impl RecordReader for Topology {
100100
total += val;
101101
}
102102
Err(e) => {
103-
warn!("could'nt convert {} to i128: {}", dr.value.trim(), e);
103+
warn!("Couldn't convert {} to i128: {}", dr.value.trim(), e);
104104
}
105105
}
106106
}
@@ -265,7 +265,7 @@ impl Sensor for PowercapRAPLSensor {
265265
}
266266
}
267267
if !found {
268-
warn!("Could'nt find any RAPL PKG domain (nor psys).");
268+
warn!("Couldn't find any RAPL PKG domain (nor psys).");
269269
}
270270
}
271271
for folder in fs::read_dir(&self.base_path).unwrap() {

‎src/sensors/utils.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ impl ProcessTracker {
598598
}
599599
}
600600
} else {
601-
debug!("Could'nt find {} in procfs.", pid.to_string());
601+
debug!("Couldn't find {} in procfs.", pid.to_string());
602602
}
603603
}
604604
description

0 commit comments

Comments
 (0)