Mesa (master): trace: Use pipe_static_mutex.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Sun Mar 6 09:19:01 UTC 2011
Module: Mesa
Branch: master
Commit: e640eec9ba9e2ff0e462671f6a3c548d2e0c40cf
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e640eec9ba9e2ff0e462671f6a3c548d2e0c40cf
Author: José Fonseca <jose.r.fonseca at gmail.com>
Date: Sun Mar 6 09:11:13 2011 +0000
trace: Use pipe_static_mutex.
---
src/gallium/drivers/trace/tr_dump.c | 16 +---------------
src/gallium/drivers/trace/tr_dump.h | 5 -----
src/gallium/drivers/trace/tr_screen.c | 2 --
3 files changed, 1 insertions(+), 22 deletions(-)
diff --git a/src/gallium/drivers/trace/tr_dump.c b/src/gallium/drivers/trace/tr_dump.c
index 51a4ea9..8a4ec20 100644
--- a/src/gallium/drivers/trace/tr_dump.c
+++ b/src/gallium/drivers/trace/tr_dump.c
@@ -60,10 +60,9 @@
static struct os_stream *stream = NULL;
static unsigned refcount = 0;
-static pipe_mutex call_mutex;
+pipe_static_mutex(call_mutex);
static long unsigned call_no = 0;
static boolean dumping = FALSE;
-static boolean initialized = FALSE;
static INLINE void
@@ -225,26 +224,13 @@ trace_dump_trace_close(void)
stream = NULL;
refcount = 0;
call_no = 0;
- pipe_mutex_destroy(call_mutex);
}
}
-void trace_dump_init()
-{
- if (initialized)
- return;
-
- pipe_mutex_init(call_mutex);
- dumping = FALSE;
- initialized = TRUE;
-}
-
boolean trace_dump_trace_begin()
{
const char *filename;
- assert(initialized);
-
filename = debug_get_option("GALLIUM_TRACE", NULL);
if(!filename)
return FALSE;
diff --git a/src/gallium/drivers/trace/tr_dump.h b/src/gallium/drivers/trace/tr_dump.h
index 74c5e83..62b4fe4 100644
--- a/src/gallium/drivers/trace/tr_dump.h
+++ b/src/gallium/drivers/trace/tr_dump.h
@@ -43,11 +43,6 @@ struct pipe_transfer;
struct pipe_box;
/*
- * Call before use.
- */
-void trace_dump_init(void);
-
-/*
* Low level dumping controls.
*
* Opening the trace file and checking if that is opened.
diff --git a/src/gallium/drivers/trace/tr_screen.c b/src/gallium/drivers/trace/tr_screen.c
index c2de2da..7cfaab0 100644
--- a/src/gallium/drivers/trace/tr_screen.c
+++ b/src/gallium/drivers/trace/tr_screen.c
@@ -472,8 +472,6 @@ trace_enabled(void)
return trace;
firstrun = FALSE;
- trace_dump_init();
-
if(trace_dump_trace_begin()) {
trace_dumping_start();
trace = TRUE;
More information about the mesa-commit
mailing list