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

util: Avoid the use of MESA_TRACE_BEGIN/END

Browse source 
Switch the last occurrences of it to the MESA_TRACE_SCOPE macro which is
easier to use.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25308>
This commit is contained in:
Corentin Noël 2023-09-20 17:25:09 +02:00 • committed by Marge Bot
parent bf1a68833b
commit b7a4e78071
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/util/compress.c
View file

@ -39,6 +39,7 @@
#endif
#include "util/compress.h"
#include "util/perf/cpu_trace.h"
#include "macros.h"
/* 3 is the recomended level, with 22 as the absolute maximum */
@ -74,6 +75,7 @@ size_t
util_compress_deflate(const uint8_t *in_data, size_t in_data_size,
uint8_t *out_data, size_t out_buff_size)
{
MESA_TRACE_FUNC();
#ifdef HAVE_ZSTD
size_t ret = ZSTD_compress(out_data, out_buff_size, in_data, in_data_size,
ZSTD_COMPRESSION_LEVEL);
@ -124,6 +126,7 @@ bool
util_compress_inflate(const uint8_t *in_data, size_t in_data_size,
uint8_t *out_data, size_t out_data_size)
{
MESA_TRACE_FUNC();
#ifdef HAVE_ZSTD
size_t ret = ZSTD_decompress(out_data, out_data_size, in_data, in_data_size);
return !ZSTD_isError(ret);

22
src/util/disk_cache.c
View file

@ -473,17 +473,17 @@ blob_put_compressed(struct disk_cache *cache, const cache_key key,
entry->uncompressed_size = size;
MESA_TRACE_BEGIN("deflate");
size_t compressed_size =
util_compress_deflate(data, size, entry->compressed_data, max_buf);
MESA_TRACE_END();
if (!compressed_size)
goto out;
unsigned entry_size = compressed_size + sizeof(*entry);
MESA_TRACE_BEGIN("blob_put");
cache->blob_put_cb(key, CACHE_KEY_SIZE, entry, entry_size);
MESA_TRACE_END();
// The curly brackets are here to only trace the blob_put_cb call
{
MESA_TRACE_SCOPE("blob_put");
cache->blob_put_cb(key, CACHE_KEY_SIZE, entry, entry_size);
}
out:
free(entry);
@ -503,10 +503,12 @@ blob_get_compressed(struct disk_cache *cache, const cache_key key,
if (!entry)
return NULL;
MESA_TRACE_BEGIN("blob_get");
signed long entry_size =
cache->blob_get_cb(key, CACHE_KEY_SIZE, entry, max_blob_size);
MESA_TRACE_END();
signed long entry_size;
// The curly brackets are here to only trace the blob_get_cb call
{
MESA_TRACE_SCOPE("blob_get");
entry_size = cache->blob_get_cb(key, CACHE_KEY_SIZE, entry, max_blob_size);
}
if (!entry_size) {
free(entry);
@ -520,10 +522,8 @@ blob_get_compressed(struct disk_cache *cache, const cache_key key,
}
unsigned compressed_size = entry_size - sizeof(*entry);
MESA_TRACE_BEGIN("inflate");
bool ret = util_compress_inflate(entry->compressed_data, compressed_size,
data, entry->uncompressed_size);
MESA_TRACE_END();
if (!ret) {
free(data);
free(entry);