/**************************************************************************
*
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2008 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* is abstracted out of this file, so that we can switch to a binary
* representation if/when it becomes justified.
*
- * @author Jose Fonseca <jrfonseca@tungstengraphics.com>
+ * @author Jose Fonseca <jfonseca@vmware.com>
*/
#include "pipe/p_config.h"
#include "pipe/p_compiler.h"
#include "os/os_thread.h"
+#include "os/os_time.h"
#include "util/u_debug.h"
#include "util/u_memory.h"
#include "util/u_string.h"
#include "tr_texture.h"
+static boolean close_stream = FALSE;
static FILE *stream = NULL;
-static unsigned refcount = 0;
pipe_static_mutex(call_mutex);
static long unsigned call_no = 0;
static boolean dumping = FALSE;
{
if(stream) {
trace_dump_writes("</trace>\n");
- fclose(stream);
- stream = NULL;
- refcount = 0;
+ if (close_stream) {
+ fclose(stream);
+ close_stream = FALSE;
+ stream = NULL;
+ }
call_no = 0;
}
}
+
+static void
+trace_dump_call_time(int64_t time)
+{
+ if (stream) {
+ trace_dump_indent(2);
+ trace_dump_tag_begin("time");
+ trace_dump_int(time);
+ trace_dump_tag_end("time");
+ trace_dump_newline();
+ }
+}
+
+
boolean
trace_dump_trace_begin(void)
{
if(!stream) {
if (strcmp(filename, "stderr") == 0) {
+ close_stream = FALSE;
stream = stderr;
}
else if (strcmp(filename, "stdout") == 0) {
+ close_stream = FALSE;
stream = stdout;
}
else {
+ close_stream = TRUE;
stream = fopen(filename, "wt");
if (!stream)
return FALSE;
trace_dump_writes("<?xml-stylesheet type='text/xsl' href='trace.xsl'?>\n");
trace_dump_writes("<trace version='0.1'>\n");
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE)
- /* Linux applications rarely cleanup GL / Gallium resources so catch
- * application exit here */
+ /* Many applications don't exit cleanly, others may create and destroy a
+ * screen multiple times, so we only write </trace> tag and close at exit
+ * time.
+ */
atexit(trace_dump_trace_close);
-#endif
}
- ++refcount;
-
return TRUE;
}
return stream ? TRUE : FALSE;
}
-void trace_dump_trace_end(void)
-{
- if(stream)
- if(!--refcount)
- trace_dump_trace_close();
-}
-
/*
* Call lock
*/
* Dump functions
*/
+static int64_t call_start_time = 0;
+
void trace_dump_call_begin_locked(const char *klass, const char *method)
{
if (!dumping)
trace_dump_escape(method);
trace_dump_writes("\'>");
trace_dump_newline();
+
+ call_start_time = os_time_get();
}
void trace_dump_call_end_locked(void)
{
+ int64_t call_end_time;
+
if (!dumping)
return;
+ call_end_time = os_time_get();
+
+ trace_dump_call_time(call_end_time - call_start_time);
trace_dump_indent(1);
trace_dump_tag_end("call");
trace_dump_newline();
}
void trace_dump_box_bytes(const void *data,
- enum pipe_format format,
+ struct pipe_resource *resource,
const struct pipe_box *box,
unsigned stride,
unsigned slice_stride)
{
size_t size;
- if (slice_stride)
- size = box->depth * slice_stride;
- else if (stride)
- size = util_format_get_nblocksy(format, box->height) * stride;
- else {
- size = util_format_get_nblocksx(format, box->width) * util_format_get_blocksize(format);
+ /*
+ * Only dump buffer transfers to avoid huge files.
+ * TODO: Make this run-time configurable
+ */
+ if (resource->target != PIPE_BUFFER) {
+ size = 0;
+ } else {
+ enum pipe_format format = resource->format;
+ if (slice_stride)
+ size = box->depth * slice_stride;
+ else if (stride)
+ size = util_format_get_nblocksy(format, box->height) * stride;
+ else {
+ size = util_format_get_nblocksx(format, box->width) * util_format_get_blocksize(format);
+ }
}
trace_dump_bytes(data, size);