Changeset 6f5db8 in git for factory

Timestamp:

Mar 17, 1998, 2:26:12 PM (26 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')

Children:

bb17e813fdec9082fa78763093e18795ea0fdbb4

Parents:

1e9da80e5772d69c637a702b3937bddd689925a4

Message:

**** merge from branch `factory-gcd' to main trunk


git-svn-id: file:///usr/local/Singular/svn/trunk@1242 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• factory/timing.h (modified) (4 diffs)

factory/timing.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: timing.h,v 1.4 1997-12-08 18:24:47 schmidt Exp $ */
+/* $Id: timing.h,v 1.5 1998-03-17 13:26:12 schmidt Exp $ */
 
 /* It should be possible to include this file multiple times for different */
@@ -37 +37 @@
 
 #ifdef WINNT
+
 #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; \
 }
-#define TIMING_DEFINE_PRINTPROTO(t) void timing_print_ ## t ( char * );
-#define TIMING_PRINT(t, msg) timing_print_ ## t ( msg );
-#else
+
+#else /* ! WINNT */
+
 #define TIMING_START(t) { struct tms timing_ ## t ## _start, timing_ ## t ## _end; \
   times( &timing_ ## t ## _start );
@@ -59 +67 @@
 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; \
 }
-#define TIMING_DEFINE_PRINTPROTO(t) void timing_print_ ## t ( char * );
+#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 );
-#endif
+#define TIMING_RESET(t) timing_reset_ ## t ();
+
 #else /* TIMING */
 #define TIMING_START(t)
@@ -70 +86 @@
 #define TIMING_DEFINE_PRINTPROTO(t)
 #define TIMING_PRINT(t, msg)
+#define TIMING_RESET(t)
 #endif /* TIMING */