summaryrefslogtreecommitdiffstats
path: root/pimd
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2018-09-14 17:57:19 +0200
committerGitHub <noreply@github.com>2018-09-14 17:57:19 +0200
commit4205a06cc4d997cae086a61db2359ff04556c10d (patch)
treece470bdc6d15cc5b2cc3dc5dbf1c2ce60087129a /pimd
parentMerge pull request #3030 from pacovn/fp_type_fixes1 (diff)
parentlib, pimd: Convert timer_wheel to use thread_execute_name (diff)
downloadfrr-4205a06cc4d997cae086a61db2359ff04556c10d.tar.xz
frr-4205a06cc4d997cae086a61db2359ff04556c10d.zip
Merge pull request #3018 from donaldsharp/twheel_names
Twheel names
Diffstat (limited to 'pimd')
-rw-r--r--pimd/pim_upstream.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 15cbf6fbc..cc255a51e 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -1764,15 +1764,18 @@ void pim_upstream_remove_lhr_star_pimreg(struct pim_instance *pim,
void pim_upstream_init(struct pim_instance *pim)
{
- char hash_name[64];
+ char name[64];
+ snprintf(name, 64, "PIM %s Timer Wheel",
+ pim->vrf->name);
pim->upstream_sg_wheel =
wheel_init(master, 31000, 100, pim_upstream_hash_key,
- pim_upstream_sg_running);
+ pim_upstream_sg_running, name);
- snprintf(hash_name, 64, "PIM %s Upstream Hash", pim->vrf->name);
+ snprintf(name, 64, "PIM %s Upstream Hash",
+ pim->vrf->name);
pim->upstream_hash = hash_create_size(8192, pim_upstream_hash_key,
- pim_upstream_equal, hash_name);
+ pim_upstream_equal, name);
pim->upstream_list = list_new();
pim->upstream_list->cmp = pim_upstream_compare;