rename timing* to stat_timing* to avoid name clashes

[r17698]

diff --git a/ir/stat/stat_timing.c b/ir/stat/stat_timing.c
new file mode 100644 (file)
index 0000000..8120392
--- /dev/null
+++ b/ir/stat/stat_timing.c
@@ -0,0 +1,75 @@
+
+#include <stdio.h>
+#include "stat_timing.h"
+
+/* we can only use the scheduling stuff, if that macro is defined in unistd.h */
+#ifdef _POSIX_PRIORITY_SCHEDULING
+
+timing_sched_env_t *timing_sched_get(timing_sched_env_t *env)
+{
+       int res;
+
+#ifdef __linux__
+       res = sched_getaffinity(0, sizeof(env->affinity), &env->affinity);
+       if (res < 0)
+               return NULL;
+#endif
+
+       env->scheduler = sched_getscheduler(0);
+       if (env->scheduler < 0)
+               return NULL;
+
+       res = sched_getparam(0, &env->params);
+       if (res < 0)
+               return NULL;
+
+       return env;
+}
+
+int timing_sched_set(const timing_sched_env_t *env)
+{
+       int res;
+
+#ifdef __linux__
+       res = sched_setaffinity(0, sizeof(env->affinity), &env->affinity);
+       if (res < 0)
+               return 0;
+#endif
+
+       res = sched_setscheduler(0, env->scheduler, &env->params);
+       if (res < 0)
+               return 0;
+
+       return 1;
+}
+
+timing_sched_env_t *timing_sched_prepare_max_prio(timing_sched_env_t *env)
+{
+       int policy = SCHED_FIFO;
+#ifdef __linux__
+       CPU_ZERO(&env->affinity);
+       CPU_SET(0, &env->affinity);
+#endif
+       env->scheduler             = policy;
+       env->params.sched_priority = sched_get_priority_max(policy);
+       return env;
+}
+
+#else /* _POSIX_PRIORITY_SCHEDULING */
+
+timing_sched_env_t *timing_sched_get(timing_sched_env_t *env)
+{
+       return NULL;
+}
+
+int timing_sched_set(const timing_sched_env_t *env)
+{
+       return 0;
+}
+
+timing_sched_env_t *timing_sched_prepare_max_prio(timing_sched_env_t *env)
+{
+       return env;
+}
+
+#endif /* _POSIX_PRIORITY_SCHEDULING */

