xnu-7195.101.1.tar.gz

[apple/xnu.git] / bsd / kern / subr_eventhandler.c

diff --git a/bsd/kern/subr_eventhandler.c b/bsd/kern/subr_eventhandler.c
index d7f3f5cbdfb5e6f25a5dff08f0afc2d7e1f8390d..167a99befcad90bf7dc874205a63eda73f8c6522 100644 (file)
--- a/bsd/kern/subr_eventhandler.c
+++ b/bsd/kern/subr_eventhandler.c
@@ -65,8 +65,6 @@
 
 int evh_debug = 0;
 
-MALLOC_DEFINE(M_EVENTHANDLER, "eventhandler", "Event handler records");
-
 SYSCTL_NODE(_kern, OID_AUTO, eventhandler, CTLFLAG_RW | CTLFLAG_LOCKED,
     0, "Eventhandler");
 SYSCTL_INT(_kern_eventhandler, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_LOCKED,
@@ -76,9 +74,7 @@ struct eventhandler_entry_arg eventhandler_entry_dummy_arg = { .ee_fm_uuid = { 0
 
 /* List of 'slow' lists */
 static struct eventhandler_lists_ctxt evthdlr_lists_ctxt_glb;
-static lck_grp_attr_t   *eventhandler_mutex_grp_attr;
-static lck_grp_t        *eventhandler_mutex_grp;
-static lck_attr_t       *eventhandler_mutex_attr;
+static LCK_GRP_DECLARE(eventhandler_mutex_grp, "eventhandler");
 
 static unsigned int eg_size;    /* size of eventhandler_entry_generic */
 static struct mcache *eg_cache; /* mcache for eventhandler_entry_generic */
@@ -86,9 +82,8 @@ static struct mcache *eg_cache; /* mcache for eventhandler_entry_generic */
 static unsigned int el_size;    /* size of eventhandler_list */
 static struct mcache *el_cache; /* mcache for eventhandler_list */
 
-static lck_grp_attr_t   *el_lock_grp_attr;
-lck_grp_t        *el_lock_grp;
-lck_attr_t       *el_lock_attr;
+LCK_GRP_DECLARE(el_lock_grp, "eventhandler list");
+LCK_ATTR_DECLARE(el_lock_attr, 0, 0);
 
 struct eventhandler_entry_generic {
        struct eventhandler_entry       ee;
@@ -106,7 +101,7 @@ eventhandler_lists_ctxt_init(struct eventhandler_lists_ctxt *evthdlr_lists_ctxt)
        TAILQ_INIT(&evthdlr_lists_ctxt->eventhandler_lists);
        evthdlr_lists_ctxt->eventhandler_lists_initted = 1;
        lck_mtx_init(&evthdlr_lists_ctxt->eventhandler_mutex,
-           eventhandler_mutex_grp, eventhandler_mutex_attr);
+           &eventhandler_mutex_grp, LCK_ATTR_NULL);
 }
 
 /*
@@ -115,16 +110,6 @@ eventhandler_lists_ctxt_init(struct eventhandler_lists_ctxt *evthdlr_lists_ctxt)
 void
 eventhandler_init(void)
 {
-       eventhandler_mutex_grp_attr = lck_grp_attr_alloc_init();
-       eventhandler_mutex_grp = lck_grp_alloc_init("eventhandler",
-           eventhandler_mutex_grp_attr);
-       eventhandler_mutex_attr = lck_attr_alloc_init();
-
-       el_lock_grp_attr = lck_grp_attr_alloc_init();
-       el_lock_grp = lck_grp_alloc_init("eventhandler list",
-           el_lock_grp_attr);
-       el_lock_attr = lck_attr_alloc_init();
-
        eventhandler_lists_ctxt_init(&evthdlr_lists_ctxt_glb);
 
        eg_size = sizeof(struct eventhandler_entry_generic);
@@ -385,6 +370,6 @@ eventhandler_lists_ctxt_destroy(struct eventhandler_lists_ctxt *evthdlr_lists_ct
        }
        lck_mtx_unlock(&evthdlr_lists_ctxt->eventhandler_mutex);
        lck_mtx_destroy(&evthdlr_lists_ctxt->eventhandler_mutex,
-           eventhandler_mutex_grp);
+           &eventhandler_mutex_grp);
        return;
 }