From 825a3d837a33f226c879cd02ad15c3fba57e8b2c Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Mon, 23 Jan 2012 23:30:42 +1000 Subject: Update the EFL to what I'm actually using, coz I'm using some stuff not yet released. --- libraries/eina/src/modules/mp/buddy/Makefile.in | 4 ++-- libraries/eina/src/modules/mp/buddy/eina_buddy.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'libraries/eina/src/modules/mp/buddy') diff --git a/libraries/eina/src/modules/mp/buddy/Makefile.in b/libraries/eina/src/modules/mp/buddy/Makefile.in index 64d7fc7..5619b2c 100644 --- a/libraries/eina/src/modules/mp/buddy/Makefile.in +++ b/libraries/eina/src/modules/mp/buddy/Makefile.in @@ -163,7 +163,9 @@ EFL_SIMD_FLAGS = @EFL_SIMD_FLAGS@ EGREP = @EGREP@ EINA_CFLAGS = @EINA_CFLAGS@ EINA_CONFIGURE_DEFAULT_MEMPOOL = @EINA_CONFIGURE_DEFAULT_MEMPOOL@ +EINA_CONFIGURE_ENABLE_LOG = @EINA_CONFIGURE_ENABLE_LOG@ EINA_CONFIGURE_HAVE_DEBUG_THREADS = @EINA_CONFIGURE_HAVE_DEBUG_THREADS@ +EINA_CONFIGURE_HAVE_DIRENT_H = @EINA_CONFIGURE_HAVE_DIRENT_H@ EINA_CONFIGURE_HAVE_INTTYPES_H = @EINA_CONFIGURE_HAVE_INTTYPES_H@ EINA_CONFIGURE_HAVE_ON_OFF_THREADS = @EINA_CONFIGURE_HAVE_ON_OFF_THREADS@ EINA_CONFIGURE_HAVE_STDINT_H = @EINA_CONFIGURE_HAVE_STDINT_H@ @@ -215,8 +217,6 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/libraries/eina/src/modules/mp/buddy/eina_buddy.c b/libraries/eina/src/modules/mp/buddy/eina_buddy.c index f402c6f..7d830db 100644 --- a/libraries/eina/src/modules/mp/buddy/eina_buddy.c +++ b/libraries/eina/src/modules/mp/buddy/eina_buddy.c @@ -133,23 +133,23 @@ static void _free(void *data, void *element) Buddy *b = data; Block *block, *buddy; size_t offset; - size_t index; + size_t idx; offset = (unsigned char *)element - (unsigned char *)b->heap; if (offset > b->size) return; - index = offset >> b->min_order; - block = &b->blocks[index]; + idx = offset >> b->min_order; + block = &b->blocks[idx]; - //printf("free %x index = %d order = %d buddy = %d\n", offset, index, block->order, index ^ (1 << block->order)); + //printf("free %x idx = %d order = %d buddy = %d\n", offset, idx, block->order, idx ^ (1 << block->order)); /* we should always work with the buddy at right */ - if (index & (1 << block->order)) + if (idx & (1 << block->order)) { Block *left; - index = index ^ (1 << block->order); - left = &b->blocks[index]; + idx = idx ^ (1 << block->order); + left = &b->blocks[idx]; if (!left->available) goto end; else @@ -170,7 +170,7 @@ check: } - buddy = &b->blocks[index ^ (1 << block->order)]; + buddy = &b->blocks[idx ^ (1 << block->order)]; if (!buddy->available) { goto end; /* merge two blocks */ @@ -239,7 +239,7 @@ static void _statistics(void *data) printf("Information:\n"); printf( - "size = %li, min_order = %d, max_order = %d, num_order = %d, num_blocks = %d (%luKB)\n", + "size = %zu, min_order = %d, max_order = %d, num_order = %d, num_blocks = %d (%uKB)\n", b->size, b->min_order, b->max_order, @@ -255,7 +255,7 @@ static void _statistics(void *data) printf("\n2^%d:", b->min_order + i); EINA_INLIST_FOREACH(b->areas[i], block) { - printf(" %li", (block - &b->blocks[0])); + printf(" %d", (block - &b->blocks[0])); } } printf("\nBlocks dumping:\n"); -- cgit v1.1