[cairo-commit] 2 commits - perf/cairo-perf-os2.c perf/Makefile.am util/Makefile.am

[Behdad Esfahbod]

 perf/Makefile.am      |    4 ++
 perf/cairo-perf-os2.c |   95 ++++++++++++++++++++++++++++++++++++++++++++++++++
 util/Makefile.am      |    2 -
 3 files changed, 100 insertions(+), 1 deletion(-)

New commits:
diff-tree 406fc63b68203e86c9236d06448e2ffa2c259669 (from 5bc1f3365d0002f2864bc30638df85c392a495f5)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Apr 22 07:11:47 2007 -0400

    [util] Change make target from "tools" to "util"
    to match targets like "test", "perf", and "doc", that match
    their directory names.

diff --git a/util/Makefile.am b/util/Makefile.am
index b37c2eb..1c0cff9 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,5 +1,5 @@
 
-tools: malloc-stats.so
+util: malloc-stats.so
 
 %.so: %.la
 	$(RM) $@
diff-tree 5bc1f3365d0002f2864bc30638df85c392a495f5 (from 3b46e105bd781d7a4081068a14668334a7c82986)
Author: Peter Weilbacher <pmw at avila.aip.de>
Date:   Sun Apr 22 07:11:00 2007 -0400

    [perf] Add OS/2 implementation for timer routines

diff --git a/perf/Makefile.am b/perf/Makefile.am
index 86bdd26..1f8e6fc 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -40,8 +40,12 @@ cairo_perf_SOURCES =		\
 if CAIRO_HAS_WIN32_SURFACE
 cairo_perf_SOURCES += cairo-perf-win32.c
 else
+if CAIRO_HAS_OS2_SURFACE
+cairo_perf_SOURCES += cairo-perf-os2.c
+else
 cairo_perf_SOURCES += cairo-perf-posix.c
 endif
+endif
 
 cairo_perf_diff_files_SOURCES =	\
 	cairo-perf-diff-files.c \
diff --git a/perf/cairo-perf-os2.c b/perf/cairo-perf-os2.c
new file mode 100644
index 0000000..4cb6447
--- /dev/null
+++ b/perf/cairo-perf-os2.c
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2007 Netlabs
+ * Copyright (c) 2006 Mozilla Corporation
+ * Copyright (c) 2006 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * the authors not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. The authors make no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Peter Weilbacher <mozilla at weilbacher.org>
+ *          Vladimir Vukicevic <vladimir at pobox.com> (win32/linux code)
+ *          Carl Worth <cworth at cworth.org> (win32/linux code)
+ */
+
+#define INCL_BASE
+#include <os2.h>
+
+#include "cairo-perf.h"
+
+/* timers */
+typedef struct _cairo_perf_timer
+{
+    /* make them double so that they can store the full QWORD precision */
+    double start;
+    double stop;
+} cairo_perf_timer_t;
+
+static cairo_perf_timer_t timer;
+
+static cairo_perf_timer_synchronize_t cairo_perf_timer_synchronize = NULL;
+static void *cairo_perf_timer_synchronize_closure = NULL;
+void
+cairo_perf_timer_set_synchronize (cairo_perf_timer_synchronize_t  synchronize,
+                                  void                           *closure)
+{
+    cairo_perf_timer_synchronize = synchronize;
+    cairo_perf_timer_synchronize_closure = closure;
+}
+
+void
+cairo_perf_timer_start (void) {
+    QWORD time;
+
+    if (cairo_perf_timer_synchronize)
+        cairo_perf_timer_synchronize (cairo_perf_timer_synchronize_closure);
+    DosTmrQueryTime(&time);
+    timer.start = (time.ulHi*4294967296.0 + time.ulLo);
+}
+
+void
+cairo_perf_timer_stop (void) {
+    QWORD time;
+
+    if (cairo_perf_timer_synchronize)
+        cairo_perf_timer_synchronize (cairo_perf_timer_synchronize_closure);
+    DosTmrQueryTime(&time);
+    timer.stop = (time.ulHi*4294967296.0 + time.ulLo);
+}
+
+cairo_perf_ticks_t
+cairo_perf_timer_elapsed (void) {
+    ULONG freq;
+
+    DosTmrQueryFreq(&freq);
+    /* return time difference in milliseconds */
+    return (timer.stop - timer.start) / freq * 1000;
+}
+
+cairo_perf_ticks_t
+cairo_perf_ticks_per_second (void) {
+    return 1000; /* in ms */
+}
+
+
+/* yield */
+void
+cairo_perf_yield (void) {
+    /* try to deactivate this thread until the scheduler calls it again */
+    DosSleep (0);
+}