diff --git a/analyze/analyze_corpus.py b/analyze/analyze_corpus.py index 912adad..c03ea88 100644 --- a/analyze/analyze_corpus.py +++ b/analyze/analyze_corpus.py @@ -31,7 +31,7 @@ def __processTest(test): t_bgn = ts; ts = ts - t_bgn t_max = max(t_max, ts) - elif line[0] == '-' and 'executing program' in line: + elif line[0] == '-' and 'executeRaw' in line: count += 1; elif "addInputToCorpus" in line: corpusCount += 1; diff --git a/analyze/analyze_coverage.py b/analyze/analyze_coverage.py index caed7e0..30ff955 100644 --- a/analyze/analyze_coverage.py +++ b/analyze/analyze_coverage.py @@ -45,7 +45,7 @@ def __processTestAltAlt(test): line = line.strip('\n').strip(); if len(line) == 0: continue; - if line[:2] == '- ' and "executing program" in line: + if line[:2] == '- ' and "executeRaw" in line: tmp = line.split(); try: n_calls = int(tmp[-1]) diff --git a/analyze/analyze_mab.py b/analyze/analyze_mab.py index 6b2058d..22b13fd 100644 --- a/analyze/analyze_mab.py +++ b/analyze/analyze_mab.py @@ -49,7 +49,7 @@ def __processTest(test): line = line.strip('\n').strip(); if len(line) == 0: continue; - if line[:2] == '- ' and "executing program" in line: # Prog/Syscall count + if line[:2] == '- ' and "executeRaw" in line: # Prog/Syscall count tmp = line.split(); try: n_calls = int(tmp[-1]) diff --git a/analyze/analyze_programs.py b/analyze/analyze_programs.py index ffc3a93..3f89f18 100644 --- a/analyze/analyze_programs.py +++ b/analyze/analyze_programs.py @@ -88,7 +88,7 @@ def __processTest(test): ts_bgn = ts_cur count["Time_Elapsed"] = (ts_cur - ts_bgn) / 1000000000.0 / 60.0 ret.append(copy.deepcopy(count)) - elif line[:2] == '- ' and 'executing program' in line: + elif line[:2] == '- ' and 'executeRaw' in line: # print(status) pgsz = int(line.split()[-1]) if not p_current is None: diff --git a/analyze/analyze_triage.py b/analyze/analyze_triage.py index ee71921..3d81b43 100644 --- a/analyze/analyze_triage.py +++ b/analyze/analyze_triage.py @@ -111,7 +111,7 @@ def __processTest(test): coverageTotal.add(pc); elif (pc & 0xffffffff00000000) == 0: coverageTotal.add(pc); - elif line[:2] == "- " and "executing program" in line: + elif line[:2] == "- " and "executeRaw" in line: executeCount += 1; status = copy.deepcopy(status_cur); status["executeCount"] = executeCount; diff --git a/analyze/analyze_work.py b/analyze/analyze_work.py index 9cac9e2..b161449 100644 --- a/analyze/analyze_work.py +++ b/analyze/analyze_work.py @@ -116,7 +116,7 @@ def __processTest(test): exec_count = 0 syscall_count = 0 prev_ts = cur_status["Time_Elapsed"] - elif line[0] == '-' and 'executing program' in line: + elif line[0] == '-' and 'executeRaw' in line: exec_count += 1; try: sz = int(line.split()[-1]) diff --git a/syz-fuzzer/proc.go b/syz-fuzzer/proc.go index fd50bc5..0d40222 100644 --- a/syz-fuzzer/proc.go +++ b/syz-fuzzer/proc.go @@ -765,6 +765,7 @@ func (proc *Proc) executeRaw(opts *ipc.ExecOpts, p *prog.Prog, stat Stat) (*ipc. proc.logProgram(opts, p) for try := 0; ; try++ { + proc.fuzzer.writeLog("- executeRaw %v\n", len(p.Calls)) atomic.AddUint64(&proc.fuzzer.stats[stat], 1) output, info, hanged, err := proc.env.Exec(opts, p) if err != nil { diff --git a/syz-manager/manager.go b/syz-manager/manager.go index 2b675af..05d0192 100644 --- a/syz-manager/manager.go +++ b/syz-manager/manager.go @@ -132,6 +132,7 @@ func main() { if err != nil { log.Fatalf("%v", err) } + fmt.Fprintf(os.Stdout, "<<<%v>>>\n", time.Now().UnixNano()) RunManager(cfg, target, sysTarget, syscalls) } @@ -218,6 +219,7 @@ func RunManager(cfg *mgrconfig.Config, target *prog.Target, sysTarget *targets.T numReproducing := atomic.LoadUint32(&mgr.numReproducing) numFuzzing := atomic.LoadUint32(&mgr.numFuzzing) + fmt.Fprintf(os.Stdout, "<<<%v>>>\n", time.Now().UnixNano()) log.Logf(0, "VMs %v, executed %v, cover %v, crashes %v, repro %v", numFuzzing, executed, signal, crashes, numReproducing) }