From owner-freebsd-net@FreeBSD.ORG Sun Aug 25 20:04:15 2013 Return-Path: Delivered-To: freebsd-net@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3F723D8E; Sun, 25 Aug 2013 20:04:15 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-ie0-x22e.google.com (mail-ie0-x22e.google.com [IPv6:2607:f8b0:4001:c03::22e]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 071FD2FAF; Sun, 25 Aug 2013 20:04:14 +0000 (UTC) Received: by mail-ie0-f174.google.com with SMTP id k14so3775997iea.33 for ; Sun, 25 Aug 2013 13:04:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=2ZK4AH4NR6lYb5mRqMxozH2mHX0JLGw5VW/Md+PeszQ=; b=smwHLVPdMJ7PZ9bvIvtXORnVUE6V6MOx6DqkcFcz6gWAo37YHnJWiMWG9kaM/avtv4 +9m4+OenDwVfBAuepn0oRByjnOr3Iozt94dWAtdVFKuID/+MUvZqkPm1TryC1P/ITXD7 W+SblsZeMQy3SEgVdJWaoxI6ml6WHiN2HNtXmZ9sVXVPZaJxzI6NrvSdXcoClQjjaTzA nO64vXUNFlSEYpgizB/nliTA+YZwrt/+bPibKa4+YJbPRs3P+iwUpkXL4rmbRa0M2z3I SRtcgjBENEdXg5+itD3EBzGXj0O/Kftby03oW1gpYDt3Nq8XQCAiYQMK0WjD6sRAamKV 6FgQ== X-Received: by 10.50.2.99 with SMTP id 3mr4422328igt.51.1377461053563; Sun, 25 Aug 2013 13:04:13 -0700 (PDT) Received: from raichu (24-212-218-13.cable.teksavvy.com. [24.212.218.13]) by mx.google.com with ESMTPSA id oq3sm13004417igb.1.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 25 Aug 2013 13:04:12 -0700 (PDT) Sender: Mark Johnston Date: Sun, 25 Aug 2013 16:04:07 -0400 From: Mark Johnston To: Yuri Subject: Re: DTrace network providers Message-ID: <20130825200407.GA76615@raichu> References: <20130821045926.GA17196@raichu> <52168B0E.1050308@rawbw.com> <5216FC0B.1060304@rawbw.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5216FC0B.1060304@rawbw.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: freebsd-net@freebsd.org, freebsd-dtrace@freebsd.org X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Aug 2013 20:04:15 -0000 On Thu, Aug 22, 2013 at 11:07:07PM -0700, Yuri wrote: > On 08/22/2013 15:30, Mark Johnston wrote: > > My apologies! It looks like r254523 introduced a conflict. r254468 is a > > minimum dependency. > > > > I'd suggest trying again with r254523 or later. > > I don't know what the problem is, but I tried on r254523 and on the > later r254677, and am getting build error during buildkernel, see below. > And I did successful buildworld and installworld before this. > I suspect that you didn't delete the files added by the patch before applying the patch a second time. That'll result in two concatenated copies of the new files, which will cause the build to fail at in_kdtrace.c. I just made the same mistake myself. :) > > --- buildkernel errors --- > /usr/src/sys/netinet/in_kdtrace.c:165:1: error: redefinition of > 'sdt_provider_ip' > SDT_PROVIDER_DEFINE(ip); > ^ > /usr/src/sys/sys/sdt.h:136:22: note: expanded from macro > 'SDT_PROVIDER_DEFINE' > struct sdt_provider sdt_provider_##prov[1] = > { \ > ^ > :127:1: note: expanded from here > sdt_provider_ip > ^ > /usr/src/sys/netinet/in_kdtrace.c:38:1: note: previous definition is here > SDT_PROVIDER_DEFINE(ip); > ^ > /usr/src/sys/sys/sdt.h:136:22: note: expanded from macro > 'SDT_PROVIDER_DEFINE' > struct sdt_provider sdt_provider_##prov[1] = > { \ > ^ > :203:1: note: expanded from here > sdt_provider_ip > ^ > /usr/src/sys/netinet/in_kdtrace.c:166:1: error: redefinition of > 'sdt_provider_tcp' > SDT_PROVIDER_DEFINE(tcp); > ^ > /usr/src/sys/sys/sdt.h:136:22: note: expanded from macro > 'SDT_PROVIDER_DEFINE' > struct sdt_provider sdt_provider_##prov[1] = > { \ > ^ >