From 4d714a4442e79f7d71dd3d9bf8742c4b7db78273 Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Sat, 18 Apr 2026 17:49:04 +0200 Subject: [PATCH] substitute tabs with , for csv output --- scripts/runner.pl | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/scripts/runner.pl b/scripts/runner.pl index ecbfd2f..c33bde6 100644 --- a/scripts/runner.pl +++ b/scripts/runner.pl @@ -289,11 +289,17 @@ sub inject { } sub query { - my ( $experiment, $query, $args, $file ) = @_; + my ( $experiment, $query, $args, $file, $substitution ) = @_; + + say "Running query $query"; my $result = qx{mariadb --defaults-file=$remote_db_conf $args -e "$query"}; die "Query failed: $?" if $? != 0; + if ( defined $substitution ) { + $result =~ $substitution; + } + open( my $results_handle, '>', "$remote_builds_dir/$experiment/$file" ) or die "failed to open file: $!"; print $results_handle $result; @@ -320,19 +326,6 @@ ORDER BY variant, benchmark, resulttype;"; query( $experiment, $results_overview_query, "-t", "results.txt" ); - # my $results_overview = qx{ - # mariadb --defaults-file=$remote_db_conf -t -e "$results_overview_query" - # }; - # die "Query failed: $?" if $? != 0; - # - # open( my $results_overview_handle, - # '>', "$remote_builds_dir/$experiment/results.txt" ) - # or die "failed to open file: $!"; - # print $results_overview_handle $results_overview; - # close($results_overview_handle) or die "failed to close file: $!"; - # - # notify_file("$remote_builds_dir/$experiment/results.txt"); - my $fail_markers_query = "SELECT CONCAT('0x', HEX(p.injection_instr_absolute)) AS fault_address, SUM(t.time2 - t.time1 + 1) AS total_fail_markers @@ -345,21 +338,8 @@ WHERE v.variant = '$experiment' AND r.resulttype = 'FAIL_MARKER' GROUP BY p.injection_instr_absolute ORDER BY SUM(t.time2 - t.time1 + 1) DESC;"; - query( $experiment, $fail_markers_query, "--batch --raw", "markers.csv" ); - -# my $fail_markers = qx{ -# mariadb --defaults-file=$remote_db_conf --batch --raw -e "$fail_markers_query" -# }; -# die "Query failed: $?" if $? != 0; -# $fail_markers =~ s/\t/,/g; -# -# open( my $fail_markers_handle, -# '>', "$remote_builds_dir/$experiment/markers.csv" ) -# or die "failed to open file: $!"; -# print $fail_markers_handle $fail_markers; -# close($fail_markers_handle) or die "failed to close file: $!"; -# -# notify_file("$remote_builds_dir/$experiment/markers.csv"); + query( $experiment, $fail_markers_query, "--batch --raw", + "markers.csv", s/\t/,/g ); } # Run experiments