Skip to content

Commit 66ca753

Browse files
committed
name migration trace_v3 -> fstrace
1 parent 273cdbc commit 66ca753

978 files changed

Lines changed: 67447 additions & 1153 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

deps/try

Submodule try updated 1 file

executor/template_script_to_execute.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fi
66

77
# Magic, don't touch without consulting Di
88
RUN=$(printf 'source %s 2>/dev/null; %s\n exit_code=$?; hs_runtime_tmp_args=("$@")\n hs_set_options_cmd="$(set +o)"; source ${RUNTIME_DIR}/pash_declare_vars.sh %s; trap - EXIT; exit $exit_code' "${LATEST_ENV_FILE}" "${CMD_STRING}" "${POST_EXEC_ENV}")
9-
trace_v3 --mode both \
9+
fstrace --mode both \
1010
--trace-file "${TRACE_FILE}" \
1111
--stream-read --stream-read-file "${TRACE_FILE}.r" \
1212
--stream-write --stream-write-file "${TRACE_FILE}.w" \

report/archive/bio-ex-tryoverhead/ex1/run

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ from pathlib import Path
77

88
parser = argparse.ArgumentParser(description="Run benchmark")
99
parser.add_argument('--window', default=5, type=int, help='window size to run hs with')
10-
parser.add_argument('--target', nargs='+', choices=['sh', 'hs', 'strace', 'trace_v3'],
11-
default=['sh', 'hs'], help='executors to run (sh, hs, strace, trace_v3)')
10+
parser.add_argument('--target', nargs='+', choices=['sh', 'hs', 'strace', 'fstrace'],
11+
default=['sh', 'hs'], help='executors to run (sh, hs, strace, fstrace)')
1212
parser.add_argument('--log', choices=['enable', 'disable'], default="enable",
1313
help='whether to enable logging for hs')
1414

@@ -47,7 +47,7 @@ if __name__ == "__main__":
4747
run_sh = 'sh' in target
4848
run_hs = 'hs' in target
4949
run_strace = 'strace' in target
50-
run_trace_v3 = 'trace_v3' in target
50+
run_fstrace = 'fstrace' in target
5151

5252
if not "PASH_SPEC_TOP" in os.environ:
5353
raise("PASH_SPEC_TOP is not set")

report/archive/bio-ex-tryoverhead/ex2-accelerated/run

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ from pathlib import Path
77

88
parser = argparse.ArgumentParser(description="Run benchmark")
99
parser.add_argument('--window', default=5, type=int, help='window size to run hs with')
10-
parser.add_argument('--target', nargs='+', choices=['sh', 'hs', 'strace', 'trace_v3'],
11-
default=['sh', 'hs'], help='executors to run (sh, hs, strace, trace_v3)')
10+
parser.add_argument('--target', nargs='+', choices=['sh', 'hs', 'strace', 'fstrace'],
11+
default=['sh', 'hs'], help='executors to run (sh, hs, strace, fstrace)')
1212
parser.add_argument('--log', choices=['enable', 'disable'], default="enable",
1313
help='whether to enable logging for hs')
1414

@@ -45,7 +45,7 @@ if __name__ == "__main__":
4545
run_sh = 'sh' in target
4646
run_hs = 'hs' in target
4747
run_strace = 'strace' in target
48-
run_trace_v3 = 'trace_v3' in target
48+
run_fstrace = 'fstrace' in target
4949

5050
if not "PASH_SPEC_TOP" in os.environ:
5151
raise("PASH_SPEC_TOP is not set")

report/archive/bio-ex-tryoverhead/ex2/run

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ from pathlib import Path
77

88
parser = argparse.ArgumentParser(description="Run benchmark")
99
parser.add_argument('--window', default=5, type=int, help='window size to run hs with')
10-
parser.add_argument('--target', nargs='+', choices=['sh', 'hs', 'strace', 'trace_v3'],
11-
default=['sh', 'hs'], help='executors to run (sh, hs, strace, trace_v3)')
10+
parser.add_argument('--target', nargs='+', choices=['sh', 'hs', 'strace', 'fstrace'],
11+
default=['sh', 'hs'], help='executors to run (sh, hs, strace, fstrace)')
1212
parser.add_argument('--log', choices=['enable', 'disable'], default="enable",
1313
help='whether to enable logging for hs')
1414

