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

[mesa.git] / src / gallium / auxiliary / util / u_debug_stack.c

diff --git a/src/gallium/auxiliary/util/u_debug_stack.c b/src/gallium/auxiliary/util/u_debug_stack.c
index 44581e0a3fba8d49e9d12d3c8051ec80f2f53f6d..21f0371d3c13f99466566ed5fd9bf6c70ba76e38 100644 (file)
--- a/src/gallium/auxiliary/util/u_debug_stack.c
+++ b/src/gallium/auxiliary/util/u_debug_stack.c
@@ -35,6 +35,7 @@
 #include "util/u_debug.h"
 #include "u_debug_symbol.h"
 #include "u_debug_stack.h"
+#include "pipe/p_config.h"
 
 #if defined(HAVE_LIBUNWIND)
 
@@ -44,9 +45,9 @@
 #include <dlfcn.h>
 
 #include "os/os_thread.h"
-#include "u_hash_table.h"
+#include "util/hash_table.h"
 
-struct hash_table* symbols_hash;
+static struct hash_table* symbols_hash;
 static mtx_t symbols_mutex = _MTX_INITIALIZER_NP;
 
 /* TODO with some refactoring we might be able to re-use debug_symbol_name_cached()
@@ -61,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;
@@ -77,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