ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging latest bugfixes

Browse source 
Merge branch 'master' into session
This commit is contained in:
Fischlurch 2009-06-19 14:36:22 +02:00
commit 4307191369
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/output/xvdisplayer.cpp
View file

@ -62,7 +62,7 @@ XvDisplayer::XvDisplayer( Gtk::Widget *drawing_area, int width, int height ) :
for ( unsigned int n = 0; gotPort == false && n < count; ++n ) for ( unsigned int n = 0; gotPort == false && n < count; ++n )
{ {
// Diagnostics // Diagnostics
INFO(gui, "%s, %d, %d, %d", adaptorInfo[ n ].name, INFO(gui, "%s, %d, %d", adaptorInfo[ n ].name,
adaptorInfo[ n ].base_id, adaptorInfo[ n ].num_ports - 1); adaptorInfo[ n ].base_id, adaptorInfo[ n ].num_ports - 1);
for ( unsigned int port = adaptorInfo[ n ].base_id; for ( unsigned int port = adaptorInfo[ n ].base_id;

12
src/lib/mpool.c
View file

@ -116,7 +116,7 @@ bitmap_bit_get_nth (MPoolcluster cluster, unsigned index)
uintptr_t quot = index>>MPOOL_DIV_SHIFT; uintptr_t quot = index>>MPOOL_DIV_SHIFT;
uintptr_t rem = index & ~((~MPOOL_C(0))<<MPOOL_DIV_SHIFT); uintptr_t rem = index & ~((~MPOOL_C(0))<<MPOOL_DIV_SHIFT);
uintptr_t* bitmap = (uintptr_t*)&cluster->data; uintptr_t* bitmap = (uintptr_t*)cluster->data;
return bitmap[quot] & ((uintptr_t)1<<rem); return bitmap[quot] & ((uintptr_t)1<<rem);
} }
@ -166,7 +166,7 @@ mpool_cluster_alloc_ (MPool self)
return NULL; return NULL;
/* clear the bitmap */ /* clear the bitmap */
memset (&cluster->data, 0, MPOOL_BITMAP_SIZE (self->elements_per_cluster)); memset (cluster->data, 0, MPOOL_BITMAP_SIZE (self->elements_per_cluster));
/* initialize freelist */ /* initialize freelist */
for (unsigned i = 0; i < self->elements_per_cluster; ++i) for (unsigned i = 0; i < self->elements_per_cluster; ++i)
@ -240,7 +240,7 @@ alloc_near (MPoolcluster cluster, MPool self, void* locality)
uintptr_t quot = index>>MPOOL_DIV_SHIFT; uintptr_t quot = index>>MPOOL_DIV_SHIFT;
uintptr_t rem = index & ~((~MPOOL_C(0))<<MPOOL_DIV_SHIFT); uintptr_t rem = index & ~((~MPOOL_C(0))<<MPOOL_DIV_SHIFT);
uintptr_t* bitmap = (uintptr_t*)&cluster->data; uintptr_t* bitmap = (uintptr_t*)cluster->data;
unsigned r = ~0U; unsigned r = ~0U;
/* the bitmap word at locality */ /* the bitmap word at locality */
@ -276,7 +276,7 @@ bitmap_set_element (MPoolcluster cluster, MPool self, void* element)
uintptr_t quot = index>>MPOOL_DIV_SHIFT; uintptr_t quot = index>>MPOOL_DIV_SHIFT;
uintptr_t rem = index & ~((~MPOOL_C(0))<<MPOOL_DIV_SHIFT); uintptr_t rem = index & ~((~MPOOL_C(0))<<MPOOL_DIV_SHIFT);
uintptr_t* bitmap = (uintptr_t*)&cluster->data; uintptr_t* bitmap = (uintptr_t*)cluster->data;
bitmap[quot] |= ((uintptr_t)1<<rem); bitmap[quot] |= ((uintptr_t)1<<rem);
TRACE (mpool_dbg, "set bit %d, index %d, of %p is %p", rem, quot, element, bitmap[quot]); TRACE (mpool_dbg, "set bit %d, index %d, of %p is %p", rem, quot, element, bitmap[quot]);
@ -295,7 +295,7 @@ bitmap_clear_element (MPoolcluster cluster, MPool self, void* element)
uintptr_t quot = index>>MPOOL_DIV_SHIFT; uintptr_t quot = index>>MPOOL_DIV_SHIFT;
uintptr_t rem = index & ~((~MPOOL_C(0))<<MPOOL_DIV_SHIFT); uintptr_t rem = index & ~((~MPOOL_C(0))<<MPOOL_DIV_SHIFT);
uintptr_t* bitmap = (uintptr_t*)&cluster->data; uintptr_t* bitmap = (uintptr_t*)cluster->data;
bitmap[quot] &= ~((uintptr_t)1<<rem); bitmap[quot] &= ~((uintptr_t)1<<rem);
TRACE (mpool_dbg, "cleared bit %d, index %d, of %p is %p", rem, quot, element, bitmap[quot]); TRACE (mpool_dbg, "cleared bit %d, index %d, of %p is %p", rem, quot, element, bitmap[quot]);
@ -403,7 +403,7 @@ find_near (MPoolcluster cluster, MPool self, void* element)
uintptr_t quot = index>>MPOOL_DIV_SHIFT; uintptr_t quot = index>>MPOOL_DIV_SHIFT;
uintptr_t rem = index & ~((~MPOOL_C(0))<<MPOOL_DIV_SHIFT); uintptr_t rem = index & ~((~MPOOL_C(0))<<MPOOL_DIV_SHIFT);
uintptr_t* bitmap = (uintptr_t*)&cluster->data; uintptr_t* bitmap = (uintptr_t*)cluster->data;
unsigned r = ~0U; unsigned r = ~0U;
/* the bitmap word at locality */ /* the bitmap word at locality */