@@ -45,7 +45,7 @@ if __name__ == "__main__":
4545
run_sh = 'sh' in target
4646
run_hs = 'hs' in target
4747
run_strace = 'strace' in target
48-
run_trace_v3 = 'trace_v3' in target
48+
run_fstrace = 'fstrace' in target
4949

5050
if not "PASH_SPEC_TOP" in os.environ:
5151
raise("PASH_SPEC_TOP is not set")

report/archive/bio-ex/ex1/run

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ from pathlib import Path
77

88
parser = argparse.ArgumentParser(description="Run benchmark")
99
parser.add_argument('--window', default=5, type=int, help='window size to run hs with')
10-
parser.add_argument('--target', nargs='+', choices=['sh', 'hs', 'strace', 'trace_v3'],
11-
default=['sh', 'hs'], help='executors to run (sh, hs, strace, trace_v3)')
10+
parser.add_argument('--target', nargs='+', choices=['sh', 'hs', 'strace', 'fstrace'],
11+
default=['sh', 'hs'], help='executors to run (sh, hs, strace, fstrace)')
1212
parser.add_argument('--log', choices=['enable', 'disable'], default="enable",
1313
help='whether to enable logging for hs')
1414

@@ -47,7 +47,7 @@ if __name__ == "__main__":
4747
run_sh = 'sh' in target
4848
run_hs = 'hs' in target
4949
run_strace = 'strace' in target
50-
run_trace_v3 = 'trace_v3' in target
50+
run_fstrace = 'fstrace' in target
5151

5252
if not "PASH_SPEC_TOP" in os.environ:
5353
raise("PASH_SPEC_TOP is not set")

report/archive/bio-ex/ex2-accelerated/run

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ from pathlib import Path
77

88
parser = argparse.ArgumentParser(description="Run benchmark")
99
parser.add_argument('--window', default=5, type=int, help='window size to run hs with')
10-
parser.add_argument('--target', nargs='+', choices=['sh', 'hs', 'strace', 'trace_v3'],
11-
default=['sh', 'hs'], help='executors to run (sh, hs, strace, trace_v3)')
10+
parser.add_argument('--target', nargs='+', choices=['sh', 'hs', 'strace', 'fstrace'],
11+
default=['sh', 'hs'], help='executors to run (sh, hs, strace, fstrace)')
1212
parser.add_argument('--log', choices=['enable', 'disable'], default="enable",
1313
help='whether to enable logging for hs')
1414

@@ -45,7 +45,7 @@ if __name__ == "__main__":
4545
run_sh = 'sh' in target
4646
run_hs = 'hs' in target
4747
run_strace = 'strace' in target
48-
run_trace_v3 = 'trace_v3' in target
48+
run_fstrace = 'fstrace' in target
4949

5050
if not "PASH_SPEC_TOP" in os.environ:
5151
raise("PASH_SPEC_TOP is not set")

report/archive/bio-ex/ex2/run

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ from pathlib import Path
77

88
parser = argparse.ArgumentParser(description="Run benchmark")
99
parser.add_argument('--window', default=5, type=int, help='window size to run hs with')
10-
parser.add_argument('--target', nargs='+', choices=['sh', 'hs', 'strace', 'trace_v3'],
11-
default=['sh', 'hs'], help='executors to run (sh, hs, strace, trace_v3)')
10+
parser.add_argument('--target', nargs='+', choices=['sh', 'hs', 'strace', 'fstrace'],
11+
default=['sh', 'hs'], help='executors to run (sh, hs, strace, fstrace)')
1212
parser.add_argument('--log', choices=['enable', 'disable'], default="enable",
1313
help='whether to enable logging for hs')
1414