diff --git a/ir/stat/stat_timing.h b/ir/stat/stat_timing.h
new file mode 100644 (file)
index 0000000..7682618
--- /dev/null
+++ b/ir/stat/stat_timing.h
@@ -0,0 +1,130 @@
+
+#ifndef _TICKS_H
+#define _TICKS_H
+
+/*
+ * To use the Pentium RDTSC timer
+ * define TIMING_USE_RDTSC when including
+ */
+#define TIMING_USE_RDTSC
+
+#if defined(_WIN32)
+
+#ifdef TIMING_USE_RDTSC
+
+typedef unsigned __int64 timing_ticks_t;
+
+__inline timing_ticks_t __timing_ticks(void) { __asm { rdtsc } }
+
+#define timing_ticks(t)              ((t) = __timing_ticks())
+#define timing_ticks_init(t)         ((t) = 0)
+#define timing_ticks_cmp(a, b, cmp)  ((a) cmp (b))
+#define timing_ticks_sub(r, a)       ((r) = (r) - (a))
+#define timing_ticks_add(r, a)       ((r) = (r) + (a))
+#define timing_ticks_ulong(t)        ((unsigned long) (t))
+#define timing_ticks_dbl(t)          ((double) (t))
+
+#else
+#error NOT IMPLEMENTED YET
+#endif /* TIMING_USE_RDTSC */
+
+typedef struct {
+       int dummy;
+} timing_sched_env_t;
+
+#else /* POSIX/Linux stuff */
+
+#include <unistd.h>
+#include <time.h>
+#include <sys/time.h>
+
+/* define GNU macro for processor affinity stuff if on linux */
+#if defined __linux__ && !defined __USE_GNU
+#define __USE_GNU
+#endif
+#include <sched.h>
+
+typedef struct {
+#ifdef _POSIX_PRIORITY_SCHEDULING
+       struct sched_param params;
+#endif
+       int scheduler;
+#ifdef __linux__
+       cpu_set_t affinity;
+#endif
+} timing_sched_env_t;
+
+/* only use rdtsc on GNU C with x86 */
+#if defined TIMING_USE_RDTSC && defined __GNUC__ && defined __i386__
+
+typedef unsigned long long timing_ticks_t;
+#define timing_ticks(t)              __asm__ __volatile__ ("rdtsc" : "=A" (t))
+#define timing_ticks_init(t)         ((t) = 0)
+#define timing_ticks_cmp(a, b, cmp)  ((a) cmp (b))
+#define timing_ticks_sub(r, a)       ((r) = (r) - (a))
+#define timing_ticks_add(r, a)       ((r) = (r) + (a))
+#define timing_ticks_ulong(t)        ((unsigned long) (t))
+#define timing_ticks_dbl(t)          ((double) (t))
+
+#else
+
+typedef struct timeval timing_ticks_t;
+#define timing_ticks(t)              (gettimeofday(&(t), NULL))
+#define timing_ticks_init(t)         ((t).tv_sec = 0, (t).tv_usec = 0)
+
+/*
+ * This shamelessly stolen and modified from glibc's
+ * /usr/include/sys/time.h
+ */
+#define timing_ticks_cmp(a, b, CMP)   \
+  (((a).tv_sec == (b).tv_sec) ?          \
+   ((a).tv_usec CMP (b).tv_usec) :    \
+   ((a).tv_sec CMP (b).tv_sec))
+
+#define timing_ticks_add(r, a)                       \
+       do {                                                                     \
+               (r).tv_sec = (r).tv_sec + (a).tv_sec;        \
+               (r).tv_usec = (r).tv_usec + (a).tv_usec;     \
+               if ((r).tv_usec >= 1000000) {                        \
+                       ++(r).tv_sec;                            \
+                       (r).tv_usec -= 1000000;                  \
+               }                                                                                \
+       } while (0)
+
+#define timing_ticks_sub(r, a)                        \
+       do {                                                                              \
+               (r).tv_sec = (r).tv_sec - (a).tv_sec;         \
+               (r).tv_usec = (r).tv_usec - (a).tv_usec;      \
+               if ((r).tv_usec < 0) {                                        \
+                       --(r).tv_sec;                                                 \
+                       (r).tv_usec += 1000000;                                   \
+               }                                                                                 \
+       } while (0)
+
+#define timing_ticks_ulong(t)        ((unsigned long) ((t).tv_usec + 1000000 * (t).tv_sec))
+#define timing_ticks_dbl(t)          (((t).tv_usec + 1000000.0 * (t).tv_sec))
+
+#endif /* TIMING_USE_RDTSC ... */
+
+#endif /* _WIN32 */
+
+/**
+ * Set the current schedule parameters.
+ * @return 1, if succeeded, 0 if not (see errno, for details).
+ */
+int timing_sched_set(const timing_sched_env_t *env);
+
+/**
+ * Get the schedule parameters.
+ * @return 1, if succeeded, 0 if not (see errno, for details).
+ */
+timing_sched_env_t *timing_sched_get(timing_sched_env_t *env);
+
+/**
+ * Prepare schedule parameters which limit the process on one CPU
+ * and set the maximum task priority.
+ * @return The paramter @p env.
+ */
+timing_sched_env_t *timing_sched_prepare_max_prio(timing_sched_env_t *env);
+
+#endif /* _TICKS_H */

diff --git a/ir/stat/statev.c b/ir/stat/statev.c
index b7c8832..8ca9a0f 100644 (file)
--- a/ir/stat/statev.c
+++ b/ir/stat/statev.c
@@ -35,7 +35,7 @@
 #include <stdarg.h>
 
 #include "util.h"
