alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

spot: Add %R, %[..]R common option.

Browse source 
For #189.

* NEWS: Update.
* bin/autfilt.cc: Replace stopwatch with process_timer.
* bin/dstar2tgba.cc: Replace stopwatch with process_timer.
* bin/ltl2tgba.cc: Replace stopwatch with process_timer.
* bin/ltlcross.cc: Replace stopwatch with process_timer.
* bin/ltldo.cc: Replace stopwatch with process_timer.
* bin/randaut.cc: Replace stopwatch with process_timer.
* bin/common_aoutput.hh: Implement process_timer, integrate it.
* bin/common_aoutput.cc: Integrate process_timer and implement new
print method.
* spot/misc/timer.hh: Modify timer class and timeinfo struct
i.e. add cutime (children_utime) and cstime (children_stime).
* spot/misc/timer.cc: Help code to behave as before all this.
* spot/twaalgos/dtbasat.cc: Help print_log to behave as before
all this.
* spot/twaalgos/dtwasat.cc: Help print_log to behave as before
all this.
* spot/misc/formater.hh: Add operator<< for spot::timer.
This commit is contained in:
Alexandre GBAGUIDI AISSE 2016-10-24 17:46:26 +02:00 • committed by Alexandre Duret-Lutz
parent 3eafbc823c
commit 6ed380709d
14 changed files with 277 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bin/autfilt.cc
View file

@ -963,8 +963,8 @@ namespace
process_automaton(const spot::const_parsed_aut_ptr& haut,
const char* filename)
{
spot::stopwatch sw;
sw.start();
process_timer timer;
timer.start();
// If --stats or --name is used, duplicate the automaton so we
// never modify the original automaton (e.g. with
@ -1183,8 +1183,7 @@ namespace
run->project(aut)->highlight(word_aut.second);
}
const double conversion_time = sw.stop();
timer.stop();
if (opt->uniq)
{
auto tmp =
@ -1197,8 +1196,7 @@ namespace
++match_count;
printer.print(aut, nullptr, filename, -1, conversion_time, haut,
prefix, suffix);
printer.print(aut, timer, nullptr, filename, -1, haut, prefix, suffix);
if (opt_max_count >= 0 && match_count >= opt_max_count)
abort_run = true;