frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace my old generic map ADT with a growable array for the extension cache.

This commit is contained in:
Jamey Sharp 2006-02-26 01:27:01 -08:00
parent 46a7549981
commit a1eff0c49a
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/xcb_ext.c
View File

@ -32,14 +32,29 @@
#include "xcbext.h" #include "xcbext.h"
#include "xcbint.h" #include "xcbint.h"
typedef struct { typedef struct lazyreply {
enum { LAZY_COOKIE, LAZY_FORCED } tag; enum { LAZY_NONE = 0, LAZY_COOKIE, LAZY_FORCED } tag;
union { union {
XCBQueryExtensionCookie cookie; XCBQueryExtensionCookie cookie;
XCBQueryExtensionRep *reply; XCBQueryExtensionRep *reply;
} value; } value;
} lazyreply; } lazyreply;
static lazyreply *get_index(XCBConnection *c, int index)
{
if(index > c->ext.extensions_size)
{
int new_size = index << 1;
lazyreply *new_extensions = realloc(c->ext.extensions, sizeof(lazyreply) * new_size);
if(!new_extensions)
return 0;
memset(new_extensions + c->ext.extensions_size, 0, sizeof(lazyreply) * (new_size - c->ext.extensions_size));
c->ext.extensions = new_extensions;
c->ext.extensions_size = new_size;
}
return c->ext.extensions + index - 1;
}
static lazyreply *get_lazyreply(XCBConnection *c, XCBExtension *ext) static lazyreply *get_lazyreply(XCBConnection *c, XCBExtension *ext)
{ {
static pthread_mutex_t global_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t global_lock = PTHREAD_MUTEX_INITIALIZER;
@ -52,28 +67,16 @@ static lazyreply *get_lazyreply(XCBConnection *c, XCBExtension *ext)
ext->global_id = ++next_global_id; ext->global_id = ++next_global_id;
pthread_mutex_unlock(&global_lock); pthread_mutex_unlock(&global_lock);
data = _xcb_map_get(c->ext.extensions, ext->global_id); data = get_index(c, ext->global_id);
if(!data) if(data && data->tag == LAZY_NONE)
{ {
/* cache miss: query the server */ /* cache miss: query the server */
data = malloc(sizeof(lazyreply));
if(!data)
return 0;
data->tag = LAZY_COOKIE; data->tag = LAZY_COOKIE;
data->value.cookie = XCBQueryExtension(c, strlen(ext->name), ext->name); data->value.cookie = XCBQueryExtension(c, strlen(ext->name), ext->name);
_xcb_map_put(c->ext.extensions, ext->global_id, data);
} }
return data; return data;
} }
static void free_lazyreply(void *p)
{
lazyreply *data = p;
if(data->tag == LAZY_FORCED)
free(data->value.reply);
free(data);
}
/* Public interface */ /* Public interface */
/* Do not free the returned XCBQueryExtensionRep - on return, it's aliased /* Do not free the returned XCBQueryExtensionRep - on return, it's aliased
@ -107,16 +110,14 @@ int _xcb_ext_init(XCBConnection *c)
{ {
if(pthread_mutex_init(&c->ext.lock, 0)) if(pthread_mutex_init(&c->ext.lock, 0))
return 0; return 0;
c->ext.extensions = _xcb_map_new();
if(!c->ext.extensions)
return 0;
return 1; return 1;
} }
void _xcb_ext_destroy(XCBConnection *c) void _xcb_ext_destroy(XCBConnection *c)
{ {
pthread_mutex_destroy(&c->ext.lock); pthread_mutex_destroy(&c->ext.lock);
_xcb_map_delete(c->ext.extensions, free_lazyreply); while(c->ext.extensions_size-- > 0)
if(c->ext.extensions[c->ext.extensions_size].tag == LAZY_FORCED)
free(c->ext.extensions[c->ext.extensions_size].value.reply);
free(c->ext.extensions);
} }

3
src/xcbint.h
View File

@ -142,7 +142,8 @@ void _xcb_xid_destroy(XCBConnection *c);
typedef struct _xcb_ext { typedef struct _xcb_ext {
pthread_mutex_t lock; pthread_mutex_t lock;
_xcb_map *extensions; struct lazyreply *extensions;
int extensions_size;
} _xcb_ext; } _xcb_ext;
int _xcb_ext_init(XCBConnection *c); int _xcb_ext_init(XCBConnection *c);