-#include "timing.h"
+#include "stat_timing.h"
 #include "irprintf.h"
 #include "statev.h"
 

diff --git a/ir/stat/statev.h b/ir/stat/statev.h
index 1545b45..3f32e71 100644 (file)
--- a/ir/stat/statev.h
+++ b/ir/stat/statev.h
@@ -52,7 +52,7 @@
 #else
 
 #include <stdio.h>
-#include "timing.h"
+#include "stat_timing.h"
 
 extern void               stat_ev_printf(char ev_type, const char *key, const char *fmt, ...);
 

diff --git a/ir/stat/timing.c b/ir/stat/timing.c
deleted file mode 100644 (file)
index 56c732d..0000000
--- a/ir/stat/timing.c
+++ /dev/null
@@ -1,75 +0,0 @@
-
-#include <stdio.h>
-#include "timing.h"
-
-/* we can only use the scheduling stuff, if that macro is defined in unistd.h */
-#ifdef _POSIX_PRIORITY_SCHEDULING
-
-timing_sched_env_t *timing_sched_get(timing_sched_env_t *env)
-{
-       int res;
-
-#ifdef __linux__
-       res = sched_getaffinity(0, sizeof(env->affinity), &env->affinity);
-       if (res < 0)
-               return NULL;
-#endif
-
-       env->scheduler = sched_getscheduler(0);
-       if (env->scheduler < 0)
-               return NULL;
-
-       res = sched_getparam(0, &env->params);
-       if (res < 0)
-               return NULL;
-
-       return env;
-}
-
-int timing_sched_set(const timing_sched_env_t *env)
-{
-       int res;
-
-#ifdef __linux__
-       res = sched_setaffinity(0, sizeof(env->affinity), &env->affinity);
-       if (res < 0)
-               return 0;
-#endif
-
-       res = sched_setscheduler(0, env->scheduler, &env->params);
-       if (res < 0)
-               return 0;
-
-       return 1;
-}
-
-timing_sched_env_t *timing_sched_prepare_max_prio(timing_sched_env_t *env)
-{
-       int policy = SCHED_FIFO;
-#ifdef __linux__
-       CPU_ZERO(&env->affinity);
-       CPU_SET(0, &env->affinity);
-#endif
-       env->scheduler             = policy;
-       env->params.sched_priority = sched_get_priority_max(policy);
-       return env;
-}
-
-#else /* _POSIX_PRIORITY_SCHEDULING */
-
-timing_sched_env_t *timing_sched_get(timing_sched_env_t *env)
-{
-       return NULL;
-}
-
-int timing_sched_set(const timing_sched_env_t *env)
-{
-       return 0;
-}
-
-timing_sched_env_t *timing_sched_prepare_max_prio(timing_sched_env_t *env)
-{
-       return env;
-}
-
-#endif /* _POSIX_PRIORITY_SCHEDULING */

