fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

intel/mda: Use archive filename as directory name instead of hardcoded "mda/"

Browse source 
This changes debug_archiver to create files inside a directory named
after the archive filename (e.g., "debug.anv.mda/") instead of the
hardcoded "mda/" directory.  This prevents conflicts if multiple
mda.tar files are extracted in the same location.

Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29146>
This commit is contained in:
Caio Oliveira 2025-06-24 22:28:53 -07:00
parent 3ff37e97a0
commit 34198545aa
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/intel/mda/debug_archiver.c
View file

@ -21,6 +21,7 @@ struct debug_archiver
tar_writer *tw;
char prefix[128];
char *archive_path;
char *mda_dir_in_archive;
};
DEBUG_GET_ONCE_OPTION(mda_output_dir, "MDA_OUTPUT_DIR", ".")
@ -92,6 +93,18 @@ debug_archiver_open(void *mem_ctx, const char *name, const char *info)
da->tw = rzalloc(da, tar_writer);
tar_writer_init(da->tw, da->f);
{
const char *filename_start = strrchr(da->archive_path, '/');
filename_start = filename_start ? filename_start + 1 : da->archive_path;
char *filename_copy = ralloc_strdup(da, filename_start);
char *tar_ext = strstr(filename_copy, ".tar");
if (tar_ext) {
*tar_ext = '\0';
}
da->mda_dir_in_archive = filename_copy;
}
debug_archiver_set_prefix(da, "");
tar_writer_start_file(da->tw, "mesa.txt");
@ -105,9 +118,9 @@ void
debug_archiver_set_prefix(debug_archiver *da, const char *prefix)
{
if (!prefix || !*prefix) {
strcpy(da->prefix, "mda");
snprintf(da->prefix, ARRAY_SIZE(da->prefix) - 1, "%s", da->mda_dir_in_archive);
} else {
snprintf(da->prefix, ARRAY_SIZE(da->prefix) - 1, "mda/%s", prefix);
snprintf(da->prefix, ARRAY_SIZE(da->prefix) - 1, "%s/%s", da->mda_dir_in_archive, prefix);
}
da->tw->prefix = da->prefix;