From owner-freebsd-current@FreeBSD.ORG Sat Dec 15 20:35:16 2012 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 75EE8BBE; Sat, 15 Dec 2012 20:35:16 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-ie0-f182.google.com (mail-ie0-f182.google.com [209.85.223.182]) by mx1.freebsd.org (Postfix) with ESMTP id 0C44E8FC0A; Sat, 15 Dec 2012 20:35:15 +0000 (UTC) Received: by mail-ie0-f182.google.com with SMTP id s9so7586098iec.13 for ; Sat, 15 Dec 2012 12:35:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=J2rqCHuEssg/RRlH1bpsFC4yRbJUO9RlxBCqtMW2kCk=; b=ELpVsTItFCJwhWDbWRxp/RviTZ2fnlIZSfLjw5XcuEArjiw+XpsCnHqsB7mNvh721N U+wvD4WE2w1CIGTpPZbsogM6inVUP06H/x9Sj3lzX6zv8Ll90SP8HJxU+b5EZAu1x3es eUlIM5wFzLTxy3wpXGD5Ykb4PqHipg1XX9leAHY19gaM/H0oRqkfhnhjBswDyd/et5TS ZgEhQeD5YoXdxVqtmjTIHQeE0TKeSR5kmZdVKbZNf5InCJHDzTt8AsLEDBQX57oq4k2o McgBDRaAEfZ0nKKtBHa6Rsh0TXOcbcRP+HbW5Jk8BUhV9FIQkfkgHTaflD8EhOFBzoSW 10xQ== Received: by 10.42.75.6 with SMTP id y6mr7722823icj.30.1355603715468; Sat, 15 Dec 2012 12:35:15 -0800 (PST) Received: from oddish ([66.11.160.25]) by mx.google.com with ESMTPS id x7sm2003527igk.8.2012.12.15.12.35.14 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 15 Dec 2012 12:35:14 -0800 (PST) Date: Sat, 15 Dec 2012 15:34:59 -0500 From: Mark Johnston To: Alexander Motin Subject: Re: [RFC/RFT] calloutng Message-ID: <20121215203458.GA22361@oddish> References: <50CCAB99.4040308@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <50CCAB99.4040308@FreeBSD.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Davide Italiano , FreeBSD Current , freebsd-arch@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2012 20:35:16 -0000 On Sat, Dec 15, 2012 at 06:55:53PM +0200, Alexander Motin wrote: > Hi. > > I'm sorry to interrupt review, but as usual good ideas came during the > final testing, causing another round. :) Here is updated patch for > HEAD, that includes several new changes: > http://people.freebsd.org/~mav/calloutng_12_15.patch This patch breaks the libprocstat build. Specifically, the OpenSolaris sys/time.h defines the preprocessor symbols gethrestime and gethrestime_sec. These symbols are also defined in cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h. libprocstat:zfs.c is compiled using include paths that pick up the OpenSolaris time.h, and with this patch _callout.h includes sys/time.h. zfs.c includes taskqueue.h (with _KERNEL defined), which includes _callout.h, so both time.h and zfs_context.h are included in zfs.c, and the symbols are thus defined twice. The patch below fixes the build for me. Another approach might be to include sys/_task.h instead of taskqueue.h at the beginning of zfs.c. Thanks, -Mark diff --git a/lib/libprocstat/zfs.c b/lib/libprocstat/zfs.c index aa6d78e..f8844bf 100644 --- a/lib/libprocstat/zfs.c +++ b/lib/libprocstat/zfs.c @@ -35,6 +35,7 @@ #undef lbolt #undef lbolt64 +#undef gethrestime #undef gethrestime_sec #include #include