Changeset d914239 in git for factory/libfac/factor

Timestamp:

Oct 24, 2012, 12:43:48 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

1130ffcea9f0651b2cb15d5f7ea1758fc8cf75aa

Parents:

7c118d6112dba9ada1b535c2016e8ba196a7ed0e

Message:

chg: timing.h in libfac and factory now coincide

File:

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

factory/libfac/factor/timing.h

@@ -43 +43 @@
 #if defined(WINNT) && ! defined(__GNUC__)
 
-#define TIMING_START(t) { clock_t timing_ ## t ## _start, timing_ ## t ## _end; \
-  timing_ ## t ## _start = clock();
+#define TIMING_START(t) timing_ ## t ## _start = clock();
 #define TIMING_END(t) timing_ ## t ## _end = clock(); \
-timing_ ## t ## _time += timing_ ## t ## _end - timing_ ## t ## _start; }
+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 ) { \
+  timing_ ## t ## _time += timing_ ## t ## _end - timing_ ## t ## _start;
+#define TIMING_DEFINE_PRINT(t) static clock_t timing_ ## t ## _start, timing_ ## t ## _end; \
+static clock_t timing_ ## t ## _time; \
+static void timing_print_ ## t ( char * msg ) { \
   fprintf( stderr, "%s%.2f sec\n", msg, float(timing_ ## t ## _time) / HZ ); \
 } \
-void timing_reset_ ## t () { \
+static void timing_reset_ ## t () { \
   timing_ ## t ## _time = 0; \
 }
@@ -61 +61 @@
 #else /* ! WINNT */
 
-#define TIMING_START(t) { struct tms timing_ ## t ## _start, timing_ ## t ## _end; \
-  times( &timing_ ## t ## _start );
+#define TIMING_START(t) 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; }
+  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 ) { \
+  timing_ ## t ## _time += timing_ ## t ## _end.tms_utime - timing_ ## t ## _start.tms_utime;
+#define TIMING_DEFINE_PRINT(t) static struct tms timing_ ## t ## _start, timing_ ## t ## _end; \
+static long timing_ ## t ## _time; \
+static void timing_print_ ## t ( char * msg ) { \
   fprintf( stderr, "%s%.2f sec\n", msg, float(timing_ ## t ## _time) / HZ ); \
 } \
-void timing_reset_ ## t () { \
+static void timing_reset_ ## t () { \
   timing_ ## t ## _time = 0; \
 }