From owner-freebsd-current@FreeBSD.ORG Sat Dec 15 21:13:31 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 B3C241D0; Sat, 15 Dec 2012 21:13:31 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id D5A298FC13; Sat, 15 Dec 2012 21:13:30 +0000 (UTC) Received: by mail-we0-f182.google.com with SMTP id u54so2131715wey.13 for ; Sat, 15 Dec 2012 13:13:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=zlGgyR5dR9vhntoD3Pa0ZBhySFyS8xxNaaXEj9GspIc=; b=gpWImdjc6HcvMWu+SRVYI3jfgZxT6C3x/5K3C/Bo3cUvD62UUefxWLe0NIJ1gCQZBq EAj/kPL6EEZmj2ZY6TzVvdAmPVzOi6lxJ47wrFfilVygYE6CxLr2bTt+DbSCuMGGOUXV 96FfaqXlqFHiQViF+BuJQhbL3QQARTx1u8lbH+7lOAnj1uwsxPQDyWbPlt++dqULb5Zq IWVPAynLeDvNh0I4u6YNqG3QjyOKlV/ty2bbfW+mxV9eX7LDYEbPmsqCQkMdm2KCoEmJ ItOeP4w4pfCBnumTQlSNv9XCL2gEV7sd4fmPRQPGhJuEjihurZjy1L/oE7WXeiDorl+3 J07Q== X-Received: by 10.180.87.39 with SMTP id u7mr8719439wiz.6.1355606009701; Sat, 15 Dec 2012 13:13:29 -0800 (PST) Received: from mavbook.mavhome.dp.ua (mavhome.mavhome.dp.ua. [213.227.240.37]) by mx.google.com with ESMTPS id i2sm3895838wiw.3.2012.12.15.13.13.27 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 15 Dec 2012 13:13:28 -0800 (PST) Sender: Alexander Motin Message-ID: <50CCE7F6.2090505@FreeBSD.org> Date: Sat, 15 Dec 2012 23:13:26 +0200 From: Alexander Motin User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:13.0) Gecko/20120628 Thunderbird/13.0.1 MIME-Version: 1.0 To: Davide Italiano Subject: Re: [RFC/RFT] calloutng References: <50CCAB99.4040308@FreeBSD.org> <20121215203458.GA22361@oddish> <50CCE59F.1080107@FreeBSD.org> In-Reply-To: <50CCE59F.1080107@FreeBSD.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-arch@freebsd.org, FreeBSD Current , Mark Johnston 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 21:13:31 -0000 On 15.12.2012 23:03, Alexander Motin wrote: > On 15.12.2012 22:50, Davide Italiano wrote: >> 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: >>>> 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. >> >> 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. > > Sorry, it's my fault. I've tried to save some time on patch generation > and forgot about that change in lib/. We haven't touched user-level in > our work except that file. Here is patch with that chunk added: > http://people.freebsd.org/~mav/calloutng_12_15_1.patch And one more part I've missed is manual pages update, that probably needs more improvements: http://people.freebsd.org/~mav/calloutng_12_15.man.patch -- Alexander Motin