From owner-svn-src-head@FreeBSD.ORG Tue Feb 25 23:17:59 2014 Return-Path: Delivered-To: svn-src-head@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 ESMTPS id 44867F54; Tue, 25 Feb 2014 23:17:59 +0000 (UTC) Received: from mail-ee0-x229.google.com (mail-ee0-x229.google.com [IPv6:2a00:1450:4013:c00::229]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5C8D616CF; Tue, 25 Feb 2014 23:17:58 +0000 (UTC) Received: by mail-ee0-f41.google.com with SMTP id b15so48139eek.0 for ; Tue, 25 Feb 2014 15:17:56 -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:message-id:subject :from:to:cc:content-type; bh=z1USaGKsGki1ByAogjuM8RuX6H0TWzPq32iz2PXngQI=; b=NwBHdUjs6v2uFPIRVmeLdzQP0RKAj8TLVwSJrfxp2EK0jOuqYN7iktgXN17JM8OK4E D6mVlGlRkToa05e/Ddfj5PjXtbbXAzFx0M02G8msPQVw7dRShv53eqYMoXlTov+EE0fo +kk8pEfXZ6JBhmWjDFXI9+5WR2kw5VaoYIz8S7fDjIpArfS+8oUUgZFIGuwVxUQbytKY Kg/VXpo0JMnoaKZK0PrtSvVYZp2q6xGw/CQ1g0EU40/aZNzTd2FTHLLvee70zuVEK8Fk DIYqXrfRNDnfIwG+N6JJOvfwBi0/1RPE6ylmpmIXVYQKHuDyKXOTWbODHeICu10n3sh7 +Vmg== MIME-Version: 1.0 X-Received: by 10.204.102.199 with SMTP id h7mr2496220bko.15.1393370276754; Tue, 25 Feb 2014 15:17:56 -0800 (PST) Sender: chmeeedalf@gmail.com Received: by 10.205.21.68 with HTTP; Tue, 25 Feb 2014 15:17:56 -0800 (PST) In-Reply-To: <201402250258.s1P2wCDd060659@svn.freebsd.org> References: <201402250258.s1P2wCDd060659@svn.freebsd.org> Date: Tue, 25 Feb 2014 15:17:56 -0800 X-Google-Sender-Auth: MjaRaKjgkPASA2Lc5k4wDsMCDR8 Message-ID: Subject: Re: svn commit: r262466 - head/sys/cddl/dev/systrace From: Justin Hibbits To: Mark Johnston Content-Type: text/plain; charset=UTF-8 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2014 23:17:59 -0000 I think this broke powerpc building. I see the following build failure: cc1: warnings being treated as errors /home/chmeee/freebsd/head/sys/modules/dtrace/systrace/../../../cddl/dev/systrace/systrace.c: In function 'systrace_probe': /home/chmeee/freebsd/head/sys/modules/dtrace/systrace/../../../cddl/dev/systrace/systrace.c:218: warning: function called through a non-compatible type /home/chmeee/freebsd/head/sys/modules/dtrace/systrace/../../../cddl/dev/systrace/systrace.c:218: note: if this code is reached, the program will abort - Justin On Mon, Feb 24, 2014 at 6:58 PM, Mark Johnston wrote: > Author: markj > Date: Tue Feb 25 02:58:11 2014 > New Revision: 262466 > URL: http://svnweb.freebsd.org/changeset/base/262466 > > Log: > Make all 8 syscall arguments available to syscall probes in the same way > that this is done for SDT probes. This fixes the syscall/tst.args.d test, > which was failing because mmap(2)'s sixth argument wasn't available to the > probe. > > MFC after: 2 weeks > > Modified: > head/sys/cddl/dev/systrace/systrace.c > > Modified: head/sys/cddl/dev/systrace/systrace.c > ============================================================================== > --- head/sys/cddl/dev/systrace/systrace.c Tue Feb 25 01:42:02 2014 (r262465) > +++ head/sys/cddl/dev/systrace/systrace.c Tue Feb 25 02:58:11 2014 (r262466) > @@ -168,6 +168,9 @@ static dtrace_pops_t systrace_pops = { > static struct cdev *systrace_cdev; > static dtrace_provider_id_t systrace_id; > > +typedef void (*systrace_dtrace_probe)(dtrace_id_t, uintptr_t, uintptr_t, > + uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t); > + > #if !defined(LINUX_SYSTRACE) > /* > * Probe callback function. > @@ -211,7 +214,8 @@ systrace_probe(u_int32_t id, int sysnum, > } > > /* Process the probe using the converted argments. */ > - dtrace_probe(id, uargs[0], uargs[1], uargs[2], uargs[3], uargs[4]); > + ((systrace_dtrace_probe)(dtrace_probe))(id, uargs[0], uargs[1], > + uargs[2], uargs[3], uargs[4], uargs[5], uargs[6], uargs[7]); > } > > #endif >