From owner-freebsd-current@FreeBSD.ORG Sat Dec 15 20:50:47 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 6DA4E351; Sat, 15 Dec 2012 20:50:47 +0000 (UTC) (envelope-from davide.italiano@gmail.com) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx1.freebsd.org (Postfix) with ESMTP id D9C948FC0A; Sat, 15 Dec 2012 20:50:46 +0000 (UTC) Received: by mail-vc0-f182.google.com with SMTP id fy27so3578976vcb.13 for ; Sat, 15 Dec 2012 12:50:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=J7IG0GsmlLlh6Q10fkGbRhKCrRcIVQfRIM9SxQL8dpg=; b=Fx1g79EIl6LPTrl7O4IotE/ljZ8or4h6gGFZTujxUBWQhT7XazkLqvDZ4RKD9OPA5c N0YZu5M4Cdopxq/zHbKaGGgzWmUJxgYPdlUSeXkWS4QuSM1CoeGlHu9BmkzNyjsFiIa5 5WNh/TOIUsZ3Spx5ZkTxGkuIwplbNy0bDJ9D0HBr/kR7RbTdu65eUGGhruYZywrDbTmH 9S6izpHGhdhVyutURYuVnrMS1DEbXYpBtNzmZYiz/uNDlzYdAzRAUcOtC9BSPRhJQ3lH kyyzTk57uLONpaf06OGucbnPsWcNRoshedHHB8C92Te/Oai2qwIokEc7roXjuz/ash0G 6ZRA== MIME-Version: 1.0 Received: by 10.52.70.46 with SMTP id j14mr13583598vdu.99.1355604645889; Sat, 15 Dec 2012 12:50:45 -0800 (PST) Sender: davide.italiano@gmail.com Received: by 10.58.245.130 with HTTP; Sat, 15 Dec 2012 12:50:45 -0800 (PST) In-Reply-To: <20121215203458.GA22361@oddish> References: <50CCAB99.4040308@FreeBSD.org> <20121215203458.GA22361@oddish> Date: Sat, 15 Dec 2012 12:50:45 -0800 X-Google-Sender-Auth: DcVtRg3QFEp51CzTIX97kavb0O4 Message-ID: Subject: Re: [RFC/RFT] calloutng From: Davide Italiano To: Mark Johnston Content-Type: text/plain; charset=ISO-8859-1 Cc: Alexander Motin , 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:50:47 -0000 On Sat, Dec 15, 2012 at 12:34 PM, Mark Johnston wrote: > 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 I fixed (or at least workarounded) that issue during the summer. http://svnweb.freebsd.org/base?view=revision&revision=237068 Probably that was lost somewhere. We're going to regenerate a patch, but for now I suggest to patch that manually or to checkout the calloutng project repository.