From owner-cvs-src@FreeBSD.ORG  Fri Apr 30 13:51:56 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 5CE7916A4CE; Fri, 30 Apr 2004 13:51:56 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4D84443D49; Fri, 30 Apr 2004 13:51:56 -0700 (PDT)
	(envelope-from wpaul@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3UKptGe045127;
	Fri, 30 Apr 2004 13:51:56 -0700 (PDT)
	(envelope-from wpaul@repoman.freebsd.org)
Received: (from wpaul@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3UKptrb045120;
	Fri, 30 Apr 2004 13:51:55 -0700 (PDT)
	(envelope-from wpaul)
Message-Id: <200404302051.i3UKptrb045120@repoman.freebsd.org>
From: Bill Paul <wpaul@FreeBSD.org>
Date: Fri, 30 Apr 2004 13:51:55 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/compat/ndis subr_ntoskrnl.c src/sys/dev/if_ndis
 if_ndis.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Apr 2004 20:51:56 -0000

wpaul       2004/04/30 13:51:55 PDT

  FreeBSD src repository

  Modified files:
    sys/compat/ndis      subr_ntoskrnl.c 
    sys/dev/if_ndis      if_ndis.c 
  Log:
  Small timer cleanups:
  
  - Use the dh_inserted member of the dispatch header in the Windows
    timer structure to indicate that the timer has been "inserted into
    the timer queue" (i.e. armed via timeout()). Use this as the value
    to return to the caller in KeCancelTimer(). Previously, I was using
    callout_pending(), but you can't use that with timeout()/untimeout()
    without creating a potential race condition.
  
  - Make ntoskrnl_init_timer() just a wrapper around ntoskrnl_init_timer_ex()
    (reduces some code duplication).
  
  - Drop Giant when entering if_ndis.c:ndis_tick() and
    subr_ntorkrnl.c:ntoskrnl_timercall(). At the moment, I'm forced to
    use system callwheel via timeout()/untimeout() to handle timers rather
    than the callout API (struct callout is too big to fit inside the
    Windows struct KTIMER, so I'm kind of hosed). Unfortunately, all
    the callouts in the callwhere are not marked as MPSAFE, so when
    one of them fires, it implicitly acquires Giant before invoking the
    callback routine (and releases it when it returns). I don't need to
    hold Giant, but there's no way to stop the callout code from acquiring
    it as long as I'm using timeout()/untimeout(), so for now we cheat
    by just dropping Giant right away (and re-acquiring it right before
    the routine returns so keep the callout code happy). At some point,
    I will need to solve this better, but for now this should be a suitable
    workaround.
  
  Revision  Changes    Path
  1.37      +19 -24    src/sys/compat/ndis/subr_ntoskrnl.c
  1.59      +6 -0      src/sys/dev/if_ndis/if_ndis.c