From owner-p4-projects@FreeBSD.ORG  Wed Jun 20 10:41:06 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E758F16A46C; Wed, 20 Jun 2007 10:41:05 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B4E8E16A421
	for <perforce@FreeBSD.org>; Wed, 20 Jun 2007 10:41:05 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id A574E13C45A
	for <perforce@FreeBSD.org>; Wed, 20 Jun 2007 10:41:05 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5KAf5SY093660
	for <perforce@FreeBSD.org>; Wed, 20 Jun 2007 10:41:05 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KAf5JW093603
	for perforce@freebsd.org; Wed, 20 Jun 2007 10:41:05 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 20 Jun 2007 10:41:05 GMT
Message-Id: <200706201041.l5KAf5JW093603@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 122023 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Wed, 20 Jun 2007 10:41:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=122023

Change 122023 by fli@fli_genesis on 2007/06/20 10:40:18

	- Allow the same event engine to execute the handler again
	  for serialized events.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.c#3 edit
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.h#3 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.c#3 (text+ko) ====

@@ -137,6 +137,7 @@
 	ev = (struct event *)arg.ptr;
 	MDNS_INIT_ASSERT(ev, ev_magic);
 
+again:
 	switch (ev->ev_type) {
 	case EVENT_TYPE_IO:
 		ret = ev->ev_cb.ev_handler.io(&ev->ev_data.io, ev->ev_handler_arg);
@@ -150,10 +151,18 @@
 	}
 
 	EV_WLOCK(ev);
+	if ((ev->ev_flags & EVENT_FLAG_EX) && ev->ev_redo > 0) {
+		ev->ev_redo--;
+		EV_UNLOCK(ev);
+		dprintf(DEBUG_EVENT, "Executing event again ev=%x", ev);
+		goto again;
+	}
 	ev->ev_refcnt--;
 	if (ev->ev_flags & EVENT_FLAG_DYING) {
 		evl = ev->ev_evl;
-		remove_event(evl, ev, NULL);
+		if (remove_event(evl, ev, NULL) == 1) {
+			EV_UNLOCK(ev);
+		}
 	}
 	else {
 		EV_UNLOCK(ev);
@@ -226,7 +235,8 @@
 		/* Exclusive event already in progress */
 		if ((ev->ev_flags & EVENT_FLAG_EX) && ev->ev_refcnt > 0)  {
 			dprintf(DEBUG_EVENT,
-				"Exclusive event already in progress ev=%x", ev); 
+				"Exclusive event already in progress ev=%x", ev);
+			ev->ev_redo++;	
 			EV_UNLOCK(ev);
 			continue;
 		}

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.h#3 (text+ko) ====

@@ -123,6 +123,7 @@
 	int ev_flags;
 #define EVENT_FLAG_EX		0x1 /* exclusive event (refcnt=1) */
 #define EVENT_FLAG_DYING	0x2 /* event is dying */
+	int ev_redo;
 	int ev_type;		/* event type */
 #define EVENT_TYPE_IO	0x1
 #define EVENT_TYPE_TMR	0x2