From owner-p4-projects@FreeBSD.ORG  Sat Apr  7 12:40:22 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 78EC21065677; Sat,  7 Apr 2012 12:40:22 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3BD611065673
	for <perforce@freebsd.org>; Sat,  7 Apr 2012 12:40:22 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 256548FC0A
	for <perforce@freebsd.org>; Sat,  7 Apr 2012 12:40:22 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q37CeMRJ033409
	for <perforce@freebsd.org>; Sat, 7 Apr 2012 12:40:22 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q37CeM25033405
	for perforce@freebsd.org; Sat, 7 Apr 2012 12:40:22 GMT
	(envelope-from jhb@freebsd.org)
Date: Sat, 7 Apr 2012 12:40:22 GMT
Message-Id: <201204071240.q37CeM25033405@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 209195 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Apr 2012 12:40:22 -0000

http://p4web.freebsd.org/@@209195?ac=10

Change 209195 by jhb@jhb_fiver on 2012/04/07 12:40:19

	Fix style of EVENTHANDLER_DEFINE() and add a SYSUNINIT to remove
	the tag on unload.

Affected files ...

.. //depot/projects/smpng/sys/sys/eventhandler.h#38 edit

Differences ...

==== //depot/projects/smpng/sys/sys/eventhandler.h#38 (text+ko) ====

@@ -171,15 +171,21 @@
 
 /* Operations to add and remove hooks. */
 #define EVENTHANDLER_DEFINE(name, func, arg, priority)			\
-	static eventhandler_tag name ## _tag;				\
-	static void name ## _evh_init(void *ctx)			\
-	{								\
-		name ## _tag = EVENTHANDLER_REGISTER(name, func, ctx,	\
-		    priority);						\
-	}								\
-	SYSINIT(name ## _evh_init, SI_SUB_CONFIGURE, SI_ORDER_ANY,	\
-	    name ## _evh_init, arg);					\
-	struct __hack
+static eventhandler_tag name ## _tag;					\
+									\
+static void name ## _evh_init(void *ctx)				\
+{									\
+	name ## _tag = EVENTHANDLER_REGISTER(name, func, ctx, priority); \
+}									\
+SYSINIT(name ## _evh_init, SI_SUB_CONFIGURE, SI_ORDER_ANY,		\
+    name ## _evh_init, arg);						\
+									\
+static void name ## _evh_fini(void *ctx __unused)			\
+{									\
+	EVENTHANDLER_DEREGISTER(name, name ## _tag);			\
+}									\
+SYSUNINIT(name ## _evh_fini, SI_SUB_CONFIGURE, SI_ORDER_ANY,		\
+    name ## _evh_fini, NULL)
 
 #define EVENTHANDLER_REGISTER(name, func, arg, priority)	\
 	eventhandler_register(NULL, #name, func, arg, priority)