Changeset 43bbd6 in git for factory/libfac/factor

Timestamp:

Feb 22, 2012, 1:27:08 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

e2c18174ad1b4c2b871cb7dbdd0d2d4fc6ec8296

Parents:

0b618a776fb1b77afc08df17205c01272c15f277

git-author:

Martin Lee <martinlee84@web.de>2012-02-22 13:27:08+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-02-22 15:31:05+01:00

Message:

chg: replaced timing.h in libfac by timing.h from factory

File:

• factory/libfac/factor/timing.h (modified) (2 diffs)

factory/libfac/factor/timing.h

@@ -1 @@
-////////////////////////////////////////////////////////////
-// emacs edit mode for this file is -*- C++ -*-
-// $Id$
-////////////////////////////////////////////////////////////
-// It is possible to include this file multiple times for different 
-// settings of TIMING (but now this isn't used)
+/* emacs edit mode for this file is -*- C++ -*- */
+/* $Id$ */
+
+/* It should be possible to include this file multiple times for different */
+/* settings of TIMING */
 
 #undef TIMING_START
 #undef TIMING_END
+#undef TIMING_END_AND_PRINT
 #undef TIMING_DEFINE_PRINT
 #undef TIMING_DEFINE_PRINTPROTO
@@ -14 +14 @@
 #ifdef TIMING
 #include <time.h>
+#if ! defined(WINNT) || defined(__GNUC__)
 #include <sys/times.h>
-#ifdef HAVE_IOSTREAM
-#include <iostream>
-#define OSTREAM std::ostream
-#define ISTREAM std::istream
-#elif defined(HAVE_IOSTREAM_H)
-#include <iostream.h>
-#define OSTREAM ostream
-#define ISTREAM istream
+#include <sys/param.h>
 #endif
+#ifndef NOSTREAMIO
+#ifdef HAVE_CSTDIO
+#include <cstdio>
+#else
+#include <stdio.h>
+#endif
+#endif
+
+// need to be adjusted on your machine:
+// the number of ticks per second: HZ
+#if ! defined (HZ) && defined (CLOCKS_PER_SEC)
+#define HZ CLOCKS_PER_SEC
+#endif
+#if ! defined (HZ)  && defined (CLK_TCK)
+#define HZ CLK_TCK
+#endif
+#ifndef HZ
+#ifdef sun
+#define HZ 60.0
+#else
+#define HZ 100.0
+#endif
+#endif
+
+#if defined(WINNT) && ! defined(__GNUC__)
+
+#define TIMING_START(t) { clock_t timing_ ## t ## _start, timing_ ## t ## _end; \
+  timing_ ## t ## _start = clock();
+#define TIMING_END(t) timing_ ## t ## _end = clock(); \
+timing_ ## t ## _time += timing_ ## t ## _end - timing_ ## t ## _start; }
+#define TIMING_END_AND_PRINT(t, msg) times( &timing_ ## t ## _end ); \
+  fprintf( stderr, "%s%.2f sec\n", msg, \
+           float( timing_ ## t ## _end - timing_ ## t ## _start ) / HZ ); \
+  timing_ ## t ## _time += timing_ ## t ## _end - timing_ ## t ## _start; }
+#define TIMING_DEFINE_PRINT(t) clock_t timing_ ## t ## _time; \
+void timing_print_ ## t ( char * msg ) { \
+  fprintf( stderr, "%s%.2f sec\n", msg, float(timing_ ## t ## _time) / HZ ); \
+} \
+void timing_reset_ ## t () { \
+  timing_ ## t ## _time = 0; \
+}
+
+#else /* ! WINNT */
+
 #define TIMING_START(t) { struct tms timing_ ## t ## _start, timing_ ## t ## _end; \
   times( &timing_ ## t ## _start );
 #define TIMING_END(t) times( &timing_ ## t ## _end ); \
   timing_ ## t ## _time += timing_ ## t ## _end.tms_utime - timing_ ## t ## _start.tms_utime; }
+#define TIMING_END_AND_PRINT(t, msg) times( &timing_ ## t ## _end ); \
+  fprintf( stderr, "%s%.2f sec\n", msg, \
+           float( timing_ ## t ## _end.tms_utime - timing_ ## t ## _start.tms_utime ) / HZ ); \
+  timing_ ## t ## _time += timing_ ## t ## _end.tms_utime - timing_ ## t ## _start.tms_utime; }
 #define TIMING_DEFINE_PRINT(t) long timing_ ## t ## _time; \
-void timing_print_ ## t ( char * msg ) { CERR.setf( ios::fixed, ios::floatfield); CERR.precision(2); \
-  CERR << msg << float(timing_ ## t ## _time) / 60 << " sec" << "\n"; }
-#define TIMING_PRINT(t,msg) timing_print_ ## t ( msg );
-#define TIMING_DEFINE_PRINTPROTO(t) void timing_print_ ## t ( char * );
-#else
+void timing_print_ ## t ( char * msg ) { \
+  fprintf( stderr, "%s%.2f sec\n", msg, float(timing_ ## t ## _time) / HZ ); \
+} \
+void timing_reset_ ## t () { \
+  timing_ ## t ## _time = 0; \
+}
+#endif /* ! WINNT */
+
+/* macros common to all platforms */
+#define TIMING_DEFINE_PRINTPROTO(t) void timing_print_ ## t ( char * ); \
+  void timing_reset_ ## t ();
+#define TIMING_PRINT(t, msg) timing_print_ ## t ( msg );
+#define TIMING_RESET(t) timing_reset_ ## t ();
+
+#else /* TIMING */
 #define TIMING_START(t)
 #define TIMING_END(t)
+#define TIMING_END_AND_PRINT(t, msg)
 #define TIMING_DEFINE_PRINT(t)
-#define TIMING_PRINT(t,msg)
 #define TIMING_DEFINE_PRINTPROTO(t)
+#define TIMING_PRINT(t, msg)
+#define TIMING_RESET(t)
 #endif /* TIMING */
-