* src/misc/timer.hh, src/misc/timer.cc: New files.

* src/misc/Makefile.am (misc_HEADERS, libmisc_la_SOURCES): Add them.
* src/tgbatest/randtgba.cc: Use time_map to measure the algorithms.
Add the -R option.
* src/sanity/style.sh: Let me use `for (.*;;)'.

src/misc/Makefile.am

@@ -35,6 +35,7 @@ misc_HEADERS = \
   minato.hh \
   modgray.hh \
   random.hh \
+  timer.hh \
   version.hh
 
 noinst_LTLIBRARIES = libmisc.la
@@ -46,4 +47,5 @@ libmisc_la_SOURCES = \
   minato.cc \
   modgray.cc \
   random.cc \
+  timer.cc \
   version.cc

src/misc/timer.cc

@@ -0,0 +1,84 @@
+// Copyright (C) 2004  Laboratoire d'Informatique de Paris 6 (LIP6),
+// département Systèmes Répartis Coopératifs (SRC), Université Pierre
+// et Marie Curie.
+//
+// This file is part of Spot, a model checking library.
+//
+// Spot is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// Spot is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+// License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Spot; see the file COPYING.  If not, write to the Free
+// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+
+#include "timer.hh"
+#include <iostream>
+#include <iomanip>
+
+namespace spot
+{
+
+  std::ostream&
+  timer_map::print(std::ostream& os) const
+  {
+    time_info total;
+    for (tm_type::const_iterator i = tm.begin(); i != tm.end(); ++i)
+      {
+	total.utime += i->second.first.utime();
+	total.stime += i->second.first.stime();
+      }
+    clock_t grand_total = total.utime + total.stime;
+
+    os << std::setw(33) << ""
+       << "|  user time |  sys. time |    total   |"
+       << std::endl
+       << std::setw(33) << "name "
+       << "| ticks    % | tics     % | tics     % |   n"
+       << std::endl
+       << std::setw(79) << std::setfill('-') << "" << std::setfill(' ')
+       << std::endl;
+    for (tm_type::const_iterator i = tm.begin(); i != tm.end(); ++i)
+      {
+	const spot::timer& t = i->second.first;
+	os << std::setw(32) << i->first << " |"
+	   << std::setw(6) << t.utime()
+	   << std::setw(5) << (total.utime ?
+			       100.0 * t.utime() / total.utime : 0)
+	   << " |"
+	   << std::setw(6) << t.stime()
+	   << std::setw(5) << (total.stime ?
+			       100.0 * t.stime() / total.stime : 0)
+	   << " |"
+	   << std::setw(6) << t.utime() + t.stime()
+	   << std::setw(5) << (grand_total ?
+			       (100.0 * (t.utime() + t.stime()) /
+				grand_total) : 0)
+	   << " |"
+	   << std::setw(4) << i->second.second
+	   << std::endl;
+      }
+    os << std::setw(79) << std::setfill('-') << "" << std::setfill(' ')
+       << std::endl
+       << std::setw(32) << "TOTAL" << " |"
+       << std::setw(6) << total.utime
+       << std::setw(5) << 100
+       << " |"
+       << std::setw(6) << total.stime
+       << std::setw(5) << 100
+       << " |"
+       << std::setw(6) << grand_total
+       << std::setw(5) << 100
+       << " |"
+       << std::endl;
+    return os;
+  }
+
+}

src/misc/timer.hh

@@ -0,0 +1,183 @@
+// Copyright (C) 2004  Laboratoire d'Informatique de Paris 6 (LIP6),
+// département Systèmes Répartis Coopératifs (SRC), Université Pierre
+// et Marie Curie.
+//
+// This file is part of Spot, a model checking library.
+//
+// Spot is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// Spot is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+// License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Spot; see the file COPYING.  If not, write to the Free
+// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+
+#ifndef SPOT_MISC_TIMER_HH
+# define SPOT_MISC_TIMER_HH
+
+# include <iosfwd>
+# include <string>
+# include <map>
+# include <sys/times.h>
+
+namespace spot
+{
+  /// \addtogroup misc_tools
+  /// @{
+
+  /// A structure to record elapsed time in clock ticks.
+  struct time_info
+  {
+    time_info()
+      : utime(), stime(0)
+    {
+    }
+    clock_t utime;
+    clock_t stime;
+  };
+
+  /// A timekeeper that accumulate interval of time.
+  class timer
+  {
+  public:
+
+    /// Start a time interval.
+    void
+    start()
+    {
+      struct tms tmp;
+      times(&tmp);
+      start_.utime = tmp.tms_utime;
+      start_.stime = tmp.tms_stime;
+    }
+
+    /// Stop a time interval and update the sum of all intervals.
+    void
+    stop()
+    {
+      struct tms tmp;
+      times(&tmp);
+      total_.utime += tmp.tms_utime - start_.utime;
+      total_.stime += tmp.tms_stime - start_.stime;
+    }
+
+    /// \brief Return the user time of all accumulated interval.
+    ///
+    /// Any time interval that has been start()ed but not stop()ed
+    /// will not be accounted for.
+    clock_t
+    utime() const
+    {
+      return total_.utime;
+    }
+
+    /// \brief Return the system time of all accumulated interval.
+    ///
+    /// Any time interval that has been start()ed but not stop()ed
+    /// will not be accounted for.
+    clock_t
+    stime() const
+    {
+      return total_.stime;
+    }
+
+  protected:
+    time_info start_;
+    time_info total_;
+  };
+
+  /// \brief A map of timer, where each timer has a name.
+  ///
+  /// Timer_map also keeps track of the number of measures each timer
+  /// has performed.
+  class timer_map
+  {
+  public:
+
+    /// \brief Start a timer with name \a name.
+    ///
+    /// The timer is created if it did not exist already.
+    /// Once started, a timer should be either stop()ed or
+    /// cancel()ed.
+    void
+    start(const std::string& name)
+    {
+      item_type& it = tm[name];
+      it.first.start();
+      ++it.second;
+    }
+
+    /// \brief Stop timer \a name.
+    ///
+    /// The timer must have been previously started with start().
+    void
+    stop(const std::string& name)
+    {
+      tm[name].first.stop();
+    }
+
+    /// \brief Cancel timer \a name.
+    ///
+    /// The timer must have been previously started with start().
+    ///
+    /// This cancel only the current measure.  (Previous measures
+    /// recorded by the timer are preserved.)  When a timer that has
+    /// not done any measure is canceled, it is removed from the map.
+    void
+    cancel(const std::string& name)
+    {
+      tm_type::iterator i = tm.find(name);
+      assert(i != tm.end());
+      assert(0 < i->second.second);
+      if (0 == --i->second.second)
+	tm.erase(i);
+    }
+
+    /// Return the timer \a name.
+    const spot::timer&
+    timer(const std::string& name) const
+    {
+      tm_type::const_iterator i = tm.find(name);
+      assert(i != tm.end());
+      return i->second.first;
+    }
+
+    /// Return the timer \a name.
+    spot::timer&
+    timer(const std::string& name)
+    {
+      return tm[name].first;
+    }
+
+    /// \brief Whether there is no timer in the map.
+    ///
+    /// If empty() return true, then either no timer where ever
+    /// started, or all started timers were canceled without
+    /// completing any measure.
+    bool
+    empty() const
+    {
+      return tm.empty();
+    }
+
+    /// Format information about all timers in a table.
+    std::ostream&
+    print(std::ostream& os) const;
+
+  protected:
+    typedef std::pair<spot::timer, int> item_type;
+    typedef std::map<std::string, item_type> tm_type;
+    tm_type tm;
+  };
+
+  /// @}
+}
+
+#endif // SPOT_MISC_ESCAPE_HH