diff options
author | Marek Olšák <marek.olsak@amd.com> | 2015-09-26 03:13:11 +0200 |
---|---|---|
committer | Marek Olšák <marek.olsak@amd.com> | 2015-10-03 22:06:07 +0200 |
commit | 89f73827d03e28af548cc11247ebd6e2825789af (patch) | |
tree | 22b117c674d8db253047938727819f3253ab4d9c /src/gallium | |
parent | 3cd5395206398847d554ddf4cad49192042bd8ef (diff) |
ddebug: separate creation of debug files
This will be used by radeonsi for logging.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'src/gallium')
-rw-r--r-- | src/gallium/drivers/ddebug/dd_draw.c | 27 | ||||
-rw-r--r-- | src/gallium/drivers/ddebug/dd_pipe.h | 4 | ||||
-rw-r--r-- | src/gallium/drivers/ddebug/dd_util.h | 71 |
3 files changed, 74 insertions, 28 deletions
diff --git a/src/gallium/drivers/ddebug/dd_draw.c b/src/gallium/drivers/ddebug/dd_draw.c index 1c986238708..b443c5b0b03 100644 --- a/src/gallium/drivers/ddebug/dd_draw.c +++ b/src/gallium/drivers/ddebug/dd_draw.c @@ -30,9 +30,6 @@ #include "util/u_dump.h" #include "util/u_format.h" #include "tgsi/tgsi_scan.h" -#include "os/os_process.h" -#include <errno.h> -#include <sys/stat.h> enum call_type @@ -88,33 +85,13 @@ struct dd_call } info; }; - static FILE * dd_get_file_stream(struct dd_context *dctx) { struct pipe_screen *screen = dctx->pipe->screen; - static unsigned index; - char proc_name[128], dir[256], name[512]; - FILE *f; - - if (!os_get_process_name(proc_name, sizeof(proc_name))) { - fprintf(stderr, "dd: can't get the process name\n"); - return NULL; - } - - snprintf(dir, sizeof(dir), "%s/"DD_DIR, debug_get_option("HOME", ".")); - - if (mkdir(dir, 0774) && errno != EEXIST) { - fprintf(stderr, "dd: can't create a directory (%i)\n", errno); - return NULL; - } - - snprintf(name, sizeof(name), "%s/%s_%u_%08u", dir, proc_name, getpid(), index++); - f = fopen(name, "w"); - if (!f) { - fprintf(stderr, "dd: can't open file %s\n", name); + FILE *f = dd_get_debug_file(); + if (!f) return NULL; - } fprintf(f, "Driver vendor: %s\n", screen->get_vendor(screen)); fprintf(f, "Device vendor: %s\n", screen->get_device_vendor(screen)); diff --git a/src/gallium/drivers/ddebug/dd_pipe.h b/src/gallium/drivers/ddebug/dd_pipe.h index c78d112988a..34f59203e4b 100644 --- a/src/gallium/drivers/ddebug/dd_pipe.h +++ b/src/gallium/drivers/ddebug/dd_pipe.h @@ -31,9 +31,7 @@ #include "pipe/p_context.h" #include "pipe/p_state.h" #include "pipe/p_screen.h" - -/* name of the directory in home */ -#define DD_DIR "ddebug_dumps" +#include "dd_util.h" enum dd_mode { DD_DETECT_HANGS, diff --git a/src/gallium/drivers/ddebug/dd_util.h b/src/gallium/drivers/ddebug/dd_util.h new file mode 100644 index 00000000000..c217c8eed68 --- /dev/null +++ b/src/gallium/drivers/ddebug/dd_util.h @@ -0,0 +1,71 @@ +/************************************************************************** + * + * Copyright 2015 Advanced Micro Devices, Inc. + * Copyright 2008 VMware, Inc. + * 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 + * on 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 + * THE AUTHOR(S) AND/OR THEIR 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. + * + **************************************************************************/ + +#ifndef DD_UTIL_H +#define DD_UTIL_H + +#include <stdio.h> +#include <errno.h> +#include <unistd.h> +#include <sys/stat.h> + +#include "os/os_process.h" +#include "util/u_debug.h" + +/* name of the directory in home */ +#define DD_DIR "ddebug_dumps" + +static inline FILE * +dd_get_debug_file() +{ + static unsigned index; + char proc_name[128], dir[256], name[512]; + FILE *f; + + if (!os_get_process_name(proc_name, sizeof(proc_name))) { + fprintf(stderr, "dd: can't get the process name\n"); + return NULL; + } + + snprintf(dir, sizeof(dir), "%s/"DD_DIR, debug_get_option("HOME", ".")); + + if (mkdir(dir, 0774) && errno != EEXIST) { + fprintf(stderr, "dd: can't create a directory (%i)\n", errno); + return NULL; + } + + snprintf(name, sizeof(name), "%s/%s_%u_%08u", dir, proc_name, getpid(), index++); + f = fopen(name, "w"); + if (!f) { + fprintf(stderr, "dd: can't open file %s\n", name); + return NULL; + } + + return f; +} + +#endif /* DD_UTIL_H */ |