From owner-freebsd-current@FreeBSD.ORG Sat Dec 15 21:03:33 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 7ADA2A9F; Sat, 15 Dec 2012 21:03:33 +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 AD1C68FC19; Sat, 15 Dec 2012 21:03:32 +0000 (UTC) Received: by mail-we0-f182.google.com with SMTP id u54so2129547wey.13 for ; Sat, 15 Dec 2012 13:03:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=uVNWanL7oPU4mSpbgzQpla/m8Id0omxxLsJEieKqPhg=; b=p+ZLMK8hO6kLuGhgS/qEkJ0SffXPxe/CuzN8ZUgb+ON8H8dtzGz7SA+AIhb/hQKoyY oQOc+9UrXPo48ZG0MLOqYi6W3W8I5hvlbM22T/5J1gIjbodm6zw5jQM3B74SuI/4GyiM oV4nT2cM73/UGxPdzZ4RI/Hhh+j7zA38Zw14ROldVdNIrGdeXy1yGAe+KwOtDN3KGd7+ ugiyGTRGoAkNh8UIQOE7BfrBnY59i4vhYOFFDZ/W1dO1l42raqKA0VnLOO/vaQEmiQxW qnp90iyghSkAWN9wXvc6EhNFNL4uYHA/cAUR2Fv8ug9C6k6D8uOFZ4UofTf/auvjvJK8 KApw== Received: by 10.180.88.138 with SMTP id bg10mr8703142wib.13.1355605411525; Sat, 15 Dec 2012 13:03:31 -0800 (PST) Received: from mavbook.mavhome.dp.ua (mavhome.mavhome.dp.ua. [213.227.240.37]) by mx.google.com with ESMTPS id cf6sm4316001wib.3.2012.12.15.13.03.29 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 15 Dec 2012 13:03:30 -0800 (PST) Sender: Alexander Motin Message-ID: <50CCE59F.1080107@FreeBSD.org> Date: Sat, 15 Dec 2012 23:03:27 +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> In-Reply-To: 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:03:33 -0000 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 -- Alexander Motin