@@ -45,7 +45,7 @@ if __name__ == "__main__":
4545
run_sh = 'sh' in target
4646
run_hs = 'hs' in target
4747
run_strace = 'strace' in target
48-
run_trace_v3 = 'trace_v3' in target
48+
run_fstrace = 'fstrace' in target
4949

5050
if not "PASH_SPEC_TOP" in os.environ:
5151
raise("PASH_SPEC_TOP is not set")

report/archive/bio4-tryoverhead/run

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ from subprocess import run, PIPE
99
parser = argparse.ArgumentParser(description="Run benchmark")
1010
parser = argparse.ArgumentParser(description="Run benchmark")
1111
parser.add_argument('--window', default=5, type=int, help='window size to run hs with')
12-
parser.add_argument('--target', required=True, nargs='+', choices=['sh', 'hs', 'strace', 'trace_v3'],
13-
default=['sh', 'hs'], help='executors to run (sh, hs, strace, trace_v3)')
12+
parser.add_argument('--target', required=True, nargs='+', choices=['sh', 'hs', 'strace', 'fstrace'],
13+
default=['sh', 'hs'], help='executors to run (sh, hs, strace, fstrace)')
1414
parser.add_argument('--log', choices=['enable', 'disable'], default="enable",
1515
help='whether to enable logging for hs')
1616
parser.add_argument('--tmpdir', type=Path)
@@ -66,7 +66,7 @@ if __name__ == '__main__':
6666
run_sh = 'sh' in target
6767
run_hs = 'hs' in target
6868
run_strace = 'strace' in target
69-
run_trace_v3 = 'trace_v3' in target
69+
run_fstrace = 'fstrace' in target
7070
output_base.mkdir(parents=True, exist_ok=True)
7171

7272
if run_sh:

report/benchmarks/artificial/fully_seq/run

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ from subprocess import run, PIPE
99
parser = argparse.ArgumentParser(description="Run benchmark")
1010
parser = argparse.ArgumentParser(description="Run benchmark")
1111
parser.add_argument('--window', default=5, type=int, help='window size to run hs with')
12-
parser.add_argument('--target', nargs='+', choices=['sh', 'hs', 'strace', 'trace_v3'],
13-
default=['sh', 'hs'], help='executors to run (sh, hs, strace, trace_v3)')
12+
parser.add_argument('--target', nargs='+', choices=['sh', 'hs', 'strace', 'fstrace'],
13+
default=['sh', 'hs'], help='executors to run (sh, hs, strace, fstrace)')
1414
parser.add_argument('--log', choices=['enable', 'disable'], default="enable",
1515
help='whether to enable logging for hs')
1616

@@ -54,14 +54,14 @@ def do_strace_run(test_base: Path, output_base: Path, env: dict):
5454
f.write(f'{duration}\n')
5555
return result.returncode
5656

57-
def do_trace_v3_run(test_base: Path, output_base: Path, env: dict):
58-
run(['trace_v3', 'install'], check=False)
59-
cmd = ['trace_v3', '--', '/bin/sh', str(test_base / SCRIPT_NAME)]
60-
print(f'Running trace_v3: {cmd}')
57+
def do_fstrace_run(test_base: Path, output_base: Path, env: dict):
58+
run(['fstrace', 'install'], check=False)
59+
cmd = ['fstrace', '--', '/bin/sh', str(test_base / SCRIPT_NAME)]
60+
print(f'Running fstrace: {cmd}')
6161
before = time.time()
6262
result = run(cmd, stdout=PIPE, stderr=PIPE, env=env)
6363
duration = time.time() - before
64-
with open(output_base / 'trace_v3_time', 'w') as f:
64+
with open(output_base / 'fstrace_time', 'w') as f:
6565
f.write(f'{duration}\n')
6666
return result.returncode
6767

@@ -82,7 +82,7 @@ if __name__ == '__main__':
8282
run_sh = 'sh' in target
8383
run_hs = 'hs' in target
8484
run_strace = 'strace' in target
85-
run_trace_v3 = 'trace_v3' in target
85+
run_fstrace = 'fstrace' in target
8686
output_base.mkdir(parents=True, exist_ok=True)
8787

8888

0 commit comments

Comments
 (0)