Module: Mesa Branch: master Commit: 7fab8a4b37a1215c51334242b070b2dcd9a3a80c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7fab8a4b37a1215c51334242b070b2dcd9a3a80c
Author: Marek Olšák <[email protected]> Date: Tue Jul 3 14:49:42 2018 -0400 Shorten u_queue names There is a 15-character limit for thread names shared by the queue name and process name. Shorten the thread name to make space for the process name. Reviewed-by: Timothy Arceri <[email protected]> --- src/gallium/auxiliary/util/u_threaded_context.c | 2 +- src/gallium/drivers/radeonsi/si_pipe.c | 4 ++-- src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 2 +- src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 2 +- src/mesa/main/glthread.c | 2 +- src/util/disk_cache.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gallium/auxiliary/util/u_threaded_context.c b/src/gallium/auxiliary/util/u_threaded_context.c index 1c647a3efd..28d0f77eba 100644 --- a/src/gallium/auxiliary/util/u_threaded_context.c +++ b/src/gallium/auxiliary/util/u_threaded_context.c @@ -2566,7 +2566,7 @@ threaded_context_create(struct pipe_context *pipe, * from the queue before being executed, so keep one tc_batch slot for that * execution. Also, keep one unused slot for an unflushed batch. */ - if (!util_queue_init(&tc->queue, "gallium_drv", TC_MAX_BATCHES - 2, 1, 0)) + if (!util_queue_init(&tc->queue, "gdrv", TC_MAX_BATCHES - 2, 1, 0)) goto fail; for (unsigned i = 0; i < TC_MAX_BATCHES; i++) { diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 86a95a0da0..ac4f77a896 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -859,7 +859,7 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws, num_comp_lo_threads = MIN2(num_comp_lo_threads, ARRAY_SIZE(sscreen->compiler_lowp)); - if (!util_queue_init(&sscreen->shader_compiler_queue, "si_shader", + if (!util_queue_init(&sscreen->shader_compiler_queue, "sh", 64, num_comp_hi_threads, UTIL_QUEUE_INIT_RESIZE_IF_FULL)) { si_destroy_shader_cache(sscreen); @@ -868,7 +868,7 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws, } if (!util_queue_init(&sscreen->shader_compiler_queue_low_priority, - "si_shader_low", + "shlo", 64, num_comp_lo_threads, UTIL_QUEUE_INIT_RESIZE_IF_FULL | UTIL_QUEUE_INIT_USE_MINIMUM_PRIORITY)) { diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index d60b3640f6..cca6a3cc25 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -320,7 +320,7 @@ amdgpu_winsys_create(int fd, const struct pipe_screen_config *config, (void) simple_mtx_init(&ws->global_bo_list_lock, mtx_plain); (void) simple_mtx_init(&ws->bo_fence_lock, mtx_plain); - if (!util_queue_init(&ws->cs_queue, "amdgpu_cs", 8, 1, + if (!util_queue_init(&ws->cs_queue, "cs", 8, 1, UTIL_QUEUE_INIT_RESIZE_IF_FULL)) { amdgpu_winsys_destroy(&ws->base); simple_mtx_unlock(&dev_tab_mutex); diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index c02f596f63..491e8e159f 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -907,7 +907,7 @@ radeon_drm_winsys_create(int fd, const struct pipe_screen_config *config, ws->info.gart_page_size = sysconf(_SC_PAGESIZE); if (ws->num_cpus > 1 && debug_get_option_thread()) - util_queue_init(&ws->cs_queue, "radeon_cs", 8, 1, 0); + util_queue_init(&ws->cs_queue, "rcs", 8, 1, 0); /* Create the screen at the end. The winsys must be initialized * completely. diff --git a/src/mesa/main/glthread.c b/src/mesa/main/glthread.c index c71c03778a..18a83bb9be 100644 --- a/src/mesa/main/glthread.c +++ b/src/mesa/main/glthread.c @@ -73,7 +73,7 @@ _mesa_glthread_init(struct gl_context *ctx) if (!glthread) return; - if (!util_queue_init(&glthread->queue, "glthread", MARSHAL_MAX_BATCHES - 2, + if (!util_queue_init(&glthread->queue, "gl", MARSHAL_MAX_BATCHES - 2, 1, 0)) { free(glthread); return; diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c index 4a762eff20..87ddfb86b2 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c @@ -376,7 +376,7 @@ disk_cache_create(const char *gpu_name, const char *timestamp, * The queue will resize automatically when it's full, so adding new jobs * doesn't stall. */ - util_queue_init(&cache->cache_queue, "disk_cache", 32, 1, + util_queue_init(&cache->cache_queue, "disk$", 32, 1, UTIL_QUEUE_INIT_RESIZE_IF_FULL | UTIL_QUEUE_INIT_USE_MINIMUM_PRIORITY); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
