SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove interval_name from interval, fix snakefile showmap

Browse Source
This commit is contained in:
Alwin Berger 2024-10-22 09:05:21 +02:00
parent f9f59211fb
commit c5c9a052e4
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuzzers/FRET/benchmark/Snakefile
View File

@ -192,7 +192,8 @@ rule tarnsform_trace:
"{remote}timedump/{fuzzer}/{target}#{num}_case.trace.ron", "{remote}timedump/{fuzzer}/{target}#{num}_case.trace.ron",
output: output:
"{remote}timedump/{fuzzer}/{target}#{num}_case.jobs.csv", "{remote}timedump/{fuzzer}/{target}#{num}_case.jobs.csv",
"{remote}timedump/{fuzzer}/{target}#{num}_case.resp.csv" "{remote}timedump/{fuzzer}/{target}#{num}_case.resp.csv",
"{remote}timedump/{fuzzer}/{target}#{num}_case.abbs.csv"
run: run:
with open('target_symbols.csv') as csvfile: with open('target_symbols.csv') as csvfile:
reader = csv.DictReader(csvfile) reader = csv.DictReader(csvfile)
@ -206,8 +207,8 @@ rule tarnsform_trace:
bkp=line['return_function'] bkp=line['return_function']
select_task=line['select_task'] select_task=line['select_task']
script=""" script="""
echo $(pwd)/../../../../state2gantt/target/debug/state2gantt -i {input} -a {output[0]} -r {output[1]} -t {select_task} echo $(pwd)/../../../../state2gantt/target/debug/state2gantt -i {input} -a {output[0]} -r {output[1]} -p {output[2]} -t {select_task}
$(pwd)/../../../../state2gantt/target/debug/state2gantt -i {input} -a {output[0]} -r {output[1]} -t {select_task} $(pwd)/../../../../state2gantt/target/debug/state2gantt -i {input} -a {output[0]} -r {output[1]} -p {output[2]} -t {select_task}
""" """
shell(script) shell(script)

1
fuzzers/FRET/src/systemstate/mod.rs
View File

@ -194,7 +194,6 @@ pub struct ExecInterval {
pub end_state: u64, pub end_state: u64,
pub start_capture: (CaptureEvent, String), pub start_capture: (CaptureEvent, String),
pub end_capture: (CaptureEvent, String), pub end_capture: (CaptureEvent, String),
pub interval_name: String,
pub level: u8, pub level: u8,
tick_spend_preempted: u64, tick_spend_preempted: u64,
pub abb: Option<AtomicBasicBlock> pub abb: Option<AtomicBasicBlock>

2
fuzzers/FRET/src/systemstate/observers.rs
View File

@ -504,7 +504,6 @@ fn states2intervals(trace: Vec<ReducedFreeRTOSSystemState>, meta: Vec<(u64, Capt
start_capture: (meta[i].1, meta[i].2.clone()), start_capture: (meta[i].1, meta[i].2.clone()),
end_capture: (meta[i+1].1, meta[i+1].2.clone()), end_capture: (meta[i+1].1, meta[i+1].2.clone()),
level: level, level: level,
interval_name: String::new(),
tick_spend_preempted: 0, tick_spend_preempted: 0,
abb: None abb: None
}); });
@ -620,7 +619,6 @@ fn add_abb_info(trace: &mut Vec<ExecInterval>, table: &HashMap<u64, ReducedFreeR
for i in 0..trace.len() { for i in 0..trace.len() {
trace[i].abb = Some((*wip_abb_trace[i]).borrow().clone()); trace[i].abb = Some((*wip_abb_trace[i]).borrow().clone());
trace[i].interval_name = (*wip_abb_trace[i]).borrow().instance_name.clone().unwrap_or(String::from(""));
} }
return ret; return ret;
} }