diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2020-03-30 14:24:03 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2020-03-30 14:24:03 +0000 |
| commit | 9b1d850be89f83b4a427318745e2f90cdec1854e (patch) | |
| tree | b38103b8e2bc51735cf6c3f7130fdb861a8e92a0 /sys/netinet/in_mcast.c | |
| parent | 9893ab3f503fb7defedeeae831e8fa07743ab24f (diff) | |
| download | src-9b1d850be89f83b4a427318745e2f90cdec1854e.tar.gz src-9b1d850be89f83b4a427318745e2f90cdec1854e.zip | |
Remove the "config" taskqgroup and its KPIs.
Equivalent functionality is already provided by taskqueue(9), just use
that instead.
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=359438
Diffstat (limited to 'sys/netinet/in_mcast.c')
| -rw-r--r-- | sys/netinet/in_mcast.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c index fe695e48a18c..32da7eb0482b 100644 --- a/sys/netinet/in_mcast.c +++ b/sys/netinet/in_mcast.c @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/ktr.h> #include <sys/taskqueue.h> -#include <sys/gtaskqueue.h> #include <sys/tree.h> #include <net/if.h> @@ -224,23 +223,16 @@ inm_is_ifp_detached(const struct in_multi *inm) } #endif -static struct grouptask free_gtask; -static struct in_multi_head inm_free_list; -static void inm_release_task(void *arg __unused); -static void inm_init(void) +static struct task free_task; +static struct in_multi_head inm_free_list = SLIST_HEAD_INITIALIZER(); +static void inm_release_task(void *arg __unused, int pending __unused); + +static void +inm_init(void) { - SLIST_INIT(&inm_free_list); - taskqgroup_config_gtask_init(NULL, &free_gtask, inm_release_task, "inm release task"); + TASK_INIT(&free_task, 0, inm_release_task, NULL); } - -#ifdef EARLY_AP_STARTUP -SYSINIT(inm_init, SI_SUB_SMP + 1, SI_ORDER_FIRST, - inm_init, NULL); -#else -SYSINIT(inm_init, SI_SUB_ROOT_CONF - 1, SI_ORDER_FIRST, - inm_init, NULL); -#endif - +SYSINIT(inm_init, SI_SUB_TASKQ, SI_ORDER_ANY, inm_init, NULL); void inm_release_list_deferred(struct in_multi_head *inmh) @@ -251,7 +243,7 @@ inm_release_list_deferred(struct in_multi_head *inmh) mtx_lock(&in_multi_free_mtx); SLIST_CONCAT(&inm_free_list, inmh, in_multi, inm_nrele); mtx_unlock(&in_multi_free_mtx); - GROUPTASK_ENQUEUE(&free_gtask); + taskqueue_enqueue(taskqueue_thread, &free_task); } void @@ -304,7 +296,7 @@ inm_release_deferred(struct in_multi *inm) } static void -inm_release_task(void *arg __unused) +inm_release_task(void *arg __unused, int pending __unused) { struct in_multi_head inm_free_tmp; struct in_multi *inm, *tinm; |