X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fstat%2Fstat_timing.h;h=517f20167be7968008198bd1d6d34e449a8ad3c2;hb=6a4b9102668449bea6e3c0905df74f7ffff2768b;hp=76826188e94ba9a36d70d136b9fa608db2167a43;hpb=e736ec171f5a02484ec01a2cebc93cf5b84aeec4;p=libfirm

diff --git a/ir/stat/stat_timing.h b/ir/stat/stat_timing.h
index 76826188e..517f20167 100644
--- a/ir/stat/stat_timing.h
+++ b/ir/stat/stat_timing.h
@@ -1,20 +1,43 @@
-
-#ifndef _TICKS_H
-#define _TICKS_H
-
 /*
- * To use the Pentium RDTSC timer
- * define TIMING_USE_RDTSC when including
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
  */
-#define TIMING_USE_RDTSC
 
-#if defined(_WIN32)
+/**
+ * @file
+ * @brief   OS abstraction from time measurement
+ * @author  Sebastian Hack, Michael Beck, Matthias Braun
+ * @version $Id$
+ */
+#ifndef FIRM_STAT_TIMING_H
+#define FIRM_STAT_TIMING_H
 
-#ifdef TIMING_USE_RDTSC
+#if defined(__i386__) || defined(_M_IX86)
 
+#if defined(__GNUC__)
+typedef unsigned long long timing_ticks_t;
+static inline timing_ticks_t __timing_ticks(void) { timing_ticks_t result; __asm__ __volatile__ ("rdtsc" : "=A" (result)); return result; }
+#elif defined(_MSC_VER)
+/* win32 implementation using rdtsc */
 typedef unsigned __int64 timing_ticks_t;
-
-__inline timing_ticks_t __timing_ticks(void) { __asm { rdtsc } }
+static __inline timing_ticks_t __timing_ticks(void) { __asm { rdtsc } }
+#else
+#error need a 64bit int type
+#endif
 
 #define timing_ticks(t)              ((t) = __timing_ticks())
 #define timing_ticks_init(t)         ((t) = 0)
@@ -24,53 +47,13 @@ __inline timing_ticks_t __timing_ticks(void) { __asm { rdtsc } }
 #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 /* !__i386__ */
 
-#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)
+#define timing_ticks_init(t)         memset(&(t), 0, sizeof(t))
 
 /*
  * This shamelessly stolen and modified from glibc's
@@ -104,27 +87,9 @@ typedef struct timeval timing_ticks_t;
 #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);
+#endif
 
-/**
- * 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);
+void timing_enter_max_prio(void);
+void timing_leave_max_prio(void);
 
-#endif /* _TICKS_H */
+#endif