Skip to content

Commit b0cbdeb

Browse files
authored
Revert "Fix incorrect use of atomic variable in src/perf_trace.rs" (#54)
1 parent 34cf846 commit b0cbdeb

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/perf_trace.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,11 @@ pub mod inner {
6666

6767
let msg = $msg();
6868
let start_info = "Start:".yellow().bold();
69-
let indent_amount = 2 * NUM_INDENT.fetch_add(1, Ordering::Relaxed);
69+
let indent_amount = 2 * NUM_INDENT.fetch_add(0, Ordering::Relaxed);
7070
let indent = compute_indent(indent_amount);
7171

7272
$crate::perf_trace::println!("{}{:8} {}", indent, start_info, msg);
73+
NUM_INDENT.fetch_add(1, Ordering::Relaxed);
7374
$crate::perf_trace::TimerInfo {
7475
msg: msg.to_string(),
7576
time: Instant::now(),
@@ -109,7 +110,8 @@ pub mod inner {
109110
let end_info = "End:".green().bold();
110111
let message = format!("{} {}", $time.msg, $msg());
111112

112-
let indent_amount = 2 * NUM_INDENT.fetch_sub(1, Ordering::Relaxed);
113+
NUM_INDENT.fetch_sub(1, Ordering::Relaxed);
114+
let indent_amount = 2 * NUM_INDENT.fetch_add(0, Ordering::Relaxed);
113115
let indent = compute_indent(indent_amount);
114116

115117
// Todo: Recursively ensure that *entire* string is of appropriate
@@ -142,7 +144,7 @@ pub mod inner {
142144
let start_indent_amount = 2 * NUM_INDENT.fetch_add(0, Ordering::Relaxed);
143145
let start_indent = compute_indent(start_indent_amount);
144146

145-
let msg_indent_amount = start_indent_amount + 2;
147+
let msg_indent_amount = 2 * NUM_INDENT.fetch_add(0, Ordering::Relaxed) + 2;
146148
let msg_indent = compute_indent_whitespace(msg_indent_amount);
147149
let mut final_message = "\n".to_string();
148150
for line in $msg().lines() {

0 commit comments

Comments
 (0)