fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2025-12-31 13:40:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

xcb: compile errors with lockdep

Browse source 
After moving the mutex to the superclass, I forgot to update the
references from the lockdep asserts.
This commit is contained in:
Chris Wilson 2010-01-25 12:14:39 +00:00
parent be81d656c5
commit 8151c72307
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/cairo-xcb-connection.c
View file

@ -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;

16
src/cairo-xcb-screen.c
View file

@ -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);