diff --git a/ir/stat/timing.h b/ir/stat/timing.h
deleted file mode 100644 (file)
index 7682618..0000000
--- a/ir/stat/timing.h
+++ /dev/null
@@ -1,130 +0,0 @@
-
-#ifndef _TICKS_H
-#define _TICKS_H
-
-/*
- * To use the Pentium RDTSC timer
- * define TIMING_USE_RDTSC when including
- */
-#define TIMING_USE_RDTSC
-
-#if defined(_WIN32)
-
-#ifdef TIMING_USE_RDTSC
-
-typedef unsigned __int64 timing_ticks_t;
-
-__inline timing_ticks_t __timing_ticks(void) { __asm { rdtsc } }
-
-#define timing_ticks(t)              ((t) = __timing_ticks())
-#define timing_ticks_init(t)         ((t) = 0)
-#define timing_ticks_cmp(a, b, cmp)  ((a) cmp (b))
-#define timing_ticks_sub(r, a)       ((r) = (r) - (a))
-#define timing_ticks_add(r, a)       ((r) = (r) + (a))
-#define timing_ticks_ulong(t)        ((unsigned long) (t))
-#define timing_ticks_dbl(t)          ((double) (t))
-
-#else
-#error NOT IMPLEMENTED YET
-#endif /* TIMING_USE_RDTSC */
-
-typedef struct {
-       int dummy;
-} timing_sched_env_t;
-
-#else /* POSIX/Linux stuff */
-
-#include <unistd.h>
-#include <time.h>
-#include <sys/time.h>
-
-/* define GNU macro for processor affinity stuff if on linux */
-#if defined __linux__ && !defined __USE_GNU
-#define __USE_GNU
-#endif
-#include <sched.h>
-
-typedef struct {
-#ifdef _POSIX_PRIORITY_SCHEDULING
-       struct sched_param params;
-#endif
-       int scheduler;
-#ifdef __linux__
-       cpu_set_t affinity;
-#endif
-} timing_sched_env_t;
-
-/* only use rdtsc on GNU C with x86 */
-#if defined TIMING_USE_RDTSC && defined __GNUC__ && defined __i386__
-
-typedef unsigned long long timing_ticks_t;
-#define timing_ticks(t)              __asm__ __volatile__ ("rdtsc" : "=A" (t))
-#define timing_ticks_init(t)         ((t) = 0)
-#define timing_ticks_cmp(a, b, cmp)  ((a) cmp (b))
-#define timing_ticks_sub(r, a)       ((r) = (r) - (a))
-#define timing_ticks_add(r, a)       ((r) = (r) + (a))
-#define timing_ticks_ulong(t)        ((unsigned long) (t))
-#define timing_ticks_dbl(t)          ((double) (t))
-
-#else
-
-typedef struct timeval timing_ticks_t;
-#define timing_ticks(t)              (gettimeofday(&(t), NULL))
-#define timing_ticks_init(t)         ((t).tv_sec = 0, (t).tv_usec = 0)
-
-/*
- * This shamelessly stolen and modified from glibc's
- * /usr/include/sys/time.h
- */
-#define timing_ticks_cmp(a, b, CMP)   \
-  (((a).tv_sec == (b).tv_sec) ?          \
-   ((a).tv_usec CMP (b).tv_usec) :    \
-   ((a).tv_sec CMP (b).tv_sec))
-
-#define timing_ticks_add(r, a)                       \
-       do {                                                                     \
-               (r).tv_sec = (r).tv_sec + (a).tv_sec;        \
-               (r).tv_usec = (r).tv_usec + (a).tv_usec;     \
-               if ((r).tv_usec >= 1000000) {                        \
-                       ++(r).tv_sec;                            \
-                       (r).tv_usec -= 1000000;                  \
-               }                                                                                \
-       } while (0)
-
-#define timing_ticks_sub(r, a)                        \
-       do {                                                                              \
-               (r).tv_sec = (r).tv_sec - (a).tv_sec;         \
-               (r).tv_usec = (r).tv_usec - (a).tv_usec;      \
-               if ((r).tv_usec < 0) {                                        \
-                       --(r).tv_sec;                                                 \
-                       (r).tv_usec += 1000000;                                   \
-               }                                                                                 \
-       } while (0)
-
-#define timing_ticks_ulong(t)        ((unsigned long) ((t).tv_usec + 1000000 * (t).tv_sec))
-#define timing_ticks_dbl(t)          (((t).tv_usec + 1000000.0 * (t).tv_sec))
-
-#endif /* TIMING_USE_RDTSC ... */
-
-#endif /* _WIN32 */
-
-/**
- * Set the current schedule parameters.
- * @return 1, if succeeded, 0 if not (see errno, for details).
- */
-int timing_sched_set(const timing_sched_env_t *env);
-
-/**
- * Get the schedule parameters.
- * @return 1, if succeeded, 0 if not (see errno, for details).
- */
-timing_sched_env_t *timing_sched_get(timing_sched_env_t *env);
-
-/**
- * Prepare schedule parameters which limit the process on one CPU
- * and set the maximum task priority.
- * @return The paramter @p env.
- */
-timing_sched_env_t *timing_sched_prepare_max_prio(timing_sched_env_t *env);
-
-#endif /* _TICKS_H */