mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-03 18:00:10 +01:00
trace: Use util's stream.
This commit is contained in:
José Fonseca
parent
86a15954bf
commit
2444c0c81a
5 changed files with 6 additions and 354 deletions
|
|
@ -9,8 +9,6 @@ trace = env.ConvenienceLibrary(
|
|||
'tr_dump.c',
|
||||
'tr_screen.c',
|
||||
'tr_state.c',
|
||||
'tr_stream_stdc.c',
|
||||
'tr_stream_wd.c',
|
||||
'tr_texture.c',
|
||||
'tr_winsys.c',
|
||||
])
|
||||
|
|
|
|||
|
|
@ -48,12 +48,12 @@
|
|||
#include "pipe/p_debug.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_string.h"
|
||||
#include "util/u_stream.h"
|
||||
|
||||
#include "tr_stream.h"
|
||||
#include "tr_dump.h"
|
||||
|
||||
|
||||
static struct trace_stream *stream = NULL;
|
||||
static struct util_stream *stream = NULL;
|
||||
static unsigned refcount = 0;
|
||||
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ static INLINE void
|
|||
trace_dump_write(const char *buf, size_t size)
|
||||
{
|
||||
if(stream)
|
||||
trace_stream_write(stream, buf, size);
|
||||
util_stream_write(stream, buf, size);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -212,7 +212,7 @@ trace_dump_trace_close(void)
|
|||
{
|
||||
if(stream) {
|
||||
trace_dump_writes("</trace>\n");
|
||||
trace_stream_close(stream);
|
||||
util_stream_close(stream);
|
||||
stream = NULL;
|
||||
refcount = 0;
|
||||
}
|
||||
|
|
@ -228,7 +228,7 @@ boolean trace_dump_trace_begin()
|
|||
|
||||
if(!stream) {
|
||||
|
||||
stream = trace_stream_create(filename);
|
||||
stream = util_stream_create(filename);
|
||||
if(!stream)
|
||||
return FALSE;
|
||||
|
||||
|
|
@ -272,7 +272,7 @@ void trace_dump_call_end(void)
|
|||
trace_dump_indent(1);
|
||||
trace_dump_tag_end("call");
|
||||
trace_dump_newline();
|
||||
trace_stream_flush(stream);
|
||||
util_stream_flush(stream);
|
||||
}
|
||||
|
||||
void trace_dump_arg_begin(const char *name)
|
||||
|
|
|
|||
|
|
@ -1,59 +0,0 @@
|
|||
/**************************************************************************
|
||||
*
|
||||
* Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sub license, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the
|
||||
* next paragraph) shall be included in all copies or substantial portions
|
||||
* of the Software.
|
||||
*
|
||||
* 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
|
||||
* 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.
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Cross-platform sequential access stream abstraction.
|
||||
*
|
||||
* These are really general purpose file access functions, and might one day
|
||||
* be moved into the util module.
|
||||
*/
|
||||
|
||||
#ifndef TR_STREAM_H
|
||||
#define TR_STREAM_H
|
||||
|
||||
|
||||
#include "pipe/p_compiler.h"
|
||||
|
||||
|
||||
struct trace_stream;
|
||||
|
||||
|
||||
struct trace_stream *
|
||||
trace_stream_create(const char *filename);
|
||||
|
||||
boolean
|
||||
trace_stream_write(struct trace_stream *stream, const void *data, size_t size);
|
||||
|
||||
void
|
||||
trace_stream_flush(struct trace_stream *stream);
|
||||
|
||||
void
|
||||
trace_stream_close(struct trace_stream *stream);
|
||||
|
||||
|
||||
#endif /* TR_STREAM_H */
|
||||
|
|
@ -1,104 +0,0 @@
|
|||
/**************************************************************************
|
||||
*
|
||||
* Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sub license, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the
|
||||
* next paragraph) shall be included in all copies or substantial portions
|
||||
* of the Software.
|
||||
*
|
||||
* 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
|
||||
* 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.
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Stream implementation based on the Standard C Library.
|
||||
*/
|
||||
|
||||
#include "pipe/p_config.h"
|
||||
|
||||
#if defined(PIPE_OS_LINUX)
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "util/u_memory.h"
|
||||
|
||||
#include "tr_stream.h"
|
||||
|
||||
|
||||
struct trace_stream
|
||||
{
|
||||
FILE *file;
|
||||
};
|
||||
|
||||
|
||||
struct trace_stream *
|
||||
trace_stream_create(const char *filename)
|
||||
{
|
||||
struct trace_stream *stream;
|
||||
|
||||
stream = CALLOC_STRUCT(trace_stream);
|
||||
if(!stream)
|
||||
goto error1;
|
||||
|
||||
stream->file = fopen(filename, "w");
|
||||
if(!stream->file)
|
||||
goto error2;
|
||||
|
||||
return stream;
|
||||
|
||||
error2:
|
||||
FREE(stream);
|
||||
error1:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
boolean
|
||||
trace_stream_write(struct trace_stream *stream, const void *data, size_t size)
|
||||
{
|
||||
if(!stream)
|
||||
return FALSE;
|
||||
|
||||
return fwrite(data, size, 1, stream->file) == size ? TRUE : FALSE;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
trace_stream_flush(struct trace_stream *stream)
|
||||
{
|
||||
if(!stream)
|
||||
return;
|
||||
|
||||
fflush(stream->file);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
trace_stream_close(struct trace_stream *stream)
|
||||
{
|
||||
if(!stream)
|
||||
return;
|
||||
|
||||
fclose(stream->file);
|
||||
|
||||
FREE(stream);
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
|
@ -1,183 +0,0 @@
|
|||
/**************************************************************************
|
||||
*
|
||||
* Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sub license, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the
|
||||
* next paragraph) shall be included in all copies or substantial portions
|
||||
* of the Software.
|
||||
*
|
||||
* 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
|
||||
* 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.
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Stream implementation for the Windows Display driver.
|
||||
*/
|
||||
|
||||
#include "pipe/p_config.h"
|
||||
|
||||
#if defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY)
|
||||
|
||||
#include <windows.h>
|
||||
#include <winddi.h>
|
||||
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_string.h"
|
||||
|
||||
#include "tr_stream.h"
|
||||
|
||||
|
||||
#define MAP_FILE_SIZE (4*1024*1024)
|
||||
|
||||
|
||||
struct trace_stream
|
||||
{
|
||||
char filename[MAX_PATH + 1];
|
||||
WCHAR wFileName[MAX_PATH + 1];
|
||||
ULONG_PTR iFile;
|
||||
char *pMap;
|
||||
size_t written;
|
||||
unsigned suffix;
|
||||
};
|
||||
|
||||
|
||||
static INLINE boolean
|
||||
trace_stream_map(struct trace_stream *stream)
|
||||
{
|
||||
ULONG BytesInUnicodeString;
|
||||
static char filename[MAX_PATH + 1];
|
||||
unsigned filename_len;
|
||||
|
||||
filename_len = util_snprintf(filename,
|
||||
sizeof(filename),
|
||||
"\\??\\%s.%04x",
|
||||
stream->filename,
|
||||
stream->suffix++);
|
||||
|
||||
EngMultiByteToUnicodeN(
|
||||
stream->wFileName,
|
||||
sizeof(stream->wFileName),
|
||||
&BytesInUnicodeString,
|
||||
filename,
|
||||
filename_len);
|
||||
|
||||
stream->pMap = EngMapFile(stream->wFileName, MAP_FILE_SIZE, &stream->iFile);
|
||||
if(!stream->pMap)
|
||||
return FALSE;
|
||||
|
||||
memset(stream->pMap, 0, MAP_FILE_SIZE);
|
||||
stream->written = 0;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
static INLINE void
|
||||
trace_stream_unmap(struct trace_stream *stream)
|
||||
{
|
||||
EngUnmapFile(stream->iFile);
|
||||
if(stream->written < MAP_FILE_SIZE) {
|
||||
/* Truncate file size */
|
||||
stream->pMap = EngMapFile(stream->wFileName, stream->written, &stream->iFile);
|
||||
if(stream->pMap)
|
||||
EngUnmapFile(stream->iFile);
|
||||
}
|
||||
|
||||
stream->pMap = NULL;
|
||||
}
|
||||
|
||||
|
||||
struct trace_stream *
|
||||
trace_stream_create(const char *filename)
|
||||
{
|
||||
struct trace_stream *stream;
|
||||
|
||||
stream = CALLOC_STRUCT(trace_stream);
|
||||
if(!stream)
|
||||
goto error1;
|
||||
|
||||
strncpy(stream->filename, filename, sizeof(stream->filename));
|
||||
|
||||
if(!trace_stream_map(stream))
|
||||
goto error2;
|
||||
|
||||
return stream;
|
||||
|
||||
error2:
|
||||
FREE(stream);
|
||||
error1:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
static INLINE void
|
||||
trace_stream_copy(struct trace_stream *stream, const char *data, size_t size)
|
||||
{
|
||||
assert(stream->written + size <= MAP_FILE_SIZE);
|
||||
memcpy(stream->pMap + stream->written, data, size);
|
||||
stream->written += size;
|
||||
}
|
||||
|
||||
|
||||
boolean
|
||||
trace_stream_write(struct trace_stream *stream, const void *data, size_t size)
|
||||
{
|
||||
if(!stream)
|
||||
return FALSE;
|
||||
|
||||
if(!stream->pMap)
|
||||
return FALSE;
|
||||
|
||||
while(stream->written + size > MAP_FILE_SIZE) {
|
||||
size_t step = MAP_FILE_SIZE - stream->written;
|
||||
trace_stream_copy(stream, data, step);
|
||||
data = (const char *)data + step;
|
||||
size -= step;
|
||||
|
||||
trace_stream_unmap(stream);
|
||||
if(!trace_stream_map(stream))
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
trace_stream_copy(stream, data, size);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
trace_stream_flush(struct trace_stream *stream)
|
||||
{
|
||||
(void)stream;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
trace_stream_close(struct trace_stream *stream)
|
||||
{
|
||||
if(!stream)
|
||||
return;
|
||||
|
||||
trace_stream_unmap(stream);
|
||||
|
||||
FREE(stream);
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
Loading…
Add table
Reference in a new issue