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

gallium: Switch u_debug_stack/symbol.c to util/hash_table.h

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6112>
This commit is contained in:
Kristian H. Kristensen 2020-07-28 22:52:46 -07:00 • committed by Marge Bot
parent e1a58ae7c4
commit e487043fd0
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gallium/auxiliary/util/u_debug_stack.c
View file

@ -45,7 +45,7 @@
#include <dlfcn.h>
#include "os/os_thread.h"
#include "u_hash_table.h"
#include "util/hash_table.h"
static struct hash_table* symbols_hash;
static mtx_t symbols_mutex = _MTX_INITIALIZER_NP;
@ -62,10 +62,9 @@ symbol_name_cached(unw_cursor_t *cursor, unw_proc_info_t *pip)
mtx_lock(&symbols_mutex);
if(!symbols_hash)
symbols_hash = util_hash_table_create_ptr_keys();
name = util_hash_table_get(symbols_hash, addr);
if(!name)
{
symbols_hash = _mesa_pointer_hash_table_create(NULL);
struct hash_entry *entry = _mesa_hash_table_search(symbols_hash, addr);
if (!entry) {
char procname[256];
unw_word_t off;
int ret;
@ -78,11 +77,11 @@ symbol_name_cached(unw_cursor_t *cursor, unw_proc_info_t *pip)
if (asprintf(&name, "%s%s", procname, ret == -UNW_ENOMEM ? "..." : "") == -1)
name = "??";
_mesa_hash_table_insert(symbols_hash, addr, (void*)name);
entry = _mesa_hash_table_insert(symbols_hash, addr, (void*)name);
}
mtx_unlock(&symbols_mutex);
return name;
return entry->data;
}
void

13
src/gallium/auxiliary/util/u_debug_symbol.c
View file

@ -38,7 +38,7 @@
#include "util/u_debug.h"
#include "u_debug_symbol.h"
#include "u_hash_table.h"
#include "util/hash_table.h"
#if defined(PIPE_OS_WINDOWS)
@ -292,16 +292,15 @@ debug_symbol_name_cached(const void *addr)
mtx_lock(&symbols_mutex);
if(!symbols_hash)
symbols_hash = util_hash_table_create_ptr_keys();
name = util_hash_table_get(symbols_hash, (void*)addr);
if(!name)
{
symbols_hash = _mesa_pointer_hash_table_create(NULL);
struct hash_entry *entry = _mesa_hash_table_search(symbols_hash, addr);
if (!entry) {
char buf[1024];
debug_symbol_name(addr, buf, sizeof(buf));
name = strdup(buf);
_mesa_hash_table_insert(symbols_hash, (void*)addr, (void*)name);
entry = _mesa_hash_table_insert(symbols_hash, addr, (void*)name);
}
mtx_unlock(&symbols_mutex);
return name;
return entry->data;
}