From d7c2f7e2d74c7e383f6933b974066221bcc5faa5 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Thu, 5 Oct 2006 15:14:14 -0700 Subject: [PATCH] perf: Rename finalize to synchronize as it is used in both start() and stop() now --- perf/cairo-perf-posix.c | 20 ++++++++++---------- perf/cairo-perf-win32.c | 20 ++++++++++---------- perf/cairo-perf.c | 4 ++-- perf/cairo-perf.h | 6 +++--- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/perf/cairo-perf-posix.c b/perf/cairo-perf-posix.c index 9a30c3257..68637ef48 100644 --- a/perf/cairo-perf-posix.c +++ b/perf/cairo-perf-posix.c @@ -121,20 +121,20 @@ typedef struct _cairo_perf_timer static cairo_perf_timer_t timer; -static cairo_perf_timer_finalize_t cairo_perf_timer_finalize = NULL; -static void *cairo_perf_timer_finalize_closure = NULL; +static cairo_perf_timer_synchronize_t cairo_perf_timer_synchronize = NULL; +static void *cairo_perf_timer_synchronize_closure = NULL; void -cairo_perf_timer_set_finalize (cairo_perf_timer_finalize_t finalize, - void *closure) +cairo_perf_timer_set_synchronize (cairo_perf_timer_synchronize_t synchronize, + void *closure) { - cairo_perf_timer_finalize = finalize; - cairo_perf_timer_finalize_closure = closure; + cairo_perf_timer_synchronize = synchronize; + cairo_perf_timer_synchronize_closure = closure; } void cairo_perf_timer_start (void) { - if (cairo_perf_timer_finalize) - cairo_perf_timer_finalize (cairo_perf_timer_finalize_closure); + if (cairo_perf_timer_synchronize) + cairo_perf_timer_synchronize (cairo_perf_timer_synchronize_closure); #ifdef OIL_STAMP timer.start = OIL_STAMP (); #else @@ -144,8 +144,8 @@ cairo_perf_timer_start (void) { void cairo_perf_timer_stop (void) { - if (cairo_perf_timer_finalize) - cairo_perf_timer_finalize (cairo_perf_timer_finalize_closure); + if (cairo_perf_timer_synchronize) + cairo_perf_timer_synchronize (cairo_perf_timer_synchronize_closure); #ifdef OIL_STAMP timer.stop = OIL_STAMP (); #else diff --git a/perf/cairo-perf-win32.c b/perf/cairo-perf-win32.c index a50f73417..c63ca7568 100644 --- a/perf/cairo-perf-win32.c +++ b/perf/cairo-perf-win32.c @@ -42,27 +42,27 @@ typedef struct _cairo_perf_timer static cairo_perf_timer_t timer; -static cairo_perf_timer_finalize_t cairo_perf_timer_finalize = NULL; -static void *cairo_perf_timer_finalize_closure = NULL; +static cairo_perf_timer_synchronize_t cairo_perf_timer_synchronize = NULL; +static void *cairo_perf_timer_synchronize_closure = NULL; void -cairo_perf_timer_set_finalize (cairo_perf_timer_finalize_t finalize, - void *closure) +cairo_perf_timer_set_synchronize (cairo_perf_timer_synchronize_t synchronize, + void *closure) { - cairo_perf_timer_finalize = finalize; - cairo_perf_timer_finalize_closure = closure; + cairo_perf_timer_synchronize = synchronize; + cairo_perf_timer_synchronize_closure = closure; } void cairo_perf_timer_start (void) { - if (cairo_perf_timer_finalize) - cairo_perf_timer_finalize (cairo_perf_timer_finalize_closure); + if (cairo_perf_timer_synchronize) + cairo_perf_timer_synchronize (cairo_perf_timer_synchronize_closure); QueryPerformanceCounter(&timer.start); } void cairo_perf_timer_stop (void) { - if (cairo_perf_timer_finalize) - cairo_perf_timer_finalize (cairo_perf_timer_finalize_closure); + if (cairo_perf_timer_synchronize) + cairo_perf_timer_synchronize (cairo_perf_timer_synchronize_closure); QueryPerformanceCounter(&timer.stop); } diff --git a/perf/cairo-perf.c b/perf/cairo-perf.c index 5b9486998..0b856a8c5 100644 --- a/perf/cairo-perf.c +++ b/perf/cairo-perf.c @@ -210,8 +210,8 @@ main (int argc, char *argv[]) perf.size, perf.size, CAIRO_BOILERPLATE_MODE_PERF, &target->closure); - cairo_perf_timer_set_finalize (target->wait_for_rendering, - target->closure); + cairo_perf_timer_set_synchronize (target->wait_for_rendering, + target->closure); perf.cr = cairo_create (surface); diff --git a/perf/cairo-perf.h b/perf/cairo-perf.h index cf3d33d96..560ba64af 100644 --- a/perf/cairo-perf.h +++ b/perf/cairo-perf.h @@ -39,11 +39,11 @@ void cairo_perf_timer_stop (void); typedef void -(*cairo_perf_timer_finalize_t) (void *closure); +(*cairo_perf_timer_synchronize_t) (void *closure); void -cairo_perf_timer_set_finalize (cairo_perf_timer_finalize_t finalize, - void *closure); +cairo_perf_timer_set_synchronize (cairo_perf_timer_synchronize_t synchronize, + void *closure); typedef uint64_t cairo_perf_ticks_t;