From 8151c72307e8cb369fbb524de56f87f805efff2b Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 25 Jan 2010 12:14:39 +0000 Subject: [PATCH] xcb: compile errors with lockdep After moving the mutex to the superclass, I forgot to update the references from the lockdep asserts. --- src/cairo-xcb-connection.c | 6 +++--- src/cairo-xcb-screen.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/cairo-xcb-connection.c b/src/cairo-xcb-connection.c index 6721e9230..e2293a6f5 100644 --- a/src/cairo-xcb-connection.c +++ b/src/cairo-xcb-connection.c @@ -706,7 +706,7 @@ _cairo_xcb_connection_put_xid (cairo_xcb_connection_t *connection, { cairo_xcb_xid_t *cache; - assert (CAIRO_MUTEX_IS_LOCKED (connection->mutex)); + assert (CAIRO_MUTEX_IS_LOCKED (connection->device.mutex)); cache = _cairo_freepool_alloc (&connection->xid_pool); if (likely (cache != NULL)) { cache->xid = xid; @@ -719,7 +719,7 @@ _cairo_xcb_connection_get_xid (cairo_xcb_connection_t *connection) { uint32_t xid; - assert (CAIRO_MUTEX_IS_LOCKED (connection->mutex)); + assert (CAIRO_MUTEX_IS_LOCKED (connection->device.mutex)); if (! cairo_list_is_empty (&connection->free_xids)) { cairo_xcb_xid_t *cache; @@ -750,7 +750,7 @@ _cairo_xcb_return_socket (void *closure) cairo_status_t _cairo_xcb_connection_take_socket (cairo_xcb_connection_t *connection) { - assert (CAIRO_MUTEX_IS_LOCKED (connection->mutex)); + assert (CAIRO_MUTEX_IS_LOCKED (connection->device.mutex)); if (unlikely (connection->device.status)) return connection->device.status; diff --git a/src/cairo-xcb-screen.c b/src/cairo-xcb-screen.c index 06c07a55c..c0235e316 100644 --- a/src/cairo-xcb-screen.c +++ b/src/cairo-xcb-screen.c @@ -323,7 +323,7 @@ _cairo_xcb_screen_get_gc (cairo_xcb_screen_t *screen, { int i; - assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->mutex)); + assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->device.mutex)); for (i = 0; i < ARRAY_LENGTH (screen->gc); i++) { if (((screen->gc_depths >> (8*i)) & 0xff) == depth) { @@ -340,7 +340,7 @@ _cairo_xcb_screen_put_gc (cairo_xcb_screen_t *screen, int depth, xcb_gcontext_t { int i; - assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->mutex)); + assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->device.mutex)); for (i = 0; i < ARRAY_LENGTH (screen->gc); i++) { if (((screen->gc_depths >> (8*i)) & 0xff) == 0) @@ -366,7 +366,7 @@ _cairo_xcb_screen_store_surface_picture (cairo_xcb_screen_t *screen, struct pattern_cache_entry *entry; cairo_status_t status; - assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->mutex)); + assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->device.mutex)); entry = _cairo_freelist_alloc (&screen->pattern_cache_entry_freelist); if (unlikely (entry == NULL)) @@ -395,7 +395,7 @@ _cairo_xcb_screen_remove_surface_picture (cairo_xcb_screen_t *screen, struct pattern_cache_entry tmpl; struct pattern_cache_entry *entry; - assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->mutex)); + assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->device.mutex)); tmpl.key.hash = picture->unique_id; @@ -412,7 +412,7 @@ _cairo_xcb_screen_store_linear_picture (cairo_xcb_screen_t *screen, struct pattern_cache_entry *entry; cairo_status_t status; - assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->mutex)); + assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->device.mutex)); entry = _cairo_freelist_alloc (&screen->pattern_cache_entry_freelist); if (unlikely (entry == NULL)) @@ -449,7 +449,7 @@ _cairo_xcb_screen_lookup_linear_picture (cairo_xcb_screen_t *screen, struct pattern_cache_entry tmpl; struct pattern_cache_entry *entry; - assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->mutex)); + assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->device.mutex)); tmpl.key.hash = _cairo_linear_pattern_hash (_CAIRO_HASH_INIT_VALUE, linear); _cairo_pattern_init_static_copy (&tmpl.pattern.base, &linear->base.base); @@ -469,7 +469,7 @@ _cairo_xcb_screen_store_radial_picture (cairo_xcb_screen_t *screen, struct pattern_cache_entry *entry; cairo_status_t status; - assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->mutex)); + assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->device.mutex)); entry = _cairo_freelist_alloc (&screen->pattern_cache_entry_freelist); if (unlikely (entry == NULL)) @@ -505,7 +505,7 @@ _cairo_xcb_screen_lookup_radial_picture (cairo_xcb_screen_t *screen, struct pattern_cache_entry tmpl; struct pattern_cache_entry *entry; - assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->mutex)); + assert (CAIRO_MUTEX_IS_LOCKED (screen->connection->device.mutex)); tmpl.key.hash = _cairo_radial_pattern_hash (_CAIRO_HASH_INIT_VALUE, radial); _cairo_pattern_init_static_copy (&tmpl.pattern.base, &radial->base.base);