[Mplayer-cvslog] CVS: main/osdep timer-darwin.c, 1.3, 1.4 timer-lx.c, 1.7, 1.8 timer-win2.c, 1.2, 1.3 timer.h, 1.5, 1.6
Torinthiel CVS
syncmail at mplayerhq.hu
Wed Aug 4 17:48:45 CEST 2004
CVS change done by Torinthiel CVS
Update of /cvsroot/mplayer/main/osdep
In directory mail:/var2/tmp/cvs-serv8076/osdep
Modified Files:
timer-darwin.c timer-lx.c timer-win2.c timer.h
Log Message:
Native darwin timer update.
Patch by Dan Christiansen <danchr at daimi.au.dk>
Index: timer-darwin.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/timer-darwin.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- timer-darwin.c 28 Jan 2004 10:40:29 -0000 1.3
+++ timer-darwin.c 4 Aug 2004 15:48:43 -0000 1.4
@@ -1,170 +1,116 @@
/*
- * Precise timer routines using Mach kernel-space timing.
+ * Precise timer routines using Mach timing
*
- * It reports to be accurate by ~20us, unless the task is preempted.
+ * Copyright (c) 2003-2004, Dan Villiom Podlaski Christiansen
*
- * (C) 2003 Dan Christiansen
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
*
- * Released into the public domain.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
*/
#include <unistd.h>
#include <stdlib.h>
-#include <stdio.h>
-
+#include <time.h>
+#include <math.h>
+#include <sys/time.h>
#include <mach/mach_time.h>
-#include <mach/mach.h>
-#include <mach/clock.h>
#include "../config.h"
#include "../mp_msg.h"
#include "timer.h"
-/* Utility macros for mach_timespec_t - it uses nsec rather than usec */
-
-/* returns time from t1 to t2, in seconds (as float) */
-#define diff_time(t1, t2) \
- (((t2).tv_sec - (t1).tv_sec) + \
- ((t2).tv_nsec - (t1).tv_nsec) / 1e9)
-
-/* returns time from t1 to t2, in microseconds (as integer) */
-#define udiff_time(t1, t2) \
- (((t2).tv_sec - (t1).tv_sec) * 1000000 + \
- ((t2).tv_nsec - (t1).tv_nsec) / 1000)
-
-/* returns float value of t, in seconds */
-#define time_to_float(t) \
- ((t).tv_sec + (t).tv_nsec / 1e9)
-
-/* returns integer value of t, in microseconds */
-#define time_to_usec(t) \
- ((t).tv_sec * 1000000 + (t).tv_nsec / 1000)
-
-/* sets ts to the value of f, in seconds */
-#define float_to_time(f, ts) \
- do { \
- (ts).tv_sec = (unsigned int)(f); \
- (ts).tv_nsec = (int)(((f) - (ts).sec) / 1000000000.0); \
- } while (0)
-
-/* sets ts to the value of i, in microseconds */
-#define usec_to_time(i, ts) \
- do { \
- (ts).tv_sec = (i) / 1000000; \
- (ts).tv_nsec = (i) % 1000000 * 1000; \
- } while (0)
-
-#define time_uadd(i, ts) \
- do { \
- (ts).tv_sec += (i) / 1000000; \
- (ts).tv_nsec += (i) % 1000000 * 1000; \
- while ((ts).tv_nsec > 1000000000) { \
- (ts).tv_sec++; \
- (ts).tv_nsec -= 1000000000; \
- } \
- } while (0)
-
-
/* global variables */
static double relative_time, startup_time;
static double timebase_ratio;
-static mach_port_t clock_port;
+const char *timer_name = "Darwin accurate";
-/* sleep usec_delay microseconds */
-int usec_sleep(int usec_delay)
+/* the core sleep function, uses floats and is used in MPlayer G2 */
+float sleep_accurate(float time_frame)
{
-#if 0
- mach_timespec_t start_time, end_time;
+ uint64_t deadline = time_frame / timebase_ratio + mach_absolute_time();
- clock_get_time(clock_port, &start_time);
+ mach_wait_until(deadline);
- end_time = start_time;
- time_uadd(usec_delay, end_time);
-
- clock_sleep(clock_port, TIME_ABSOLUTE, end_time, NULL);
-
- clock_get_time(clock_port, &end_time);
+ return (mach_absolute_time() - deadline) * timebase_ratio;
+}
- return usec_delay - udiff_time(start_time, end_time);
-#else
- usleep(usec_delay);
-#endif
+/* wrapper for MPlayer G1 */
+int usec_sleep(int usec_delay)
+{
+ return sleep_accurate(usec_delay / 1e6) * 1e6;
}
-/* Returns current time in microseconds */
+/* current time in microseconds */
unsigned int GetTimer()
{
return (unsigned int)((mach_absolute_time() * timebase_ratio - startup_time)
* 1e6);
-}
+}
-/* Returns current time in milliseconds */
+/* current time in milliseconds */
unsigned int GetTimerMS()
{
return (unsigned int)(GetTimer() / 1000);
}
-/* Returns time spent between now and last call in seconds */
+/* time spent between now and last call in seconds */
float GetRelativeTime()
{
- double last_time;
-
- last_time = relative_time;
+ double last_time = relative_time;
+
+ if (!relative_time)
+ InitTimer();
relative_time = mach_absolute_time() * timebase_ratio;
return (float)(relative_time-last_time);
}
-/* Initialize timer, must be called at least once at start */
+/* initialize timer, must be called at least once at start */
void InitTimer()
{
struct mach_timebase_info timebase;
- /* get base for mach_absolute_time() */
mach_timebase_info(&timebase);
timebase_ratio = (double)timebase.numer / (double)timebase.denom
* (double)1e-9;
-
- /* get mach port for the clock */
- host_get_clock_service(mach_host_self(), REALTIME_CLOCK, &clock_port);
-
- /* prepare for GetRelativeTime() */
+
relative_time = startup_time =
(double)(mach_absolute_time() * timebase_ratio);
}
-
#if 0
-int main()
-{
- const long delay = 0.001*1e6;
- const unsigned short attempts = 100;
- int i,j[attempts],t[attempts],r[attempts];
- double sqtotal;
- double total;
+#include <stdio.h>
+
+int main() {
+ int i,j, r, c = 200;
+ long long t = 0;
InitTimer();
- for (i = 0; i < attempts; i++) {
- t[i] = j[i] = GetTimer();
- r[i] = usec_sleep(delay);
- j[i] = delay-(GetTimer() - j[i]);
- fflush(stdout);
+ for (i = 0; i < c; i++) {
+ const int delay = rand() / (RAND_MAX / 1e5);
+ j = GetTimer();
+#if 1
+ r = usec_sleep(delay);
+#else
+ r = sleep_accurate(delay / 1e6) * 1e6;
+#endif
+ j = (GetTimer() - j) - delay;
+ printf("sleep time:%8i %5i (%i)\n", delay, j, j - r);
+ t += j - r;
}
+ fprintf(stderr, "average error:\t%lli\n", t / c);
- for (i = 0; i < attempts; i++) {
- sqtotal += j[i]*j[i];
- total += j[i];
- printf("%2i=%0.06g \tr: %9i\tj: %9i\tr - j:%9i\n",
- i, t[i] / 1e6, r[i], j[i], r[i] - j[i]);
- }
-
- printf("attempts: %i\ttotal=%g\trms=%g\tavg=%g\n", attempts, total,
- sqrt(sqtotal/attempts),total/attempts);
-
return 0;
}
#endif
Index: timer-lx.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/timer-lx.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- timer-lx.c 24 Mar 2002 00:58:27 -0000 1.7
+++ timer-lx.c 4 Aug 2004 15:48:43 -0000 1.8
@@ -6,6 +6,13 @@
#include <sys/time.h>
#include "../config.h"
+const char *timer_name() =
+#ifdef HAVE_NANOSLEEP
+ "nanosleep()";
+#else
+ "usleep()";
+#endif
+
int usec_sleep(int usec_delay)
{
#ifdef HAVE_NANOSLEEP
@@ -18,7 +25,6 @@
#endif
}
-
// Returns current time in microseconds
unsigned int GetTimer(){
struct timeval tv;
Index: timer-win2.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/timer-win2.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- timer-win2.c 16 Nov 2003 15:11:52 -0000 1.2
+++ timer-win2.c 4 Aug 2004 15:48:43 -0000 1.3
@@ -4,6 +4,8 @@
#include <mmsystem.h>
#include "timer.h"
+const char *timer_name = "Windows native";
+
// Returns current time in microseconds
unsigned int GetTimer(){
return timeGetTime() * 1000;
Index: timer.h
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/timer.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- timer.h 25 Feb 2002 14:24:11 -0000 1.5
+++ timer.h 4 Aug 2004 15:48:43 -0000 1.6
@@ -1,6 +1,8 @@
#ifndef __TIMER_H
#define __TIMER_H
+extern const char *timer_name;
+
void InitTimer();
unsigned int GetTimer();
unsigned int GetTimerMS();
More information about the MPlayer-cvslog
mailing list