From: Quentin Young <qlyoung@nvidia.com>
Date: Wed, 16 Sep 2020 00:11:39 +0000 (-0400)
Subject: lib: set threadmaster name to 'default' if none
X-Git-Tag: base_7.6~556^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F7109%2Fhead;p=mirror%2Ffrr.git

lib: set threadmaster name to 'default' if none

And also include the name of the threadmaster in its event hash name.

Signed-off-by: Quentin Young <qlyoung@nvidia.com>
---

diff --git a/lib/thread.c b/lib/thread.c
index 19e4827283..db35a3f031 100644
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -438,7 +438,8 @@ struct thread_master *thread_master_create(const char *name)
 	pthread_cond_init(&rv->cancel_cond, NULL);
 
 	/* Set name */
-	rv->name = name ? XSTRDUP(MTYPE_THREAD_MASTER, name) : NULL;
+	name = name ? name : "default";
+	rv->name = XSTRDUP(MTYPE_THREAD_MASTER, name);
 
 	/* Initialize I/O task data structures */
 	getrlimit(RLIMIT_NOFILE, &limit);
@@ -449,10 +450,13 @@ struct thread_master *thread_master_create(const char *name)
 	rv->write = XCALLOC(MTYPE_THREAD_POLL,
 			    sizeof(struct thread *) * rv->fd_limit);
 
+	char tmhashname[strlen(name) + 32];
+	snprintf(tmhashname, sizeof(tmhashname), "%s - threadmaster event hash",
+		 name);
 	rv->cpu_record = hash_create_size(
 		8, (unsigned int (*)(const void *))cpu_record_hash_key,
 		(bool (*)(const void *, const void *))cpu_record_hash_cmp,
-		"Thread Hash");
+		tmhashname);
 
 	thread_list_init(&rv->event);
 	thread_list_init(&rv->ready);