X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=util.c;h=92f8e5e4405c0698d29171826826bf07910fe7ee;hp=26803c898276897ed2d1b1abedf075be3d09c98e;hb=f2b21158d801e96b5f8d7c9491186267dc75a4dc;hpb=fa155f8a42a95111099b8c97a6617cb81317ea6c diff --git a/util.c b/util.c index 26803c8..92f8e5e 100644 --- a/util.c +++ b/util.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 + * Copyright (C) 2012, 2013 * Dale Weiler * Wolfgang Bumiller * @@ -30,6 +30,8 @@ uint64_t mem_ab = 0; uint64_t mem_db = 0; uint64_t mem_at = 0; uint64_t mem_dt = 0; +uint64_t mem_pk = 0; +uint64_t mem_hw = 0; struct memblock_t { const char *file; @@ -39,6 +41,12 @@ struct memblock_t { struct memblock_t *prev; }; +#define PEAK_MEM \ + do { \ + if (mem_hw > mem_pk) \ + mem_pk = mem_hw; \ + } while (0) + static struct memblock_t *mem_start = NULL; void *util_memory_a(size_t byte, unsigned int line, const char *file) { @@ -54,21 +62,23 @@ void *util_memory_a(size_t byte, unsigned int line, const char *file) { mem_start->prev = info; mem_start = info; - util_debug("MEM", "allocation: % 8u (bytes) address 0x%08X @ %s:%u\n", byte, data, file, line); mem_at++; mem_ab += info->byte; + mem_hw += info->byte; + + PEAK_MEM; return data; } -void util_memory_d(void *ptrn, unsigned int line, const char *file) { +void util_memory_d(void *ptrn) { struct memblock_t *info = NULL; if (!ptrn) return; info = ((struct memblock_t*)ptrn - 1); - util_debug("MEM", "released: % 8u (bytes) address 0x%08X @ %s:%u\n", info->byte, ptrn, file, line); mem_db += info->byte; + mem_hw -= info->byte; mem_dt++; if (info->prev) @@ -89,18 +99,16 @@ void *util_memory_r(void *ptrn, size_t byte, unsigned int line, const char *file if (!ptrn) return util_memory_a(byte, line, file); if (!byte) { - util_memory_d(ptrn, line, file); + util_memory_d(ptrn); return NULL; } oldinfo = ((struct memblock_t*)ptrn - 1); newinfo = ((struct memblock_t*)malloc(sizeof(struct memblock_t) + byte)); - util_debug("MEM", "reallocation: % 8u -> %u (bytes) address 0x%08X -> 0x%08X @ %s:%u\n", oldinfo->byte, byte, ptrn, (void*)(newinfo+1), file, line); - /* new data */ if (!newinfo) { - util_memory_d(oldinfo+1, line, file); + util_memory_d(oldinfo+1); return NULL; } @@ -126,51 +134,92 @@ void *util_memory_r(void *ptrn, size_t byte, unsigned int line, const char *file mem_start = newinfo; mem_ab -= oldinfo->byte; + mem_hw -= oldinfo->byte; mem_ab += newinfo->byte; + mem_hw += newinfo->byte; + + PEAK_MEM; free(oldinfo); return newinfo+1; } +static void util_dumpmem(struct memblock_t *memory, uint16_t cols) { + uint32_t i, j; + for (i = 0; i < memory->byte + ((memory->byte % cols) ? (cols - memory->byte % cols) : 0); i++) { + if (i % cols == 0) con_out(" 0x%06X: ", i); + if (i < memory->byte) con_out("%02X " , 0xFF & ((char*)(memory + 1))[i]); + else con_out(" "); + + if ((uint16_t)(i % cols) == (cols - 1)) { + for (j = i - (cols - 1); j <= i; j++) { + con_out("%c", + (j >= memory->byte) + ? ' ' + : (isprint(((char*)(memory + 1))[j])) + ? 0xFF & ((char*)(memory + 1)) [j] + : '.' + ); + } + con_out("\n"); + } + } +} + void util_meminfo() { struct memblock_t *info; - if (!opts.memchk) - return; - for (info = mem_start; info; info = info->next) { - util_debug("MEM", "lost: % 8u (bytes) at %s:%u\n", - info->byte, - info->file, - info->line); + if (OPTS_OPTION_BOOL(OPTION_DEBUG)) { + for (info = mem_start; info; info = info->next) { + con_out("lost: %u (bytes) at %s:%u\n", + info->byte, + info->file, + info->line); + + util_dumpmem(info, OPTS_OPTION_U16(OPTION_MEMDUMPCOLS)); + } } - util_debug("MEM", "Memory information:\n\ - Total allocations: %llu\n\ - Total deallocations: %llu\n\ - Total allocated: %llu (bytes)\n\ - Total deallocated: %llu (bytes)\n\ - Leaks found: lost %llu (bytes) in %d allocations\n", - mem_at, mem_dt, - mem_ab, mem_db, - (mem_ab - mem_db), - (mem_at - mem_dt) - ); + if (OPTS_OPTION_BOOL(OPTION_DEBUG) || + OPTS_OPTION_BOOL(OPTION_MEMCHK)) { + con_out("Memory information:\n\ + Total allocations: %llu\n\ + Total deallocations: %llu\n\ + Total allocated: %f (MB)\n\ + Total deallocated: %f (MB)\n\ + Total peak memory: %f (MB)\n\ + Total leaked memory: %f (MB) in %llu allocations\n", + mem_at, + (float)(mem_dt) / 1048576.0f, + mem_ab, + (float)(mem_db) / 1048576.0f, + (float)(mem_pk) / 1048576.0f, + (float)(mem_ab - mem_db) / 1048576.0f, + + /* could be more clever */ + (mem_at - mem_dt) + ); + } } /* * Some string utility functions, because strdup uses malloc, and we want * to track all memory (without replacing malloc). */ -char *util_strdup(const char *s) { +char *_util_Estrdup(const char *s, const char *file, size_t line) { size_t len = 0; char *ptr = NULL; + /* in case of -DNOTRACK */ + (void)file; + (void)line; + if (!s) return NULL; - if ((len = strlen(s)) && (ptr = (char*)mem_a(len+1))) { + if ((len = strlen(s)) && (ptr = (char*)mem_af(len+1, line, file))) { memcpy(ptr, s, len); ptr[len] = '\0'; } @@ -179,10 +228,10 @@ char *util_strdup(const char *s) { void util_debug(const char *area, const char *ms, ...) { va_list va; - if (!opts.debug) + if (!OPTS_OPTION_BOOL(OPTION_DEBUG)) return; - if (!strcmp(area, "MEM") && !opts.memchk) + if (!strcmp(area, "MEM") && !OPTS_OPTION_BOOL(OPTION_MEMCHK)) return; va_start(va, ms); @@ -257,7 +306,7 @@ void util_endianswap(void *_data, size_t length, unsigned int typesize) { util_swap64((uint32_t*)_data, length>>3); return; - default: abort(); /* please blow the fuck up! */ + default: exit(EXIT_FAILURE); /* please blow the fuck up! */ } # endif #endif @@ -514,6 +563,40 @@ void *util_htget(hash_table_t *ht, const char *key) { return util_htgeth(ht, key, util_hthash(ht, key)); } +void *code_util_str_htgeth(hash_table_t *ht, const char *key, size_t bin) { + hash_node_t *pair; + size_t len, keylen; + int cmp; + + keylen = strlen(key); + + pair = ht->table[bin]; + while (pair && pair->key) { + len = strlen(pair->key); + if (len < keylen) { + pair = pair->next; + continue; + } + if (keylen == len) { + cmp = strcmp(key, pair->key); + if (cmp == 0) + return pair->value; + if (cmp < 0) + return NULL; + pair = pair->next; + continue; + } + cmp = strcmp(key, pair->key + len - keylen); + if (cmp == 0) { + uintptr_t up = (uintptr_t)pair->value; + up += len - keylen; + return (void*)up; + } + pair = pair->next; + } + return NULL; +} + /* * Free all allocated data in a hashtable, this is quite the amount * of work. @@ -539,6 +622,218 @@ void util_htdel(hash_table_t *ht) { mem_d(ht); } +/* + * A basic implementation of a hash-set. Unlike a hashtable, a hash + * set doesn't maintain key-value pairs. It simply maintains a key + * that can be set, removed, and checked for. + * + * See EXPOSED interface comment below + */ +#define GMQCC_HASHSET_PRIME0 0x0049 +#define GMQCC_HASHSET_PRIME1 0x1391 + +static int util_hsput(hash_set_t *set, void *item) { + size_t hash = (size_t)item; /* shouldn't drop the bits */ + size_t iter; + + /* a == 0 || a == 1 */ + if (hash >> 1) + return -1; + + iter = set->mask & (GMQCC_HASHSET_PRIME0 * hash); + + /* while (set->items[iter] != 0 && set->items[iter] != 1) */ + while (!(set->items[iter] >> 1)) { + if (set->items[iter] == hash) + return 0; + + iter = set->mask & (iter + GMQCC_HASHSET_PRIME1); + } + + set->total ++; + set->items[iter] = hash; + + return 1; +} + +static void util_hsupdate(hash_set_t *set) { + size_t *old; + size_t end; + size_t itr; + + /* time to rehash? */ + if ((float)set->total >= (size_t)((double)set->capacity * 0.85)) { + old = set->items; + end = set->capacity; + + set->bits ++; + set->capacity = (size_t)(1 << set->bits); + set->mask = set->capacity - 1; + set->items = (size_t*)mem_a(set->capacity * sizeof(size_t)); + set->total = 0; + + /*assert(set->items);*/ + + /* + * this shouldn't be slow? if so unroll it a little perhaps + * (shouldn't be though) + */ + for (itr = 0; itr < end; itr++) + util_hsput(set, (void*)old[itr]); + + mem_d(old); + } +} + +/* + * EXPOSED interface: all of these functions are exposed to the outside + * for use. The stuff above is static because it's the "internal" mechanics + * for syncronizing the set for updating, and putting data into the set. + */ +int util_hsadd(hash_set_t *set, void *item) { + int run = util_hsput(set, item); /* inlined */ + util_hsupdate(set); + + return run; +} + +/* remove item in set */ +int util_hsrem(hash_set_t *set, void *item) { + size_t hash = (size_t)item; + size_t iter = set->mask & (GMQCC_HASHSET_PRIME0 * hash); + + while (set->items[iter]) { + if (set->items[iter] == hash) { + set->items[iter] = 1; + set->total --; + + return 1; + } + iter = set->mask & (iter + GMQCC_HASHSET_PRIME1); + } + + return 0; +} + +/* check if item is set */ +int util_hshas(hash_set_t *set, void *item) { + size_t hash = (size_t)item; + size_t iter = set->mask & (GMQCC_HASHSET_PRIME0 * hash); + + while (set->items[iter]) { + if (set->items[iter] == hash) + return 1; + + iter = set->mask & (iter + GMQCC_HASHSET_PRIME1); + } + + return 0; +} + +hash_set_t *util_hsnew(void) { + hash_set_t *set; + + if (!(set = (hash_set_t*)mem_a(sizeof(hash_set_t)))) + return NULL; + + set->bits = 3; + set->total = 0; + set->capacity = (size_t)(1 << set->bits); + set->mask = set->capacity - 1; + set->items = (size_t*)mem_a(set->capacity * sizeof(size_t)); + + if (!set->items) { + util_hsdel(set); + return NULL; + } + + return set; +} + +void util_hsdel(hash_set_t *set) { + if (!set) return; + + if (set->items) + mem_d(set->items); + + mem_d(set); +} +#undef GMQCC_HASHSET_PRIME0 +#undef GMQCC_HASHSET_PRIME1 + + +/* + * Portable implementation of vasprintf/asprintf. Assumes vsnprintf + * exists, otherwise compiler error. + * + * TODO: fix for MSVC .... + */ +int util_vasprintf(char **dat, const char *fmt, va_list args) { + int ret; + int len; + char *tmp = NULL; + + /* + * For visuals tido _vsnprintf doesn't tell you the length of a + * formatted string if it overflows. However there is a MSVC + * intrinsic (which is documented wrong) called _vcsprintf which + * will return the required amount to allocate. + */ + #ifdef _MSC_VER + char *str; + if ((len = _vscprintf(fmt, args)) < 0) { + *dat = NULL; + return -1; + } + + tmp = mem_a(len + 1); + if ((ret = _vsnprintf(tmp, len+1, fmt, args)) != len) { + mem_d(tmp); + *dat = NULL; + return -1; + } + *dat = tmp; + return len; + #else + /* + * For everything else we have a decent conformint vsnprintf that + * returns the number of bytes needed. We give it a try though on + * a short buffer, since efficently speaking, it could be nice to + * above a second vsnprintf call. + */ + char buf[128]; + va_list cpy; + va_copy(cpy, args); + len = vsnprintf(buf, sizeof(buf), fmt, cpy); + va_end (cpy); + + if (len < (int)sizeof(buf)) { + *dat = util_strdup(buf); + return len; + } + + /* not large enough ... */ + tmp = (char*)mem_a(len + 1); + if ((ret = vsnprintf(tmp, len + 1, fmt, args)) != len) { + mem_d(tmp); + *dat = NULL; + return -1; + } + + *dat = tmp; + return len; + #endif +} +int util_asprintf(char **ret, const char *fmt, ...) { + va_list args; + int read; + va_start(args, fmt); + read = util_vasprintf(ret, fmt, args); + va_end (args); + + return read; +} + /* * Implementation of the Mersenne twister PRNG (pseudo random numer * generator). Implementation of MT19937. Has a period of 2^19937-1 @@ -595,12 +890,12 @@ static GMQCC_INLINE void mt_generate() { * to [0, MT_SIZE) (634 iterations). */ for (i = 0; i < MT_SPACE; ++i) { - y = (0x800000000 & mt_state[i]) | (0x7FFFFFF & mt_state[i + 1]); + y = (0x80000000 & mt_state[i]) | (0x7FFFFFF & mt_state[i + 1]); mt_state[i] = mt_state[i + MT_PERIOD] ^ (y >> 1) ^ matrix[y & 1]; i ++; /* loop unroll */ - y = (0x800000000 & mt_state[i]) | (0x7FFFFFF & mt_state[i + 1]); + y = (0x80000000 & mt_state[i]) | (0x7FFFFFF & mt_state[i + 1]); mt_state[i] = mt_state[i + MT_PERIOD] ^ (y >> 1) ^ matrix[y & 1]; }