From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 00:13:33 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B288AC7; Sun, 14 Jun 2015 00:13:33 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-yk0-x233.google.com (mail-yk0-x233.google.com [IPv6:2607:f8b0:4002:c07::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 15D2FB55; Sun, 14 Jun 2015 00:13:33 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: by ykfr66 with SMTP id r66so34195124ykf.0; Sat, 13 Jun 2015 17:13:32 -0700 (PDT) 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=k13Ni9A9IeMAPUIS+vgpv6R9ZbKdiMtrCgzBB7U1pFc=; b=ubfndYnnI9giEzav/A4Ec8Pw/fUgB5Q2ViGefe30UALZZR55jWRBrsVFXKYsL4uC/1 9TL1OaDFPaQ343nub2Z2qeaMDs2g33C6+ndtewn/bArIYpFeqNFPs5LfKpp3OPXEd/CL r4uOiPhTI7uWXe3xUVtkaB1dz8kmcVybiBvMHeDEuw6tvGT57yUJBo29RvAqGeyjmlfX 57pDCl2BnkwzNGSpOl3fBrBDY998cTtHVBpCSrpOOrj6WI42dJWckxMOTx7taq6bbZ6D Mc+fcuiclhZslll42qRXeiuyeH+V2QJkDW2PaHzN2GgIl5cZyMJmUbkmtJiqgDsy0z8t Oqcw== MIME-Version: 1.0 X-Received: by 10.170.224.84 with SMTP id q81mr27118314ykf.122.1434240812075; Sat, 13 Jun 2015 17:13:32 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.37.125.198 with HTTP; Sat, 13 Jun 2015 17:13:31 -0700 (PDT) In-Reply-To: <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> Date: Sat, 13 Jun 2015 17:13:31 -0700 X-Google-Sender-Auth: kLY3Jnpdn9ivDpyN9K7CSsChVp4 Message-ID: Subject: Re: svn commit: r284198 - head/bin/ls From: Craig Rodrigues To: Marcel Moolenaar Cc: Marcel Moolenaar , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 00:13:33 -0000 Hey Marcel, I hope that the current discussion thread doesn't dishearten you and Phil *too* much, and that you continue with the libxo work in FreeBSD. I think libxo is cool stuff. I've talked to a few people who are not FreeBSD users (they do Linux mostly), and they also think that libxo is pretty cool, because it makes it easier to obtain system-level information from FreeBSD, and analyze and present the info using the tools of the trade. The people I talk to use scripting languages like Python or Ruby, and devops frameworks like Ansible, Saltstack, Puppet, and Chef. They may do some quick prototyping and UI work with Javascript and HTML/CSS. Being able to generate JSON directly from system-level tools, and then analyze that in a Python script, or splash it on a Javascript/HTML 5 web page quite easily is really cool. For people who are trying to build FreeBSD-based embedded products with modern web UI's, this is *really* useful. It's unfortunate that some libxo commits broke some stuff. Are there ATF-style tests in either C or Bourne shell that we could add to the system as more utilities are converted over? It's not perfect, and a lot of the existing utilities do not have existing tests, so this might be tough, but anything we do which can help would be nice. Thanks for your work. -- Craig From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 00:26:42 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EDD9DCBC; Sun, 14 Jun 2015 00:26:41 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "troutmask", Issuer "troutmask" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id C91BDD63; Sun, 14 Jun 2015 00:26:41 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.14.9/8.14.9) with ESMTP id t5E0QeXA002756 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 13 Jun 2015 17:26:40 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.9/8.14.9/Submit) id t5E0QeVK002755; Sat, 13 Jun 2015 17:26:40 -0700 (PDT) (envelope-from sgk) Date: Sat, 13 Jun 2015 17:26:40 -0700 From: Steve Kargl To: Craig Rodrigues Cc: Marcel Moolenaar , Marcel Moolenaar , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284198 - head/bin/ls Message-ID: <20150614002640.GA2746@troutmask.apl.washington.edu> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 00:26:42 -0000 On Sat, Jun 13, 2015 at 05:13:31PM -0700, Craig Rodrigues wrote: > > For people who are trying to build FreeBSD-based embedded products with > modern web UI's, > this is *really* useful. > Given the bloat caused by libxo, which I showed in March, I don't see how people working on embedded products could be thrilled with this. Given the horrid state of the manpages, which I showed in March, one can only wonder about the internals of the libxo itself. -- Steve From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 00:30:09 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8A1DFE2F; Sun, 14 Jun 2015 00:30:09 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x230.google.com (mail-ig0-x230.google.com [IPv6:2607:f8b0:4001:c05::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 555A5D88; Sun, 14 Jun 2015 00:30:09 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igbzc4 with SMTP id zc4so32939282igb.0; Sat, 13 Jun 2015 17:30:08 -0700 (PDT) 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:content-type; bh=pZWlm9THq97IqTVlw8ECuoFIA+DFeUnuQqRbd5sv4HU=; b=trLDxyuXK9g7dwO9muwQDzH1+zKpMTx1TKJ8erCZnsQBDv84mk7hKhIJugDD6/y0il jF8AeEc1+Uv4tRed33c+8iOpEuuaAv0Vh8oZSsQwFjZji9J1wrHXHuubLofcHeoRsVMT vTPxahRAqgrS2b+YZXv012NVqyKlQz1SEUQVBoZea0gg4f7hrsYCel3RKJzuEEwrMx2y J0VCaOsiYKGHKJjl0ljRxEHA3HecOb9GT6pN753ebBcWU2oPmcawg8GlEl0REsMRg6Ni zsXQD+ME5grLxT/QiUuwvit31hy26R1MuwKsLzZgtwWVXPKd72PADmK3BV09D50Zom3n 2PuA== MIME-Version: 1.0 X-Received: by 10.42.176.8 with SMTP id bc8mr7869733icb.22.1434241808790; Sat, 13 Jun 2015 17:30:08 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Sat, 13 Jun 2015 17:30:08 -0700 (PDT) In-Reply-To: <201506132201.t5DM1LCV025599@svn.freebsd.org> References: <201506132201.t5DM1LCV025599@svn.freebsd.org> Date: Sat, 13 Jun 2015 17:30:08 -0700 X-Google-Sender-Auth: Jj3m9RWhWlo5lshV2bszKoJ2Amg Message-ID: Subject: Re: svn commit: r284356 - head/usr.sbin/crunch/crunchgen From: Adrian Chadd To: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 00:30:09 -0000 tsk, this broke some stuff (nostdlibs?) .. let me fix this. Sorry! -a From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 00:31:22 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CECFDF74; Sun, 14 Jun 2015 00:31:22 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BD106EE0; Sun, 14 Jun 2015 00:31:22 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5E0VMSo006314; Sun, 14 Jun 2015 00:31:22 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5E0VM7C006313; Sun, 14 Jun 2015 00:31:22 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201506140031.t5E0VM7C006313@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sun, 14 Jun 2015 00:31:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284363 - head/usr.sbin/crunch/crunchgen X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 00:31:22 -0000 Author: adrian Date: Sun Jun 14 00:31:22 2015 New Revision: 284363 URL: https://svnweb.freebsd.org/changeset/base/284363 Log: Fix typo - this upsets llvm/gcc-4.9, but not gcc-4.2 for some reason. Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c ============================================================================== --- head/usr.sbin/crunch/crunchgen/crunchgen.c Sat Jun 13 23:12:06 2015 (r284362) +++ head/usr.sbin/crunch/crunchgen/crunchgen.c Sun Jun 14 00:31:22 2015 (r284363) @@ -1110,7 +1110,7 @@ prog_makefile_rules(FILE *outmk, prog_t fprintf(outmk, " $(%s_LIBS)", p->ident); fprintf(outmk, "\n"); - fprintf(outmk, "\t$(CC) -nostdlibs -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", + fprintf(outmk, "\t$(CC) -nostdlib -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", p->name, p->name, p->ident); if (p->libs) fprintf(outmk, " $(%s_LIBS)", p->ident); From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 00:41:00 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F0C01A2; Sun, 14 Jun 2015 00:41:00 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-yk0-x22c.google.com (mail-yk0-x22c.google.com [IPv6:2607:f8b0:4002:c07::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 478CA68; Sun, 14 Jun 2015 00:41:00 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: by ykfl8 with SMTP id l8so34419821ykf.1; Sat, 13 Jun 2015 17:40:59 -0700 (PDT) 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=Rf/2Brzmr56r7t0jHW9WZJ/BhXNaFSPXOY6srDbsnaA=; b=h5f6IqyYAOka/oSjtozVj/cU+uqc4qwVqORHrTqU/CFt7eRh3jx9225XFS+ESsX98h aJGUMzFADmydIsFZTxBw7aNkmNqzB9V61JkfFEhLunI7g069XfLyEmIhlwD2e+zpOcIc OEMFhJ2vQ+eTqaArHFVtqkJ7qhlWu5xy9OUdFV2N7GNgJT1+D6Vo5hKhQiwPgIvs4mHP oTQ+MJTba/xkqdVf4ujaMXb8/0uZhCma89jmuEluJF9fx8e3AgO6rrW1DdionrenKKv4 XVHH8IRdzO3tcvKEuWAzDHSJ6cBqa8ewEHTnWNd6lZiqQyDWSOB8r37Cc+k5ItlCozFp Z67Q== MIME-Version: 1.0 X-Received: by 10.129.119.7 with SMTP id s7mr26300339ywc.87.1434242459127; Sat, 13 Jun 2015 17:40:59 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.37.125.198 with HTTP; Sat, 13 Jun 2015 17:40:59 -0700 (PDT) In-Reply-To: <20150614002640.GA2746@troutmask.apl.washington.edu> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> Date: Sat, 13 Jun 2015 17:40:59 -0700 X-Google-Sender-Auth: l8rhFvFt__nTQliSmq7S-3ZgEtA Message-ID: Subject: Re: svn commit: r284198 - head/bin/ls From: Craig Rodrigues To: Steve Kargl Cc: Marcel Moolenaar , Marcel Moolenaar , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 00:41:00 -0000 On Sat, Jun 13, 2015 at 5:26 PM, Steve Kargl < sgk@troutmask.apl.washington.edu> wrote: > On Sat, Jun 13, 2015 at 05:13:31PM -0700, Craig Rodrigues wrote: > > > > For people who are trying to build FreeBSD-based embedded products with > > modern web UI's, > > this is *really* useful. > > > > Given the bloat caused by libxo, which I showed in March, > I don't see how people working on embedded products could > be thrilled with this. > Steve, For people building embedded products these days, storage of gigabytes and even terabytes is often available, so the space increase that libxo provides is not that big a problem, at least for the last few products that I have worked on in the past few years. > > Given the horrid state of the manpages, which I showed > in March, one can only wonder about the internals of > the libxo itself. > Are you talking about this comment you made? https://lists.freebsd.org/pipermail/freebsd-current/2015-March/054899.html I can't make heads or tails of what you wrote, other than you seemed very angry. -- Craig From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 00:58:03 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 23F0237B; Sun, 14 Jun 2015 00:58:03 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x233.google.com (mail-ig0-x233.google.com [IPv6:2607:f8b0:4001:c05::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DBF103F9; Sun, 14 Jun 2015 00:58:02 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igboe5 with SMTP id oe5so7669246igb.1; Sat, 13 Jun 2015 17:58:02 -0700 (PDT) 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=gW/TNuwGaWlFKfVFgWWsfLH1n3raJRO0WOJviJb3f9o=; b=EolwE1V9QJBcjKrS/Y8XBPcterldrDXTPQ9hK8iSzrYNdmabL4L+NUu+DjgO0vwEGy +tMRIgSbDiUVPEU0hb/ofW2mUJHlc3Dhh4j8Xdh2+HOd3/ZOKzblCwkrj+CSqhoUBins 39qzXrs39hRswRPII0i/c5UHdPHnkvl2canrboJx+5qJltlP0AGwH+tliycnnl0PTRx9 uq5eKPT0wCq1fmI2+B8+ANBAum29HjLwkVoJ2GTbtWkMcAKNJsFQINu86mtrWfF6uX3m LPcX+Yhs7n3123fOUORxqRhcaGo5LOX7j6Zo7jGd7m/n3cpu2cD5OwhkWtJwy0YaU094 Xh4Q== MIME-Version: 1.0 X-Received: by 10.107.164.70 with SMTP id n67mr26345893ioe.8.1434243482327; Sat, 13 Jun 2015 17:58:02 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Sat, 13 Jun 2015 17:58:02 -0700 (PDT) In-Reply-To: References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> Date: Sat, 13 Jun 2015 17:58:02 -0700 X-Google-Sender-Auth: FQ7Qyy2Ks_p-Mna7ZuqhuaFQPAE Message-ID: Subject: Re: svn commit: r284198 - head/bin/ls From: Adrian Chadd To: Craig Rodrigues Cc: Steve Kargl , Marcel Moolenaar , Marcel Moolenaar , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 00:58:03 -0000 Hi craig, I guarantee that no matter what you've worked on, there's approximately five orders of magnitude of shipping devices whose entire storage space can be measured in 1 digit megabytes. Each year. -adrian From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 01:00:55 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B4E4C4C8; Sun, 14 Jun 2015 01:00:55 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x236.google.com (mail-ig0-x236.google.com [IPv6:2607:f8b0:4001:c05::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 78FBA66B; Sun, 14 Jun 2015 01:00:55 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igbpi8 with SMTP id pi8so33427684igb.0; Sat, 13 Jun 2015 18:00:54 -0700 (PDT) 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=uQFpcLeANJ7aM9qBt+JfS4M76ttWHAeJAaq0RvaByf4=; b=cql4gek+Kl0RtHRqC9NdyBpBvmzBY9KnjV995gbKc4m1VydYInbshVJp9d3JgVuRGz 5u2H1dhuW2dc/lHFyZUOKxIeff7XkyplWtv0l1RjWkxOsYRMxOTk3vNLaDCgyxhccClf xsw4spO/xg1z3vMtyA4FaTFQ8JEvSlyL2Er2hd3fbStNveVzCHGOhzIS85epfWclrvoB tma55JnK0qHiMmbwbwCHOQ9G2p03NPNakZAHelrcztBRF/zaWXpN8K3kHSAHuVCrPcQL uw5O9TgZHuwkevK7GK14waLBqPzDJXI/BZfzacHye0oxAvZm6Vb2psZEOwsO9xeXd6en RVyA== MIME-Version: 1.0 X-Received: by 10.42.176.8 with SMTP id bc8mr7933828icb.22.1434243654936; Sat, 13 Jun 2015 18:00:54 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Sat, 13 Jun 2015 18:00:54 -0700 (PDT) In-Reply-To: References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> Date: Sat, 13 Jun 2015 18:00:54 -0700 X-Google-Sender-Auth: yq6NbC20YVzLHkHCf_TgiG_GsO8 Message-ID: Subject: Re: svn commit: r284198 - head/bin/ls From: Adrian Chadd To: Craig Rodrigues Cc: Steve Kargl , Marcel Moolenaar , Marcel Moolenaar , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 01:00:55 -0000 On 13 June 2015 at 17:58, Adrian Chadd wrote: > Hi craig, > > I guarantee that no matter what you've worked on, there's > approximately five orders of magnitude of shipping devices whose > entire storage space can be measured in 1 digit megabytes. Each year. (And yes - there's an appreciable set of them for which freebsd boots, runs and keeps running on them.0 You can buy em too, some of them even under $60. -adrian From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 01:22:45 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7148C7CA; Sun, 14 Jun 2015 01:22:45 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-yk0-x22d.google.com (mail-yk0-x22d.google.com [IPv6:2607:f8b0:4002:c07::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2A37EC27; Sun, 14 Jun 2015 01:22:45 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: by ykfr66 with SMTP id r66so34619112ykf.0; Sat, 13 Jun 2015 18:22:44 -0700 (PDT) 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=xIlFaOFngOC8WJDOxEzfIOYbhQoiHxOXG15P8yu+xrg=; b=T687zfeWNZVNYDA0aAmYdgLQXGdW0+lfJXVDZ4Wiu2I6rYiYJU2J+2jX2REin7rzLo eurB9GkCj8nvt1pwluKzJbXTbpm22oswqcmt4KFM9lAOIHKEcPM9vAmHOGvn9aY4Av3G DHj4bvzaMR77HEG0biNvdWRV0bTUItW9h3uvkDA4oFV3V8VXG7OuVzbV84GXjokASaEr pRD4cpPSnqCse/PDZQec8jTnP5LOrenRLsB7gvLQYe8CuFC748zNCfpO3FK8VK8xkKFL WKtXvtkos4OjFmuGZhTT65tbzqw/+0BrQS4QItj6nQbv8lMvDTuUHEddqlyG9Oxk0UHY V4LQ== MIME-Version: 1.0 X-Received: by 10.129.136.135 with SMTP id y129mr27333800ywf.111.1434244964268; Sat, 13 Jun 2015 18:22:44 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.37.39.130 with HTTP; Sat, 13 Jun 2015 18:22:44 -0700 (PDT) In-Reply-To: References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> Date: Sat, 13 Jun 2015 18:22:44 -0700 X-Google-Sender-Auth: 9wsu7KkOESLnAVWFZI6WMoxbMsE Message-ID: Subject: Re: svn commit: r284198 - head/bin/ls From: Craig Rodrigues To: Adrian Chadd Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 01:22:45 -0000 On Sat, Jun 13, 2015 at 6:00 PM, Adrian Chadd wrote: > > > > I guarantee that no matter what you've worked on, there's > > approximately five orders of magnitude of shipping devices whose > > entire storage space can be measured in 1 digit megabytes. Each year. > > (And yes - there's an appreciable set of them for which freebsd boots, > runs and keeps running on them.0 > > You can buy em too, some of them even under $60. Can FreeBSD now not run on these systems because of libxo? -- Craig From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 01:29:26 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D00EE92B; Sun, 14 Jun 2015 01:29:26 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "troutmask", Issuer "troutmask" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 8F7D2C41; Sun, 14 Jun 2015 01:29:26 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.14.9/8.14.9) with ESMTP id t5E1TP1D003037 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 13 Jun 2015 18:29:25 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.9/8.14.9/Submit) id t5E1TObB003036; Sat, 13 Jun 2015 18:29:24 -0700 (PDT) (envelope-from sgk) Date: Sat, 13 Jun 2015 18:29:24 -0700 From: Steve Kargl To: Craig Rodrigues Cc: Marcel Moolenaar , Marcel Moolenaar , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284198 - head/bin/ls Message-ID: <20150614012924.GA2965@troutmask.apl.washington.edu> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 01:29:26 -0000 On Sat, Jun 13, 2015 at 05:40:59PM -0700, Craig Rodrigues wrote: > On Sat, Jun 13, 2015 at 5:26 PM, Steve Kargl < > sgk@troutmask.apl.washington.edu> wrote: > > > > Given the horrid state of the manpages, which I showed > > in March, one can only wonder about the internals of > > the libxo itself. > > > > Are you talking about this comment you made? > https://lists.freebsd.org/pipermail/freebsd-current/2015-March/054899.html > > I can't make heads or tails of what you wrote, other than you seemed very > angry. > I wasn't very angry. I'm simply pointing out that the libxo manpages, which should document what libxo is/does, are horrible documentation. If the quality of the manpages matches the quality of library, and the brokeness that we have been witnesses bears this out, should be questioned. % cd src/contrib/libxo/libxo % grep Nd *.3 | grep formatted xo_attr.3:.Nd emit formatted output based on format string and arguments xo_create.3:.Nd emit formatted output based on format string and arguments xo_emit.3:.Nd emit formatted output based on format string and arguments xo_finish.3:.Nd emit formatted output based on format string and arguments xo_flush.3:.Nd emit formatted output based on format string and arguments xo_open_list.3:.Nd emit formatted output based on format string and arguments xo_set_allocator.3:.Nd emit formatted output based on format string and arguments xo_set_flags.3:.Nd emit formatted output based on format string and arguments xo_set_info.3:.Nd emit formatted output based on format string and arguments xo_set_style.3:.Nd emit formatted output based on format string and arguments xo_set_writer.3:.Nd emit formatted output based on format string and arguments Do you really believe that the Nd entries for these manpages are correct? -- Steve From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 01:45:59 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1A10CACA; Sun, 14 Jun 2015 01:45:59 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-yk0-x233.google.com (mail-yk0-x233.google.com [IPv6:2607:f8b0:4002:c07::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C5689E; Sun, 14 Jun 2015 01:45:58 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: by ykfl8 with SMTP id l8so34819781ykf.1; Sat, 13 Jun 2015 18:45:57 -0700 (PDT) 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=EEI4g2L/x7v4Yb7l9xmGL6jN4x0T+4XuY/nSHUu7rZo=; b=0kY4/o4xJeLMfyXFw5AYcsqrQ0e+1UZUGJbbrW8JiXf5ygCSRGZjgztZ7ntjFz8JQb vYgmjP7jxvMC3qyjv8zWSRkHcHY5Mp8L/osVe2S7eqq9PKZ0HesaPsCo2gsl9UXNbUhA t13JrZm7o/3Nsue24T3bH+zGsv+q1EMs7ICV74GSJ8nJlP80lJpucC+zvMUkCRPRRZHz ECyYvLRQQiB9YX+7eMIf6l3KtZ3LQd9WCIYqhXrNPF+qzsbE+uzLLqG2aPbQOBaPwwhb dq9+d0D2cHQTSUnA+9b7VDbAoohiOvtiu0oBxNjrpBxnqhpudP5Jp/mV1PyKMdi3xx9l rGjg== MIME-Version: 1.0 X-Received: by 10.170.59.213 with SMTP id b204mr26542678ykb.10.1434246357865; Sat, 13 Jun 2015 18:45:57 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.37.39.130 with HTTP; Sat, 13 Jun 2015 18:45:57 -0700 (PDT) In-Reply-To: <20150614012924.GA2965@troutmask.apl.washington.edu> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> <20150614012924.GA2965@troutmask.apl.washington.edu> Date: Sat, 13 Jun 2015 18:45:57 -0700 X-Google-Sender-Auth: qYKy5kgBGodST05vzlYdz6vjKoM Message-ID: Subject: Re: svn commit: r284198 - head/bin/ls From: Craig Rodrigues To: Steve Kargl Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 01:45:59 -0000 On Sat, Jun 13, 2015 at 6:29 PM, Steve Kargl < sgk@troutmask.apl.washington.edu> wrote: > > > > Are you talking about this comment you made? > > > https://lists.freebsd.org/pipermail/freebsd-current/2015-March/054899.html > > > > I can't make heads or tails of what you wrote, other than you seemed very > > angry. > > > > I wasn't very angry. It's hard for me to tell, really, since you submitted patches with FUBAR in them, so you seemed pretty angry in that e-mail. I'm simply pointing out that the libxo > manpages, which should document what libxo is/does, are > horrible documentation. If the quality of the manpages > matches the quality of library, and the brokeness that > we have been witnesses bears this out, should be questioned. > > I can't comment on the quality of the code, since I haven't looked at it in detail. I have read the discussions on arch@, and understand what libxo is trying to accomplish, and am eager to have this because I will definitely use it in stuff I am working on. I have also worked with Marcel and Phil, and respect them both quite a bit. It's a shame that some of the libxo commits broke some things, but if I was doing this type of work, I would probably make some mistakes and break things too, since this is low-level stuff covering many utilities in Unix. Hopefully, we can fix these things can quickly, and we move on. > Do you really believe that the Nd entries for these manpages are > correct? > I'm not an expert on the mdoc format, so I couldn't tell you. If you can think of some patches to fix things, in the man pages, would you be able to submit the patches to Phil, and have them incorporated into the software to make it better? libxo is maintained at https://github.com/Juniper/libxo . I don't know if you are willing/able to submit patches to the libxo project on Github, to help fix things. That would be great if you could do that and help out. -- Craig From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 02:06:49 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 637A8DD0; Sun, 14 Jun 2015 02:06:49 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-yh0-x22f.google.com (mail-yh0-x22f.google.com [IPv6:2607:f8b0:4002:c01::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1D9BF688; Sun, 14 Jun 2015 02:06:49 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: by yhan67 with SMTP id n67so25771500yha.3; Sat, 13 Jun 2015 19:06:48 -0700 (PDT) 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=YnSOgwEcPN638otTczfNB7mjNenGKXUFhyIOtUTyYVw=; b=LAi7qccFBIyeE4igKkuIB4zDDOVzpK2DR4oOAb4S4PB9facd9iukeYe1T2EwnH64ef kN9u8QuTYgscKVZFqCJczr+a1+Hw9u7Q28+NVTsiHRxPP69plcSeiTaqZF+5i5fWwZ8h kJUbyDK/IBcGdcjxEVpMc2g7sN1uR7+UsIBGGneM1MNT4WuYjXLbUb6QlmUVTr/MpQZt YjqWqw++lYp8SIO9k0I0albaZloRla6A5iIwgqZXPaBJFtO8KgrHcm4Pp2+2IYfnw94V 5WglWDz506mHVwqMZm4ajKrv2GFbUCFzyobE/HGfBofE/pMpo1QBe8gQU4TGF/bRAxA6 hHTA== MIME-Version: 1.0 X-Received: by 10.129.45.136 with SMTP id t130mr27282871ywt.83.1434247607974; Sat, 13 Jun 2015 19:06:47 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.37.39.130 with HTTP; Sat, 13 Jun 2015 19:06:47 -0700 (PDT) In-Reply-To: <950C4B23-B625-4173-A7C4-A4F1B2C5771D@gmail.com> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <950C4B23-B625-4173-A7C4-A4F1B2C5771D@gmail.com> Date: Sat, 13 Jun 2015 19:06:47 -0700 X-Google-Sender-Auth: s3H0OSHaAV8QzzH8KOVYt2cyRwc Message-ID: Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... From: Craig Rodrigues To: Garrett Cooper Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 02:06:49 -0000 On Sat, Jun 13, 2015 at 3:37 PM, Garrett Cooper wrote: > On Jun 13, 2015, at 15:34, Craig Rodrigues wrote: > > > On Sat, Jun 13, 2015 at 12:20 PM, Simon J. Gerraty > wrote: > > Author: sjg > > Date: Sat Jun 13 19:20:56 2015 > > New Revision: 284345 > > URL: https://svnweb.freebsd.org/changeset/base/284345 > > > > Log: > > Add META_MODE support. > > > > Simon, > > > > Can you take a look at this: > > https://jenkins.freebsd.org/job/FreeBSD_HEAD/2860/ > > > > > > The console output is showing this: > > + make -j 4 buildworld __MAKE_CONF=/builds/FreeBSD_HEAD/make.conf > > make: "/builds/FreeBSD_HEAD/Makefile" line 102: Malformed conditional > (${MK_META_MODE} == "yes") > > make: Fatal errors encountered -- cannot continue > > make: stopped in /builds/FreeBSD_HEAD > > Build step 'Execute shell' marked build as failure > > > > This is using a FreeBSD 10.1 host to build HEAD. > > The problem is that the bootstrapping capability has been broken with > fmake. The quick fix would probably be to add MK_META_MODE?= yes to the > Makefile. > According to this commit: https://svnweb.freebsd.org/base?view=revision&revision=250699 /usr/bin/make is bmake in FreeBSD 10.1-R. Can you clarify to me why bootstrapping HEAD on a FreeBSD 10.1 host now does not work? How is fmake involved? Thanks. -- Craig From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 02:14:00 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1E89F3E; Sun, 14 Jun 2015 02:14:00 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pa0-x233.google.com (mail-pa0-x233.google.com [IPv6:2607:f8b0:400e:c03::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6A6E28CE; Sun, 14 Jun 2015 02:14:00 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by pacgb13 with SMTP id gb13so13549511pac.1; Sat, 13 Jun 2015 19:14:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=Rhi+jhCGacodt+9rKNAQZvH83QLKHXlJuM+DnLZObpk=; b=Wjw9ZF6XQaPOWoaHSFnjlVRzLT+KrX00VPu15oN21vGzReHHZVScPqtii0VIYWhccG wMAwuiYzpovALA902ChlgamAaLrsZAyMikj4l3A7KnwQBMkm2Ky+egLXRD/1zzKOqQgO ta8/FhhC37cMdvc1hc+luPe8gIzggSEsjAjO2qMPsLjrS+vTUDVqkYsLlFocc2cOKQyb pYOyOcGZH4Qqpm29Rl7DpwqjYWvd3/JghkZpSNPd+0whAEAl00vwU8Sm5YpjWvSHBMt6 4hCv6HThcsOvTw9iWtQS9IK6XMRv9GEHURXhVipsSsOE27dyfe6EwR36/7OiWycAGROJ c8aQ== X-Received: by 10.66.222.161 with SMTP id qn1mr36550617pac.66.1434248039972; Sat, 13 Jun 2015 19:13:59 -0700 (PDT) Received: from [192.168.20.7] (c-98-247-240-204.hsd1.wa.comcast.net. [98.247.240.204]) by mx.google.com with ESMTPSA id ki3sm7877729pdb.74.2015.06.13.19.13.58 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 13 Jun 2015 19:13:58 -0700 (PDT) Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... From: Garrett Cooper X-Mailer: iPhone Mail (12F70) In-Reply-To: Date: Sat, 13 Jun 2015 19:13:57 -0700 Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-Id: <89F16527-2EBC-4B69-82E7-9B6F105B4C9E@gmail.com> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <950C4B23-B625-4173-A7C4-A4F1B2C5771D@gmail.com> To: Craig Rodrigues Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 02:14:00 -0000 > On Jun 13, 2015, at 19:06, Craig Rodrigues wrote: >=20 >> On Sat, Jun 13, 2015 at 3:37 PM, Garrett Cooper w= rote: >> On Jun 13, 2015, at 15:34, Craig Rodrigues wrote: >>=20 >> > On Sat, Jun 13, 2015 at 12:20 PM, Simon J. Gerraty wr= ote: >> > Author: sjg >> > Date: Sat Jun 13 19:20:56 2015 >> > New Revision: 284345 >> > URL: https://svnweb.freebsd.org/changeset/base/284345 >> > >> > Log: >> > Add META_MODE support. >> > >> > Simon, >> > >> > Can you take a look at this: >> > https://jenkins.freebsd.org/job/FreeBSD_HEAD/2860/ >> > >> > >> > The console output is showing this: >> > + make -j 4 buildworld __MAKE_CONF=3D/builds/FreeBSD_HEAD/make.conf >> > make: "/builds/FreeBSD_HEAD/Makefile" line 102: Malformed conditional (= ${MK_META_MODE} =3D=3D "yes") >> > make: Fatal errors encountered -- cannot continue >> > make: stopped in /builds/FreeBSD_HEAD >> > Build step 'Execute shell' marked build as failure >> > >> > This is using a FreeBSD 10.1 host to build HEAD. >>=20 >> The problem is that the bootstrapping capability has been broken with fma= ke. The quick fix would probably be to add MK_META_MODE?=3D yes to the Makef= ile. >=20 > =20 > According to this commit: https://svnweb.freebsd.org/base?view=3Drevision&= revision=3D250699 > /usr/bin/make is bmake in FreeBSD 10.1-R. Can you clarify to me why > bootstrapping HEAD on a FreeBSD 10.1 host now does not work? How is fmake= involved? Not 100% sure yet, but that's what repros the issue for me...= From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 02:48:07 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 40D854B9; Sun, 14 Jun 2015 02:48:07 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x230.google.com (mail-ig0-x230.google.com [IPv6:2607:f8b0:4001:c05::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 04244F15; Sun, 14 Jun 2015 02:48:07 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igbzc4 with SMTP id zc4so33820413igb.0; Sat, 13 Jun 2015 19:48:06 -0700 (PDT) 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=/49k6NaIHPDw6OzZfLzW1DhaEHdkffI0bKQJZYx6KPI=; b=Bg4S4U3nW4L+ygPE6ZGuXspjdxYOM7MBYOIbRfqMAwr+MfwVs0btwgEslJbXvMZJic QIJGv+LYB2WL7/B8C0SS+r2f8BzUPMnxd4a8kYoKPop8D7k0hSBRedb1Fbhd+TuW1wn2 GagI+en7Bzv1UTMQIVEWtxrbIOsBihr2GqyEsCUCIlGYhbRNU1d/EunnISnBgUeQzHQX m8YGs6y4CxPwmH6fV5RFfQ3S4zxLaJIJWpqygT666f37F6GvGbnSpHF8CqcXTHH2tEXO Xzd21E58vRTDBd0SccwgtleyZo/n1+/IewR9jYwFCAweldAPrS73FVtxBb/2/uTf1adQ Vnhg== MIME-Version: 1.0 X-Received: by 10.43.163.129 with SMTP id mo1mr23098842icc.61.1434250086517; Sat, 13 Jun 2015 19:48:06 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Sat, 13 Jun 2015 19:48:06 -0700 (PDT) In-Reply-To: References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> Date: Sat, 13 Jun 2015 19:48:06 -0700 X-Google-Sender-Auth: jAAnifVsWfpYm3iF8fQQs8w_RUc Message-ID: Subject: Re: svn commit: r284198 - head/bin/ls From: Adrian Chadd To: Craig Rodrigues Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 02:48:07 -0000 On 13 June 2015 at 18:22, Craig Rodrigues wrote: > > > On Sat, Jun 13, 2015 at 6:00 PM, Adrian Chadd wrote: >> >> > >> > I guarantee that no matter what you've worked on, there's >> > approximately five orders of magnitude of shipping devices whose >> > entire storage space can be measured in 1 digit megabytes. Each year. >> >> (And yes - there's an appreciable set of them for which freebsd boots, >> runs and keeps running on them.0 >> >> You can buy em too, some of them even under $60. > > > Can FreeBSD now not run on these systems because of libxo? It's a tight squeeze as it is. Running in 8MB of flash (even if it's compressed) is still an exercise in "what can you cut out." My point isn't that it isn't running because of libxo; my point is that arguing about "embedded" involving "lots of storage" is woefully incorrect and will continue to be until those gigabytes of storage are available for a penny. Which yes, I'm guessing will happen in my career - but it's also quite likely code bloat will continue to chase that upward. -adrian From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 03:27:23 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3A6C1392; Sun, 14 Jun 2015 03:27:23 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 233B0B83; Sun, 14 Jun 2015 03:27:23 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5E3RNj2094669; Sun, 14 Jun 2015 03:27:23 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5E3RMvP094668; Sun, 14 Jun 2015 03:27:22 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506140327.t5E3RMvP094668@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 14 Jun 2015 03:27:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284366 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 03:27:23 -0000 Author: sjg Date: Sun Jun 14 03:27:22 2015 New Revision: 284366 URL: https://svnweb.freebsd.org/changeset/base/284366 Log: Avoid anoying warning Modified: head/share/mk/bsd.init.mk Modified: head/share/mk/bsd.init.mk ============================================================================== --- head/share/mk/bsd.init.mk Sun Jun 14 03:14:45 2015 (r284365) +++ head/share/mk/bsd.init.mk Sun Jun 14 03:27:22 2015 (r284366) @@ -20,7 +20,7 @@ ____: # this tells lib.mk and prog.mk to not actually build anything _SKIP_BUILD = not building at level 0 .endif -.if !empty(_SKIP_BUILD) +.if ${.MAKE.LEVEL} > 0 && !empty(_SKIP_BUILD) .warning ${_SKIP_BUILD} .endif From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 03:28:26 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0C8FD4E7; Sun, 14 Jun 2015 03:28:26 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EF5A2B8F; Sun, 14 Jun 2015 03:28:25 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5E3SPxU094849; Sun, 14 Jun 2015 03:28:25 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5E3SPNM094848; Sun, 14 Jun 2015 03:28:25 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506140328.t5E3SPNM094848@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 14 Jun 2015 03:28:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284367 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 03:28:26 -0000 Author: sjg Date: Sun Jun 14 03:28:25 2015 New Revision: 284367 URL: https://svnweb.freebsd.org/changeset/base/284367 Log: Watch out for bin/cat in host stage tree Modified: head/share/mk/local.dirdeps.mk Modified: head/share/mk/local.dirdeps.mk ============================================================================== --- head/share/mk/local.dirdeps.mk Sun Jun 14 03:27:22 2015 (r284366) +++ head/share/mk/local.dirdeps.mk Sun Jun 14 03:28:25 2015 (r284367) @@ -50,6 +50,7 @@ DIRDEPS_FILTER.host = \ DIRDEPS_FILTER+= \ + Nbin/cat.host \ ${DIRDEPS_FILTER.xtras:U} .endif From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 03:28:49 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 776B7621; Sun, 14 Jun 2015 03:28:49 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 65FC0B92; Sun, 14 Jun 2015 03:28:49 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5E3Snpi094943; Sun, 14 Jun 2015 03:28:49 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5E3SnBa094942; Sun, 14 Jun 2015 03:28:49 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506140328.t5E3SnBa094942@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 14 Jun 2015 03:28:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284368 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 03:28:49 -0000 Author: sjg Date: Sun Jun 14 03:28:48 2015 New Revision: 284368 URL: https://svnweb.freebsd.org/changeset/base/284368 Log: Avoid trailing white-space Modified: head/share/mk/local.gendirdeps.mk Modified: head/share/mk/local.gendirdeps.mk ============================================================================== --- head/share/mk/local.gendirdeps.mk Sun Jun 14 03:28:25 2015 (r284367) +++ head/share/mk/local.gendirdeps.mk Sun Jun 14 03:28:48 2015 (r284368) @@ -1,7 +1,7 @@ # $FreeBSD$ # we need a keyword, this noise is to prevent it being expanded -GENDIRDEPS_HEADER= echo '\# ${FreeBSD:L:@v@$$$v$$ @} '; +GENDIRDEPS_HEADER= echo '\# ${FreeBSD:L:@v@$$$v$$ @:M*F*}'; # supress optional/auto dependecies # local.dirdeps.mk will put them in if necessary From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 03:29:25 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C1760780; Sun, 14 Jun 2015 03:29:25 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B00B4BA0; Sun, 14 Jun 2015 03:29:25 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5E3TPxj095076; Sun, 14 Jun 2015 03:29:25 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5E3TPBJ095075; Sun, 14 Jun 2015 03:29:25 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506140329.t5E3TPBJ095075@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 14 Jun 2015 03:29:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284369 - head/targets/pseudo/userland X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 03:29:25 -0000 Author: sjg Date: Sun Jun 14 03:29:24 2015 New Revision: 284369 URL: https://svnweb.freebsd.org/changeset/base/284369 Log: We cannot build makewhatis and mandoc Modified: head/targets/pseudo/userland/Makefile.depend Modified: head/targets/pseudo/userland/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/Makefile.depend Sun Jun 14 03:28:48 2015 (r284368) +++ head/targets/pseudo/userland/Makefile.depend Sun Jun 14 03:29:24 2015 (r284369) @@ -2,9 +2,17 @@ # This file is not autogenerated - take care! +.if !defined(MK_MANDOCDB) +.include +.endif + DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DIRDEPS = \ +DIRDEPS= +.if ${MK_MANDOCDB} == "no" +DIRDEPS+= usr.bin/makewhatis +.endif +DIRDEPS+= \ bin/cat \ bin/chflags \ bin/chio \ @@ -271,7 +279,6 @@ DIRDEPS = \ usr.bin/lzmainfo \ usr.bin/m4 \ usr.bin/mail \ - usr.bin/makewhatis \ usr.bin/man \ usr.bin/mandoc \ usr.bin/mesg \ @@ -777,4 +784,5 @@ DIRDEPS.powerpc= \ DIRDEPS+= ${DIRDEPS.${MACHINE}:U} + .include From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 03:30:40 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 092868C9; Sun, 14 Jun 2015 03:30:40 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EBF18C01; Sun, 14 Jun 2015 03:30:39 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5E3Ud3M097265; Sun, 14 Jun 2015 03:30:39 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5E3Udm8097264; Sun, 14 Jun 2015 03:30:39 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506140330.t5E3Udm8097264@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 14 Jun 2015 03:30:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284370 - head/usr.bin/kdump X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 03:30:40 -0000 Author: sjg Date: Sun Jun 14 03:30:39 2015 New Revision: 284370 URL: https://svnweb.freebsd.org/changeset/base/284370 Log: Create proper targets for linux*syscalls.c Modified: head/usr.bin/kdump/Makefile Modified: head/usr.bin/kdump/Makefile ============================================================================== --- head/usr.bin/kdump/Makefile Sun Jun 14 03:29:24 2015 (r284369) +++ head/usr.bin/kdump/Makefile Sun Jun 14 03:30:39 2015 (r284370) @@ -25,9 +25,17 @@ CLEANFILES= ioctl.c kdump_subr.c kdump_s .if (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386") CLEANFILES+= linux_syscalls.c +kdump.o: linux_syscalls.c +linux_syscalls.c: linux_syscalls.conf + sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \ + ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux/syscalls.master ${.CURDIR}/linux_syscalls.conf .endif .if (${MACHINE_ARCH} == "amd64") CLEANFILES+= linux32_syscalls.c +kdump.o: linux32_syscalls.c +linux32_syscalls.c: linux32_syscalls.conf + sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \ + ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux32/syscalls.master ${.CURDIR}/linux32_syscalls.conf .endif ioctl.c: mkioctls @@ -40,13 +48,5 @@ kdump_subr.h: mksubr kdump_subr.c: mksubr kdump_subr.h sh ${.CURDIR}/mksubr ${DESTDIR}${INCLUDEDIR} >${.TARGET} -.if (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386") - sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \ - ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux/syscalls.master ${.CURDIR}/linux_syscalls.conf -.endif -.if (${MACHINE_ARCH} == "amd64") - sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \ - ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux32/syscalls.master ${.CURDIR}/linux32_syscalls.conf -.endif .include From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 03:31:24 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C470CA0E; Sun, 14 Jun 2015 03:31:24 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3230C85; Sun, 14 Jun 2015 03:31:24 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5E3VOx5099069; Sun, 14 Jun 2015 03:31:24 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5E3VOZj099068; Sun, 14 Jun 2015 03:31:24 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506140331.t5E3VOZj099068@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 14 Jun 2015 03:31:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284371 - head/libexec/ftpd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 03:31:24 -0000 Author: sjg Date: Sun Jun 14 03:31:23 2015 New Revision: 284371 URL: https://svnweb.freebsd.org/changeset/base/284371 Log: Needs libxo Modified: head/libexec/ftpd/Makefile.depend Modified: head/libexec/ftpd/Makefile.depend ============================================================================== --- head/libexec/ftpd/Makefile.depend Sun Jun 14 03:30:39 2015 (r284370) +++ head/libexec/ftpd/Makefile.depend Sun Jun 14 03:31:23 2015 (r284371) @@ -15,6 +15,7 @@ DIRDEPS = \ lib/libopie \ lib/libpam/libpam \ lib/libutil \ + lib/libxo \ lib/msun \ usr.bin/yacc.host \ From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 03:32:50 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 11450B5C; Sun, 14 Jun 2015 03:32:50 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F3E37D80; Sun, 14 Jun 2015 03:32:49 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5E3WnPP099289; Sun, 14 Jun 2015 03:32:49 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5E3Wn3k099287; Sun, 14 Jun 2015 03:32:49 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506140332.t5E3Wn3k099287@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 14 Jun 2015 03:32:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284372 - head/usr.bin/xlint/llib X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 03:32:50 -0000 Author: sjg Date: Sun Jun 14 03:32:49 2015 New Revision: 284372 URL: https://svnweb.freebsd.org/changeset/base/284372 Log: Need to provide -I for meta mode Modified: head/usr.bin/xlint/llib/Makefile Modified: head/usr.bin/xlint/llib/Makefile ============================================================================== --- head/usr.bin/xlint/llib/Makefile Sun Jun 14 03:31:23 2015 (r284371) +++ head/usr.bin/xlint/llib/Makefile Sun Jun 14 03:32:49 2015 (r284372) @@ -8,6 +8,8 @@ FILESDIR= ${LINTLIBDIR} CLEANFILES+= ${LIBS} + + llib-lposix.ln: llib-lposix ${LINT} ${LINTFLAGS} -Cposix ${.ALLSRC} @@ -15,3 +17,7 @@ llib-lstdc.ln: llib-lstdc ${LINT} ${LINTFLAGS} -Cstdc ${.ALLSRC} .include + +.if ${MK_META_MODE} == "yes" +LINTFLAGS+= -I${STAGE_INCLUDEDIR} +.endif From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 03:33:28 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9945D7D; Sun, 14 Jun 2015 03:33:28 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A776CD87; Sun, 14 Jun 2015 03:33:28 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5E3XSAA099564; Sun, 14 Jun 2015 03:33:28 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5E3XSoa099563; Sun, 14 Jun 2015 03:33:28 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506140333.t5E3XSoa099563@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 14 Jun 2015 03:33:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284373 - head/gnu/usr.bin/binutils/libbfd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 03:33:28 -0000 Author: sjg Date: Sun Jun 14 03:33:27 2015 New Revision: 284373 URL: https://svnweb.freebsd.org/changeset/base/284373 Log: Avoid circular dependency with nm Modified: head/gnu/usr.bin/binutils/libbfd/Makefile Modified: head/gnu/usr.bin/binutils/libbfd/Makefile ============================================================================== --- head/gnu/usr.bin/binutils/libbfd/Makefile Sun Jun 14 03:32:49 2015 (r284372) +++ head/gnu/usr.bin/binutils/libbfd/Makefile Sun Jun 14 03:33:27 2015 (r284373) @@ -103,4 +103,7 @@ elf32-target.h: elfxx-target.h elf64-target.h: elfxx-target.h sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} +# avoid cicular dependency +GENDIRDEPS_FILTER+= N*/nm + .include From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 03:34:10 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9764DEC5; Sun, 14 Jun 2015 03:34:10 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 85A5FD91; Sun, 14 Jun 2015 03:34:10 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5E3YAAw099700; Sun, 14 Jun 2015 03:34:10 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5E3YAiJ099698; Sun, 14 Jun 2015 03:34:10 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506140334.t5E3YAiJ099698@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 14 Jun 2015 03:34:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284374 - in head/usr.bin: mkcsmapper_static mkesdb_static X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 03:34:10 -0000 Author: sjg Date: Sun Jun 14 03:34:09 2015 New Revision: 284374 URL: https://svnweb.freebsd.org/changeset/base/284374 Log: NO_WARNS when building for host Modified: head/usr.bin/mkcsmapper_static/Makefile head/usr.bin/mkesdb_static/Makefile Modified: head/usr.bin/mkcsmapper_static/Makefile ============================================================================== --- head/usr.bin/mkcsmapper_static/Makefile Sun Jun 14 03:33:27 2015 (r284373) +++ head/usr.bin/mkcsmapper_static/Makefile Sun Jun 14 03:34:09 2015 (r284374) @@ -7,6 +7,9 @@ SRCS= citrus_bcs.c citrus_db_factory.c c citrus_lookup_factory.c citrus_pivot_factory.c MAN= NO_SHARED= yes +.if ${MACHINE} == "host" +NO_WARNS= yes +.endif build-tools: mkcsmapper_static Modified: head/usr.bin/mkesdb_static/Makefile ============================================================================== --- head/usr.bin/mkesdb_static/Makefile Sun Jun 14 03:33:27 2015 (r284373) +++ head/usr.bin/mkesdb_static/Makefile Sun Jun 14 03:34:09 2015 (r284374) @@ -7,6 +7,9 @@ SRCS= citrus_bcs.c citrus_db_factory.c c citrus_lookup_factory.c MAN= NO_SHARED= yes +.if ${MACHINE} == "host" +NO_WARNS= yes +.endif build-tools: mkesdb_static From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 04:38:18 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 79C0D2C4; Sun, 14 Jun 2015 04:38:18 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DF6C5CA2; Sun, 14 Jun 2015 04:38:17 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id t5E4c8VS090740 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Sun, 14 Jun 2015 07:38:08 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua t5E4c8VS090740 Received: (from kostik@localhost) by tom.home (8.14.9/8.14.9/Submit) id t5E4c82x090739; Sun, 14 Jun 2015 07:38:08 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 14 Jun 2015 07:38:08 +0300 From: Konstantin Belousov To: Garrett Cooper Cc: araujo@FreeBSD.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, "src-committers@freebsd.org" , Allan Jude Subject: Re: svn commit: r284336 - head/sys/dev/acpi_support Message-ID: <20150614043808.GL2080@kib.kiev.ua> References: <201506130555.t5D5tQij003839@svn.freebsd.org> <20150613073746.GJ2080@kib.kiev.ua> <17D20218-2A87-4F1E-BF8C-563C38305C51@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <17D20218-2A87-4F1E-BF8C-563C38305C51@gmail.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 04:38:18 -0000 On Sat, Jun 13, 2015 at 03:31:16PM -0700, Garrett Cooper wrote: > On Jun 13, 2015, at 4:30, Marcelo Araujo wrote: > > > +1. > > Fixed (r284357/r284358). Thanks! I doubt that anything is fixed. >From a little information I can gather from the r284336 commit message, there was some NULL pointer dereference (may be not, FWIW). The r284336 papered over it, just ignoring the chunk of code when bith env variables are _not_ NULL. Now, the condition is reversed, and since r284336 hide the bug, it is arguable that both env vars were not NULL on the problematic machines. The consequence is that the check is a nop now, since machines do have valid SMBIOS info, and a bug, whatever it is, is not fixed, and probably not even diagnosed. From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 04:46:30 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AC161716; Sun, 14 Jun 2015 04:46:30 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-yh0-x235.google.com (mail-yh0-x235.google.com [IPv6:2607:f8b0:4002:c01::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 66442EAB; Sun, 14 Jun 2015 04:46:30 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: by yhpn97 with SMTP id n97so26210263yhp.0; Sat, 13 Jun 2015 21:46:29 -0700 (PDT) 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=1cS6sFMLkimLZozQp5mymp7wQguJ9Qk/FwIHxAmoRwI=; b=WTqWEW6NVSIw7FwTb0BfCKNEMwHxCsU/RzRrF5ym3JwrZ/jYu/RoFBjkX489ELq6Fx VyA/z7ov9mfycItgsCGX4GNiv5HMQuWFlJTmQCldMiRa2ajy07L6isqMMYvB3N0Bop0o FTZQJIUdkPJgYSNgTEz+4pJ+aupRLO7fXm3xpJgh7FS9wQ5V6WT93XYHyb7MVSN8L6ou JNSILSJWyvpUqNsBhQV4lpKVaY+ylwctU/1GS5XV1SQDfoRl8nA9bUyQBpU4za6KXYiO b5M3GOFtJzT90m5PAoMq5b1vjeEULFMb1ygYxA5dLGTVVQ+q0tyYoS4Q0lCEipIxWgqD PgLA== MIME-Version: 1.0 X-Received: by 10.13.232.8 with SMTP id r8mr840364ywe.167.1434257189526; Sat, 13 Jun 2015 21:46:29 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.37.39.130 with HTTP; Sat, 13 Jun 2015 21:46:29 -0700 (PDT) In-Reply-To: References: <201506131920.t5DJKwMH033508@svn.freebsd.org> Date: Sat, 13 Jun 2015 21:46:29 -0700 X-Google-Sender-Auth: iiXXkG9TvJ_nVi5X3NMJ7LeZywM Message-ID: Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... From: Craig Rodrigues To: "Simon J. Gerraty" Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 04:46:30 -0000 On Sat, Jun 13, 2015 at 3:34 PM, Craig Rodrigues wrote: > > On Sat, Jun 13, 2015 at 12:20 PM, Simon J. Gerraty wrote: >> >> Author: sjg >> Date: Sat Jun 13 19:20:56 2015 >> New Revision: 284345 >> URL: https://svnweb.freebsd.org/changeset/base/284345 >> >> Log: >> Add META_MODE support. > > > Simon, > > Can you take a look at this: > https://jenkins.freebsd.org/job/FreeBSD_HEAD/2860/ > > > The console output is showing this: > > + make -j 4 buildworld __MAKE_CONF=/builds/FreeBSD_HEAD/make.conf > make: "/builds/FreeBSD_HEAD/Makefile" line 102: Malformed conditional (${MK_META_MODE} == "yes") > make: Fatal errors encountered -- cannot continue > make: stopped in /builds/FreeBSD_HEAD > Build step 'Execute shell' marked build as failure > > This is using a FreeBSD 10.1 host to build HEAD. > I can reproduce the problem pretty quickly. I did this on a FreeBSD-CURRENT host: # svn co svn://svn.freebsd.org/base/head src # cd src # make -V MK_META_MODE no I did this on a FreeBSD 10.1-R host: # svn co svn://svn.freebsd.org/base/head src # cd src # make -V MK_META_MODE make: "/root/src/Makefile" line 102: Malformed conditional (${MK_META_MODE} == "yes") make: Fatal errors encountered -- cannot continue make: stopped in /root/src FreeBSD 10.1 is using bmake as /usr/bin/make so fmake is not an issue here. I think the issue is that on FreeBSD 10.1, the /usr/share/mk files do not have the logic to define MK_META_MODE. I am not sure if this is the right fix, but I did this: Index: Makefile =================================================================== --- Makefile (revision 284374) +++ Makefile (working copy) @@ -99,7 +99,7 @@ # # For more information, see the build(7) manual page. # -.if ${MK_META_MODE} == "yes" +.if !empty(MK_META_MODE) && ${MK_META_MODE} == "yes" # targets/Makefile plays the role of top-level .include "targets/Makefile" .else and that made things work for me on FreeBSD 10.1-R. -- Craig From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 05:23:40 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 60EC3463; Sun, 14 Jun 2015 05:23:40 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4F4F0A1D; Sun, 14 Jun 2015 05:23:40 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5E5NePl059453; Sun, 14 Jun 2015 05:23:40 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5E5NebT059452; Sun, 14 Jun 2015 05:23:40 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201506140523.t5E5NebT059452@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Sun, 14 Jun 2015 05:23:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284376 - head/sys/vm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 05:23:40 -0000 Author: alc Date: Sun Jun 14 05:23:39 2015 New Revision: 284376 URL: https://svnweb.freebsd.org/changeset/base/284376 Log: As the next step in eliminating PG_CACHE pages, free rather than cache pages in vm_pageout_scan(). The reactivation rate of cache pages created by vm_pageout_scan() is extremely low; typically no more than 0.5% to 2.25% of the pages are ever reactivated. At the same time, caching pages is more expensive than freeing them. For example, in a test with PostgreSQL, this change reduced the amount of time spent in the inactive queue scan by 1/6. Differential Revision: https://reviews.freebsd.org/D2805 Reviewed by: kib Sponsored by: EMC / Isilon Storage Division Modified: head/sys/vm/vm_pageout.c Modified: head/sys/vm/vm_pageout.c ============================================================================== --- head/sys/vm/vm_pageout.c Sun Jun 14 05:12:48 2015 (r284375) +++ head/sys/vm/vm_pageout.c Sun Jun 14 05:23:39 2015 (r284376) @@ -1233,10 +1233,10 @@ vm_pageout_scan(struct vm_domain *vmd, i --page_shortage; } else if (m->dirty == 0) { /* - * Clean pages can be placed onto the cache queue. - * This effectively frees them. + * Clean pages can be freed. */ - vm_page_cache(m); + vm_page_free(m); + PCPU_INC(cnt.v_dfree); --page_shortage; } else if ((m->flags & PG_WINATCFLS) == 0 && pass < 2) { /* From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 05:48:00 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 382F2B85; Sun, 14 Jun 2015 05:48:00 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from vps.hungerhost.com (vps.hungerhost.com [64.131.64.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0BBF4EBA; Sun, 14 Jun 2015 05:47:59 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from [137.122.64.33] (port=49785 helo=[10.2.213.120]) by vps.hungerhost.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.85) (envelope-from ) id 1Z40ly-0007Io-Np; Sun, 14 Jun 2015 01:47:58 -0400 Message-ID: <557D1595.1000104@neville-neil.com> Date: Sun, 14 Jun 2015 01:48:05 -0400 From: George Neville-Neil User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Gleb Smirnoff , David Chisnall CC: Ian Lepore , Steve Kargl , Alexander Kabaev , Marcel Moolenaar , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284198 - head/bin/ls References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <20150613191639.GO73119@FreeBSD.org> In-Reply-To: <20150613191639.GO73119@FreeBSD.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - vps.hungerhost.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - neville-neil.com X-Get-Message-Sender-Via: vps.hungerhost.com: authenticated_id: gnn@neville-neil.com X-Source: X-Source-Args: X-Source-Dir: X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 05:48:00 -0000 On 06/13/2015 15:16, Gleb Smirnoff wrote: > On Sat, Jun 13, 2015 at 11:38:11AM -0400, David Chisnall wrote: > D> > If you would have told me a year ago that you had a simple scheme that > D> > could make 30 years of experience maintaining code for unix-like systems > D> > completely worthless I would have been skeptical, but it seems we're > D> > well on our way. > D> > D> There is a lot of heckling and unhelpful hyperbole in this thread. Reading the xo_emit format strings takes a little bit of getting used to, but the same is true of printf - it’s just that we’re already used to printf. The structured parts (xo_open_container, xo_close_container and friends) are clear and descriptive. The changes are fairly invasive, but the benefits are also very large for anyone who is wanting to automate administration of FreeBSD systems. > D> > D> If you have suggestions for how the libxo APIs could be improved, then please let us know - Phil is very reception to suggestions but objections along the lines of ‘it’s not what I’m used to and changes sometimes break things so we should never have changes’ are not helpful. > > I would agree with David. After xo_emit format is learned, reading sources > of converted programs isn't a big deal. > > All the problems with converted utilities are due to very bad quality of > initial conversion commits. > Can this whole conversation be moved out of the commits list and onto arch@ where it belongs? Best, George From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 06:09:41 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A393DFA8; Sun, 14 Jun 2015 06:09:41 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "troutmask", Issuer "troutmask" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 6522E3C9; Sun, 14 Jun 2015 06:09:41 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.14.9/8.14.9) with ESMTP id t5E69Z5t003899 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 13 Jun 2015 23:09:35 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.9/8.14.9/Submit) id t5E69ZbJ003898; Sat, 13 Jun 2015 23:09:35 -0700 (PDT) (envelope-from sgk) Date: Sat, 13 Jun 2015 23:09:35 -0700 From: Steve Kargl To: Craig Rodrigues Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284198 - head/bin/ls Message-ID: <20150614060935.GA3889@troutmask.apl.washington.edu> References: <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> <20150614012924.GA2965@troutmask.apl.washington.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 06:09:41 -0000 On Sat, Jun 13, 2015 at 06:45:57PM -0700, Craig Rodrigues wrote: > On Sat, Jun 13, 2015 at 6:29 PM, Steve Kargl < > sgk@troutmask.apl.washington.edu> wrote: > > > > > > > Are you talking about this comment you made? > > > > > https://lists.freebsd.org/pipermail/freebsd-current/2015-March/054899.html > > > > > > I can't make heads or tails of what you wrote, other than you seemed very > > > angry. > > > > > > > I wasn't very angry. > > It's hard for me to tell, really, since you submitted patches > with FUBAR in them, so you seemed pretty angry in that e-mail. > FUBAR is as good as what is already there. Simply drawing attention to the people responsible for libxo's inclusion in FreeBSD that they need to fix it. > > Do you really believe that the Nd entries for these manpages are > > correct? > > > > I'm not an expert on the mdoc format, so I couldn't tell you. > If you can think of some patches to fix things, in the man pages, > would you be able to submit the patches to Phil, and have them incorporated > into the software to make it better? There isn't a public mailing list or other mechanism to submit a patch. One needs to sign up for an account. I have way too many accounts on way too many systems to sign up for a new account to send in a single patch. > libxo is maintained at https://github.com/Juniper/libxo . > > I don't know if you are willing/able to submit patches to the libxo project > on Github, > to help fix things. That would be great if you could do that and help out. It seems that libxo developers have no interest in FreeBSD documentation. https://github.com/Juniper/libxo/issues/13 Those that imported/maintain libxo within FreeBSD should fix the documentation. -- Steve From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 07:47:19 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AAFE2B77; Sun, 14 Jun 2015 07:47:19 +0000 (UTC) (envelope-from jlh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7F39CD49; Sun, 14 Jun 2015 07:47:19 +0000 (UTC) (envelope-from jlh@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5E7lJBC029407; Sun, 14 Jun 2015 07:47:19 GMT (envelope-from jlh@FreeBSD.org) Received: (from jlh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5E7lJvh029406; Sun, 14 Jun 2015 07:47:19 GMT (envelope-from jlh@FreeBSD.org) Message-Id: <201506140747.t5E7lJvh029406@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jlh set sender to jlh@FreeBSD.org using -f From: Jeremie Le Hen Date: Sun, 14 Jun 2015 07:47:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284377 - head/lib/libc/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 07:47:19 -0000 Author: jlh Date: Sun Jun 14 07:47:18 2015 New Revision: 284377 URL: https://svnweb.freebsd.org/changeset/base/284377 Log: NetBSD commit log: Use a constant array for the MIB. Newer LLVM decided that mib[] warranted stack protections, with the obvious crash after the setup was done. As a positive side effect, code size shrinks a bit. I'm not sure why this hasn't bitten us yes, but it is certainly possible and there are no real drawbacks to this change anyway. Submitted by: pfg Obtained from: NetBSD MFC after: 1 week Modified: head/lib/libc/sys/stack_protector.c Modified: head/lib/libc/sys/stack_protector.c ============================================================================== --- head/lib/libc/sys/stack_protector.c Sun Jun 14 05:23:39 2015 (r284376) +++ head/lib/libc/sys/stack_protector.c Sun Jun 14 07:47:18 2015 (r284377) @@ -41,8 +41,8 @@ __FBSDID("$FreeBSD$"); #include #include "libc_private.h" -extern int __sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, - void *newp, size_t newlen); +extern int __sysctl(const int *name, u_int namelen, void *oldp, + size_t *oldlenp, void *newp, size_t newlen); long __stack_chk_guard[8] = {0, 0, 0, 0, 0, 0, 0, 0}; static void __guard_setup(void) __attribute__((__constructor__, __used__)); @@ -54,7 +54,7 @@ void __chk_fail(void); static void __guard_setup(void) { - int mib[2]; + static const int mib[2] = { CTL_KERN, KERN_ARND }; size_t len; int error; @@ -65,12 +65,9 @@ __guard_setup(void) if (error == 0 && __stack_chk_guard[0] != 0) return; - mib[0] = CTL_KERN; - mib[1] = KERN_ARND; - len = sizeof(__stack_chk_guard); - if (__sysctl(mib, 2, __stack_chk_guard, &len, NULL, 0) == -1 || - len != sizeof(__stack_chk_guard)) { + if (__sysctl(mib, nitems(mib), __stack_chk_guard, &len, NULL, 0) == + -1 || len != sizeof(__stack_chk_guard)) { /* If sysctl was unsuccessful, use the "terminator canary". */ ((unsigned char *)(void *)__stack_chk_guard)[0] = 0; ((unsigned char *)(void *)__stack_chk_guard)[1] = 0; From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 07:51:19 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 01B17CF8; Sun, 14 Jun 2015 07:51:18 +0000 (UTC) (envelope-from jlehen@gmail.com) Received: from mail-lb0-x232.google.com (mail-lb0-x232.google.com [IPv6:2a00:1450:4010:c04::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7CFBFEBD; Sun, 14 Jun 2015 07:51:18 +0000 (UTC) (envelope-from jlehen@gmail.com) Received: by lbbtu8 with SMTP id tu8so37609863lbb.2; Sun, 14 Jun 2015 00:51:16 -0700 (PDT) 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=T4ytS97TNfgzYz0K+4KT53VX0tpiRudZccUtXpywCZQ=; b=yTUudLj48D3nCDIQcDJLw4al5mKpJSBsH4c+lm+1oqhHy3bgfGmt77x+VkUGZZL1aJ 0f5bDsEugkaAjW1DojtUfMQn6QCX+viv2c9aR1Q1YFS/XvdCzhOMJKD6CtkkFVGVYA8D 9dLYlKUwp2PK1iY1XV3bf2jr6dr6ENM/JZT/Aol9APCARAZhz7B07WsZCZ1W4O+XNHCG /M/G9TXBDjIwmqHS569+BYJWfIEis9F8ggFCW94CPiWgJbCX0XIbGuolXCfqS9VPV78m xMyblXYPEpymbXZSzetLZg954QlJ4Y925qM9qZtp7FreXPLYWUZ3L3pA8LHTalZeKiQC SUsQ== MIME-Version: 1.0 X-Received: by 10.112.119.198 with SMTP id kw6mr19803632lbb.97.1434268276611; Sun, 14 Jun 2015 00:51:16 -0700 (PDT) Sender: jlehen@gmail.com Received: by 10.112.58.169 with HTTP; Sun, 14 Jun 2015 00:51:16 -0700 (PDT) In-Reply-To: <201506140747.t5E7lJvh029406@svn.freebsd.org> References: <201506140747.t5E7lJvh029406@svn.freebsd.org> Date: Sun, 14 Jun 2015 09:51:16 +0200 X-Google-Sender-Auth: ZjQLykb-dy_FSTGty2LqVr7V4D8 Message-ID: Subject: Re: svn commit: r284377 - head/lib/libc/sys From: Jeremie Le Hen To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Cc: Oliver Pinter Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 07:51:19 -0000 On Sun, Jun 14, 2015 at 9:47 AM, Jeremie Le Hen wrote: > Author: jlh > Date: Sun Jun 14 07:47:18 2015 > New Revision: 284377 > URL: https://svnweb.freebsd.org/changeset/base/284377 > > Log: > NetBSD commit log: > Use a constant array for the MIB. Newer LLVM decided that mib[] warranted > stack protections, with the obvious crash after the setup was done. > As a positive side effect, code size shrinks a bit. > > I'm not sure why this hasn't bitten us yes, but it is certainly possible and > there are no real drawbacks to this change anyway. > > Submitted by: pfg Correction: Pedro only forwarded this to me. The person who initially discovered this is Oliver (cc'ed). Sorry for that mistake! -- Jeremie Le Hen jlh@FreeBSD.org From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 08:33:15 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D9737E5; Sun, 14 Jun 2015 08:33:15 +0000 (UTC) (envelope-from jlh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0BB16A4F; Sun, 14 Jun 2015 08:33:15 +0000 (UTC) (envelope-from jlh@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5E8XE55053960; Sun, 14 Jun 2015 08:33:14 GMT (envelope-from jlh@FreeBSD.org) Received: (from jlh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5E8XE73053959; Sun, 14 Jun 2015 08:33:14 GMT (envelope-from jlh@FreeBSD.org) Message-Id: <201506140833.t5E8XE73053959@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jlh set sender to jlh@FreeBSD.org using -f From: Jeremie Le Hen Date: Sun, 14 Jun 2015 08:33:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284378 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 08:33:15 -0000 Author: jlh Date: Sun Jun 14 08:33:14 2015 New Revision: 284378 URL: https://svnweb.freebsd.org/changeset/base/284378 Log: nit: Rename racct_alloc_resource to racct_adjust_resource. This is more accurate as the amount can be negative. MFC after: 2 weeks Modified: head/sys/kern/kern_racct.c Modified: head/sys/kern/kern_racct.c ============================================================================== --- head/sys/kern/kern_racct.c Sun Jun 14 07:47:18 2015 (r284377) +++ head/sys/kern/kern_racct.c Sun Jun 14 08:33:14 2015 (r284378) @@ -500,7 +500,7 @@ racct_destroy(struct racct **racct) * may be less than zero. */ static void -racct_alloc_resource(struct racct *racct, int resource, +racct_adjust_resource(struct racct *racct, int resource, uint64_t amount) { @@ -553,7 +553,7 @@ racct_add_locked(struct proc *p, int res return (error); } #endif - racct_alloc_resource(p->p_racct, resource, amount); + racct_adjust_resource(p->p_racct, resource, amount); racct_add_cred_locked(p->p_ucred, resource, amount); return (0); @@ -587,11 +587,11 @@ racct_add_cred_locked(struct ucred *cred SDT_PROBE(racct, kernel, rusage, add__cred, cred, resource, amount, 0, 0); - racct_alloc_resource(cred->cr_ruidinfo->ui_racct, resource, amount); + racct_adjust_resource(cred->cr_ruidinfo->ui_racct, resource, amount); for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent) - racct_alloc_resource(pr->pr_prison_racct->prr_racct, resource, + racct_adjust_resource(pr->pr_prison_racct->prr_racct, resource, amount); - racct_alloc_resource(cred->cr_loginclass->lc_racct, resource, amount); + racct_adjust_resource(cred->cr_loginclass->lc_racct, resource, amount); } /* @@ -631,7 +631,7 @@ racct_add_force(struct proc *p, int reso PROC_LOCK_ASSERT(p, MA_OWNED); mtx_lock(&racct_lock); - racct_alloc_resource(p->p_racct, resource, amount); + racct_adjust_resource(p->p_racct, resource, amount); mtx_unlock(&racct_lock); racct_add_cred(p->p_ucred, resource, amount); } @@ -685,7 +685,7 @@ racct_set_locked(struct proc *p, int res } } #endif - racct_alloc_resource(p->p_racct, resource, diff_proc); + racct_adjust_resource(p->p_racct, resource, diff_proc); if (diff_cred > 0) racct_add_cred_locked(p->p_ucred, resource, diff_cred); else if (diff_cred < 0) @@ -747,7 +747,7 @@ racct_set_force_locked(struct proc *p, i } else diff_cred = diff_proc; - racct_alloc_resource(p->p_racct, resource, diff_proc); + racct_adjust_resource(p->p_racct, resource, diff_proc); if (diff_cred > 0) racct_add_cred_locked(p->p_ucred, resource, diff_cred); else if (diff_cred < 0) @@ -849,7 +849,7 @@ racct_sub(struct proc *p, int resource, "than allocated %jd for %s (pid %d)", __func__, amount, resource, (intmax_t)p->p_racct->r_resources[resource], p->p_comm, p->p_pid)); - racct_alloc_resource(p->p_racct, resource, -amount); + racct_adjust_resource(p->p_racct, resource, -amount); racct_sub_cred_locked(p->p_ucred, resource, amount); mtx_unlock(&racct_lock); } @@ -870,11 +870,11 @@ racct_sub_cred_locked(struct ucred *cred resource)); #endif - racct_alloc_resource(cred->cr_ruidinfo->ui_racct, resource, -amount); + racct_adjust_resource(cred->cr_ruidinfo->ui_racct, resource, -amount); for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent) - racct_alloc_resource(pr->pr_prison_racct->prr_racct, resource, + racct_adjust_resource(pr->pr_prison_racct->prr_racct, resource, -amount); - racct_alloc_resource(cred->cr_loginclass->lc_racct, resource, -amount); + racct_adjust_resource(cred->cr_loginclass->lc_racct, resource, -amount); } /* From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 09:41:27 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AA958FE0; Sun, 14 Jun 2015 09:41:27 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay103.isp.belgacom.be (mailrelay103.isp.belgacom.be [195.238.20.130]) by mx1.freebsd.org (Postfix) with ESMTP id B5305AB5; Sun, 14 Jun 2015 09:41:26 +0000 (UTC) (envelope-from tijl@freebsd.org) X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=gx4LFt9C7U8MVtlopYu6y61Gbp9nqOyhneTyg/i0HKM= c=1 sm=2 a=kj9zAlcOel0A:10 a=6I5d2MoRAAAA:8 a=wAjpjfyCkEmsMIONckEA:9 a=CjuIK1q_8ugA:10 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2ATCwCVSn1V/++YsFtcgxBUUg29fAmBYYV6AoEdORQBAQEBAQEBgQpBBYNdAQEEJxMcIxALFAQJJQ8qHgYTiDMBCMhpAQEBAQEBAQMBAQEBAQEBFwSLRIRTMweELQEEk1uEUIZxmBEmg3s8MYJHAQEB Received: from 239.152-176-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.176.152.239]) by relay.skynet.be with ESMTP; 14 Jun 2015 11:41:18 +0200 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.9/8.14.9) with ESMTP id t5E9fHhN001101; Sun, 14 Jun 2015 11:41:17 +0200 (CEST) (envelope-from tijl@FreeBSD.org) Date: Sun, 14 Jun 2015 11:41:16 +0200 From: Tijl Coosemans To: Adrian Chadd Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284356 - head/usr.sbin/crunch/crunchgen Message-ID: <20150614114116.2ba761da@kalimero.tijl.coosemans.org> In-Reply-To: <201506132201.t5DM1LCV025599@svn.freebsd.org> References: <201506132201.t5DM1LCV025599@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 09:41:27 -0000 On Sat, 13 Jun 2015 22:01:21 +0000 (UTC) Adrian Chadd wrote: > Author: adrian > Date: Sat Jun 13 22:01:21 2015 > New Revision: 284356 > URL: https://svnweb.freebsd.org/changeset/base/284356 > > Log: > Fix up crunchgen binary generation to work with external cross-build > tools. > > * Allow STRIP to be overridden by the environment > * Use CC to tie things together, not LD > > Tested: > > * i386, mips32 > > Submitted by: kan > > Modified: > head/usr.sbin/crunch/crunchgen/crunchgen.c > > Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c > ============================================================================== > --- head/usr.sbin/crunch/crunchgen/crunchgen.c Sat Jun 13 20:15:44 2015 (r284355) > +++ head/usr.sbin/crunch/crunchgen/crunchgen.c Sat Jun 13 22:01:21 2015 (r284356) > @@ -980,6 +980,7 @@ top_makefile_rules(FILE *outmk) > prog_t *p; > > fprintf(outmk, "LD?= ld\n"); > + fprintf(outmk, "STRIP?= strip\n"); > if ( subtract_strlst(&libs, &libs_so) ) > fprintf(outmk, "# NOTE: Some LIBS declarations below overridden by LIBS_SO\n"); > > @@ -1027,7 +1028,7 @@ top_makefile_rules(FILE *outmk) > fprintf(outmk, "\t$(CC) -static -o %s %s.o $(CRUNCHED_OBJS) $(LIBS)\n", > execfname, execfname); > fprintf(outmk, ".endif\n"); > - fprintf(outmk, "\tstrip %s\n", execfname); > + fprintf(outmk, "\t$(STRIP) %s\n", execfname); > fprintf(outmk, "realclean: clean subclean\n"); > fprintf(outmk, "clean:\n\trm -f %s *.lo *.o *_stub.c\n", execfname); > fprintf(outmk, "subclean: $(SUBCLEAN_TARGETS)\n"); > @@ -1109,7 +1110,7 @@ prog_makefile_rules(FILE *outmk, prog_t > fprintf(outmk, " $(%s_LIBS)", p->ident); > > fprintf(outmk, "\n"); > - fprintf(outmk, "\t$(LD) -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", > + fprintf(outmk, "\t$(CC) -nostdlibs -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", Does CC understand -dc and -r? From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 10:00:50 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8FEAC376; Sun, 14 Jun 2015 10:00:50 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 45598E80; Sun, 14 Jun 2015 10:00:50 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from slw by zxy.spb.ru with local (Exim 4.84 (FreeBSD)) (envelope-from ) id 1Z44ib-000C3V-PB; Sun, 14 Jun 2015 13:00:45 +0300 Date: Sun, 14 Jun 2015 13:00:45 +0300 From: Slawa Olhovchenkov To: Craig Rodrigues Cc: Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Subject: Re: svn commit: r284198 - head/bin/ls Message-ID: <20150614100045.GF58397@zxy.spb.ru> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 10:00:50 -0000 On Sat, Jun 13, 2015 at 05:13:31PM -0700, Craig Rodrigues wrote: > The people I talk to use scripting languages like Python or Ruby, > and devops frameworks like Ansible, Saltstack, Puppet, and Chef. > They may do some quick prototyping and UI work with Javascript and HTML/CSS. > Being able to generate JSON directly from system-level tools, > and then analyze that in a Python script, You need JSON from system-level tools for analyze that in a Python script? Realy? Not plain text? or tab/space separated? From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 10:17:27 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 35E8E6CC; Sun, 14 Jun 2015 10:17:27 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pd0-x22e.google.com (mail-pd0-x22e.google.com [IPv6:2607:f8b0:400e:c02::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 09010284; Sun, 14 Jun 2015 10:17:26 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by pdbki1 with SMTP id ki1so52230554pdb.1; Sun, 14 Jun 2015 03:17:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:mime-version:content-type:from:in-reply-to:date:cc :message-id:references:to; bh=iiZzcqt4DlKQE9Y83//qwam2tt346HyI6HJUKVmzShs=; b=n4seySIxCOlcujvVYMQDDNung/juS2YXjmiT+Fh1CZE/8ELw9RwRuLxBItixHeZQJx lHgzpsZffSgOmhQafDHjvMAjI6hOb2PVUwsFzTquGFWdE62ZM6mZxaHZ+A85JA43vNfh W5sSPndfAvRe30i5K6nh5kb9yvhlyLJYNOwfcujLTfXlTVoeof71+zmPHzQPhc+YZMlH ipwYzH0CHHJaKZUPuRZ7i+FbVUswLqktsqHvEElvwuixbyeQA3sijf0gAMh9ZEzE8LOT +iyogHfH21ifBv5oQotGM/+LFtiIM5C9K5bt+bcFL1DMN5bidJFtHeB3Q3TNW7DrS6gW wudg== X-Received: by 10.70.103.230 with SMTP id fz6mr38836295pdb.1.1434277046473; Sun, 14 Jun 2015 03:17:26 -0700 (PDT) Received: from ?IPv6:2601:8:ab80:7d6:2434:29cc:2519:36ef? ([2601:8:ab80:7d6:2434:29cc:2519:36ef]) by mx.google.com with ESMTPSA id jp10sm8860645pbb.9.2015.06.14.03.17.24 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 14 Jun 2015 03:17:25 -0700 (PDT) Subject: Re: svn commit: r284198 - head/bin/ls Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Content-Type: multipart/signed; boundary="Apple-Mail=_837C15EC-BA09-43B5-8069-34B1797DFF88"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5 From: Garrett Cooper In-Reply-To: <20150614100045.GF58397@zxy.spb.ru> Date: Sun, 14 Jun 2015 03:17:21 -0700 Cc: Craig Rodrigues , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Message-Id: <45B665F4-B81F-439B-89DC-6D27BA96F87D@gmail.com> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> To: Slawa Olhovchenkov X-Mailer: Apple Mail (2.1878.6) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 10:17:27 -0000 --Apple-Mail=_837C15EC-BA09-43B5-8069-34B1797DFF88 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Jun 14, 2015, at 3:00, Slawa Olhovchenkov wrote: > On Sat, Jun 13, 2015 at 05:13:31PM -0700, Craig Rodrigues wrote: >=20 >> The people I talk to use scripting languages like Python or Ruby, >> and devops frameworks like Ansible, Saltstack, Puppet, and Chef. >> They may do some quick prototyping and UI work with Javascript and = HTML/CSS. >> Being able to generate JSON directly from system-level tools, >> and then analyze that in a Python script, >=20 > You need JSON from system-level tools for analyze that in a Python > script? Realy? Not plain text? or tab/space separated? Having written a bunch of tools that parse plaintext, it=92s a pain in = the rear. It=92s far easier to have JSON and a schema for working with = that JSON when developing tools to parse things out. Programmers are inherently lazy =97 the more we have to make them work, = the more pushback we=92re going to get from them as far as integrating = FreeBSD=92s concerned. Thanks! --Apple-Mail=_837C15EC-BA09-43B5-8069-34B1797DFF88 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJVfVSyAAoJEMZr5QU6S73eEaAH/iicFoGoehIIGJjjIRGZU/hj BsHz5rhyZkMWlbfPu0rpUGcv1xrgUFkza4Z6NbkhuDtKEAe36eI4KZfNa+SMEv6S DAJXs4RtVoXlLqcriO20BfaZtf0eS34sM4riuI+ehMZC6mCOTjajbucWHAZfw5vY LiFtIf4G9pAc5ZnekaSpXqyOw9y9XXWsvngRJXtyfgwwV33GVYsr22AyfxJfcvg2 MkVCr8+hrJ1Xtu5yzZPUsmSJSTu2+4s210jL+r9ON8uj1gBeSoMaH8kSs3KYFcsj 3aWDr+plpXCSoEDhvJzl/g+AxE7JlpqPUwq/JYmH2JdFedwvgOoHm24dbAIY7y8= =7jNS -----END PGP SIGNATURE----- --Apple-Mail=_837C15EC-BA09-43B5-8069-34B1797DFF88-- From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 10:22:14 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 89431942 for ; Sun, 14 Jun 2015 10:22:14 +0000 (UTC) (envelope-from bms@fastmail.net) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4814D68A for ; Sun, 14 Jun 2015 10:22:14 +0000 (UTC) (envelope-from bms@fastmail.net) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 959632038E for ; Sun, 14 Jun 2015 06:22:06 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 14 Jun 2015 06:22:06 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.net; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=UrS3lFugXI8NV5Hn4okW2O0vvpA=; b=MKtopW E3lZOTtvJo8SrVW82h16zeWEP7x+km5m7ACWsfIys+f4RxQ1EJysg8gYY7rx1m7Q BLrxnfvn6vnBtYWav3gjnxDLZP62tmNvESCf35DbI0VuKsKIK1njDIlaE2x9EvvQ OGLL28NWMPStiNHju9Q59ocgVrZwvN1x7VqkE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=UrS3lFugXI8NV5H n4okW2O0vvpA=; b=WZ3d4tUCw5Cg/bKM6gnn84oA6rUTPQUazRUcAbaTM43arY0 /8CpsjRK3khzhi45IAw5K35cmMi48txhVDeftyBbytPw9ahNTgcShekis9Zxkyq0 LlcJ6lM1zs+d1gxaJxZI/Yt66Uu7yd9OqdWhFE2AYeHa8cdQoa5Z/t1LZr7U= X-Sasl-enc: lHB5cJBSW8xKiw9pl3utxMj7OPQMAWG6wwsbNDKopU3X 1434277325 Received: from [192.168.1.87] (unknown [94.194.112.103]) by mail.messagingengine.com (Postfix) with ESMTPA id A350EC00017; Sun, 14 Jun 2015 06:22:04 -0400 (EDT) Message-ID: <557D55CB.5050009@fastmail.net> Date: Sun, 14 Jun 2015 11:22:03 +0100 From: Bruce Simpson User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Slawa Olhovchenkov , Craig Rodrigues CC: Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Subject: Re: svn commit: r284198 - head/bin/ls References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> In-Reply-To: <20150614100045.GF58397@zxy.spb.ru> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 10:22:14 -0000 On 14/06/2015 11:00, Slawa Olhovchenkov wrote: > On Sat, Jun 13, 2015 at 05:13:31PM -0700, Craig Rodrigues wrote: > >> The people I talk to use scripting languages like Python or Ruby, >> and devops frameworks like Ansible, Saltstack, Puppet, and Chef. >> They may do some quick prototyping and UI work with Javascript and HTML/CSS. >> Being able to generate JSON directly from system-level tools, >> and then analyze that in a Python script, > > You need JSON from system-level tools for analyze that in a Python > script? Realy? Not plain text? or tab/space separated? > So, I am broadly in favour of keeping libxo -- providing the problems with its introduction are fixed. I'm not even thinking of the "DevOps" space, but the R&D space, where Python and R are king. Man pages are small beer and can be dealt with easily. Control flow and regressions from previous functionality are another issue, and I am not for a moment going to duck out and suggest those responsible for introducing it aren't also responsible for fixing these specific issues. But I have yet to see a coherent argument here -- size(1) numbers, RSS figures etc. -- about how it allegedly adds bloat. Most of what I've seen so far is POLA, NIH resistance, and hand-wavery. If anything it helps to future proof the code as it stands, and make it easier for us to actually engineer the system for performance. I tend to look upon counter-arguments against that last point as "The more we obfuscate, the harder it is to get found out that the code isn't actually that good." So, if you read my previous response to this thread, I've clearly pointed out that: there are specific problems in parsing the output of these system tools as they stand. If you don't believe this, you can have my yesterday morning/afternoon, where I was post-processing the output of 4000 individual "vmstat -z" and "vmstat -m" reports. Another 1000 this morning, with more to follow. "Oh boy," I'd say to myself, "I wish I had libxo!" This argument is not limited to base system utilities. For example: iperf 3.x has had a similar reworking of its reporting format to include JSON. This is a massive improvement over iperf 2.x, which does not even clearly document its CSV fields; you have to read the source for that. JSON actually tags each field. This reduces the time from experiment to analysed result significantly, just because I can easily see what each god damned number means. Given, you need to read the source to understand why its naive sequencing algorithm breaks in multipath networking scenarios, but one should not have to do this just to get basic throughput results tabulated. From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 10:53:18 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BA2372F5; Sun, 14 Jun 2015 10:53:18 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6DB58D75; Sun, 14 Jun 2015 10:53:18 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from slw by zxy.spb.ru with local (Exim 4.84 (FreeBSD)) (envelope-from ) id 1Z45XQ-000Ctu-Dh; Sun, 14 Jun 2015 13:53:16 +0300 Date: Sun, 14 Jun 2015 13:53:16 +0300 From: Slawa Olhovchenkov To: Bruce Simpson Cc: Craig Rodrigues , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" , Marcel Moolenaar Subject: Re: svn commit: r284198 - head/bin/ls Message-ID: <20150614105316.GG58397@zxy.spb.ru> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <557D55CB.5050009@fastmail.net> User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 10:53:18 -0000 On Sun, Jun 14, 2015 at 11:22:03AM +0100, Bruce Simpson wrote: > On 14/06/2015 11:00, Slawa Olhovchenkov wrote: > > On Sat, Jun 13, 2015 at 05:13:31PM -0700, Craig Rodrigues wrote: > > > >> The people I talk to use scripting languages like Python or Ruby, > >> and devops frameworks like Ansible, Saltstack, Puppet, and Chef. > >> They may do some quick prototyping and UI work with Javascript and HTML/CSS. > >> Being able to generate JSON directly from system-level tools, > >> and then analyze that in a Python script, > > > > You need JSON from system-level tools for analyze that in a Python > > script? Realy? Not plain text? or tab/space separated? > > > > So, I am broadly in favour of keeping libxo -- providing the problems > with its introduction are fixed. > > I'm not even thinking of the "DevOps" space, but the R&D space, where > Python and R are king. > > Man pages are small beer and can be dealt with easily. > > Control flow and regressions from previous functionality are another > issue, and I am not for a moment going to duck out and suggest those > responsible for introducing it aren't also responsible for fixing these > specific issues. > > But I have yet to see a coherent argument here -- size(1) numbers, RSS > figures etc. -- about how it allegedly adds bloat. Most of what I've > seen so far is POLA, NIH resistance, and hand-wavery. > > If anything it helps to future proof the code as it stands, and make it > easier for us to actually engineer the system for performance. > > I tend to look upon counter-arguments against that last point as "The > more we obfuscate, the harder it is to get found out that the code isn't > actually that good." > > So, if you read my previous response to this thread, I've clearly > pointed out that: there are specific problems in parsing the output of > these system tools as they stand. > > If you don't believe this, you can have my yesterday morning/afternoon, > where I was post-processing the output of 4000 individual "vmstat -z" > and "vmstat -m" reports. > > Another 1000 this morning, with more to follow. "Oh boy," I'd say to > myself, "I wish I had libxo!" > > This argument is not limited to base system utilities. For example: > iperf 3.x has had a similar reworking of its reporting format to include > JSON. > > This is a massive improvement over iperf 2.x, which does not even > clearly document its CSV fields; you have to read the source for that. > JSON actually tags each field. > > This reduces the time from experiment to analysed result significantly, > just because I can easily see what each god damned number means. > > Given, you need to read the source to understand why its naive > sequencing algorithm breaks in multipath networking scenarios, but one > should not have to do this just to get basic throughput results tabulated. Post-processing massive outputs and individual outputs is different task. Anoder one -- one-line scripts. I am don't like some aspects of ls/find outputs (for example -- date/time format changed depends of age). Some utilites already have key for script-processing (zfs -H, for example). I am don't see how libxo integrated to ls, but I see that in other utilites format changed options don't tigh integrated: # zpool list -v NAME SIZE ALLOC FREE EXPANDSZ FRAG CAP DEDUP HEALTH ALTROOT tank 46.2T 37.3M 46.2T - 0% 0% 1.00x ONLINE - mirror 2.72T 2.15M 2.72T - 0% 0% da2 - - - - - - da0 - - - - - - # zpool list -v -p NAME SIZE ALLOC FREE EXPANDSZ FRAG CAP DEDUP HEALTH ALTROOT tank 50818053046272 39088128 50818013958144 - 0% 0 1.00x ONLINE - mirror 2.72T 2.15M 2.72T - 0% 0% da2 - - - - - - da0 - - - - - - only 'total' format changed, not components. And this is more complex problem for scripting/automating that JSON/plaint text. Also, I am don't like pyton. I am use perl. For JSON parsing I am need additional modules. I am can't easy use JSON output in one-lines shell pipes -- system utilites (like sort, awk, cut and etc.) don't understand and parsed JSON. But understand tab/space/null separated stream. vmstat have slight different problem -- no easy filtering. gstat can't output in file/stream in looped mode. All this problems don't resolved by JSON output. I am don't talk about need or don't need libxo, good or bad code in libxo. I am just about needing json output for system utilites. I am see tons of utilites. Some utiltes born in FreeBSD. Some born in relative projects (NetBSD, OpenBSD). Some GNU. And etc. Who do JSONification all of this? Who ported to libxo ZFS utilites? clang oputput? Or some utilites will be JSON, some -- not? As I see, JSON output good only for Ansible and direct output to web interface. From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 11:09:38 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7839C64D; Sun, 14 Jun 2015 11:09:38 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pd0-x229.google.com (mail-pd0-x229.google.com [IPv6:2607:f8b0:400e:c02::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4338DFA5; Sun, 14 Jun 2015 11:09:38 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by pdbnf5 with SMTP id nf5so52773190pdb.2; Sun, 14 Jun 2015 04:09:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:mime-version:content-type:from:in-reply-to:date:cc :message-id:references:to; bh=kRtA1/rlcExXC5I3+M09VvLLe8xWOMlAYl7DsNQx1AY=; b=c/8R0vDBKpdkhYbdfg6skhNHT9UPU2BqkyZkCNHlfZ+A5TWupV3TQL4JrNyD8OkXCU ghKu85An2iEoLQ8bqxhooKTn4lojTyAhyQvo0lHNeBCkZbOEAPWwbzpAw15wdWTkZzbd 8ZO8T/13Nj+MrsXJFfPDNxZp3HasVhh6XS3w0sKLP7bnWDzW292m8aQ45XQSETy6zYRo 1/hm3svUrQNXg8Rm//XdoqAAQRkusScfKclNh+R1/Ph0ZqXwkz/iF+VhRv0O6TMkWpFV wy4jS2iLUyO4iaA+RBlnz/Fa8pc3bcYlso9vvuKA2mOKdQIGvNzVppszBLtHOXFMtNDn 98bw== X-Received: by 10.66.190.228 with SMTP id gt4mr39087947pac.72.1434280177638; Sun, 14 Jun 2015 04:09:37 -0700 (PDT) Received: from ?IPv6:2601:8:ab80:7d6:2434:29cc:2519:36ef? ([2601:8:ab80:7d6:2434:29cc:2519:36ef]) by mx.google.com with ESMTPSA id v9sm8934339pdr.96.2015.06.14.04.09.36 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 14 Jun 2015 04:09:36 -0700 (PDT) Subject: Re: svn commit: r284198 - head/bin/ls Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Content-Type: multipart/signed; boundary="Apple-Mail=_D0207CB8-6EF1-4A13-8660-9E54A9B19E16"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5 From: Garrett Cooper In-Reply-To: <20150614060935.GA3889@troutmask.apl.washington.edu> Date: Sun, 14 Jun 2015 04:09:29 -0700 Cc: Craig Rodrigues , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-Id: References: <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> <20150614012924.GA2965@troutmask.apl.washington.edu> <20150614060935.GA3889@troutmask.apl.washington.edu> To: Steve Kargl X-Mailer: Apple Mail (2.1878.6) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 11:09:38 -0000 --Apple-Mail=_D0207CB8-6EF1-4A13-8660-9E54A9B19E16 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Jun 13, 2015, at 23:09, Steve Kargl = wrote: > On Sat, Jun 13, 2015 at 06:45:57PM -0700, Craig Rodrigues wrote: >> On Sat, Jun 13, 2015 at 6:29 PM, Steve Kargl < >> sgk@troutmask.apl.washington.edu> wrote: >>=20 >>>>=20 >>>> Are you talking about this comment you made? >>>>=20 >>> = https://lists.freebsd.org/pipermail/freebsd-current/2015-March/054899.html= >>>>=20 >>>> I can't make heads or tails of what you wrote, other than you = seemed very >>>> angry. >>>>=20 >>>=20 >>> I wasn't very angry. >>=20 >> It's hard for me to tell, really, since you submitted patches >> with FUBAR in them, so you seemed pretty angry in that e-mail. >>=20 >=20 > FUBAR is as good as what is already there. Simply drawing > attention to the people responsible for libxo's inclusion > in FreeBSD that they need to fix it. I see the benefit in libxo, but I see the argument in it being = unnecessary bloat as well. >>> Do you really believe that the Nd entries for these manpages are >>> correct? >>>=20 >>=20 >> I'm not an expert on the mdoc format, so I couldn't tell you. >> If you can think of some patches to fix things, in the man pages, >> would you be able to submit the patches to Phil, and have them = incorporated >> into the software to make it better? >=20 > There isn't a public mailing list or other mechanism to > submit a patch. One needs to sign up for an account. > I have way too many accounts on way too many systems > to sign up for a new account to send in a single patch. Github is rather straightforward, but yes.. the workflow=92s a bit = different: 1. Fork project. 2. Create a branch for a =93topic=94 (i.e. fix/enhance X). 3. Open a pull request (which will open an issue). >> libxo is maintained at https://github.com/Juniper/libxo . >>=20 >> I don't know if you are willing/able to submit patches to the libxo = project >> on Github, >> to help fix things. That would be great if you could do that and = help out. >=20 > It seems that libxo developers have no interest in FreeBSD = documentation. Not entirely true. They=92re willing to work on the versioning problem I = noted in the above issue. > https://github.com/Juniper/libxo/issues/13 >=20 > Those that imported/maintain libxo within FreeBSD should fix the > documentation. The problem was with the manpage to github link referencing -- which can = change. FWIW I=92m happy they have documentation, unlike our current = defacto toolchain in FreeBSD (man clang makes me sad=85 I keep gcc = installed just so I can refer to something halfway decent): -O0 Means "no optimization": this level compiles the = fastest and generates the most debuggable code. -O1 Somewhere between -O0 and -O2. -O2 Moderate level of optimization which enables most optimizations. Really clang? I didn=92t realize that 1 was between 0 and 2... Thanks. --Apple-Mail=_D0207CB8-6EF1-4A13-8660-9E54A9B19E16 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJVfWDtAAoJEMZr5QU6S73efR0H/A0Dl08yqBkoDVbgdmlrDDwM MDmgP4MXaPmLFJk1KJtED0GodWyPQ0CyLj2lcMHnNIzz+v1kfofNI8oqWFf7yC8W /hohx9HGwCnM7bNiKzPmp+jWjfNyuUHZybn+53SBzIHzFgslWxy8UWFRZN86z30/ 7GOceCwWPkKKPUkOmHNS4dWxlmj7WuAp46YHYoo/H2uZKfFJmrEVp+zL/ts95X81 YK8s6MXGUNLGwiTDQFonj9eHL/v2IbvUWvzCoreX0UTkR/77Q1+rSlgKRUcmIMwI QpUIwLZwzCkyOVSLNk4G4TjI/XQMI6JI2lFvRqTOzNjG2/Mi7Fv+qydDnY27fjc= =T7OB -----END PGP SIGNATURE----- --Apple-Mail=_D0207CB8-6EF1-4A13-8660-9E54A9B19E16-- From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 14:08:53 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 967D8A00; Sun, 14 Jun 2015 14:08:53 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 85122E9B; Sun, 14 Jun 2015 14:08:53 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5EE8rFs019826; Sun, 14 Jun 2015 14:08:53 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5EE8qqC019823; Sun, 14 Jun 2015 14:08:52 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201506141408.t5EE8qqC019823@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sun, 14 Jun 2015 14:08:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284380 - in head/sys: kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 14:08:53 -0000 Author: mjg Date: Sun Jun 14 14:08:52 2015 New Revision: 284380 URL: https://svnweb.freebsd.org/changeset/base/284380 Log: fd: move out actual fp installation to _finstall Use it in fd passing functions as the first step towards fd code cleanup. Modified: head/sys/kern/kern_descrip.c head/sys/kern/uipc_usrreq.c head/sys/sys/filedesc.h Modified: head/sys/kern/kern_descrip.c ============================================================================== --- head/sys/kern/kern_descrip.c Sun Jun 14 11:08:27 2015 (r284379) +++ head/sys/kern/kern_descrip.c Sun Jun 14 14:08:52 2015 (r284380) @@ -1750,26 +1750,18 @@ falloc_noinstall(struct thread *td, stru /* * Install a file in a file descriptor table. */ -int -finstall(struct thread *td, struct file *fp, int *fd, int flags, +void +_finstall(struct filedesc *fdp, struct file *fp, int fd, int flags, struct filecaps *fcaps) { - struct filedesc *fdp = td->td_proc->p_fd; struct filedescent *fde; - int error; - KASSERT(fd != NULL, ("%s: fd == NULL", __func__)); - KASSERT(fp != NULL, ("%s: fp == NULL", __func__)); + MPASS(fp != NULL); if (fcaps != NULL) filecaps_validate(fcaps, __func__); + FILEDESC_XLOCK_ASSERT(fdp); - FILEDESC_XLOCK(fdp); - if ((error = fdalloc(td, 0, fd))) { - FILEDESC_XUNLOCK(fdp); - return (error); - } - fhold(fp); - fde = &fdp->fd_ofiles[*fd]; + fde = &fdp->fd_ofiles[fd]; #ifdef CAPABILITIES seq_write_begin(&fde->fde_seq); #endif @@ -1783,6 +1775,24 @@ finstall(struct thread *td, struct file #ifdef CAPABILITIES seq_write_end(&fde->fde_seq); #endif +} + +int +finstall(struct thread *td, struct file *fp, int *fd, int flags, + struct filecaps *fcaps) +{ + struct filedesc *fdp = td->td_proc->p_fd; + int error; + + MPASS(fd != NULL); + + FILEDESC_XLOCK(fdp); + if ((error = fdalloc(td, 0, fd))) { + FILEDESC_XUNLOCK(fdp); + return (error); + } + fhold(fp); + _finstall(fdp, fp, *fd, flags, fcaps); FILEDESC_XUNLOCK(fdp); return (0); } Modified: head/sys/kern/uipc_usrreq.c ============================================================================== --- head/sys/kern/uipc_usrreq.c Sun Jun 14 11:08:27 2015 (r284379) +++ head/sys/kern/uipc_usrreq.c Sun Jun 14 14:08:52 2015 (r284380) @@ -1736,7 +1736,7 @@ unp_externalize(struct mbuf *control, st int i; int *fdp; struct filedesc *fdesc = td->td_proc->p_fd; - struct filedescent *fde, **fdep; + struct filedescent **fdep; void *data; socklen_t clen = control->m_len, datalen; int error, newfds; @@ -1795,13 +1795,10 @@ unp_externalize(struct mbuf *control, st goto next; } for (i = 0; i < newfds; i++, fdp++) { - fde = &fdesc->fd_ofiles[*fdp]; - fde->fde_file = fdep[i]->fde_file; - filecaps_move(&fdep[i]->fde_caps, - &fde->fde_caps); - if ((flags & MSG_CMSG_CLOEXEC) != 0) - fde->fde_flags |= UF_EXCLOSE; - unp_externalize_fp(fde->fde_file); + _finstall(fdesc, fdep[i]->fde_file, *fdp, + (flags & MSG_CMSG_CLOEXEC) != 0 ? UF_EXCLOSE : 0, + &fdep[i]->fde_caps); + unp_externalize_fp(fdep[i]->fde_file); } FILEDESC_XUNLOCK(fdesc); free(fdep[0], M_FILECAPS); Modified: head/sys/sys/filedesc.h ============================================================================== --- head/sys/sys/filedesc.h Sun Jun 14 11:08:27 2015 (r284379) +++ head/sys/sys/filedesc.h Sun Jun 14 14:08:52 2015 (r284380) @@ -147,7 +147,9 @@ int dupfdopen(struct thread *td, struct int falloc(struct thread *td, struct file **resultfp, int *resultfd, int flags); int falloc_noinstall(struct thread *td, struct file **resultfp); -int finstall(struct thread *td, struct file *fp, int *resultfp, int flags, +void _finstall(struct filedesc *fdp, struct file *fp, int fd, int flags, + struct filecaps *fcaps); +int finstall(struct thread *td, struct file *fp, int *resultfd, int flags, struct filecaps *fcaps); int fdalloc(struct thread *td, int minfd, int *result); int fdallocn(struct thread *td, int minfd, int *fds, int n); From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 14:10:06 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42899B58; Sun, 14 Jun 2015 14:10:06 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31CDFEB3; Sun, 14 Jun 2015 14:10:06 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5EEA6BQ020115; Sun, 14 Jun 2015 14:10:06 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5EEA6kR020114; Sun, 14 Jun 2015 14:10:06 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201506141410.t5EEA6kR020114@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sun, 14 Jun 2015 14:10:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284381 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 14:10:06 -0000 Author: mjg Date: Sun Jun 14 14:10:05 2015 New Revision: 284381 URL: https://svnweb.freebsd.org/changeset/base/284381 Log: fd: reduce excessive zeroing on fd close fde_file as NULL is already an indicator of an unused fd. All other fields are populated when fp is installed. Modified: head/sys/kern/kern_descrip.c Modified: head/sys/kern/kern_descrip.c ============================================================================== --- head/sys/kern/kern_descrip.c Sun Jun 14 14:08:52 2015 (r284380) +++ head/sys/kern/kern_descrip.c Sun Jun 14 14:10:05 2015 (r284381) @@ -309,7 +309,7 @@ fdfree(struct filedesc *fdp, int fd) seq_write_begin(&fde->fde_seq); #endif fdefree_last(fde); - bzero(fde, fde_change_size); + fde->fde_file = NULL; fdunused(fdp, fd); #ifdef CAPABILITIES seq_write_end(&fde->fde_seq); @@ -1651,7 +1651,6 @@ fdalloc(struct thread *td, int minfd, in ("fd_first_free() returned non-free descriptor")); KASSERT(fdp->fd_ofiles[fd].fde_file == NULL, ("file descriptor isn't free")); - KASSERT(fdp->fd_ofiles[fd].fde_flags == 0, ("file flags are set")); fdused(fdp, fd); *result = fd; return (0); @@ -1766,8 +1765,7 @@ _finstall(struct filedesc *fdp, struct f seq_write_begin(&fde->fde_seq); #endif fde->fde_file = fp; - if ((flags & O_CLOEXEC) != 0) - fde->fde_flags |= UF_EXCLOSE; + fde->fde_flags = (flags & O_CLOEXEC) != 0 ? UF_EXCLOSE : 0; if (fcaps != NULL) filecaps_move(fcaps, &fde->fde_caps); else @@ -2852,7 +2850,7 @@ dupfdopen(struct thread *td, struct file seq_write_begin(&newfde->fde_seq); #endif memcpy(newfde, oldfde, fde_change_size); - bzero(oldfde, fde_change_size); + oldfde->fde_file = NULL; fdunused(fdp, dfd); #ifdef CAPABILITIES seq_write_end(&newfde->fde_seq); From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 15:03:00 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 265039E6; Sun, 14 Jun 2015 15:03:00 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (unknown [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D5DE2E41; Sun, 14 Jun 2015 15:02:59 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from [IPv6:2001:7b8:3a7::ad7a:6fe0:9873:3fb4] (unknown [IPv6:2001:7b8:3a7:0:ad7a:6fe0:9873:3fb4]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 9F37720DA0; Sun, 14 Jun 2015 17:02:52 +0200 (CEST) Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_B2C9C6C7-8914-488F-B3BD-ADCAEFB0A591"; protocol="application/pgp-signature"; micalg=pgp-sha1 X-Pgp-Agent: GPGMail 2.5 From: Dimitry Andric In-Reply-To: <201506131920.t5DJKwMH033508@svn.freebsd.org> Date: Sun, 14 Jun 2015 17:02:46 +0200 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: References: <201506131920.t5DJKwMH033508@svn.freebsd.org> To: "Simon J. Gerraty" X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 15:03:00 -0000 --Apple-Mail=_B2C9C6C7-8914-488F-B3BD-ADCAEFB0A591 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 13 Jun 2015, at 21:20, Simon J. Gerraty wrote: >=20 > Author: sjg > Date: Sat Jun 13 19:20:56 2015 > New Revision: 284345 > URL: https://svnweb.freebsd.org/changeset/base/284345 >=20 > Log: > Add META_MODE support. >=20 > Off by default, build behaves normally. > WITH_META_MODE we get auto objdir creation, the ability to > start build from anywhere in the tree. >=20 > Still need to add real targets under targets/ to build packages. >=20 > Differential Revision: D2796 > Reviewed by: brooks imp >=20 > Added: > head/bin/cat/Makefile.depend (contents, props changed) > head/bin/chflags/Makefile.depend (contents, props changed) Some questions about this commit, which I'm sure more people must have: * Was it really necessary to commit hundreds of clearly generated files? * Couldn't these be generated on the fly, or with some "make depend" = like command? * How to update these files, if you change anything in the 'real' = Makefiles? * Or are you now the maintainer of these .depend files? :-) -Dimitry --Apple-Mail=_B2C9C6C7-8914-488F-B3BD-ADCAEFB0A591 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.27 iEYEARECAAYFAlV9l5wACgkQsF6jCi4glqOlgwCgx3tc+N9ZhgaeNMWVt/NZUg5X oWUAn3k5uMtrF86MBL4BvBncCEjKU0os =+znT -----END PGP SIGNATURE----- --Apple-Mail=_B2C9C6C7-8914-488F-B3BD-ADCAEFB0A591-- From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 15:07:19 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E914DCA1; Sun, 14 Jun 2015 15:07:18 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x235.google.com (mail-ig0-x235.google.com [IPv6:2607:f8b0:4001:c05::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B3084E7F; Sun, 14 Jun 2015 15:07:18 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igbsb11 with SMTP id sb11so35907420igb.0; Sun, 14 Jun 2015 08:07:18 -0700 (PDT) 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=qhKDhOKlXRJlhxcPXZ+Fk0gKLUc+ze4PTr5n2LMapyw=; b=M0sHYE2vFguNAJ4C3kjBiYxp046NeHGrPaQ4X/9RDbNGMu0Cq4YkNyoye0R+aPzSVm dGbee+ffwItNuTlEKR8rarAot3xG1h0GlVmGfj9Oz/zHj2qz9mlyeCZ9jp5sbWzJcBd7 SR5u1ROfaSaaEkV8acFCyapUwCfmCZ5FWbFHfxBThsx2pRDcIu2Ami3pQ/moXr7mf/sO 9tKSF5+Dx5tJKbj0ecyhzttcp+rtkwXb2KBQbQiRkp6ztnWbBvaabjHlvkwo5kQ1lCeU cNxKV+BBpVtxCf1LDvOAVhZOaL7u/aO5+lGJN35ctIXf+cfrfarXDe6FIn4Q0r1zWThk ybfg== MIME-Version: 1.0 X-Received: by 10.42.120.66 with SMTP id e2mr25683161icr.37.1434294438040; Sun, 14 Jun 2015 08:07:18 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Sun, 14 Jun 2015 08:07:17 -0700 (PDT) In-Reply-To: <20150614114116.2ba761da@kalimero.tijl.coosemans.org> References: <201506132201.t5DM1LCV025599@svn.freebsd.org> <20150614114116.2ba761da@kalimero.tijl.coosemans.org> Date: Sun, 14 Jun 2015 08:07:17 -0700 X-Google-Sender-Auth: thFcXhK8bAmhyS8PnAZz0HpJSII Message-ID: Subject: Re: svn commit: r284356 - head/usr.sbin/crunch/crunchgen From: Adrian Chadd To: Tijl Coosemans Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 15:07:19 -0000 On 14 June 2015 at 02:41, Tijl Coosemans wrote: > On Sat, 13 Jun 2015 22:01:21 +0000 (UTC) Adrian Chadd wrote: >> Author: adrian >> Date: Sat Jun 13 22:01:21 2015 >> New Revision: 284356 >> URL: https://svnweb.freebsd.org/changeset/base/284356 >> >> Log: >> Fix up crunchgen binary generation to work with external cross-build >> tools. >> >> * Allow STRIP to be overridden by the environment >> * Use CC to tie things together, not LD >> >> Tested: >> >> * i386, mips32 >> >> Submitted by: kan >> >> Modified: >> head/usr.sbin/crunch/crunchgen/crunchgen.c >> >> Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c >> ============================================================================== >> --- head/usr.sbin/crunch/crunchgen/crunchgen.c Sat Jun 13 20:15:44 2015 (r284355) >> +++ head/usr.sbin/crunch/crunchgen/crunchgen.c Sat Jun 13 22:01:21 2015 (r284356) >> @@ -980,6 +980,7 @@ top_makefile_rules(FILE *outmk) >> prog_t *p; >> >> fprintf(outmk, "LD?= ld\n"); >> + fprintf(outmk, "STRIP?= strip\n"); >> if ( subtract_strlst(&libs, &libs_so) ) >> fprintf(outmk, "# NOTE: Some LIBS declarations below overridden by LIBS_SO\n"); >> >> @@ -1027,7 +1028,7 @@ top_makefile_rules(FILE *outmk) >> fprintf(outmk, "\t$(CC) -static -o %s %s.o $(CRUNCHED_OBJS) $(LIBS)\n", >> execfname, execfname); >> fprintf(outmk, ".endif\n"); >> - fprintf(outmk, "\tstrip %s\n", execfname); >> + fprintf(outmk, "\t$(STRIP) %s\n", execfname); >> fprintf(outmk, "realclean: clean subclean\n"); >> fprintf(outmk, "clean:\n\trm -f %s *.lo *.o *_stub.c\n", execfname); >> fprintf(outmk, "subclean: $(SUBCLEAN_TARGETS)\n"); >> @@ -1109,7 +1110,7 @@ prog_makefile_rules(FILE *outmk, prog_t >> fprintf(outmk, " $(%s_LIBS)", p->ident); >> >> fprintf(outmk, "\n"); >> - fprintf(outmk, "\t$(LD) -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", >> + fprintf(outmk, "\t$(CC) -nostdlibs -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", > > Does CC understand -dc and -r? Apparently? -a From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 15:29:30 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3DE1B47A; Sun, 14 Jun 2015 15:29:30 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay102.isp.belgacom.be (mailrelay102.isp.belgacom.be [195.238.20.129]) by mx1.freebsd.org (Postfix) with ESMTP id 4A32235B; Sun, 14 Jun 2015 15:29:28 +0000 (UTC) (envelope-from tijl@freebsd.org) X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=d6O4W030xngO5QkzyDOul/vmjwC4sFqcTOV5kZr+d1k= c=1 sm=2 a=kj9zAlcOel0A:10 a=6I5d2MoRAAAA:8 a=-9BD_NaV-UemQAqXyQoA:9 a=CjuIK1q_8ugA:10 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CQCwCfnH1V/++YsFtcgxBUUg29fQmBYYV6AoEeORQBAQEBAQEBgQpBBYNdAQEEJxMcIxALFAQJJQ8qHgYTiDMBCMhsAQEBAQEBAQMBAQEBAQEBFwSLRIRTMweELQEEk1uEUIZxmBEmg3s8MYJHAQEB Received: from 239.152-176-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.176.152.239]) by relay.skynet.be with ESMTP; 14 Jun 2015 17:28:18 +0200 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.9/8.14.9) with ESMTP id t5EFSGvd002863; Sun, 14 Jun 2015 17:28:16 +0200 (CEST) (envelope-from tijl@FreeBSD.org) Date: Sun, 14 Jun 2015 17:28:16 +0200 From: Tijl Coosemans To: Adrian Chadd Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284356 - head/usr.sbin/crunch/crunchgen Message-ID: <20150614172816.0695d45e@kalimero.tijl.coosemans.org> In-Reply-To: References: <201506132201.t5DM1LCV025599@svn.freebsd.org> <20150614114116.2ba761da@kalimero.tijl.coosemans.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 15:29:30 -0000 On Sun, 14 Jun 2015 08:07:17 -0700 Adrian Chadd wrote: > On 14 June 2015 at 02:41, Tijl Coosemans wrote: >> On Sat, 13 Jun 2015 22:01:21 +0000 (UTC) Adrian Chadd wrote: >>> Author: adrian >>> Date: Sat Jun 13 22:01:21 2015 >>> New Revision: 284356 >>> URL: https://svnweb.freebsd.org/changeset/base/284356 >>> >>> Log: >>> Fix up crunchgen binary generation to work with external cross-build >>> tools. >>> >>> * Allow STRIP to be overridden by the environment >>> * Use CC to tie things together, not LD >>> >>> Tested: >>> >>> * i386, mips32 >>> >>> Submitted by: kan >>> >>> Modified: >>> head/usr.sbin/crunch/crunchgen/crunchgen.c >>> >>> Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c >>> ============================================================================== >>> --- head/usr.sbin/crunch/crunchgen/crunchgen.c Sat Jun 13 20:15:44 2015 (r284355) >>> +++ head/usr.sbin/crunch/crunchgen/crunchgen.c Sat Jun 13 22:01:21 2015 (r284356) >>> @@ -1109,7 +1110,7 @@ prog_makefile_rules(FILE *outmk, prog_t >>> fprintf(outmk, " $(%s_LIBS)", p->ident); >>> >>> fprintf(outmk, "\n"); >>> - fprintf(outmk, "\t$(LD) -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", >>> + fprintf(outmk, "\t$(CC) -nostdlibs -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", >> >> Does CC understand -dc and -r? > > Apparently? Hmm, it's undocumented but it seems to recognise -r and pass it on to the linker. Not -dc though. It's safer to use: -Wl,-dc -Wl,-r From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 15:31:33 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8A0527B9; Sun, 14 Jun 2015 15:31:33 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ie0-x229.google.com (mail-ie0-x229.google.com [IPv6:2607:f8b0:4001:c03::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B86B634; Sun, 14 Jun 2015 15:31:33 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by iesa3 with SMTP id a3so48825675ies.2; Sun, 14 Jun 2015 08:31:32 -0700 (PDT) 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=pNzJJ5h6wrCrj4htgpuDFjaSj+jm0oPt0PKu02rbCCk=; b=CijUe4pS6FnJvh7eiD7+vh2pQtSNgg45eaR01gbHcGoQf8zjX/4rWjioW64I2GI3/2 L812WWaobuK+s3GAfhOQ/b4JSqZI0yR1CIJH3in7C6CDYDhBpSjyJINbdUtgPIUW/XyR jB75gEP4pIWYi1Oad6z6i+//NRpn9mwelWQZ0F6HFP/tCqXyjLtXmDPz6f/rJQcwiE1P F+T28UaZgvZIFpUvIEdCLwa073T5DnBKMzB3jAVzS7/+FQBGiNd1WAiLoHrHSsTD2lGg 5/MWFwAxGYX4ICBSPnrkKcGMFGzoVz7pNYtTEfWGdHRAvXeEOzI7guBCnCbNHWnevSwm dM3g== MIME-Version: 1.0 X-Received: by 10.107.155.74 with SMTP id d71mr29058126ioe.29.1434295892682; Sun, 14 Jun 2015 08:31:32 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Sun, 14 Jun 2015 08:31:32 -0700 (PDT) In-Reply-To: <20150614172816.0695d45e@kalimero.tijl.coosemans.org> References: <201506132201.t5DM1LCV025599@svn.freebsd.org> <20150614114116.2ba761da@kalimero.tijl.coosemans.org> <20150614172816.0695d45e@kalimero.tijl.coosemans.org> Date: Sun, 14 Jun 2015 08:31:32 -0700 X-Google-Sender-Auth: 6Rp_duei-0korT0nHdBDXyrzW-k Message-ID: Subject: Re: svn commit: r284356 - head/usr.sbin/crunch/crunchgen From: Adrian Chadd To: Tijl Coosemans Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 15:31:33 -0000 On 14 June 2015 at 08:28, Tijl Coosemans wrote: > On Sun, 14 Jun 2015 08:07:17 -0700 Adrian Chadd wrote: >> On 14 June 2015 at 02:41, Tijl Coosemans wrote: >>> On Sat, 13 Jun 2015 22:01:21 +0000 (UTC) Adrian Chadd wrote: >>>> Author: adrian >>>> Date: Sat Jun 13 22:01:21 2015 >>>> New Revision: 284356 >>>> URL: https://svnweb.freebsd.org/changeset/base/284356 >>>> >>>> Log: >>>> Fix up crunchgen binary generation to work with external cross-build >>>> tools. >>>> >>>> * Allow STRIP to be overridden by the environment >>>> * Use CC to tie things together, not LD >>>> >>>> Tested: >>>> >>>> * i386, mips32 >>>> >>>> Submitted by: kan >>>> >>>> Modified: >>>> head/usr.sbin/crunch/crunchgen/crunchgen.c >>>> >>>> Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c >>>> ============================================================================== >>>> --- head/usr.sbin/crunch/crunchgen/crunchgen.c Sat Jun 13 20:15:44 2015 (r284355) >>>> +++ head/usr.sbin/crunch/crunchgen/crunchgen.c Sat Jun 13 22:01:21 2015 (r284356) >>>> @@ -1109,7 +1110,7 @@ prog_makefile_rules(FILE *outmk, prog_t >>>> fprintf(outmk, " $(%s_LIBS)", p->ident); >>>> >>>> fprintf(outmk, "\n"); >>>> - fprintf(outmk, "\t$(LD) -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", >>>> + fprintf(outmk, "\t$(CC) -nostdlibs -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", >>> >>> Does CC understand -dc and -r? >> >> Apparently? > > Hmm, it's undocumented but it seems to recognise -r and pass it on to > the linker. Not -dc though. It's safer to use: -Wl,-dc -Wl,-r Ok. Would you mind committing it? I'm not near a FreeBSD machine at the moment. Thanks! -a From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 15:40:18 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CB1A4AF2; Sun, 14 Jun 2015 15:40:18 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B9C86805; Sun, 14 Jun 2015 15:40:18 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5EFeIR9066715; Sun, 14 Jun 2015 15:40:18 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5EFeI94066714; Sun, 14 Jun 2015 15:40:18 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201506141540.t5EFeI94066714@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 14 Jun 2015 15:40:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284382 - head/usr.sbin/crunch/crunchgen X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 15:40:18 -0000 Author: tijl Date: Sun Jun 14 15:40:17 2015 New Revision: 284382 URL: https://svnweb.freebsd.org/changeset/base/284382 Log: Tell the compiler that -dc and -r are linker flags. Reviewed by: adrian Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c ============================================================================== --- head/usr.sbin/crunch/crunchgen/crunchgen.c Sun Jun 14 14:10:05 2015 (r284381) +++ head/usr.sbin/crunch/crunchgen/crunchgen.c Sun Jun 14 15:40:17 2015 (r284382) @@ -1110,7 +1110,7 @@ prog_makefile_rules(FILE *outmk, prog_t fprintf(outmk, " $(%s_LIBS)", p->ident); fprintf(outmk, "\n"); - fprintf(outmk, "\t$(CC) -nostdlib -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", + fprintf(outmk, "\t$(CC) -nostdlib -Wl,-dc -Wl,-r -o %s.lo %s_stub.o $(%s_OBJPATHS)", p->name, p->name, p->ident); if (p->libs) fprintf(outmk, " $(%s_LIBS)", p->ident); From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 15:41:35 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 55F29D58; Sun, 14 Jun 2015 15:41:35 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay102.isp.belgacom.be (mailrelay102.isp.belgacom.be [195.238.20.129]) by mx1.freebsd.org (Postfix) with ESMTP id 67EC697F; Sun, 14 Jun 2015 15:41:33 +0000 (UTC) (envelope-from tijl@freebsd.org) X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=d6O4W030xngO5QkzyDOul/vmjwC4sFqcTOV5kZr+d1k= c=1 sm=2 a=kj9zAlcOel0A:10 a=6I5d2MoRAAAA:8 a=bVi76fQjxsvHlU0x08AA:9 a=CjuIK1q_8ugA:10 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CQCwDwn31V/++YsFtcgxBUUg29fQmBYYV6AoEeORQBAQEBAQEBgQpBBYNdAQEEJxMcIxALFAQJJQ8qHgYTiDMBCMhvAQEBAQEBAQMBAQEBAQEBFwSLRIRTMweELQEEk1uEUIZxmBEmg3s8MYJHAQEB Received: from 239.152-176-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.176.152.239]) by relay.skynet.be with ESMTP; 14 Jun 2015 17:41:33 +0200 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.9/8.14.9) with ESMTP id t5EFfVJM002986; Sun, 14 Jun 2015 17:41:32 +0200 (CEST) (envelope-from tijl@FreeBSD.org) Date: Sun, 14 Jun 2015 17:41:31 +0200 From: Tijl Coosemans To: Adrian Chadd Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284356 - head/usr.sbin/crunch/crunchgen Message-ID: <20150614174131.1d723381@kalimero.tijl.coosemans.org> In-Reply-To: References: <201506132201.t5DM1LCV025599@svn.freebsd.org> <20150614114116.2ba761da@kalimero.tijl.coosemans.org> <20150614172816.0695d45e@kalimero.tijl.coosemans.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 15:41:35 -0000 On Sun, 14 Jun 2015 08:31:32 -0700 Adrian Chadd wrote: > On 14 June 2015 at 08:28, Tijl Coosemans wrote: >> On Sun, 14 Jun 2015 08:07:17 -0700 Adrian Chadd wrote: >>> On 14 June 2015 at 02:41, Tijl Coosemans wrote: >>>> On Sat, 13 Jun 2015 22:01:21 +0000 (UTC) Adrian Chadd wrote: >>>>> Author: adrian >>>>> Date: Sat Jun 13 22:01:21 2015 >>>>> New Revision: 284356 >>>>> URL: https://svnweb.freebsd.org/changeset/base/284356 >>>>> >>>>> Log: >>>>> Fix up crunchgen binary generation to work with external cross-build >>>>> tools. >>>>> >>>>> * Allow STRIP to be overridden by the environment >>>>> * Use CC to tie things together, not LD >>>>> >>>>> Tested: >>>>> >>>>> * i386, mips32 >>>>> >>>>> Submitted by: kan >>>>> >>>>> Modified: >>>>> head/usr.sbin/crunch/crunchgen/crunchgen.c >>>>> >>>>> Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c >>>>> ============================================================================== >>>>> --- head/usr.sbin/crunch/crunchgen/crunchgen.c Sat Jun 13 20:15:44 2015 (r284355) >>>>> +++ head/usr.sbin/crunch/crunchgen/crunchgen.c Sat Jun 13 22:01:21 2015 (r284356) >>>>> @@ -1109,7 +1110,7 @@ prog_makefile_rules(FILE *outmk, prog_t >>>>> fprintf(outmk, " $(%s_LIBS)", p->ident); >>>>> >>>>> fprintf(outmk, "\n"); >>>>> - fprintf(outmk, "\t$(LD) -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", >>>>> + fprintf(outmk, "\t$(CC) -nostdlibs -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", >>>> >>>> Does CC understand -dc and -r? >>> >>> Apparently? >> >> Hmm, it's undocumented but it seems to recognise -r and pass it on to >> the linker. Not -dc though. It's safer to use: -Wl,-dc -Wl,-r > > Ok. Would you mind committing it? I'm not near a FreeBSD machine at the moment. Done in r284382. From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 16:16:50 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C8D894DA; Sun, 14 Jun 2015 16:16:50 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (unknown [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 86BC5B5; Sun, 14 Jun 2015 16:16:50 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from [IPv6:2001:7b8:3a7::ad7a:6fe0:9873:3fb4] (unknown [IPv6:2001:7b8:3a7:0:ad7a:6fe0:9873:3fb4]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 9052720EA2; Sun, 14 Jun 2015 18:16:45 +0200 (CEST) Subject: Re: svn commit: r284370 - head/usr.bin/kdump Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_C8D63735-4345-424B-9DBD-6CA5B3FC8B18"; protocol="application/pgp-signature"; micalg=pgp-sha1 X-Pgp-Agent: GPGMail 2.5 From: Dimitry Andric In-Reply-To: <201506140330.t5E3Udm8097264@svn.freebsd.org> Date: Sun, 14 Jun 2015 18:16:35 +0200 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <038E4912-D9DD-4306-8429-15054B15AFCE@FreeBSD.org> References: <201506140330.t5E3Udm8097264@svn.freebsd.org> To: "Simon J. Gerraty" X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 16:16:50 -0000 --Apple-Mail=_C8D63735-4345-424B-9DBD-6CA5B3FC8B18 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 14 Jun 2015, at 05:30, Simon J. Gerraty wrote: >=20 > Author: sjg > Date: Sun Jun 14 03:30:39 2015 > New Revision: 284370 > URL: https://svnweb.freebsd.org/changeset/base/284370 >=20 > Log: > Create proper targets for linux*syscalls.c >=20 > Modified: > head/usr.bin/kdump/Makefile Is this supposed to fix things? Even at r284381, I get: =3D=3D=3D> usr.bin/kdump (depend) sh /usr/src/usr.bin/kdump/mksubr /usr/obj/usr/src/tmp/usr/include = >kdump_subr.c env MACHINE=3Di386 CPP=3D"cpp " sh /usr/src/usr.bin/kdump/mkioctls = print /usr/obj/usr/src/tmp/usr/include > ioctl.c :1:10: fatal error: 'cam/cam_compat.h' file not found #include ^ 1 error generated. rm -f .depend CC=3D'cc ' mkdep -f .depend -a -I/usr/src/usr.bin/kdump/../ktrace = -I/usr/src/usr.bin/kdump -I/usr/src/usr.bin/kdump/../.. -I. = -DHAVE_LIBCAPSICUM -DPF -std=3Dgnu99 kdump_subr.c = /usr/src/usr.bin/kdump/kdump.c ioctl.c = /usr/src/usr.bin/kdump/../ktrace/subr.c /usr/src/usr.bin/kdump/kdump.c:153:10: fatal error: 'linux_syscalls.c' = file not found #include ^ 1 error generated. mkdep: compile failed *** Error code 1 Stop. Any idea? I obviously do not see any linux_syscalls.c in the objdir. -Dimitry --Apple-Mail=_C8D63735-4345-424B-9DBD-6CA5B3FC8B18 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.27 iEYEARECAAYFAlV9qO0ACgkQsF6jCi4glqN3wACgzBOgi1vvszGsv0nRtN0RbXoz 1fsAoLnSJogRCt7CMGbDiOI6WLkbYyJ1 =LpxS -----END PGP SIGNATURE----- --Apple-Mail=_C8D63735-4345-424B-9DBD-6CA5B3FC8B18-- From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 16:31:07 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C51BC870; Sun, 14 Jun 2015 16:31:07 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A65293E8; Sun, 14 Jun 2015 16:31:07 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5EGV7e0093617; Sun, 14 Jun 2015 16:31:07 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5EGV7J0093616; Sun, 14 Jun 2015 16:31:07 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506141631.t5EGV7J0093616@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 14 Jun 2015 16:31:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284383 - head/sys/dev/filemon X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 16:31:07 -0000 Author: sjg Date: Sun Jun 14 16:31:06 2015 New Revision: 284383 URL: https://svnweb.freebsd.org/changeset/base/284383 Log: Latest clang uses openat(2). If the pathname is absolute or dirfd is AT_FDCWD we can handle it exactly like open(2). Otherwise we output an A record to indicate that the path of an open directory needs to be used (earlier in the trace). Differential Revision: D2810 Reviewed by: jhb MFC after: a bit Modified: head/sys/dev/filemon/filemon_wrapper.c Modified: head/sys/dev/filemon/filemon_wrapper.c ============================================================================== --- head/sys/dev/filemon/filemon_wrapper.c Sun Jun 14 15:40:17 2015 (r284382) +++ head/sys/dev/filemon/filemon_wrapper.c Sun Jun 14 16:31:06 2015 (r284383) @@ -316,6 +316,68 @@ filemon_wrapper_open(struct thread *td, } static int +filemon_wrapper_openat(struct thread *td, struct openat_args *uap) +{ + int ret; + size_t done; + size_t len; + struct filemon *filemon; + + if ((ret = sys_openat(td, uap)) == 0) { + /* Grab a read lock on the filemon inuse list. */ + filemon_lock_read(); + + if ((filemon = filemon_pid_check(curproc)) != NULL) { + /* Lock the found filemon structure. */ + filemon_filemon_lock(filemon); + + copyinstr(uap->path, filemon->fname1, + sizeof(filemon->fname1), &done); + + filemon->fname2[0] = '\0'; + if (filemon->fname1[0] != '/' && uap->fd != AT_FDCWD) { + /* + * rats - we cannot do too much about this. + * the trace should show a dir we read + * recently.. output an A record as a clue + * until we can do better. + */ + len = snprintf(filemon->msgbufr, + sizeof(filemon->msgbufr), "A %d %s\n", + curproc->p_pid, filemon->fname1); + filemon_output(filemon, filemon->msgbufr, len); + } + if (uap->flag & O_RDWR) { + /* + * We'll get the W record below, but need + * to also output an R to distingish from + * O_WRONLY. + */ + len = snprintf(filemon->msgbufr, + sizeof(filemon->msgbufr), "R %d %s%s\n", + curproc->p_pid, filemon->fname2, filemon->fname1); + filemon_output(filemon, filemon->msgbufr, len); + } + + + len = snprintf(filemon->msgbufr, + sizeof(filemon->msgbufr), "%c %d %s%s\n", + (uap->flag & O_ACCMODE) ? 'W':'R', + curproc->p_pid, filemon->fname2, filemon->fname1); + filemon_output(filemon, filemon->msgbufr, len); + + /* Unlock the found filemon structure. */ + filemon_filemon_unlock(filemon); + } + + /* Release the read lock. */ + filemon_unlock_read(); + } + + return (ret); +} + +static int filemon_wrapper_rename(struct thread *td, struct rename_args *uap) { int ret; @@ -669,6 +731,7 @@ filemon_wrapper_install(void) sv_table[SYS_execve].sy_call = (sy_call_t *) filemon_wrapper_execve; sv_table[SYS_fork].sy_call = (sy_call_t *) filemon_wrapper_fork; sv_table[SYS_open].sy_call = (sy_call_t *) filemon_wrapper_open; + sv_table[SYS_openat].sy_call = (sy_call_t *) filemon_wrapper_openat; sv_table[SYS_rename].sy_call = (sy_call_t *) filemon_wrapper_rename; sv_table[SYS_stat].sy_call = (sy_call_t *) filemon_wrapper_stat; sv_table[SYS_unlink].sy_call = (sy_call_t *) filemon_wrapper_unlink; @@ -687,6 +750,7 @@ filemon_wrapper_install(void) sv_table[FREEBSD32_SYS_freebsd32_execve].sy_call = (sy_call_t *) filemon_wrapper_freebsd32_execve; sv_table[FREEBSD32_SYS_fork].sy_call = (sy_call_t *) filemon_wrapper_fork; sv_table[FREEBSD32_SYS_open].sy_call = (sy_call_t *) filemon_wrapper_open; + sv_table[FREEBSD32_SYS_openat].sy_call = (sy_call_t *) filemon_wrapper_openat; sv_table[FREEBSD32_SYS_rename].sy_call = (sy_call_t *) filemon_wrapper_rename; sv_table[FREEBSD32_SYS_freebsd32_stat].sy_call = (sy_call_t *) filemon_wrapper_freebsd32_stat; sv_table[FREEBSD32_SYS_unlink].sy_call = (sy_call_t *) filemon_wrapper_unlink; @@ -713,6 +777,7 @@ filemon_wrapper_deinstall(void) sv_table[SYS_execve].sy_call = (sy_call_t *)sys_execve; sv_table[SYS_fork].sy_call = (sy_call_t *)sys_fork; sv_table[SYS_open].sy_call = (sy_call_t *)sys_open; + sv_table[SYS_openat].sy_call = (sy_call_t *)sys_openat; sv_table[SYS_rename].sy_call = (sy_call_t *)sys_rename; sv_table[SYS_stat].sy_call = (sy_call_t *)sys_stat; sv_table[SYS_unlink].sy_call = (sy_call_t *)sys_unlink; @@ -731,6 +796,7 @@ filemon_wrapper_deinstall(void) sv_table[FREEBSD32_SYS_freebsd32_execve].sy_call = (sy_call_t *)freebsd32_execve; sv_table[FREEBSD32_SYS_fork].sy_call = (sy_call_t *)sys_fork; sv_table[FREEBSD32_SYS_open].sy_call = (sy_call_t *)sys_open; + sv_table[FREEBSD32_SYS_openat].sy_call = (sy_call_t *)sys_openat; sv_table[FREEBSD32_SYS_rename].sy_call = (sy_call_t *)sys_rename; sv_table[FREEBSD32_SYS_freebsd32_stat].sy_call = (sy_call_t *)freebsd32_stat; sv_table[FREEBSD32_SYS_unlink].sy_call = (sy_call_t *)sys_unlink; From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 17:10:42 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 845ABDF4; Sun, 14 Jun 2015 17:10:42 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "troutmask", Issuer "troutmask" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 5BA2AEC2; Sun, 14 Jun 2015 17:10:42 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.14.9/8.14.9) with ESMTP id t5EHAWiu005906 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sun, 14 Jun 2015 10:10:32 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.9/8.14.9/Submit) id t5EHAV78005905; Sun, 14 Jun 2015 10:10:31 -0700 (PDT) (envelope-from sgk) Date: Sun, 14 Jun 2015 10:10:31 -0700 From: Steve Kargl To: Bruce Simpson Cc: Slawa Olhovchenkov , Craig Rodrigues , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Subject: Re: svn commit: r284198 - head/bin/ls Message-ID: <20150614171031.GA5857@troutmask.apl.washington.edu> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <557D55CB.5050009@fastmail.net> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 17:10:42 -0000 On Sun, Jun 14, 2015 at 11:22:03AM +0100, Bruce Simpson wrote: > > But I have yet to see a coherent argument here -- size(1) numbers, RSS > figures etc. -- about how it allegedly adds bloat. Most of what I've > seen so far is POLA, NIH resistance, and hand-wavery. > It is not alleged. I actaully measured the bloat libxo caused when w(1) was converted. https://lists.freebsd.org/pipermail/freebsd-current/2015-March/054917.html Here's the bloat with ls(1) % ldd /bin/ls /bin/ls: libutil.so.9 => /lib/libutil.so.9 (0x2807d000) libncursesw.so.8 => /lib/libncursesw.so.8 (0x2808f000) libc.so.7 => /lib/libc.so.7 (0x280db000) % ll /bin/ls -r-xr-xr-x 1 root wheel - 28568 Jun 7 21:01 /bin/ls* % ldd /bin/ls /bin/ls: libutil.so.9 => /lib/libutil.so.9 (0x2807d000) libncursesw.so.8 => /lib/libncursesw.so.8 (0x2808f000) libxo.so.0 => /lib/libxo.so.0 (0x280db000) libc.so.7 => /lib/libc.so.7 (0x280ec000) laptop-kargl:kargl[204] ll /bin/ls -r-xr-xr-x 1 root wheel - 31376 Jun 14 10:06 /bin/ls* -- Steve From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 17:38:51 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D76E2A7; Sun, 14 Jun 2015 17:38:51 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ie0-x229.google.com (mail-ie0-x229.google.com [IPv6:2607:f8b0:4001:c03::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 308D4667; Sun, 14 Jun 2015 17:38:51 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by iebgx4 with SMTP id gx4so49774447ieb.0; Sun, 14 Jun 2015 10:38:50 -0700 (PDT) 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=RCcZxtY1eSfUP4H5WVJipdWWcE4x12Vae638mDx5wJA=; b=nTz5HLoM1XajqnYpdkm/7UHFgb5rA5hd+aIJkkwc/U09Pq5g+6YKVHJMnGKJIEoqjk pdi1747E/6xAlaHx6HCr+8w/ZdFbLSaOTfEkv8wPw39vAfXSBWHgGtHV0+3CFr1zzytj VnZpeNH9jZA7a4ra/zsukYDhb7T84n2PZP52B60hvvryu7/Quew/khb8rR2RjenimGAV jUPHP+GU1qpRAil5L49yEoKHVgvQ0aPmu+qIj0ruyMbYYYA0+cWHPiPugR5w9SD/2mXS uzp5o0LI7ga3nfcp5BI66MxBqL/IecviSYZaeY0d4hlPwEwWI8UXm1+2aGXyewkfvZWN nbfQ== MIME-Version: 1.0 X-Received: by 10.42.176.8 with SMTP id bc8mr10771719icb.22.1434303530649; Sun, 14 Jun 2015 10:38:50 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Sun, 14 Jun 2015 10:38:50 -0700 (PDT) In-Reply-To: <20150614171031.GA5857@troutmask.apl.washington.edu> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> <20150614171031.GA5857@troutmask.apl.washington.edu> Date: Sun, 14 Jun 2015 10:38:50 -0700 X-Google-Sender-Auth: 2RWhgqONP1sHyaFTUgJXSrjc2RU Message-ID: Subject: Re: svn commit: r284198 - head/bin/ls From: Adrian Chadd To: Steve Kargl Cc: Bruce Simpson , Slawa Olhovchenkov , Craig Rodrigues , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 17:38:51 -0000 On 14 June 2015 at 10:10, Steve Kargl wrote: > On Sun, Jun 14, 2015 at 11:22:03AM +0100, Bruce Simpson wrote: >> >> But I have yet to see a coherent argument here -- size(1) numbers, RSS >> figures etc. -- about how it allegedly adds bloat. Most of what I've >> seen so far is POLA, NIH resistance, and hand-wavery. >> > > It is not alleged. I actaully measured the bloat libxo > caused when w(1) was converted. > > https://lists.freebsd.org/pipermail/freebsd-current/2015-March/054917.html > > Here's the bloat with ls(1) > > % ldd /bin/ls > /bin/ls: > libutil.so.9 => /lib/libutil.so.9 (0x2807d000) > libncursesw.so.8 => /lib/libncursesw.so.8 (0x2808f000) > libc.so.7 => /lib/libc.so.7 (0x280db000) > % ll /bin/ls > -r-xr-xr-x 1 root wheel - 28568 Jun 7 21:01 /bin/ls* > > % ldd /bin/ls > /bin/ls: > libutil.so.9 => /lib/libutil.so.9 (0x2807d000) > libncursesw.so.8 => /lib/libncursesw.so.8 (0x2808f000) > libxo.so.0 => /lib/libxo.so.0 (0x280db000) > libc.so.7 => /lib/libc.so.7 (0x280ec000) > laptop-kargl:kargl[204] ll /bin/ls > -r-xr-xr-x 1 root wheel - 31376 Jun 14 10:06 /bin/ls* Plus 60k for the shared library. I don't mind that too much right now - it's around an extra 4k of overhead per binary right now. -adrian From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 17:40:31 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C2563F6; Sun, 14 Jun 2015 17:40:31 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x232.google.com (mail-ig0-x232.google.com [IPv6:2607:f8b0:4001:c05::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 046F76BF; Sun, 14 Jun 2015 17:40:31 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igblz2 with SMTP id lz2so37083279igb.1; Sun, 14 Jun 2015 10:40:30 -0700 (PDT) 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=YlCq0FtcpYaba+o/QTevBtXo8W+f8g6BEvrYwv70tMc=; b=K7n3tRvanhod8ahWsXwNLTEJ2SLz+gtR9+a9Dh7uxOvALzYR1/vFwW/nr7j8SOclV3 4tNKS78k5CMNoQVvajW3Iy4Z5POVtW7eG4kSxtBHi1d5hSmpUgBzgGab/VfTVE6iDIQ4 rDyOWL2K+XlPICq/mom+IYrJ3q756hkgUQFsi/UM9gUIo4A5EGG50lv5ng9g3D9xH0Xh /zJ/6Vu2WhJ6EcpcIpQIXuDM5qx5ldvRHYj8yPNFKOXMbvxqEwBt4RqHD68YetgSSkrM iXkkkrPvld/AxKQay4fa0m6ZbjETtS0tSQu6zOLS7tTfGI/8Fnh5bwHxEalyTgp8D8Tv /pLQ== MIME-Version: 1.0 X-Received: by 10.43.163.129 with SMTP id mo1mr25666881icc.61.1434303630426; Sun, 14 Jun 2015 10:40:30 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Sun, 14 Jun 2015 10:40:30 -0700 (PDT) In-Reply-To: <201506131920.t5DJKwMH033508@svn.freebsd.org> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> Date: Sun, 14 Jun 2015 10:40:30 -0700 X-Google-Sender-Auth: BGhdnufXYe4BqMNo0d8vm5A1WLI Message-ID: Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... From: Adrian Chadd To: "Simon J. Gerraty" Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 17:40:31 -0000 Wait a second - y'all committed a bunch of dependencies that we aren't supposed to edit directly? So what's the process for making sure we don't stomp over the feet of other people who are using the depend based builds? -adrian From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 17:48:44 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E768083F; Sun, 14 Jun 2015 17:48:44 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D5BC18ED; Sun, 14 Jun 2015 17:48:44 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5EHmi8u030392; Sun, 14 Jun 2015 17:48:44 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5EHmiv8030391; Sun, 14 Jun 2015 17:48:44 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201506141748.t5EHmiv8030391@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sun, 14 Jun 2015 17:48:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284384 - head/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 17:48:45 -0000 Author: tuexen Date: Sun Jun 14 17:48:44 2015 New Revision: 284384 URL: https://svnweb.freebsd.org/changeset/base/284384 Log: Stop the heartbeat timer when removing a net. Thanks to the reporter of https://code.google.com/p/sctp-refimpl/issues/detail?id=14 for reporting the issue. MFC after: 3 days Modified: head/sys/netinet/sctp_var.h Modified: head/sys/netinet/sctp_var.h ============================================================================== --- head/sys/netinet/sctp_var.h Sun Jun 14 16:31:06 2015 (r284383) +++ head/sys/netinet/sctp_var.h Sun Jun 14 17:48:44 2015 (r284384) @@ -178,6 +178,7 @@ extern struct pr_usrreqs sctp_usrreqs; if (SCTP_DECREMENT_AND_CHECK_REFCOUNT(&(__net)->ref_count)) { \ (void)SCTP_OS_TIMER_STOP(&(__net)->rxt_timer.timer); \ (void)SCTP_OS_TIMER_STOP(&(__net)->pmtu_timer.timer); \ + (void)SCTP_OS_TIMER_STOP(&(__net)->hb_timer.timer); \ if ((__net)->ro.ro_rt) { \ RTFREE((__net)->ro.ro_rt); \ (__net)->ro.ro_rt = NULL; \ From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 17:57:21 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9608BBB0 for ; Sun, 14 Jun 2015 17:57:21 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from mail-ig0-f173.google.com (mail-ig0-f173.google.com [209.85.213.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5C882B07 for ; Sun, 14 Jun 2015 17:57:21 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: by igbsb11 with SMTP id sb11so37225614igb.0 for ; Sun, 14 Jun 2015 10:57:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:mime-version:content-type:from :in-reply-to:date:cc:message-id:references:to; bh=1nr+9Vduaoc0vNaSfAw2wkriFUfrHll4KXoXr+3G4Ek=; b=Ib3VmXqVqoEt2n2pFxciW/Oq66torgDTcgP4tlEXIgaZFWd8ZemC6o1T9+1ZnMSToq b0iG2XDFcCEPdpimPnwy16Cx8ruAEgdtB4KFiDFs3hF1YlvrU+B9TOg9u1cNFjon4fhm 7LyoS3KaNY1qvF8OLuefneOSE8YSIn2ykyyE5R8vqHVMfAPmTvXRe2YyHHDQ95v2DM0C CrKSh99D7v9Ir7Xyz+LeDc2ZdKlrtJgiYkcvkcjbKOhGbf5roSMzxQ73fJ/fp68vg4ZL ARO0FkipxK3aA/ryUeCKHa+ymFpVE2rktkhGwF7aZ+Uq7or1AprcPZ1l9C41fy8SdUgV qi6g== X-Gm-Message-State: ALoCoQkf5kVzsC3Y7waaTH2Bvciy2NdKLQOuGpjv/OKJZpaFAR565tyMEZ0XdGOz1VDfc6GgoXru X-Received: by 10.43.10.194 with SMTP id pb2mr26953310icb.31.1434304640568; Sun, 14 Jun 2015 10:57:20 -0700 (PDT) Received: from netflix-mac.bsdimp.com ([50.253.99.174]) by mx.google.com with ESMTPSA id q10sm5849492ige.16.2015.06.14.10.57.19 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 14 Jun 2015 10:57:19 -0700 (PDT) Sender: Warner Losh Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_BB29014A-84EA-4BC8-B3E5-192B36885A64"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5b6 From: Warner Losh In-Reply-To: Date: Sun, 14 Jun 2015 13:57:19 -0400 Cc: "Simon J. Gerraty" , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-Id: <4E3C5AEE-8AF8-4594-86F3-19856810F4F8@bsdimp.com> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> To: Craig Rodrigues X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 17:57:21 -0000 --Apple-Mail=_BB29014A-84EA-4BC8-B3E5-192B36885A64 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Jun 14, 2015, at 12:46 AM, Craig Rodrigues = wrote: >=20 > On Sat, Jun 13, 2015 at 3:34 PM, Craig Rodrigues = wrote: > > > > On Sat, Jun 13, 2015 at 12:20 PM, Simon J. Gerraty = wrote: > >> > >> Author: sjg > >> Date: Sat Jun 13 19:20:56 2015 > >> New Revision: 284345 > >> URL: https://svnweb.freebsd.org/changeset/base/284345 > >> > >> Log: > >> Add META_MODE support. > > > > > > Simon, > > > > Can you take a look at this: > > https://jenkins.freebsd.org/job/FreeBSD_HEAD/2860/ > > > > > > The console output is showing this: > > > > + make -j 4 buildworld __MAKE_CONF=3D/builds/FreeBSD_HEAD/make.conf > > make: "/builds/FreeBSD_HEAD/Makefile" line 102: Malformed = conditional (${MK_META_MODE} =3D=3D "yes") > > make: Fatal errors encountered -- cannot continue > > make: stopped in /builds/FreeBSD_HEAD > > Build step 'Execute shell' marked build as failure > > > > This is using a FreeBSD 10.1 host to build HEAD. > > >=20 > I can reproduce the problem pretty quickly. > I did this on a FreeBSD-CURRENT host: >=20 > # svn co svn://svn.freebsd.org/base/head src > # cd src > # make -V MK_META_MODE > no >=20 > I did this on a FreeBSD 10.1-R host: >=20 > # svn co svn://svn.freebsd.org/base/head src > # cd src > # make -V MK_META_MODE > make: "/root/src/Makefile" line 102: Malformed conditional = (${MK_META_MODE} =3D=3D "yes") > make: Fatal errors encountered -- cannot continue > make: stopped in /root/src >=20 > FreeBSD 10.1 is using bmake as /usr/bin/make so fmake is not an issue = here. > I think the issue is that on FreeBSD 10.1, the /usr/share/mk files do > not have the logic to define MK_META_MODE. >=20 > I am not sure if this is the right fix, but I did this: >=20 > Index: Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- Makefile (revision 284374) > +++ Makefile (working copy) > @@ -99,7 +99,7 @@ > # > # For more information, see the build(7) manual page. > # > -.if ${MK_META_MODE} =3D=3D "yes" > +.if !empty(MK_META_MODE) && ${MK_META_MODE} =3D=3D "yes" > # targets/Makefile plays the role of top-level > .include "targets/Makefile" > .else >=20 >=20 > and that made things work for me on FreeBSD 10.1-R. Since the src.opts.mk files isn=E2=80=99t included for src/Makefile, = MK_META_MODE isn=E2=80=99t defined. Warner --Apple-Mail=_BB29014A-84EA-4BC8-B3E5-192B36885A64 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJVfcCAAAoJEGwc0Sh9sBEAQLIQANy2xf5S6d9fX/YBY+jrZzhU gI+SnQZqAORoSgFsZPCR4H+v9I6zBDAsT3o3P9BPcgiXvRSHO57Umwz3jPMxnzfG G0AeLn1EpCSpjkU9P5HlcHlOKm2B4fN0nwxiQb0MoR4rvW8KGhHcj7nMl3OHIxVb 0oFquEXMUny5hvRQ6NL86cpIbGHEMMT38FpxvEIJaJTCfyyMV3U1KS3u1GkRds8l P5S2uT6Lxb0erMWOlu1FAzRtui0B3EvSAMH3QxMjMrCxFX5K363yIEdBMW7X6EVF e8OzrpEEjdyJLfvtugl2FmQ6U8gTfdD+hU6x7kC70y9MSOWjidj4GIvLs/6DDkGs K0iWQwe7FyPemPM6gWOvwsGwvTrNw3tKrBxtJLLWUypGxhiwy2rGYxxq8Kd6/IsY +eoUgDyWemV0qnrDwngdnYEHoDqO3cv+dLHFhHVGs67dD4YpI4x1miOCLr42DlbF 0K/D5Wlj4MQ9Y8pd/Vz6PEh/NkXPkQXDICXra/Q0/4sJ9bfCYISiP7+18PyTHJIL mfGXGOJcBM5GnsxK6WA/MWty7qUl9W4rTnfBQOrz9EGPWeHOYTj4K/7prZhy68x5 IpoujEyJY3GlxgMp3gPDQx4bTtk3ny0Gpy6bG5wPR12BBOajPcPcl01EzVhz/9Sh 9KCYHG97XlyE1TtMt0S3 =WhGc -----END PGP SIGNATURE----- --Apple-Mail=_BB29014A-84EA-4BC8-B3E5-192B36885A64-- From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 18:00:35 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9D10BD05 for ; Sun, 14 Jun 2015 18:00:35 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from mail-ig0-f169.google.com (mail-ig0-f169.google.com [209.85.213.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 62015B68 for ; Sun, 14 Jun 2015 18:00:35 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: by igbos3 with SMTP id os3so4234619igb.0 for ; Sun, 14 Jun 2015 11:00:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:mime-version:content-type:from :in-reply-to:date:cc:message-id:references:to; bh=M3QTLMqz84HVSl2spKpbxdUQ2e94gs0OVTKv798T1cc=; b=j2VjRIqspXStE1kcLGpuqOtU1ZzNUc8fMeEMu/XOmnT0ePINUII3LWiIg4YXkUBcCs DRk0INuVqNXKc2Y0x8IDZZIPZUlB/q5m1vBhCDreUfSX8iZsHkqRkXU5+bZKbjMf3Aug Q5u5nT7/xf1RrrXIz4EvOskhKXk305DJa+YK1GIryzzJ8kWWKzoY9TCeMBzhtv5ioYqy Td8LOh82H21OO9degiQPoOJjekO7sHRnlHoe9idj33MdAgJwGvL8eh01LwPhobOAzh/b mvOioDRxGRT2t3lWwVd2lVKRaxc7Ki5nC6GLvvYTq96GcfmiZsVEg4ltuGiXDX+Yae5Y VPzg== X-Gm-Message-State: ALoCoQnzlXHsosvsSmVcjAPP9qFm5P9jmG2XIA1LoDoN8OirTNUJXRFIe8UijeyHcRCLBbSdLKer X-Received: by 10.50.138.232 with SMTP id qt8mr16225871igb.28.1434304834703; Sun, 14 Jun 2015 11:00:34 -0700 (PDT) Received: from netflix-mac.bsdimp.com ([50.253.99.174]) by mx.google.com with ESMTPSA id p17sm5855095igr.15.2015.06.14.11.00.33 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 14 Jun 2015 11:00:33 -0700 (PDT) Sender: Warner Losh Subject: Re: svn commit: r284198 - head/bin/ls Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_5F3316E3-6E41-457F-BB53-C7399C1BDDA7"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5b6 From: Warner Losh In-Reply-To: Date: Sun, 14 Jun 2015 14:00:34 -0400 Cc: Steve Kargl , Marcel Moolenaar , Marcel Moolenaar , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-Id: References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> To: Craig Rodrigues X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 18:00:35 -0000 --Apple-Mail=_5F3316E3-6E41-457F-BB53-C7399C1BDDA7 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Jun 13, 2015, at 8:40 PM, Craig Rodrigues = wrote: >=20 > On Sat, Jun 13, 2015 at 5:26 PM, Steve Kargl = wrote: > On Sat, Jun 13, 2015 at 05:13:31PM -0700, Craig Rodrigues wrote: > > > > For people who are trying to build FreeBSD-based embedded products = with > > modern web UI's, > > this is *really* useful. > > >=20 > Given the bloat caused by libxo, which I showed in March, > I don't see how people working on embedded products could > be thrilled with this. >=20 > Steve, >=20 > For people building embedded products these days, > storage of gigabytes and even terabytes is often available, Often, but not always. The bloat is another issue with libxo. It=E2=80=99s= a problem for the embedded routers that Adrian has been pushing. It is a problem = with many of the embedded boards I have. It isn=E2=80=99t too big of a = problem with RPi and the like because SD cards are a lot easier to upgrade than chip-down NAND Flash parts. > so the space increase that libxo provides is not that big a problem, > at least for the last few products that I have worked on in the past = few years. You are working on fairly big embedded. Warner --Apple-Mail=_5F3316E3-6E41-457F-BB53-C7399C1BDDA7 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJVfcFCAAoJEGwc0Sh9sBEAh5MP/jwe/HoGS16KiJeD0eLvpjUg bxpeSwHiPTcSu26f2K0fBmCQlooNmOHpgjqtWVWCRyMO2OjveUq/cNEIe+NU7ity za8ZlA74rGiobGRfZSuzXI+uWlktURN2aRCVYBkm70OuN41CItrlygUqXsRqrFyj DOEgjJYCNk+6OuWcv6mSeBTSgd96vz2Sby3yaeS68ISj4kqLIswC1gmc/mSrupDG jarYyNTtdKcGPCWM6DJekROhuDWZ5lj/+uq9/IekJcc4yDPZaQVTnu1HOzfNfL+H 2RKcfZa9XoiUWyaVZQgpY1bHjDEZ93bmaaJwRySxWkeURx9GYrdjrdpK1kJjfJwN HyqSH9pBBV7iFb+XJWCuDNTUpSXxIVREr8huffS37PjMD8N8lR9WXnL764RgQ9xQ edN+gyvfo2cwRCDlm9lEy3Bmv87J+/lNcCFOJK8MOWJJAAqu77aQ/gLWShDigK9o ncy9Z6h0m2BjLb2nnhalSoL1alA5YvWWTmhYp9UgbRYR4HI2iu6OJ54Y3tFZdB5n ubHzbVycYuB3/Cc1TW5oV2WpahcaHxDLv0WNVIoN35bNH8xGTZNoPifhXvVzOjrv +AZr4BuZNibmjS9+/zAsbu25mEIvwjaprhU+f1Fa/QaZR//bpN53uKIm04GAW2sO XbF6PLBiW+uYxq6bzxku =1GKR -----END PGP SIGNATURE----- --Apple-Mail=_5F3316E3-6E41-457F-BB53-C7399C1BDDA7-- From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 18:02:18 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 000D0F48 for ; Sun, 14 Jun 2015 18:02:17 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from mail-ie0-f175.google.com (mail-ie0-f175.google.com [209.85.223.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B7555D0E for ; Sun, 14 Jun 2015 18:02:17 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: by iebmu5 with SMTP id mu5so49957669ieb.1 for ; Sun, 14 Jun 2015 11:02:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:mime-version:content-type:from :in-reply-to:date:cc:message-id:references:to; bh=2WbzwNWat8IGRcf4lmZClPI7L0FhEncOzUvBuFkHCqY=; b=kluUA/AiKm1wc5dqR3Sq4MJoiEZC8rMcio1sSr5cAZI/VO2ha8BshS29whkXrqf9eP 3BHxNpevRlrqr62M7hDkGs5mEIS8PxhEIUCbYrwxfiu8hB3l/P8EESVc73qyTppjDpHh WK1P+xxzTTKQgsUi9V9RAt2DKm3DvIgq2X6m7zm17/0ySQbKpaV1dnIfxrcMOrv8H9f2 E5/wkY5VjqcvZJrf9JoSJFiApMqyxDVSHS5vhcTme3wWUHtdOYeqwHnEYSoGlCOmEcG/ iKioKepuKyidugXq3GPM4gAVkHFeRHkg0itVvl+CO3u1/HWQ4ZHJxywVuNJGA62W+jAM H8ew== X-Gm-Message-State: ALoCoQnIoWs0jgCto2yc372SNdeLeomjgzoo6hZSQI+eqUpCOkVhPxrS1B6Vl+6/wUNNHVWd4js8 X-Received: by 10.50.136.134 with SMTP id qa6mr16192462igb.26.1434304937036; Sun, 14 Jun 2015 11:02:17 -0700 (PDT) Received: from netflix-mac.bsdimp.com ([50.253.99.174]) by mx.google.com with ESMTPSA id b15sm5860110igm.12.2015.06.14.11.02.15 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 14 Jun 2015 11:02:16 -0700 (PDT) Sender: Warner Losh Subject: Re: svn commit: r284198 - head/bin/ls Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_BDEAEA4E-8523-4235-8F39-B832F2C13448"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5b6 From: Warner Losh In-Reply-To: Date: Sun, 14 Jun 2015 14:02:16 -0400 Cc: Adrian Chadd , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-Id: <7A2A6548-BADA-40AE-879E-7DE294023A12@bsdimp.com> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> To: Craig Rodrigues X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 18:02:18 -0000 --Apple-Mail=_BDEAEA4E-8523-4235-8F39-B832F2C13448 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii > On Jun 13, 2015, at 9:22 PM, Craig Rodrigues wrote: > > > > On Sat, Jun 13, 2015 at 6:00 PM, Adrian Chadd wrote: > > > > I guarantee that no matter what you've worked on, there's > > approximately five orders of magnitude of shipping devices whose > > entire storage space can be measured in 1 digit megabytes. Each year. > > (And yes - there's an appreciable set of them for which freebsd boots, > runs and keeps running on them.0 > > You can buy em too, some of them even under $60. > > Can FreeBSD now not run on these systems because of libxo? Yes. The root image sizes for a reasonable subset of the system now exceeds the flash that I have on my embedded arm boards. I have to spill over onto the SD card if I want to make progress. Some trimming could be done, but 11 images are quite a bit bigger than 10 images for the same software. Warner --Apple-Mail=_BDEAEA4E-8523-4235-8F39-B832F2C13448 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJVfcGoAAoJEGwc0Sh9sBEAkCwQAI47I01RAbx0tFgip+FeYTCG eefViHqEgVbKq1tSjtUAfd+FSK3qFDJnwwz8ev8qBaB92qHsc4SvAfJdUpbuV7ao hgMMgJe2ut0m/MtFsAshgltppjqioV8ZNrpisUbRQjBckrfkiAcJVX9bSnuwFGoa Fp3SHalVGLdfQ63kXeDkX4SvY4NSHty+PYIDwzHCvJb0Aec5blQVF+T5kIVGcYIW dFTj3aANVmmtTcmXJ+toVN5UIKeBDNaqSZMsvkDGrL5dPtAHb1fbxtUqIpZ+qlS+ B7JjVBWSiZZbgk8NkUcNSVGC+jcxj3lm6EpOSJSFZeuhrLg9bMJQz1zJuZfXEcEm NVnySX02veYT1uV2DO1q+kg520olS9z0I1IV2d4I2JIbHcnHRAgxac9ijazk+sGv pUboX+VsLTo6CiTTACax8n1Y5YlDQ6lGnQqymTtoyptwIg8aXumdBcRKWZZ9VvJd v7XjPcwOeTl8XNl43DzR1LQU+x7Jp+FrryvSmhDKIzlwwe+hFEOTOKusknk45SnI Rgtc9ZGoN9WZDUOOSKsXO2qSi4ibveP0YY5DIsFj9xkSZagIh7uVX66NikVensNu niG3uaaFerVegvvh9FrHAqSJHZizIA5pA1oI242skPHeKC90zC1v4gGVKqdXGbY1 Y4w2JgHkOZ+PeEiNACve =vuJl -----END PGP SIGNATURE----- --Apple-Mail=_BDEAEA4E-8523-4235-8F39-B832F2C13448-- From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 18:35:08 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AFD99551; Sun, 14 Jun 2015 18:35:08 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x231.google.com (mail-ig0-x231.google.com [IPv6:2607:f8b0:4001:c05::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 781695E7; Sun, 14 Jun 2015 18:35:08 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igbos3 with SMTP id os3so4535661igb.0; Sun, 14 Jun 2015 11:35:07 -0700 (PDT) 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=YYDe5QuV3GdWl6hw+OQr1DqfwYSafa09tMdvvUrltvI=; b=MQB+R00VVbiyKyRt7/6TrZ07Zi8uuKT4Nz2zn+N2T8pNQX+suIRdSJGrYm18ZiYemW RGdjgTQJVXeq/jxrKUoFkX8JgjzH0bBHKuLDxtbU2X6WVpn5RTwhhx6yzVIW4I9sSShN G+a25mPH/VC76Mspq29EVg5J5ivdS9oRkFSYfHnAJzDUhUevpaVv3CNIM/L8T310A2Oi u0T8NWvmqg7T2rXM+JQU+DrusYdxGAC5BcbwYaZXqVlho3+1F/LMGXUu5toWiMnnIguE ui32+v7jFP647RRc01FFYMTm/XB524kldvU54ULA13n00dOa98z4p4TbhSlCJtx0aMQv J08g== MIME-Version: 1.0 X-Received: by 10.42.176.8 with SMTP id bc8mr10920258icb.22.1434306907858; Sun, 14 Jun 2015 11:35:07 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Sun, 14 Jun 2015 11:35:07 -0700 (PDT) In-Reply-To: <201506131920.t5DJKwMH033508@svn.freebsd.org> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> Date: Sun, 14 Jun 2015 11:35:07 -0700 X-Google-Sender-Auth: ncyBYZSt9a06ZC1jJui0Jvil5N8 Message-ID: Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... From: Adrian Chadd To: "Simon J. Gerraty" Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 18:35:08 -0000 Hi, + make -j 4 buildworld __MAKE_CONF=/builds/FreeBSD_HEAD/make.conf make: "/builds/FreeBSD_HEAD/Makefile" line 102: Malformed conditional (${MK_META_MODE} == "yes") make: Fatal errors encountered -- cannot continue make: stopped in /builds/FreeBSD_HEAD Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE IRC notifier plugin: Sending notification to: #freebsd-commits .. do you have a fix for this? Or if you don't, would you mind backing things out until you've come up with a solution? -a From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 18:46:10 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 679AD798 for ; Sun, 14 Jun 2015 18:46:10 +0000 (UTC) (envelope-from bms@fastmail.net) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 23B37887 for ; Sun, 14 Jun 2015 18:46:09 +0000 (UTC) (envelope-from bms@fastmail.net) Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 4823F20DE6 for ; Sun, 14 Jun 2015 14:46:08 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute6.internal (MEProxy); Sun, 14 Jun 2015 14:46:08 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.net; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=6dAEuUUDpP+yrHb6Ybshd3MR5Iw=; b=QuAZs0 7yhDzSoV1jWkVESsgOaf2nGz5srylqyAxsEozn+ezPLkcl+5pn+vyyhNcw+hQX2s sRxdTHAvR7XJTq8eRl2FqvmD2eAH1vG0Rwd7HmU+Y2PvfN51E5TNWVj3GDnZayGL K99pH+nfyXUCwmge7Kgf2Xd/9hbrK1hz1dPs0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=6dAEuUUDpP+yrHb 6Ybshd3MR5Iw=; b=ErTuN5x/yndx0qs3FH22KHQplzcjvRC2qC5QEMttzDzaTMb qXlr9hWdSSPXTRpZbwBVD0KI1UUxqsrwGO+ybERoQErd+XvuVwKVKLmac9EdYJvA IejTRBjdh0vGqXxIIPOrY+1aP4yVTE0EO+CE7n1mhNVUnV7CT0KY0FZ7bvlk= X-Sasl-enc: HeDuzsFtp7Dx07YZ0FhnyobKMpsyE/+Flsd4GXaJIbZV 1434307567 Received: from [192.168.1.64] (unknown [94.194.112.103]) by mail.messagingengine.com (Postfix) with ESMTPA id B9992680141; Sun, 14 Jun 2015 14:46:06 -0400 (EDT) Message-ID: <557DCBED.2010804@fastmail.net> Date: Sun, 14 Jun 2015 19:46:05 +0100 From: Bruce Simpson User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Steve Kargl CC: Slawa Olhovchenkov , Craig Rodrigues , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Subject: Re: svn commit: r284198 - head/bin/ls References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> <20150614171031.GA5857@troutmask.apl.washington.edu> In-Reply-To: <20150614171031.GA5857@troutmask.apl.washington.edu> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 18:46:10 -0000 On 14/06/2015 18:10, Steve Kargl wrote: > On Sun, Jun 14, 2015 at 11:22:03AM +0100, Bruce Simpson wrote: >> >> But I have yet to see a coherent argument here -- size(1) numbers, RSS >> figures etc. -- about how it allegedly adds bloat. Most of what I've >> seen so far is POLA, NIH resistance, and hand-wavery. >> > > It is not alleged. I actaully measured the bloat libxo > caused when w(1) was converted. ... > Here's the bloat with ls(1) ... Steve, that's still less than one 4KB page. OK, so I find it difficult to believe -- in this day and age of pipeline-saving CMOV instructions -- that the overhead is as large as ~2800 bytes, where I would have expected roughly half that. But not knowing what compile options you used, or having information about sizes (and working sets - just listing file sizes is hand waving) across the libxo modified binaries, this still doesn't give a complete picture of the relative cost of the feature. However, that's still a very modest increase, considering the architectural scope of the libxo change and what it provides. Warner suggests that for some targets it is too much, and he might have a point. But if you look at That Other Operating System, this is generally dealt with there by deploying something like BusyBox instead. I can understand why we don't want to go down that road -- in my experience, the choice of BusyBox sacrifices too much usability -- and would support a WITH_LIBXO for that reason alone. The extra bytes might even disappear in the noise after crunchgen. I think it is also fair that the people who advocated for this in the beginning (not I, though I support it in principle) and did the work (not I either, ENOTIME) should have done this work up front. I've had to do it to justify similar changes in other projects. From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 18:53:06 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4D026AF6; Sun, 14 Jun 2015 18:53:06 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x232.google.com (mail-ig0-x232.google.com [IPv6:2607:f8b0:4001:c05::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 10676A94; Sun, 14 Jun 2015 18:53:06 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igbos3 with SMTP id os3so4679613igb.0; Sun, 14 Jun 2015 11:53:05 -0700 (PDT) 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=Y2FOK1N6lU0wt2f56wgF6z8Qhz0tfrgUA0bQy+MJpbE=; b=NY6gLMogF8ExB0A+dv9dyiFOmgP4ceWPdsddZB4TtbBBpE7gCk25na0FhdI6UnMAxD CQl7HUlG4ja2VGGCCL66salb78PX5Wc+GHYEahmX7XrrlPGKTiREs0qAt1D6L3SvJWqq 1aGqGRTpNJH0EUWAnN0NnJvtMHMG5hP9NjhPaVBfCKO5AZ2uB2JUsva8GeoEMA+0ep3p Nr/Uw9Lz9JDCJfq9jyosed2H58LPlat65PECEHnhZ8wDvY2CIUJCwyX69JncY43nGFnG 1BLA3mxKytt43XUhNfCHZZ+/aWH+i1rj+CDI2IsInSdODvE7+m3HYw4GWNLEYqwF/jtY Gzbw== MIME-Version: 1.0 X-Received: by 10.42.176.8 with SMTP id bc8mr10965659icb.22.1434307985494; Sun, 14 Jun 2015 11:53:05 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Sun, 14 Jun 2015 11:53:05 -0700 (PDT) In-Reply-To: <557DCBED.2010804@fastmail.net> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> <20150614171031.GA5857@troutmask.apl.washington.edu> <557DCBED.2010804@fastmail.net> Date: Sun, 14 Jun 2015 11:53:05 -0700 X-Google-Sender-Auth: LAtV2_yQWPrNb7XoQsppE3dFbUg Message-ID: Subject: Re: svn commit: r284198 - head/bin/ls From: Adrian Chadd To: Bruce Simpson Cc: Steve Kargl , Slawa Olhovchenkov , Craig Rodrigues , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 18:53:06 -0000 We have busybox already - it's called bsdbox, and it's in base, and we're already using it, and yes, it does pull in libxo. :) I'm not worried about the size increase of libxo. That's the wrong thing to focus on. If it gets much more bloated then I'll poke people with the big "what are you thinking" stick. The issues people have aren't size related, they're "this API needs improvement and we have bugs introduced into tools." I do like how zero percent of the comments are "hey, maybe we need unit tests that run these tools and ensure they output the right stuff." If this were ${WORK} and I were ${BOSS}, I'd have asked the libxo developers to include unit tests before/after for each thing they broke, so we don't have a repeat of this kind of thing. But, this apparently isn't ${WORK} and I definitely don't want to be anyones boss, so.. -a From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 19:01:58 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 62972F75; Sun, 14 Jun 2015 19:01:58 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "troutmask", Issuer "troutmask" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 23C5BCAD; Sun, 14 Jun 2015 19:01:58 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.14.9/8.14.9) with ESMTP id t5EJ1jtg006370 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sun, 14 Jun 2015 12:01:45 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.9/8.14.9/Submit) id t5EJ1iHe006369; Sun, 14 Jun 2015 12:01:44 -0700 (PDT) (envelope-from sgk) Date: Sun, 14 Jun 2015 12:01:44 -0700 From: Steve Kargl To: Bruce Simpson Cc: Slawa Olhovchenkov , Craig Rodrigues , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Subject: Re: svn commit: r284198 - head/bin/ls Message-ID: <20150614190144.GA6295@troutmask.apl.washington.edu> References: <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> <20150614171031.GA5857@troutmask.apl.washington.edu> <557DCBED.2010804@fastmail.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <557DCBED.2010804@fastmail.net> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 19:01:58 -0000 On Sun, Jun 14, 2015 at 07:46:05PM +0100, Bruce Simpson wrote: > On 14/06/2015 18:10, Steve Kargl wrote: > > On Sun, Jun 14, 2015 at 11:22:03AM +0100, Bruce Simpson wrote: > >> > >> But I have yet to see a coherent argument here -- size(1) numbers, RSS > >> figures etc. -- about how it allegedly adds bloat. Most of what I've > >> seen so far is POLA, NIH resistance, and hand-wavery. > >> > > > > It is not alleged. I actaully measured the bloat libxo > > caused when w(1) was converted. > ... > > Here's the bloat with ls(1) > ... > > Steve, that's still less than one 4KB page. 4KB for dynamic linking. 38KB for static linking. How many utilities are to be converted? 4KB (or 38KB) can add up quickly. > But not knowing what compile options you used, or having information > about sizes (and working sets - just listing file sizes is hand waving) > across the libxo modified binaries, this still doesn't give a complete > picture of the relative cost of the feature. Default 'make buildworld' options with CPUTYPE?=core2. So, -O2. I also tested with CFLAGS+=-static in w(1) and ls(1)'s Makefile. The numbers that I showed are from 'make buildworld'. The only difference is w(1) and ls(1) with/without the libxo change. I don't need to cook the numbers to fabricate some issue. Choose your favorite CFLAGS. Use svn to get w(1) and ls(1) with/without libxo. It's not difficult. -- Steve From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 19:19:47 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B62F6700; Sun, 14 Jun 2015 19:19:47 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A47CDF13; Sun, 14 Jun 2015 19:19:47 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5EJJlYR075494; Sun, 14 Jun 2015 19:19:47 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5EJJlWP075493; Sun, 14 Jun 2015 19:19:47 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201506141919.t5EJJlWP075493@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 14 Jun 2015 19:19:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284385 - head/lib/libthr/thread X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 19:19:47 -0000 Author: kib Date: Sun Jun 14 19:19:46 2015 New Revision: 284385 URL: https://svnweb.freebsd.org/changeset/base/284385 Log: Fix typo in comment. MFC after: 3 days Modified: head/lib/libthr/thread/thr_sig.c Modified: head/lib/libthr/thread/thr_sig.c ============================================================================== --- head/lib/libthr/thread/thr_sig.c Sun Jun 14 17:48:44 2015 (r284384) +++ head/lib/libthr/thread/thr_sig.c Sun Jun 14 19:19:46 2015 (r284385) @@ -293,8 +293,8 @@ check_cancel(struct pthread *curthread, * 2) because _thr_ast() may be called by * THR_CRITICAL_LEAVE() which is used by rtld rwlock * and any libthr internal locks, when rtld rwlock - * is used, it is mostly caused my an unresolved PLT. - * those routines may clear the TDP_WAKEUP flag by + * is used, it is mostly caused by an unresolved PLT. + * Those routines may clear the TDP_WAKEUP flag by * invoking some system calls, in those cases, we * also should reenable the flag. * 3) thread is in sigsuspend(), and the syscall insists From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 19:25:06 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 746FB9A1; Sun, 14 Jun 2015 19:25:06 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-yk0-x22e.google.com (mail-yk0-x22e.google.com [IPv6:2607:f8b0:4002:c07::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 285FF186; Sun, 14 Jun 2015 19:25:06 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: by ykar6 with SMTP id r6so15588210yka.2; Sun, 14 Jun 2015 12:25:05 -0700 (PDT) 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=kmkGbLmMBhNmcnGNoiw1/R4x3DyCg2Wi9+2p3PbEK5s=; b=kbFE8UGkm8MB3uv1qnCd4ocsdXVN14sgyJxWDhWBS1dC4mMR41BoaWxkAPjxi9spte Q/GRIWwDbpWVVH2JGOxao7hlC4rDKCLLqAVqecvqFz2e5d2gnEUkcZHOI3hFVrs5HG63 3PrKeSIV/HyMRdXpJjmnibBj7u3rq+AP2ciJn+nN86IhDsBI02k53a8funRtDzL2/+Se 75/0CtJGM7oP0zgeCLPbKtR5KkyKcf6fk8u5P9lG/KRMp5ZCI+/vAYlI/GGPenVgc6R6 W2fXn/yGtQSpNTqUxo7nfJ1iXEGvpWasnM15XLVQp4TLS2qIqZ3wcWBoorNjsFGk0qJW h+zg== MIME-Version: 1.0 X-Received: by 10.170.150.7 with SMTP id r7mr8962364ykc.48.1434309905269; Sun, 14 Jun 2015 12:25:05 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.37.39.130 with HTTP; Sun, 14 Jun 2015 12:25:05 -0700 (PDT) In-Reply-To: References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> <20150614171031.GA5857@troutmask.apl.washington.edu> <557DCBED.2010804@fastmail.net> Date: Sun, 14 Jun 2015 12:25:05 -0700 X-Google-Sender-Auth: IwmhPT_7nL5yPftcmADAr1fHw2g Message-ID: Subject: Re: svn commit: r284198 - head/bin/ls From: Craig Rodrigues To: Adrian Chadd Cc: Bruce Simpson , Steve Kargl , Slawa Olhovchenkov , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 19:25:06 -0000 On Sun, Jun 14, 2015 at 11:53 AM, Adrian Chadd wrote: > I do like how zero percent of the comments are "hey, maybe we need > unit tests that run these tools and ensure they output the right > stuff." > Actually you are wrong on that point. See: https://lists.freebsd.org/pipermail/svn-src-all/2015-June/105753.html -- Craig From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 19:59:40 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3748C40E; Sun, 14 Jun 2015 19:59:40 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x235.google.com (mail-ig0-x235.google.com [IPv6:2607:f8b0:4001:c05::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ECDCEA62; Sun, 14 Jun 2015 19:59:39 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igblz2 with SMTP id lz2so38125682igb.1; Sun, 14 Jun 2015 12:59:39 -0700 (PDT) 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=hrrH7nXWnyWFWSrRDIAoQS1kflmpL0sjQRAk+6OvvHM=; b=f+q/F2UrEK/OJFuEegJ686tvSj46t0lQnXJoC7NO6N3qRUzonV4Rf8Sty8adrQb9Kz HZVSy8qpcAC3dfp6TxsLUA8t0ATuZWZ6mFwXRfh6XN/zv9bvMSd+ivNJXz+lEOWsn+Eb SxIoSPPoRvgKHp2vUUNZNC2L4Fwzohr2lhtl1ureE+zPEBQPoWuf5mY6iSq8T6BFNW2x THr2c6oXUAhy2vWBS/OuW5O91fm638LQWb9maEfq37UuQJhtqXCoSiZyDhQYrBPp9VAh FNxl353uZW6Q0sUmG0diggIER+z5H1CD5K7i+rIgcwuFZdaZlPqykZsdFCS8YJS7y6rM ARdA== MIME-Version: 1.0 X-Received: by 10.50.136.197 with SMTP id qc5mr16421656igb.6.1434311979393; Sun, 14 Jun 2015 12:59:39 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Sun, 14 Jun 2015 12:59:39 -0700 (PDT) In-Reply-To: References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> <20150614171031.GA5857@troutmask.apl.washington.edu> <557DCBED.2010804@fastmail.net> Date: Sun, 14 Jun 2015 12:59:39 -0700 X-Google-Sender-Auth: yDmepd4wMw-V0IJQwKYL8ujVdtY Message-ID: Subject: Re: svn commit: r284198 - head/bin/ls From: Adrian Chadd To: Craig Rodrigues Cc: Bruce Simpson , Steve Kargl , Slawa Olhovchenkov , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 19:59:40 -0000 On 14 June 2015 at 12:25, Craig Rodrigues wrote: > > > On Sun, Jun 14, 2015 at 11:53 AM, Adrian Chadd wrote: >> >> I do like how zero percent of the comments are "hey, maybe we need >> unit tests that run these tools and ensure they output the right >> stuff." > > > Actually you are wrong on that point. See: > > https://lists.freebsd.org/pipermail/svn-src-all/2015-June/105753.html > > -- > Craig > Woo! Glad to be wrong. -a From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 20:16:36 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB4B9A4D; Sun, 14 Jun 2015 20:16:36 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D97C8E83; Sun, 14 Jun 2015 20:16:36 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5EKGahU005846; Sun, 14 Jun 2015 20:16:36 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5EKGaGe005845; Sun, 14 Jun 2015 20:16:36 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201506142016.t5EKGaGe005845@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sun, 14 Jun 2015 20:16:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284386 - head/lib/libc/net X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 20:16:37 -0000 Author: tuexen Date: Sun Jun 14 20:16:36 2015 New Revision: 284386 URL: https://svnweb.freebsd.org/changeset/base/284386 Log: Fix name of a constant. MFC after: 3 days Modified: head/lib/libc/net/sctp_bindx.3 Modified: head/lib/libc/net/sctp_bindx.3 ============================================================================== --- head/lib/libc/net/sctp_bindx.3 Sun Jun 14 19:19:46 2015 (r284385) +++ head/lib/libc/net/sctp_bindx.3 Sun Jun 14 20:16:36 2015 (r284386) @@ -28,7 +28,7 @@ .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 .\" $FreeBSD$ .\" -.Dd December 15, 2006 +.Dd June 14, 2015 .Dt SCTP_BINDX 3 .Os .Sh NAME @@ -71,7 +71,7 @@ must be one of the following values. This value indicates that the listed address(es) need to be added to the endpoint. .Pp -.Dv SCTP_BINDX_DEL_ADDR +.Dv SCTP_BINDX_REM_ADDR This value indicates that the listed address(es) need to be removed from the endpoint. .Pp From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 20:23:42 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F386D9A; Sun, 14 Jun 2015 20:23:42 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 23788CA; Sun, 14 Jun 2015 20:23:42 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5EKNgOI011007; Sun, 14 Jun 2015 20:23:42 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5EKNgNo011006; Sun, 14 Jun 2015 20:23:42 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201506142023.t5EKNgNo011006@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 14 Jun 2015 20:23:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284387 - head/sys/vm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 20:23:42 -0000 Author: kib Date: Sun Jun 14 20:23:41 2015 New Revision: 284387 URL: https://svnweb.freebsd.org/changeset/base/284387 Log: Invalid pages do not need neither update of the activation count nor they coould be dirty. Move the handling if the invalid pages in the inactive scan earlier. Remove some code duplication in the scan by introducing the 'drop_page' label, which centralizes the object and the page unlock. Suggested and reviewed by: alc Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Modified: head/sys/vm/vm_pageout.c Modified: head/sys/vm/vm_pageout.c ============================================================================== --- head/sys/vm/vm_pageout.c Sun Jun 14 20:16:36 2015 (r284386) +++ head/sys/vm/vm_pageout.c Sun Jun 14 20:23:41 2015 (r284387) @@ -1159,6 +1159,17 @@ vm_pageout_scan(struct vm_domain *vmd, i queues_locked = FALSE; /* + * Invalid pages can be easily freed. They cannot be + * mapped, vm_page_free() asserts this. + */ + if (m->valid == 0 && m->hold_count == 0) { + vm_page_free(m); + PCPU_INC(cnt.v_dfree); + --page_shortage; + goto drop_page; + } + + /* * We bump the activation count if the page has been * referenced while in the inactive queue. This makes * it less likely that the page will be added back to the @@ -1192,15 +1203,10 @@ vm_pageout_scan(struct vm_domain *vmd, i queues_locked = TRUE; vm_page_requeue_locked(m); } - VM_OBJECT_WUNLOCK(object); - vm_page_unlock(m); - goto relock_queues; + goto drop_page; } if (m->hold_count != 0) { - vm_page_unlock(m); - VM_OBJECT_WUNLOCK(object); - /* * Held pages are essentially stuck in the * queue. So, they ought to be discounted @@ -1209,7 +1215,7 @@ vm_pageout_scan(struct vm_domain *vmd, i * loop over the active queue below. */ addl_page_shortage++; - goto relock_queues; + goto drop_page; } /* @@ -1224,14 +1230,7 @@ vm_pageout_scan(struct vm_domain *vmd, i if (m->dirty == 0 && object->ref_count != 0) pmap_remove_all(m); - if (m->valid == 0) { - /* - * Invalid pages can be easily freed - */ - vm_page_free(m); - PCPU_INC(cnt.v_dfree); - --page_shortage; - } else if (m->dirty == 0) { + if (m->dirty == 0) { /* * Clean pages can be freed. */ @@ -1305,6 +1304,7 @@ vm_pageout_scan(struct vm_domain *vmd, i vm_page_lock_assert(m, MA_NOTOWNED); goto relock_queues; } +drop_page: vm_page_unlock(m); VM_OBJECT_WUNLOCK(object); relock_queues: From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 21:24:25 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1F137F91; Sun, 14 Jun 2015 21:24:25 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pd0-x229.google.com (mail-pd0-x229.google.com [IPv6:2607:f8b0:400e:c02::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D8B56C3; Sun, 14 Jun 2015 21:24:24 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by pdbki1 with SMTP id ki1so58254164pdb.1; Sun, 14 Jun 2015 14:24:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:mime-version:content-type:from:in-reply-to:date:cc :message-id:references:to; bh=EbsnlPnQzX8DxgaJCGKPe1osZKKCE27mO5/d3LA6nP0=; b=CHReDdGuosBjDlIQ4BlxAKwIrGwdM/QOeaXa+T0oa+1be0OUgJgTGRNqcZVbpWvsD/ haJi5bdasu5vuABdMlAGfTZGnNDZ/apU/dh3CRyZzEpbLbJ5edVQjEms7HKkY9V4Yj3F 2C1OOmI6FTCb9Pc4fwxHvGapdkJVZTi25A0yPGmNCX7KSGu5tgtdI5b2Aru3bgDQo6nU VE6rPpx4+ovB/XtCXSPI2WQwKJ7Rm0ibxiWMWJ4xwClnxDtyLr74RuinOiw5Rm1uCQLq H+7tjXCUc6yTidRBN6Bdz1wKpbx6T5ZOMthU+lOPSpSRvLwXXJTwKIClrKDKyLQWHSi0 iWkg== X-Received: by 10.70.87.195 with SMTP id ba3mr42670427pdb.154.1434317064387; Sun, 14 Jun 2015 14:24:24 -0700 (PDT) Received: from ?IPv6:2601:8:ab80:7d6:b59f:fd7d:4dde:e4ae? ([2601:8:ab80:7d6:b59f:fd7d:4dde:e4ae]) by mx.google.com with ESMTPSA id le17sm10042627pab.2.2015.06.14.14.24.23 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 14 Jun 2015 14:24:23 -0700 (PDT) Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Content-Type: multipart/signed; boundary="Apple-Mail=_55833144-E1FB-44E0-9A00-99A61A924D42"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5 From: Garrett Cooper In-Reply-To: <16996.1434316874@chaos> Date: Sun, 14 Jun 2015 14:24:21 -0700 Cc: Craig Rodrigues , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Baptiste Daroussin Message-Id: <094A5FA6-7DB8-485E-84A8-C15D2A0BC9F6@gmail.com> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <950C4B23-B625-4173-A7C4-A4F1B2C5771D@gmail.com> <306889B5-3417-467C-965F-B011866E6F15@gmail.com> <450D8D9A-CBF2-445A-8221-4CD353591549@gmail.com> <16996.1434316874@chaos> To: "Simon J. Gerraty" X-Mailer: Apple Mail (2.1878.6) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 21:24:25 -0000 --Apple-Mail=_55833144-E1FB-44E0-9A00-99A61A924D42 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Jun 14, 2015, at 14:21, Simon J. Gerraty wrote: > Garrett Cooper wrote: >>> Great. More breakage: >>>=20 >>> $ fmake buildworld >=20 > Babt has committed enough changes to head in recent months that = building > with fmake is no longer an option. Baptiste only committed one issue to share/bsd.links.mk that broke = bootstrapping from upgrade_checks. I=92m waiting for replies to my other = private thread about deprecating/removing fmake so I can propose its = official removal on -arch. Breaking source upgrades to later versions is painful. We want to make = sure fmake at least works with upgrade_checks so people can upgrade from = earlier versions of 8/9/10 to 11 without having to deal with a lot of = pain. Thanks, --Apple-Mail=_55833144-E1FB-44E0-9A00-99A61A924D42 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJVffEFAAoJEMZr5QU6S73exOUIAKUDW5935naz1m5pdZ9iBUak FYJ6/SXF/2SAq8ecGXr5OndVv3PgB8m9j9XYNwe6aZoUXGKvOpphdowh8de8dg5R q8sRIeDJFKJ6wJcUB55UylevvvUdNNbdYdj1nrsfQy/SFABjLboFjaBMGMBGjvcD Kh+c3GDXcK8tJK8fwtfp7KYnY4mRsndWEn1Jygew3YXBukd/05b5DRpu+2E5GRv6 NieCLke5PtS06z0kz5EXeS5VUrlpkZS/3fWD+Ue595OtzA4rryRj8MYrv3jvEn3a wYePoxtxc5HynFPXhA60xxmTx/yB5r+yAXorwkdzAILnqy/e4RqU3Mi/AEursdc= =0KlP -----END PGP SIGNATURE----- --Apple-Mail=_55833144-E1FB-44E0-9A00-99A61A924D42-- From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 21:35:44 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6B6C9584; Sun, 14 Jun 2015 21:35:44 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0135.outbound.protection.outlook.com [157.56.111.135]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AC27932B; Sun, 14 Jun 2015 21:35:43 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from SN1PR05CA0006.namprd05.prod.outlook.com (10.163.68.144) by BLUPR05MB707.namprd05.prod.outlook.com (10.141.207.19) with Microsoft SMTP Server (TLS) id 15.1.190.14; Sun, 14 Jun 2015 21:35:41 +0000 Received: from BY2FFO11OLC002.protection.gbl (2a01:111:f400:7c0c::187) by SN1PR05CA0006.outlook.office365.com (2a01:111:e400:5197::16) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Sun, 14 Jun 2015 21:35:40 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BY2FFO11OLC002.mail.protection.outlook.com (10.1.15.178) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Sun, 14 Jun 2015 21:35:40 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Sun, 14 Jun 2015 14:35:39 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5ELZcD95446; Sun, 14 Jun 2015 14:35:39 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id BB237580A3; Sun, 14 Jun 2015 14:35:38 -0700 (PDT) To: Bryan Drewery CC: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... In-Reply-To: <16F9D7DF-A3D6-4675-9789-4F5AE1E3F940@FreeBSD.org> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <16F9D7DF-A3D6-4675-9789-4F5AE1E3F940@FreeBSD.org> Comments: In-reply-to: Bryan Drewery message dated "Sat, 13 Jun 2015 15:34:03 -0400." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Sun, 14 Jun 2015 14:35:38 -0700 Message-ID: <12679.1434317738@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC002; 1:P5dzBPhmR5m6f8faVCP+iXa0XBIlsS2TLLOS5TM/nOWuxLLIPOcA927qnAHNrRu97NWRb83eK3kuQB0rsmllOImj6KZ5rb/TJaZPS4kfXh8RrZeIDSYBahlqgGOoJVsfppCkI5TonaGjJoqZWjmzPI+QOIKTBLML5sxqsWxVAgGkK5a3ur7t0CSxLhRXO5Pb8f8gYDWsjMh3cYnBdiM843hrw4l42WGfmqi/sx2Up2C6Q36Do18iT5AFekWodCJ0w+M+TRr7bhPoz7Bahe/UN4m4SabbEiqdBjmZHKKe+ws= X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(199003)(24454002)(189002)(105596002)(86362001)(106466001)(558084003)(117636001)(92566002)(76506005)(57986006)(87936001)(77096005)(450100001)(62966003)(77156002)(48376002)(33716001)(189998001)(2950100001)(47776003)(110136002)(5001960100002)(5001920100001)(50466002)(76176999)(50986999)(50226001)(46102003)(19580395003)(6806004)(19580405001)(62816006)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR05MB707; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB707; 2:7c+dExAqOaLYSCYriwyv7qyGeP2vaLpB6iQBR00OOXoNL7irEwt8V9hyTaHbtArJ; 2:ft0rVMb0xJz9xXt2PlwNUPyTgXkO2KHAhpoLPAn6LzoEEij5L/AKk8Ucqm6XbnhWNsUAPXkMGUFWS0elRm9ZLTLnclBkkxUEVynsSBKNCJ9+OXZko5z/3Q7ONUn5Bqs6dTJvqoGGLihpVsB3UVaSEgsJOS4/S8Z567KS0s1bf5lyh4lmkZCE4ivg2bMRvg1VK6I5obuVhiDAaG6tVcwi1T0gmIIuHtQ5hq6fuPjiRZ4=; 6:QZiMFhrvfushv4XfS3GWfKJjC8v9HK2ry888U96RGlARFsloS8QvuNfiR3cl+PtMStBJRBjGpXG6vAHIww9MBc3+EIJDDdXorckVPS24eM1a99xirsQ7BzTQeLQsj9qT7H0faTpLvBOQtILU5IRYjpbTXXKTeN2g5ld6aHxCSHpIY57M/XiyojQQZgFao5dGiZfPzsfcQ2c2RzgwcXSYsfKIS4p9QHvX7k+Cu6t2sIfUWZlUtptAf+p7f9Q080ylDYEsq3+GBT31AMXhClIa7fKNYp19b786NvHfgYMzZwjCmjybThG2rIqQXIMkj4XJuclU5uTA39gV7gQOHdiBRcNRZq3ofOfMvWrkVRIgFIpEl1UQZcJgIUK7R8mNEH2FEEZONk4Exm3T0op6foucArNKQ0TM6WJO5urEpmxI19Mdt4a2Pc6pmZay1pbJ/UFaZIhOl1pQhuncsMvW5hWS6PSv69S+QZRZQqS6zqCz3SpdPGYrftwqvQ0ScCtDcEy3 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR05MB707; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(520003)(5005006)(3002001); SRVR:BLUPR05MB707; BCL:0; PCL:0; RULEID:; SRVR:BLUPR05MB707; X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB707; 3:iALs1bUMPKojmZ1+Zz3KWR147W0FYcwuJs6vcBpTo2JscylLfw6ipudIMGuswnS7d/cklMCQ55Ay8Yb8ujtMYH+kgcpzZy5cjMjlokrWmFlR6w44Y+UUG9mFKuy5F8KLMsxjL9loL8dIZbw1CU8yjID9jtExP9XmMeoW5QWhPIdFEShG0MvaZMDYt+FMRgYa9VM7Sy/zBntizT78ztTVkxnB4PuruFPqEpbXYQXjgwvTQJeOxH/SaTr3d13Tms9dVUEFgJyVX29Mh4/F0AhdmJuXFfwvFfKyw22y8qE+eRc/ncFRRyjA55CSqExQaRmR X-Forefront-PRVS: 06070568C5 X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB707; 9:kMg6j2Qre3eun6BCXlG4/k/RjyqoDuTZmoQ88dvDTrNMxibGNFDvLipl9/uSXJSgfF39ZkGPP7+l2IJeQ/gmpus11jYdnT+mVH0/FuZbcCj9paHbvTePQofIdvL1POPF/f2ZQQepJMst8ubCI4ngMmr8YIGT/7xkle9WYyf99AOB5/FiWHq9fVMwPdrFL1XN3+HDuZl3qulmaGJEzlg0yfy/a+H1a3jDyw4kylRtVyuJUSIEEj2r1XURWhnFiv7xk3SlfKfnmbav9Ejgc4Ivx5s4FnFv42b5EQQvpNejJrIsHeuuQsL+KHf448po0LpopmokSyuCUbQYLmmoNtqZDQGRSgNPUs05Q7bp9OvCsTwAhphAPSkQGmlOSTPO7nDiJF5YA0WEifciz5YjS/Qgw6QEwWFAG9KwdDS/SwegWooiyg1BWf9XvulYbxbqgqJeHhJrGJnQi3qy05BRZDs+Ie+7LmUWmkoMc4b1KzYwnbL2VJGKatl7t/mR8xlkfp+c75P8FyBde9j7bDcYzPg0K2+ghJunW/cxhjCy8MmjRHqAzB3wxsWjKjqL9fG7VF1eN0M+/ekMJJE7Bsvlvoulj7Z+isp248IIafv5a8XfXxWPcLlk4tTSrId+TgIkM30huM70OMFmYf7rtxRmsCUN/CTlAZCeEPLchq43qMVREt+l3AxXOOvSPpnvNX4bEyEQbkf7X8hclb/fYHwhU36oHsQvGn6ht4e52klq/eWZtBGm+08TCY//0nmIpPscjf9QYqmhMCEU9QnMAnfBOGsbOq9WL7FjghYJNlZUws81EilYnYzbxXojJZ0tiimQKN7QKSJC2XNWGwjklIOypY+pDIG6DC+X588jSKp39mIHf/gsso2XGfhMnq4ZLiDp55C4LPRMjsCfMHtKZFk2FIHe8pRRFfRk1GEkmHgpes7xXzE= X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB707; 3:OdseQEV0hAfjShvHWzu41rVA05+mDZ6v5vbkX1kSEkNicytgiBXa6rzZPHqUGxXcg42M8r7sSTXH0HM4qaTshmI2kD/qbKcO9fEtjblrg/RvXyr/h6W7tp4bnx269791R6Zyp+hgPdvMTODdDgBWfg==; 10:8hh2/vyQybh48SALN+PwnnBpdCPIutSJ7VL80zEq48ZyDN+TZT42tNBTf9kTwryI6C1Uhje8KPVlLhy690zV3xKfqNDOLO011aHSbJmk9m8=; 6:O7JvfUgkeASQX6Vbp4L6dmim5AbNovm0QhE9a3eYDH53+u9E/xCbhTZkPL8Ts7jW X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2015 21:35:40.2042 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR05MB707 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 21:35:44 -0000 Bryan Drewery wrote: > Is anything remaining from the projects/bmake branch? I don't think so - apart from some merge botches ;-) From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 21:36:04 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B7BEF6C2; Sun, 14 Jun 2015 21:36:04 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0118.outbound.protection.outlook.com [207.46.100.118]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1F97C32F; Sun, 14 Jun 2015 21:36:03 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from BY2PR05CA033.namprd05.prod.outlook.com (10.141.250.23) by BY2PR05MB710.namprd05.prod.outlook.com (10.141.222.147) with Microsoft SMTP Server (TLS) id 15.1.184.17; Sun, 14 Jun 2015 21:21:17 +0000 Received: from BN1AFFO11FD044.protection.gbl (2a01:111:f400:7c10::189) by BY2PR05CA033.outlook.office365.com (2a01:111:e400:2c5f::23) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Sun, 14 Jun 2015 21:21:17 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BN1AFFO11FD044.mail.protection.outlook.com (10.58.52.191) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Sun, 14 Jun 2015 21:21:16 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Sun, 14 Jun 2015 14:21:15 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5ELLED88615; Sun, 14 Jun 2015 14:21:15 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id B8C52580A3; Sun, 14 Jun 2015 14:21:14 -0700 (PDT) To: Garrett Cooper CC: Craig Rodrigues , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Baptiste Daroussin Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... In-Reply-To: <450D8D9A-CBF2-445A-8221-4CD353591549@gmail.com> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <950C4B23-B625-4173-A7C4-A4F1B2C5771D@gmail.com> <306889B5-3417-467C-965F-B011866E6F15@gmail.com> <450D8D9A-CBF2-445A-8221-4CD353591549@gmail.com> Comments: In-reply-to: Garrett Cooper message dated "Sat, 13 Jun 2015 16:06:24 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Sun, 14 Jun 2015 14:21:14 -0700 Message-ID: <16996.1434316874@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD044; 1:JccdS+gCtiGPgyAhrp/7tPlBwfg3XVK5HXEcnXKm7q0oBEASF2tbD37roebCSJa1a2BV/QM3tB9b1yIK1YEIGiahArKIIOd5QSlJ0iWhkHa12Sh8W7za5cql0tuUSaglYwl1GIj5rcFPJwQXM4kEBO3fEU6AEqG6+AxIn00H0qc2h/i8S2SdCbyQySxXh3eTWr4eVAEO/OP1QQNwqim9wK52NCmV42VTOIGtbPv4u5fOh17CI+S93tYg/21+qM6e9ep8P4FVk7Kz+S4qhsg6cXyjVOcSXumgxJnwuhHy/LATq0q2KDPkjKrWv3eRmJh2aR9jvYkQI6rF8JjUw9GCFw== X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(199003)(24454002)(51704005)(189002)(76506005)(57986006)(105596002)(46102003)(47776003)(1411001)(106466001)(77156002)(92566002)(62966003)(50466002)(48376002)(50226001)(558084003)(6806004)(2950100001)(77096005)(93886004)(19580405001)(5001960100002)(5001920100001)(110136002)(76176999)(86362001)(50986999)(19580395003)(117636001)(189998001)(87936001)(33716001)(42262002)(62816006); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR05MB710; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR05MB710; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:BY2PR05MB710; BCL:0; PCL:0; RULEID:; SRVR:BY2PR05MB710; X-Forefront-PRVS: 06070568C5 X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2015 21:21:16.3152 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR05MB710 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 21:36:04 -0000 Garrett Cooper wrote: > > Great. More breakage: > > > > $ fmake buildworld Babt has committed enough changes to head in recent months that building with fmake is no longer an option. From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 19:02:18 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8BC2912E; Sun, 14 Jun 2015 19:02:18 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pa0-x231.google.com (mail-pa0-x231.google.com [IPv6:2607:f8b0:400e:c03::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 531EBCCA; Sun, 14 Jun 2015 19:02:18 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by pacgb13 with SMTP id gb13so21359787pac.1; Sun, 14 Jun 2015 12:02:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=KVA+uOTIOo9R2PEFKu4IYk9AizQMg7MNtQoA31ewl4w=; b=fScLdtMGORLKQeV8w0x7kRFVEApMJ1kF2KIZ2YHFeTLVUpy6MFBAhgFJstAeygR0VA ObNcjOTCjC9MFJz2Nr3UuVuS3XcsmRrc5+2HKJ2VeR444mbEKVXMUHPOwV6It9osHkTY 5Kj0y9hwCEAHvfTGyknVGiRo/8QO/5GLyTRny0i9kwEjZhMgYGAoyncRXJB0zDnvyw4+ qiL01kG3auT62jXuF+kUeNTEzMYVNaV6Zy9L/YqXB7WCpl3dN89xufBpoj2NfCYHrpvx vpNmf2skKA5/ELfgE1FIWqdPgjoQNjqnloMw5YPcjmi2yn4WrcJ9pnjxB1mAUaGp7yWH 3wTQ== X-Received: by 10.68.193.232 with SMTP id hr8mr41668912pbc.145.1434308537790; Sun, 14 Jun 2015 12:02:17 -0700 (PDT) Received: from [192.168.20.7] (c-98-247-240-204.hsd1.wa.comcast.net. [98.247.240.204]) by mx.google.com with ESMTPSA id fd3sm9869049pdb.0.2015.06.14.12.02.16 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 14 Jun 2015 12:02:16 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r284198 - head/bin/ls From: Garrett Cooper X-Mailer: iPhone Mail (12F70) In-Reply-To: Date: Sun, 14 Jun 2015 12:02:15 -0700 Cc: Bruce Simpson , Steve Kargl , Slawa Olhovchenkov , Craig Rodrigues , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Content-Transfer-Encoding: 7bit Message-Id: <887CD9C6-9807-48AF-A7A6-B33F91901414@gmail.com> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> <20150614171031.GA5857@troutmask.apl.washington.edu> <557DCBED.2010804@fastmail.net> To: Adrian Chadd X-Mailman-Approved-At: Sun, 14 Jun 2015 21:48:51 +0000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 19:02:18 -0000 > On Jun 14, 2015, at 11:53, Adrian Chadd wrote: > > We have busybox already - it's called bsdbox, and it's in base, and > we're already using it, and yes, it does pull in libxo. :) > > I'm not worried about the size increase of libxo. That's the wrong > thing to focus on. If it gets much more bloated then I'll poke people > with the big "what are you thinking" stick. The issues people have > aren't size related, they're "this API needs improvement and we have > bugs introduced into tools." > > I do like how zero percent of the comments are "hey, maybe we need > unit tests that run these tools and ensure they output the right > stuff." If this were ${WORK} and I were ${BOSS}, I'd have asked the > libxo developers to include unit tests before/after for each thing > they broke, so we don't have a repeat of this kind of thing. But, this > apparently isn't ${WORK} and I definitely don't want to be anyones > boss, so.. Ugh. I'll write the tests ;(... From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 21:50:39 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87CB0AFE; Sun, 14 Jun 2015 21:50:39 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7629A834; Sun, 14 Jun 2015 21:50:39 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5ELocLr052714; Sun, 14 Jun 2015 21:50:38 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5ELochN052713; Sun, 14 Jun 2015 21:50:38 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506142150.t5ELochN052713@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 14 Jun 2015 21:50:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284392 - head/usr.sbin/pw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 21:50:39 -0000 Author: bapt Date: Sun Jun 14 21:50:38 2015 New Revision: 284392 URL: https://svnweb.freebsd.org/changeset/base/284392 Log: Change the documentation to reflect where the -V option should be used Suggested by: kientzle Modified: head/usr.sbin/pw/pw.8 Modified: head/usr.sbin/pw/pw.8 ============================================================================== --- head/usr.sbin/pw/pw.8 Sun Jun 14 21:14:47 2015 (r284391) +++ head/usr.sbin/pw/pw.8 Sun Jun 14 21:50:38 2015 (r284392) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 3, 2015 +.Dd June 14, 2015 .Dt PW 8 .Os .Sh NAME @@ -278,7 +278,7 @@ flag may be used to override this behavi As an exception to the general rule where options must follow the operation type, the .Fl V -flag may be used on the command line before the operation keyword. +flag must be used on the command line before the operation keyword. .It Fl C Ar config By default, .Nm From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 21:58:53 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BABD4DFD; Sun, 14 Jun 2015 21:58:53 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0131.outbound.protection.outlook.com [157.56.110.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 096A39E6; Sun, 14 Jun 2015 21:58:52 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from SN1PR0501CA0041.namprd05.prod.outlook.com (10.163.126.179) by BLUPR05MB627.namprd05.prod.outlook.com (10.141.204.150) with Microsoft SMTP Server (TLS) id 15.1.190.14; Sun, 14 Jun 2015 21:58:51 +0000 Received: from BY2FFO11FD040.protection.gbl (2a01:111:f400:7c0c::182) by SN1PR0501CA0041.outlook.office365.com (2a01:111:e400:52fe::51) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Sun, 14 Jun 2015 21:58:51 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BY2FFO11FD040.mail.protection.outlook.com (10.1.14.225) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Sun, 14 Jun 2015 21:58:49 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Sun, 14 Jun 2015 14:58:49 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5ELwmD03842; Sun, 14 Jun 2015 14:58:48 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id AEF77580A3; Sun, 14 Jun 2015 14:58:48 -0700 (PDT) To: Adrian Chadd CC: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... In-Reply-To: References: <201506131920.t5DJKwMH033508@svn.freebsd.org> Comments: In-reply-to: Adrian Chadd message dated "Sun, 14 Jun 2015 11:35:07 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Sun, 14 Jun 2015 14:58:48 -0700 Message-ID: <893.1434319128@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD040; 1:yWhMCrSp//knHo6zF+WmDBRDaYfuJS1PTR/dGH8wud2iEcnRPmL5P+f3QOFFzG66LaTEb0sbbvL24nmNO7yihhssgIDaeIqWGAnJjcsYop/o0fLQcUyc3eG0BVNmolFaA455MrMJZdyNwTr894Ecs8qDatF2d5ehkKannNHOSJ4+ArhWAiVFT5pMsgm7LiRIGhrdGo/UUDn3TmD2sl75SJSt5etQTIJD2vgePkQ2xuAOUZEGe1nsxYhx7ep6uWTaQoLOppeHwv3KIMN74zaoG/hQyug3eg7zXwbAGcLODQ4= X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(51704005)(199003)(24454002)(189002)(19580405001)(46102003)(76506005)(33716001)(6806004)(77096005)(77156002)(87936001)(19580395003)(62966003)(450100001)(57986006)(5001960100002)(110136002)(189998001)(76176999)(86362001)(50466002)(2950100001)(50226001)(48376002)(92566002)(105596002)(106466001)(50986999)(47776003)(117636001)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR05MB627; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB627; 2:OjO7UED6kXjBtxEGH5td3ZEqQrWIG1+5BgoKP6tqwq8Lkcb84YfjDAlwK45wBm0d; 2:17VjU3wtfyKBrlBC6PdUahqhA7NJJmL1m+a4cJNrEkaukxGGEHsPAYJrC/yxFu3qaLfRao6dfpeiXaiNL/5z9QVJTIOAo24tgKNpjagOZIR10LbAhuR4fvsyVy3qZkogGG4TmtUXc/5RxsbDmSAe1Ge/ZZcvb+7cqwmEL7I/rRq9MPJ1BX/Twu4yYPQk7aXvpxjWNjSmm9+SQoqo1qpp+aFTB4q8xp6lTLpOY1RGMkg=; 6:ZGdsWNNndc4uRi9dqhJJHomhdNpfBx/SwsTf9UIwaJw0CQMSUnWwuCDfHgzZPLiFahRX3WJukv4eEiH+vGzhAeCzPXK9dcgNRNYgbJgWHT0xf4eT6Bo7MZM3Ii1pun6PCjCopgtNeaaoLemdfrmND4ST6UsXB/lrF6s0QBHGRpZLF0i99GUrXfQlbw1Lc+XYXO9KQUcMXBbzF4M6vZaf+BNFoMKukHX52Y9fBNxj/h5EOX5YDh8aowRRV6tGlPaoWgPyPEv3Mr6c465JeEKOfXhicHcbWctGwkScNna+6m95GTQUz3L0XrtWTkk06Y/j1bAxYtwB1vhEr3hm5jI9WpuBHVMPlTWy394r0c1s/Zgp/dmBA+Ic9doOOgCnPdi1a9XlwjpE6dr7KweaMrldjaAddsPOEQgGwHGJivr8jIvGfqdzUT8+Mem3nHfWrPdrBhvYVh7ItE1mw7zv2RjM1Avkz75Ilq1N/S2KISvCZwZTM6Z/y91HI1WkBaduc/gS X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR05MB627; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(520003)(5005006)(3002001); SRVR:BLUPR05MB627; BCL:0; PCL:0; RULEID:; SRVR:BLUPR05MB627; X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB627; 3:RMO0W4CgK9Z2T9iFfD/ZqTEawdvuyewkMJnjRjURmYRs7qXOVFqMvTk9ssNIj8KqyYWxhi2u4CjeDaUq3/IMG3cDJDk0N5ls9vLXOBzfk6xokRNNKUCqwjoAuiqXsJJlPuGEMljBmyL+yfAHKH+44GPkK3I61YQhzsmTXAo4/jAEConZrvOMFFEzmnO2WPGwijK4CQzFYX/b+rwAdONgVgFHZDP3rkbtR5xrEjl9Ri/ZkHxOFghrSHC0ZLAW+mdXcg/G0pVE5H2KVuLG/6MQNoQLV9KPjH/0KiZEvHrHo3qu6h/aF+2rowTQPb9LTHTF X-Forefront-PRVS: 06070568C5 X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB627; 9:PcKSEQkGavhfHusD11fQscT5JwpmKrwJEKq4vmhTOpiMY2u15WNOQS64GDcqTTW6e/1ktHKRPNs/82UcjprXS8lj/8G56dEn5KATkLp7MARyLuKa6/GGPIMX1iXCesRiSEGLHKOuKlOTCVlOGAkdFGFWfPb2yZYEYWki6rz1EkuCW2ftXNOhNOpAzWX9vbXBBs9pU2T6GaGX4HpaoozUo4EK/cLaqyAMw2PT/caNXyne3ZkjS1S2mlRV+39SfNGB/+/imDqhUMBG5/2KZvajcbIG7dHah879LKen8WiOr84jxjet9haZnP71bgfqmChLu6ii781BokdW0unOdAXU5IHscvPkjD8GHAs4HHkHQ0BA3JzvJaUa/Vg3cZIpVoQSGl/3gx7mvHkJsYys1QzIrkZtmEkVSuN/+3X430T8JOnsgxmmf3o2YBc16LLxwNgek6mTsqhazaRx9CZ/eb7tAItd4gZOobyZVnvZIA58kUu8syEshBCSKohp0oDiOMZkOvdtfc6ULhXqpmWDbvZQAVEnq1pUFFrOwej/TXJEhPPnbi6qYwMXUIBB/WnkeIymLIoTkTdJwgjmcjgDdr6WAkmBPTUjTBL6UAviqheZhgT1WpzbLX9T/29Lyjr7IW9z2wlHqJZDruGldq4BcqmoYe1I+6cyWyW3ZvYk5Kl6WTtRcUGzgDlGbPqJxuf2yPzM34/ld4vTd9HVciFqx40F/zAXTb/HWooyxyR1K/xzzV7oH88Ow/cNLGo/ROJpseFDJm4HaSAslAVWTvzWBDsEekR/g4CWnySTWaEqm8Hz4C3KXPRuEmjUZPqQ8RFZdRG6zV9/GO+EThxLSgsK3EbpiETn+/JRkqJaGL9tr4AuKSsgcp3MCK3FRrEUooNCmHQA X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB627; 3:KgvoRQmeCdHz0mEzxHN2lW3nA1RkNieQyDkDQeJR0FgUsCVgOQcvYR1PWYEMkDHFCVhZaUUcAjsE7wm5A6HqaROIG+46taxTzZX16pT+vK9WToUG/WQ7zaexiZxcz0YWUTniTteXd55hKQL0J9ls0g==; 10:yM1pOB+We4afg7ZdgQSDSgQTaHNiCksIS2mofafdorZLcOxZ4mCT2qMrz1qaMxbLCn6yAxCbeXqS/BNpPsXEFbshsb8HUHUPyxilNOdxDKw=; 6:I3357PqUFntUgNwYEbV2UtwBqR8qJJnIs1u8aT6OqUDInsRbI4S/x8PEiNaJHbsk X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2015 21:58:49.8375 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR05MB627 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 21:58:53 -0000 Adrian Chadd wrote: > Hi, > > + make -j 4 buildworld __MAKE_CONF=/builds/FreeBSD_HEAD/make.conf > make: "/builds/FreeBSD_HEAD/Makefile" line 102: Malformed conditional > (${MK_META_MODE} == "yes") > make: Fatal errors encountered -- cannot continue > make: stopped in /builds/FreeBSD_HEAD > Build step 'Execute shell' marked build as failure > [WARNINGS] Skipping publisher since build result is FAILURE > IRC notifier plugin: Sending notification to: #freebsd-commits > > .. do you have a fix for this? Or if you don't, would you mind backing > things out until you've come up with a solution? My suggested fix is to use the sys.mk etc from head make -m .../share/mk buildworld or the patch that craig suggested will avoid the above error, though not sure that things will build if you don't use head's share/mk/ From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 22:00:19 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 51896BC; Sun, 14 Jun 2015 22:00:19 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0117.outbound.protection.outlook.com [65.55.169.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 91F78A2A; Sun, 14 Jun 2015 22:00:18 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from BY1PR0501CA0025.namprd05.prod.outlook.com (10.162.139.35) by DM2PR05MB720.namprd05.prod.outlook.com (10.141.177.152) with Microsoft SMTP Server (TLS) id 15.1.190.14; Sun, 14 Jun 2015 22:00:11 +0000 Received: from BY2FFO11FD025.protection.gbl (2a01:111:f400:7c0c::189) by BY1PR0501CA0025.outlook.office365.com (2a01:111:e400:4821::35) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Sun, 14 Jun 2015 22:00:10 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BY2FFO11FD025.mail.protection.outlook.com (10.1.15.214) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Sun, 14 Jun 2015 22:00:10 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Sun, 14 Jun 2015 15:00:09 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5EM06D04145; Sun, 14 Jun 2015 15:00:08 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id 2B4F5580A3; Sun, 14 Jun 2015 15:00:05 -0700 (PDT) To: Garrett Cooper CC: Craig Rodrigues , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Baptiste Daroussin Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... In-Reply-To: <094A5FA6-7DB8-485E-84A8-C15D2A0BC9F6@gmail.com> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <950C4B23-B625-4173-A7C4-A4F1B2C5771D@gmail.com> <306889B5-3417-467C-965F-B011866E6F15@gmail.com> <450D8D9A-CBF2-445A-8221-4CD353591549@gmail.com> <16996.1434316874@chaos> <094A5FA6-7DB8-485E-84A8-C15D2A0BC9F6@gmail.com> Comments: In-reply-to: Garrett Cooper message dated "Sun, 14 Jun 2015 14:24:21 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Sun, 14 Jun 2015 15:00:05 -0700 Message-ID: <4710.1434319205@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD025; 1:cJM4IIvui3gi0j0fbefoF7XJt57Dr0yZk+kmP90/qW3S/itzkIPkoTz2rdsVqf0EmYjhgpKEbDJr26G71rPBAydGe9PN9TjJNLODXblkVcgqfUfUdYQmgfPrVN5vL1g2QTbxekSQndPEjpmtxcZ+4UXKpY+27k+QWZWRpGOVl9pVrkcf6jWCoyOVwqZCKrwse+qtjragitt2iU44HswX7BUfyaQ6Zho0XQObj7tf+G01D88wqeqjkZDF2a4BIl9dL260G9eiR1LnlgetoJgwUduBjZ/OaretP5FExThf0Q3SiP1iLya0iRRPa3fqBphBIGcSc6JLVMvA7PhUxF3t/A== X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(24454002)(199003)(479174004)(189002)(47776003)(5001960100002)(117636001)(57986006)(77096005)(33716001)(110136002)(92566002)(2950100001)(46102003)(77156002)(62966003)(189998001)(1411001)(50226001)(5001920100001)(105596002)(6806004)(87936001)(48376002)(50986999)(76506005)(19580405001)(50466002)(76176999)(106466001)(86362001)(19580395003)(93886004)(62816006)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR05MB720; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB720; 2:aaW+ojS18lW9ARSKWTJ4F6srIQzH1MIvoelQ6VYUwm+71RJOKZ4TWNI719JEn47m; 2:e5pJ2aDq2NLIW9X1MWv0MTE9r+5o7rA/5zk29w257BpPoYxLcpWETyjI6ayMmPXGJMHlo8obkk4gl/VnxBzZD4TxlSNyjPwMZ7d6bq534rCvswWIx1UfDcNdwGZKaXgZOmpqZfc3Lc/PlzBTMtt2XsPKGSUqq9XI3SvzQluhqWYV6p6tSDkphKDDhTKAZqFE9DqKGIarJ3pUFYnt5RpAnox4wL8Te4LQlYhM199DBYk=; 6:+sQ5SzkRycYVlHPNriIVQXXx4ApGxqgdbtkFT1U6GfamVK0Hl1xLPVCPK++C7aLgtHg+phHnhT3KBufEHDeCUB6z3dl26B7fWrNgoRPsLJokJw9nyTUOMt2tWF8+ytWCux+PkOx2NbuoGN8YIah2ZyZnrUft/0G+9/+YiSYNSFKd5TvyB1347lI1Ok+O4L5uDWcuxbiE/DYuyrVcIJXaXikN/kDox02oiUjsKPO4WM0JWyKU9EfOi9yCssZMsL6ALCFZt8ANa4+7iak2g5O3uzUBfYCZRs74x6SVioeSZ4hT5K4DL3q9fWjSoyrDvq9rVfjdKWr9MkqEa+YEJgKlx+W7A8H5ZCrTanntrHNCVcpH8I9JaS4lS6R0Gy0phuRsMGEnZFjw0rcNCw89RLZTYjLJYDqLvzcm59qAAvQIX0SXkk1Kd88oCYquUMW6toMtaSPTRbyjgPKlFriNeaIUXex3ttA9SUEIbIbAZUUmnOUqrFpIthBaqBRHyrV3fKPm X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR05MB720; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:DM2PR05MB720; BCL:0; PCL:0; RULEID:; SRVR:DM2PR05MB720; X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB720; 3:81vUPSz7h7GwNL5HDi+tPKoA/GGQrWUmpb/rX8By40Ws1UcTArvc/8fbrncUH+XPAzoBHvsTt6ud9qfeuGPutpQGOIlTpNGJYOuQsh8h3Py99sPlKAejPO5lyo/WNkdlMbQEnURLRHkAWTJtpfhD3IEBL3GZ5v1DgBA3mNgV5kRbL9MoHw6MnCj5z0ezD57MIeQ+UwNC2Xd0p5E8FXz0gUQxw5PHQn8DjI+P9RXBTSXQDWLp6z0OpGk2sIMZzawc2WjPRT8rP5T16rIKbHdEv7Lak4c1noqcg0Sy4g/Qg1qG9JPefB6yad4Ceh30jbZs X-Forefront-PRVS: 06070568C5 X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB720; 9:A+pza6dAwZ23GEsr9+YRhsSqNaEXs9DhVfeT1CqjJum8RKF7rVgH+gVmOXV5POFaHA7LMocfqFrtWJtCKdEA66waVrGfdsciBNHrI6wMgg3FfYdrQR3vBCLHVrjcAzvR8XaEuF5CHWWo818kTO3vGc8VR76fEjXd1MZc/9uaW1/Hh+9GrtrWRUB/766QuVa9dFEpH7XEUhB3b6q9tZZiuPzHtYbsqZaGM97/cBlGKY0OjjLFXRMXr+M19FtQcYcD1ecBVaNTyDpBU9QELf896tC+2gSd04+jev9I/mg0fOC2HMO5KC+5wZVJBVJlZcx1HkbrybZ2TxKFx8Op+04ICUkFEU9afwEV9DOYzceV6SXTi94plruQPB0woBjNUNEO0jBmy8oeooxMHve4ncFJWhVNt28k7EL+vD5y3fc8vso9I7Bl4Ft0y/ml/fxhm9e1DZyRGzweUtmvGi/cDR101gfx1tKK0301jvd8vQGrdIh0apDNa/P1yLl+4COFyyZYU5JLYvQRL+pVJXgFIuIAyCrvDb1OmfV9hXYT+tLHpj0dHu2XVI7P8AukC9VqXh4Zu+STlSekdKet+V6F5QOy4B5n1XCDb3rxSILhbbAyRlwE57FD3UWMkU8oFi8QnIluKLbYmL781yh1Q/AmYPdDLibRBjD/6FkhkMTQPTQ7junYmtAJBEbVkbrfG35c51hMIb54Cd0jSqZYHNHDJd0/0d3dbPK3Wi7clrw8RLrrzpp49JJLIdxr3VIokGSDJuoIhAmJKqj3wUw5P9PZThWHoZhaM65y9QO0aO4ZTzp7lHvN5GoKyznwb4LuLJ2N99+X8OmeCzAv0RiiaXP8WcELT5n+NAM62692rJLeQI6M/AWE7O5s3GRUqCpYXhxb4zzyjPVfzgLvMcEetDNY8NzMCqXi0jvts8Of9lelI77VYqQksziyUpMMa/GKF2nUbLBY X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB720; 3:GRJaCCBiAYEYUuIQZeA31pBeBg9D2uT1xcoddTDImhDii66Pb52EW8NiAQtndiY8TzGXiIo2nF6uSyh97CCdfU8kVbSqftnlZyyo3na8q9FWi7uQzjgQNITNVgMsPDAJQKXBhJu8pSDJHl1WEuezeA==; 10:9yYzc5Hb240iyMnSpvHEZ61GriPscKDL2Bn9dMjA4wLRbulU7ChiKwj1VR+9rwJmc8W8rXGD59k9OnHyQk+0LHMHCkP04Pw0s0fG/Txgh/w=; 6:W2j3Ni06/vmGe8btx+nL2NdgmPdZFtdp0LifwVfFAgq5ckiWAjiqvTLlMPcXTm/4 X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2015 22:00:10.0178 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR05MB720 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 22:00:19 -0000 Garrett Cooper wrote: > Breaking source upgrades to later versions is painful. We want to make > sure fmake at least works with upgrade_checks so people can upgrade > from earlier versions of 8/9/10 to 11 without having to deal with a > lot of pain. I agree but 8 -> 11 is a very big jump. From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 22:06:23 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4EDD2C6 for ; Sun, 14 Jun 2015 22:06:23 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49665C16 for ; Sun, 14 Jun 2015 22:06:23 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by wgbhy7 with SMTP id hy7so22424951wgb.2 for ; Sun, 14 Jun 2015 15:06:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=VIZpg5gPiZ3Q5hWn8fS3jaEEj+Yk5BG/mfoVMMzZTiQ=; b=aCUoGIfe5+ZYIfEStJHmmlkGAVjTg5gf/SBLiHRezvcb5km1LihXnfiLkWe5xGQV55 YDQ6Wbdsz33J3nl2XcmaXuFYDtz3PZM07ZiZGVm2+Xo26OwfBc5l43pRM3iqG+q8ZVFy ilDX3jCWXz2NFUUflBIqlV6ssI7l4+ESZ7SB4EX/bqqVdnsJoxf+5GU2ICQippy3+ltj jDjTmbSJ9pcVxPnz6qNyjWC5EatQfsjn0YLCcH0MWlok5DjR2DGyUaiYlpZcpnJP4yBj iZu20bMFAUwtYvp5Zgstn75yQbhLOK+FArdxtVd4xYefSzAe3jt9ubkT1l8n82v02LLg EiRw== X-Gm-Message-State: ALoCoQldquvwJnJfyiRIZZgQXa6J044K4CXNjhrDRv2MxqfhrptSWMRHgtrILo4a/9olXZINGh9D MIME-Version: 1.0 X-Received: by 10.180.102.227 with SMTP id fr3mr25378557wib.19.1434319575424; Sun, 14 Jun 2015 15:06:15 -0700 (PDT) Received: by 10.194.162.225 with HTTP; Sun, 14 Jun 2015 15:06:15 -0700 (PDT) In-Reply-To: <4710.1434319205@chaos> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <950C4B23-B625-4173-A7C4-A4F1B2C5771D@gmail.com> <306889B5-3417-467C-965F-B011866E6F15@gmail.com> <450D8D9A-CBF2-445A-8221-4CD353591549@gmail.com> <16996.1434316874@chaos> <094A5FA6-7DB8-485E-84A8-C15D2A0BC9F6@gmail.com> <4710.1434319205@chaos> Date: Mon, 15 Jun 2015 00:06:15 +0200 Message-ID: Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... From: Oliver Pinter To: "Simon J. Gerraty" Cc: Garrett Cooper , Craig Rodrigues , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Baptiste Daroussin Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 22:06:23 -0000 On 6/15/15, Simon J. Gerraty wrote: > Garrett Cooper wrote: > >> Breaking source upgrades to later versions is painful. We want to make >> sure fmake at least works with upgrade_checks so people can upgrade >> from earlier versions of 8/9/10 to 11 without having to deal with a >> lot of pain. > > I agree but 8 -> 11 is a very big jump. Simon, how can I update these dependency files? Is there any exact command or make target or something magic-tool? > _______________________________________________ > svn-src-head@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" > From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 22:14:01 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 68667410; Sun, 14 Jun 2015 22:14:01 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5668FE0F; Sun, 14 Jun 2015 22:14:01 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5EME1fv066204; Sun, 14 Jun 2015 22:14:01 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5EME1vg066202; Sun, 14 Jun 2015 22:14:01 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201506142214.t5EME1vg066202@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sun, 14 Jun 2015 22:14:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284393 - head/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 22:14:01 -0000 Author: tuexen Date: Sun Jun 14 22:14:00 2015 New Revision: 284393 URL: https://svnweb.freebsd.org/changeset/base/284393 Log: Correctly detect the case where the last address is removed. MFC after: 3 days Modified: head/sys/netinet/sctp_asconf.c Modified: head/sys/netinet/sctp_asconf.c ============================================================================== --- head/sys/netinet/sctp_asconf.c Sun Jun 14 21:50:38 2015 (r284392) +++ head/sys/netinet/sctp_asconf.c Sun Jun 14 22:14:00 2015 (r284393) @@ -1328,6 +1328,7 @@ sctp_asconf_queue_add(struct sctp_tcb *s { uint32_t status; int pending_delete_queued = 0; + int last; /* see if peer supports ASCONF */ if (stcb->asoc.asconf_supported == 0) { @@ -1337,15 +1338,21 @@ sctp_asconf_queue_add(struct sctp_tcb *s * if this is deleting the last address from the assoc, mark it as * pending. */ - if ((type == SCTP_DEL_IP_ADDRESS) && !stcb->asoc.asconf_del_pending && - (sctp_local_addr_count(stcb) < 2)) { - /* set the pending delete info only */ - stcb->asoc.asconf_del_pending = 1; - stcb->asoc.asconf_addr_del_pending = ifa; - atomic_add_int(&ifa->refcount, 1); - SCTPDBG(SCTP_DEBUG_ASCONF2, - "asconf_queue_add: mark delete last address pending\n"); - return (-1); + if ((type == SCTP_DEL_IP_ADDRESS) && !stcb->asoc.asconf_del_pending) { + if (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_BOUNDALL) { + last = (sctp_local_addr_count(stcb) == 0); + } else { + last = (sctp_local_addr_count(stcb) == 1); + } + if (last) { + /* set the pending delete info only */ + stcb->asoc.asconf_del_pending = 1; + stcb->asoc.asconf_addr_del_pending = ifa; + atomic_add_int(&ifa->refcount, 1); + SCTPDBG(SCTP_DEBUG_ASCONF2, + "asconf_queue_add: mark delete last address pending\n"); + return (-1); + } } /* queue an asconf parameter */ status = sctp_asconf_queue_mgmt(stcb, ifa, type); From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 22:16:50 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8FEFA576; Sun, 14 Jun 2015 22:16:50 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0145.outbound.protection.outlook.com [207.46.100.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1239AE24; Sun, 14 Jun 2015 22:16:49 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from CO2PR05CA050.namprd05.prod.outlook.com (10.141.241.178) by BY2PR05MB773.namprd05.prod.outlook.com (10.141.224.140) with Microsoft SMTP Server (TLS) id 15.1.184.17; Sun, 14 Jun 2015 21:43:21 +0000 Received: from BL2FFO11FD027.protection.gbl (2a01:111:f400:7c09::123) by CO2PR05CA050.outlook.office365.com (2a01:111:e400:1429::50) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Sun, 14 Jun 2015 21:43:20 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BL2FFO11FD027.mail.protection.outlook.com (10.173.161.106) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Sun, 14 Jun 2015 21:43:20 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Sun, 14 Jun 2015 14:43:19 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5ELhID97256; Sun, 14 Jun 2015 14:43:18 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id 76BA7580A3; Sun, 14 Jun 2015 14:43:18 -0700 (PDT) To: Dimitry Andric CC: , , Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... In-Reply-To: References: <201506131920.t5DJKwMH033508@svn.freebsd.org> Comments: In-reply-to: Dimitry Andric message dated "Sun, 14 Jun 2015 17:02:46 +0200." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Sun, 14 Jun 2015 14:43:18 -0700 Message-ID: <24490.1434318198@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD027; 1:q/6FzzCnHF7TLuP8/Gh0fLd41EpqmrHv4Trb/zmhHvIKi6k9NG4OO2rVSHG5IkvfZs+k566le33e+dSsIVheO9NxS4Y3QUuVeakzKr7/VFojZHuwQTDPpmlO3niM5RCX6a4f/+e43L9jB/OoNLZ/t0r1M30XHCLLo1efBXqSsJpmi/6szE1UkVtt0qWsqdpwfb5ZbKKrUHRu7DgLjuC3MPjetEOlRp98gq9AnQURvPdkjX4Ba6d+k3oZZunT8JIPEsGJ+iV1qurlVIgg1QDq79aFvVGlv8mOcsoXL/vGK9k= X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(189002)(51444003)(199003)(24454002)(19580395003)(19580405001)(87936001)(46102003)(77096005)(106466001)(50226001)(47776003)(48376002)(50466002)(2950100001)(33716001)(57986006)(76506005)(92566002)(77156002)(5001960100002)(450100001)(86362001)(62966003)(189998001)(105596002)(6806004)(76176999)(50986999)(117636001)(110136002)(62816006)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR05MB773; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR05MB773; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(520003)(5005006)(3002001); SRVR:BY2PR05MB773; BCL:0; PCL:0; RULEID:; SRVR:BY2PR05MB773; X-Forefront-PRVS: 06070568C5 X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2015 21:43:20.2764 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR05MB773 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 22:16:50 -0000 Dimitry Andric wrote: > Some questions about this commit, which I'm sure more people must have: Sure, good questions and as you say, many likely thinking the same. > * Was it really necessary to commit hundreds of clearly generated files? Short answer is "yes" - since they are actually what makes the build work. > * Couldn't these be generated on the fly, or with some "make depend" like command? The whole point is to avoid that overhead. > * How to update these files, if you change anything in the 'real' Makefiles? For now don't worry about it, those of us that want to build/play with meta mode will take care of updating them. Simply building in meta mode is all that is needed to update them. > * Or are you now the maintainer of these .depend files? :-) For now, yes. I think that's the only reasonable approach at this early stage. Thanks --sjg From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 22:19:34 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D9A36BB; Sun, 14 Jun 2015 22:19:34 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pd0-x235.google.com (mail-pd0-x235.google.com [IPv6:2607:f8b0:400e:c02::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DA9D5E2B; Sun, 14 Jun 2015 22:19:33 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by pdbki1 with SMTP id ki1so58756807pdb.1; Sun, 14 Jun 2015 15:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=FrXPoZzW2la4y7ZfXA5hlmdRA+O8QOTynodnKinGfXA=; b=IL809YbVViyNTQ8OSLZE5YfTmOiLnHepqiOrZ3bfHaJrRgJWibPoj4Neyz+4cDoJ5l qbWLqfcGE0tkbVTroTzK3sD/iHOwdr7hwxAumMhoNgCgovAwhvOnzatpBaZC3O8/s4a/ IoxvCIDPKtgk7nV9v4nRaQ8FRyfLzaHxd2CI5zez4+jUt4DHiI5RnYZx8Jd2GvzzOiX6 +Sz/hDJC+y/4civwNEQ5yCZgXXoecNK+54ZSQP3oibzICDL2z7otuBa8M91+0bnmfHnj iWD+EjvYy29aikRclODfN1zmnia0Afu4BkZCBI8rVI8ivnJ6ZnyUhAKpN4lA6chIHFzR h/vw== X-Received: by 10.70.135.129 with SMTP id ps1mr41951944pdb.110.1434320373512; Sun, 14 Jun 2015 15:19:33 -0700 (PDT) Received: from ?IPv6:2601:8:ab80:7d6:4c2d:ef81:af53:9183? ([2601:8:ab80:7d6:4c2d:ef81:af53:9183]) by mx.google.com with ESMTPSA id ss3sm10147943pab.43.2015.06.14.15.19.32 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 14 Jun 2015 15:19:32 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... From: Garrett Cooper X-Mailer: iPhone Mail (12F70) In-Reply-To: <4710.1434319205@chaos> Date: Sun, 14 Jun 2015 15:19:31 -0700 Cc: Craig Rodrigues , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Baptiste Daroussin Content-Transfer-Encoding: quoted-printable Message-Id: <1851AC51-AAA2-42B1-A184-83CAB23ACFDC@gmail.com> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <950C4B23-B625-4173-A7C4-A4F1B2C5771D@gmail.com> <306889B5-3417-467C-965F-B011866E6F15@gmail.com> <450D8D9A-CBF2-445A-8221-4CD353591549@gmail.com> <16996.1434316874@chaos> <094A5FA6-7DB8-485E-84A8-C15D2A0BC9F6@gmail.com> <4710.1434319205@chaos> To: "Simon J. Gerraty" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 22:19:34 -0000 > On Jun 14, 2015, at 15:00, Simon J. Gerraty wrote: >=20 > Garrett Cooper wrote: >=20 >> Breaking source upgrades to later versions is painful. We want to make >> sure fmake at least works with upgrade_checks so people can upgrade >> from earlier versions of 8/9/10 to 11 without having to deal with a >> lot of pain. >=20 > I agree but 8 -> 11 is a very big jump. Yes. BOOTSTRAPPING in Makefile.inc1 implies that. Let's try and honor that a= s best possible.= From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 22:19:43 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE1A67FD for ; Sun, 14 Jun 2015 22:19:43 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6CD91E2D for ; Sun, 14 Jun 2015 22:19:43 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by wgv5 with SMTP id 5so55700113wgv.1 for ; Sun, 14 Jun 2015 15:19:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=84NWSZYsPv5ILI2CLUXFlSaKAN+fvZHiBUTKoqE6ygE=; b=eXEU0LtjT0hSC4CIGKzhItQ8/l0fbVKtZDpxy1sGGE8IyYU8oNcPAqg+pG8vQFsfy1 3kEFP1OKPBKvtYzQUJO1fwb6pLh5IAXYpqc97GTu8mb74INZ3SlSXWHdZfsSQXngph49 lOyFkq1iulo0JX7G1I527eZPjEqhowdo7qpHcAuBtH7mo5zXWII8a8urYYx+h89gqgqo XmGq3UErtPNVFB0RJHz2JqSuHVk9cLLjEMkbIu2xEnDAr4VPqcbsz8UZaTo/6MUPmbGI X3J688t9f1J1McTtzOwJHq0plsd5dmoQ5Iksncw+ZcWKI6rqCnV4xPMquU/nfLCfBoHN u6KA== X-Gm-Message-State: ALoCoQmgY+ALPXBzEP01L69AlQ5OQR9q0SpnFs6CLR0+vD08GQYrYFvGTLI1LIVm0uzYcQLHNiIh MIME-Version: 1.0 X-Received: by 10.180.99.2 with SMTP id em2mr26073551wib.59.1434320381716; Sun, 14 Jun 2015 15:19:41 -0700 (PDT) Received: by 10.194.162.225 with HTTP; Sun, 14 Jun 2015 15:19:41 -0700 (PDT) In-Reply-To: <24490.1434318198@chaos> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <24490.1434318198@chaos> Date: Mon, 15 Jun 2015 00:19:41 +0200 Message-ID: Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... From: Oliver Pinter To: "Simon J. Gerraty" Cc: Dimitry Andric , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 22:19:43 -0000 On 6/14/15, Simon J. Gerraty wrote: > Dimitry Andric wrote: >> Some questions about this commit, which I'm sure more people must have: > > Sure, good questions and as you say, many likely thinking the same. > >> * Was it really necessary to commit hundreds of clearly generated files? > > Short answer is "yes" - since they are actually what makes the build > work. > >> * Couldn't these be generated on the fly, or with some "make depend" like >> command? > > The whole point is to avoid that overhead. > >> * How to update these files, if you change anything in the 'real' >> Makefiles? > > For now don't worry about it, those of us that want to build/play with > meta mode will take care of updating them. > > Simply building in meta mode is all that is needed to update them. > >> * Or are you now the maintainer of these .depend files? :-) > > For now, yes. > I think that's the only reasonable approach at this early stage. Cool! What is you github account? I like to add your access to our repo, and please fix this issue: http://jenkins.hardenedbsd.org:8180/jenkins/job/HardenedBSD-master-amd64/133/consoleFull > > Thanks > --sjg > > _______________________________________________ > svn-src-head@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" > From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 22:21:48 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AB2AF952; Sun, 14 Jun 2015 22:21:48 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wi0-x22d.google.com (mail-wi0-x22d.google.com [IPv6:2a00:1450:400c:c05::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48728FDD; Sun, 14 Jun 2015 22:21:48 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: by wibdq8 with SMTP id dq8so60396012wib.1; Sun, 14 Jun 2015 15:21:46 -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=CiGg9bISKJrry7RXN4haZX97cf9D+4MAhsAVEhlXafM=; b=OcP1tsHFeSoB5NHBMKhncJTEWnmQNA6WY/4wvjxw8HPmil+T1NQxAeLvmzub21II44 PSznhyKyM3T1bMp9gkdx6sR6wad4cGWRtiKn9cdQUud2OZxJ+p3O4t31QeoZW+568vsT uwzurGOeEh5qZOaf+v4vMQMhNy+lyVrkHE/wYpcSWi6Ev0Uo7rohBhX+ObVhTZgVrz0S 6+Z5Cxm0DuMBuT2RZeW0dWXK0BdDfz7qkx0aSGXKDsP+9vJ2+AkgePBIhmB9kKgTUS76 88/zDlHQDmszoH1qWbw7TVXlIsoEmNOJj1jk5uPS5kxc4Sg2auN1rsH+tDMtM68gVxeO tQNA== X-Received: by 10.194.142.146 with SMTP id rw18mr28090567wjb.110.1434320506824; Sun, 14 Jun 2015 15:21:46 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id hn7sm16118452wjc.16.2015.06.14.15.21.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Jun 2015 15:21:46 -0700 (PDT) Sender: Baptiste Daroussin Date: Mon, 15 Jun 2015 00:21:44 +0200 From: Baptiste Daroussin To: Oliver Pinter Cc: "Simon J. Gerraty" , Garrett Cooper , Craig Rodrigues , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... Message-ID: <20150614222143.GF925@ivaldir.etoilebsd.net> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <950C4B23-B625-4173-A7C4-A4F1B2C5771D@gmail.com> <306889B5-3417-467C-965F-B011866E6F15@gmail.com> <450D8D9A-CBF2-445A-8221-4CD353591549@gmail.com> <16996.1434316874@chaos> <094A5FA6-7DB8-485E-84A8-C15D2A0BC9F6@gmail.com> <4710.1434319205@chaos> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="HB4mHL4PVvkpZAgW" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 22:21:48 -0000 --HB4mHL4PVvkpZAgW Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 15, 2015 at 12:06:15AM +0200, Oliver Pinter wrote: > On 6/15/15, Simon J. Gerraty wrote: > > Garrett Cooper wrote: > > > >> Breaking source upgrades to later versions is painful. We want to make > >> sure fmake at least works with upgrade_checks so people can upgrade > >> from earlier versions of 8/9/10 to 11 without having to deal with a > >> lot of pain. > > > > I agree but 8 -> 11 is a very big jump. >=20 > Simon, how can I update these dependency files? Is there any exact > command or make target or something magic-tool? isn't bmake in the bootstrap tools?, it should just work as long as anythin= g to get into the point of having a bootstrapped bmake is fmake compatible. Also note that bmake is available 9.3 and 8.4 will be EOLed in 15 days, also bmake is avilable on all version via ports pkg install bmake then you can u= se it to build the source. Best regards, Bapt --HB4mHL4PVvkpZAgW Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlV9/ncACgkQ8kTtMUmk6EzyaACfdMfW9VlalOIhstL0RQSsJqq5 MYQAoIGfbrjhn3qu7GkZYougDOtQjoUg =BHwL -----END PGP SIGNATURE----- --HB4mHL4PVvkpZAgW-- From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 22:36:28 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 63360B42; Sun, 14 Jun 2015 22:36:28 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 51894289; Sun, 14 Jun 2015 22:36:28 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5EMaSCm076477; Sun, 14 Jun 2015 22:36:28 GMT (envelope-from rodrigc@FreeBSD.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5EMaSG2076476; Sun, 14 Jun 2015 22:36:28 GMT (envelope-from rodrigc@FreeBSD.org) Message-Id: <201506142236.t5EMaSG2076476@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rodrigc set sender to rodrigc@FreeBSD.org using -f From: Craig Rodrigues Date: Sun, 14 Jun 2015 22:36:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284394 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 22:36:28 -0000 Author: rodrigc Date: Sun Jun 14 22:36:27 2015 New Revision: 284394 URL: https://svnweb.freebsd.org/changeset/base/284394 Log: If MK_META_MODE is unset, assume a value of no. This is needed to build HEAD on FreeBSD 10.1, which has bmake, but does not have /usr/share/mk/src.opts.mk Reviewed by: sjg Reported by: jenkins Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Sun Jun 14 22:14:00 2015 (r284393) +++ head/Makefile Sun Jun 14 22:36:27 2015 (r284394) @@ -99,7 +99,7 @@ # # For more information, see the build(7) manual page. # -.if ${MK_META_MODE} == "yes" +.if ${MK_META_MODE:Uno} == "yes" # targets/Makefile plays the role of top-level .include "targets/Makefile" .else From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 22:37:03 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87E65C8F; Sun, 14 Jun 2015 22:37:03 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x22f.google.com (mail-ig0-x22f.google.com [IPv6:2607:f8b0:4001:c05::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F30D2A2; Sun, 14 Jun 2015 22:37:03 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igblz2 with SMTP id lz2so39274008igb.1; Sun, 14 Jun 2015 15:37:02 -0700 (PDT) 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=P4Vcec03f7GhCXpQxZdNOkP7EOfLJ7hYJ1jOIDLVwo4=; b=lyTVK5jJHmUobw7Fq44b+BvDNpYrDnNq2ULT8Ol8ixzkDhy3WsNOrQnH+uGPaXVjuf qhz507B0ZxVW6SKiB0b9Ug6ko9zR50hY5csW2RG5IYcFgAfQiaiRm94npQA59ELGtzpQ CFVS/JaADNOQpzKxucT9RuyxGS4zQ/XP+cDPQ9dnPNNL8WxqRd2edr+QQWlrOqNT6fyG u/QwpKWvCpwoojcU2A73jYcH2pirLqPdab2o0dtackOkH8kfLwQpOSTbv4k6h6GlASIy 5mYqx/jmJKEKSVyQDaY9iL5Qv7z4EKbMdZvpm860A9GEll7uzCzmtLh/aiCsWoWAlgg8 Yydg== MIME-Version: 1.0 X-Received: by 10.50.97.105 with SMTP id dz9mr16983621igb.49.1434321422756; Sun, 14 Jun 2015 15:37:02 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Sun, 14 Jun 2015 15:37:02 -0700 (PDT) In-Reply-To: <24490.1434318198@chaos> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <24490.1434318198@chaos> Date: Sun, 14 Jun 2015 15:37:02 -0700 X-Google-Sender-Auth: vGKwtVabUitmCwHgPQJVj_a8S7w Message-ID: Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... From: Adrian Chadd To: "Simon J. Gerraty" Cc: Dimitry Andric , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 22:37:03 -0000 Hi, I'm happy for this to be your baby and see how it all pans out in the tree, but I thought we as a project learnt some lessons about checking in autogenerated files. -adrian From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 22:56:51 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8E7332A9; Sun, 14 Jun 2015 22:56:51 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-yh0-x233.google.com (mail-yh0-x233.google.com [IPv6:2607:f8b0:4002:c01::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 488C396B; Sun, 14 Jun 2015 22:56:51 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: by yhak3 with SMTP id k3so31916040yha.2; Sun, 14 Jun 2015 15:56:50 -0700 (PDT) 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=kWDfLF3pe/mo9TVKdmVM3dp0QYvrl2BzRl0dKxy63/Q=; b=eEwlxPtLGD1LIEoQ3GFIXYpOdREtwOQD/YFWlZwOc0MDaAcoAyyfC2DDpHmxlNk40k aB9ctcG6gRDHNAGreiiH4ohg1jdZtXAbzUpGj1YhAlPRCsetm1DLlVQ2JFHjeLLLi9Z2 klOg1fvnQH5zTJdWxKYeDPUcvJ9v0JSH9g8epdDNWgRaLyyMCNeiwJ17F0sOR32vZoZB trC4jZc+y7N5ycmewgf/oVJpqFm4YuMD6y42W277ddZv0ImJofoUejOUAH0xaqLva2K2 o6eMq6M97VtZfiO+av4NX0qjZYSa9KqSITxMe+LFeZ6y6lVtH/kq5bQp3LPRAX/cx9v4 Se4A== MIME-Version: 1.0 X-Received: by 10.129.60.12 with SMTP id j12mr6647703ywa.90.1434322610177; Sun, 14 Jun 2015 15:56:50 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.37.39.130 with HTTP; Sun, 14 Jun 2015 15:56:50 -0700 (PDT) In-Reply-To: References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <24490.1434318198@chaos> Date: Sun, 14 Jun 2015 15:56:50 -0700 X-Google-Sender-Auth: da6WsaX5wp62J6tncEnqjVyu9gU Message-ID: Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... From: Craig Rodrigues To: Adrian Chadd Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 22:56:51 -0000 On Sun, Jun 14, 2015 at 3:37 PM, Adrian Chadd wrote: > Hi, > > I'm happy for this to be your baby and see how it all pans out in the > tree, but I thought we as a project learnt some lessons about checking > in autogenerated files. > > Well, I would like to give Simon the benefit of the doubt here. When I worked at Juniper, I worked first with John Birrell on the early jbuild prototype, and later with Simon on the bmake + meta-mode work. Simon gave this presentation + video on meta-mode at BSDCan 2014: http://www.bsdcan.org/2014/schedule/track/Hacking/460.en.html I gave this preso on jbuild at BSDCan 2010: https://www.bsdcan.org/2010/schedule/events/198.en.html Inside Juniper, there were concerns expressed about checking in generated dependency files. I'm seeing the same concerns expressed by the FreeBSD community. :) It turns out that checking in the dependency files was the right way to go. This has been battle tested inside Juniper, and it does work....I've seen it. It turns out that running a dependency generation step at the beginning of the build takes a long time. When you are building something on the scale of an operating system, like FreeBSD, or something even huger, like JUNOS, this takes a non-trivial amount of time, and gets worse as the size of the code grows. Checking in the dependencies allows you to do some pretty amazing stuff with the build, especially when you start integrating manifests and packaging of the base system. Now I will agree with Adrian on a couple of points: (1) For the initial go around, if Simon babysits the Makefile.depend files in HEAD that would be OK. They are turned off by default anyways. (2) In the long run, having better documentation, tooling and procedures to update the Makefile.depend files will be definitely needed. Using automation systems like Jenkins would definitely help, but that's not the only way to do things. -- Craig From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 19:07:07 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 06D2F41F; Sun, 14 Jun 2015 19:07:07 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x232.google.com (mail-ig0-x232.google.com [IPv6:2607:f8b0:4001:c05::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BB46BCF5; Sun, 14 Jun 2015 19:07:06 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igbzc4 with SMTP id zc4so40983572igb.0; Sun, 14 Jun 2015 12:07:06 -0700 (PDT) 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=MXdSrXGCBO9lvDviDYzEviqT9tbLso0gsJn1t7ax2xw=; b=s/ezvG5gKT0/OUxjk14y8EJsilxbSFV/D8CBziUTKSRAOS31hbFDaucTJL2avAi+ij L7cra2tBslb2M7N4z9SAQy0JNIG2mKFMka42jXdWNNmuILlBKiB9PeYHFcZLn8eIbXET gtcs1gaCdjjVXStOf2/QoQuF86rm5CVovoyXMCt7vnrDk3crI1snRq6oGthiCx7p0NHW ubXDB9INFkn8ppqqtB8WnfoKGiYc6IMtV/dCSEwp31r4sDlECjle/4ifHoEoB/xSxT8t 31iZDfpZZZmbUgTv/i7wRBnduSYYdZeo9xHyVCNWIcVOgtAMAI3HI3InaVpnH5gOnxHg adeg== MIME-Version: 1.0 X-Received: by 10.50.79.228 with SMTP id m4mr16250270igx.6.1434308826244; Sun, 14 Jun 2015 12:07:06 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Sun, 14 Jun 2015 12:07:06 -0700 (PDT) In-Reply-To: <887CD9C6-9807-48AF-A7A6-B33F91901414@gmail.com> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> <20150614171031.GA5857@troutmask.apl.washington.edu> <557DCBED.2010804@fastmail.net> <887CD9C6-9807-48AF-A7A6-B33F91901414@gmail.com> Date: Sun, 14 Jun 2015 12:07:06 -0700 X-Google-Sender-Auth: JEnTF_9lbwssCYyLCFlDqLbb2m8 Message-ID: Subject: Re: svn commit: r284198 - head/bin/ls From: Adrian Chadd To: Garrett Cooper Cc: Bruce Simpson , Steve Kargl , Slawa Olhovchenkov , Craig Rodrigues , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Mailman-Approved-At: Sun, 14 Jun 2015 23:03:26 +0000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 19:07:07 -0000 On 14 June 2015 at 12:02, Garrett Cooper wrote: > >> On Jun 14, 2015, at 11:53, Adrian Chadd wrote: >> >> We have busybox already - it's called bsdbox, and it's in base, and >> we're already using it, and yes, it does pull in libxo. :) >> >> I'm not worried about the size increase of libxo. That's the wrong >> thing to focus on. If it gets much more bloated then I'll poke people >> with the big "what are you thinking" stick. The issues people have >> aren't size related, they're "this API needs improvement and we have >> bugs introduced into tools." >> >> I do like how zero percent of the comments are "hey, maybe we need >> unit tests that run these tools and ensure they output the right >> stuff." If this were ${WORK} and I were ${BOSS}, I'd have asked the >> libxo developers to include unit tests before/after for each thing >> they broke, so we don't have a repeat of this kind of thing. But, this >> apparently isn't ${WORK} and I definitely don't want to be anyones >> boss, so.. > > Ugh. I'll write the tests ;(... I'm not your boss! (but if you go and do it - great! thankyou! This is what should've been neckbearded, not the rest of the thread!) -a From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 19:19:38 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C7D70615; Sun, 14 Jun 2015 19:19:38 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pd0-x232.google.com (mail-pd0-x232.google.com [IPv6:2607:f8b0:400e:c02::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8D97BF11; Sun, 14 Jun 2015 19:19:38 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by pdbnf5 with SMTP id nf5so57265309pdb.2; Sun, 14 Jun 2015 12:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=dvyqai7Soou2ARZVJ5zyoT8g96EmpAf4f1ZZVkh/4QU=; b=eS/Uz6nOu/2A4BspoveMOdqZW6H2Qu87aegUAddOXQeWkdWsl0Mn0xn7c4M7PWXAQm EfX8Ui5WDWxQ+jjGFVa+69s4j3OpgjUvXR4T3pY+kGULVQMvYW8v3RA4ErOH6yxOaYPt R+g0YQd1jG9N4fCuv/Bi2Z5vt3NeNG+IT/0zTlAk1nx60Corlqzghw7/GbNQXbCbR0Le HiEu7fbmvLItpU0PSbBssQ1Z0T6wwiYlpR+VE0DaTfNx7G/ZYZw000j99qrW4rqRPLx+ xQjFcOhrcHzmL8Y1B1sWRXkJ01b3LBl9hlDdGWox5dfUb23v41GnwDHUIgfQLz2/xzJy mUyw== X-Received: by 10.70.124.134 with SMTP id mi6mr20677466pdb.104.1434309578127; Sun, 14 Jun 2015 12:19:38 -0700 (PDT) Received: from [192.168.20.7] (c-98-247-240-204.hsd1.wa.comcast.net. [98.247.240.204]) by mx.google.com with ESMTPSA id jt2sm9875361pbc.21.2015.06.14.12.19.37 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 14 Jun 2015 12:19:37 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r284198 - head/bin/ls From: Garrett Cooper X-Mailer: iPhone Mail (12F70) In-Reply-To: Date: Sun, 14 Jun 2015 12:19:36 -0700 Cc: Bruce Simpson , Steve Kargl , Slawa Olhovchenkov , Craig Rodrigues , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> <20150614171031.GA5857@troutmask.apl.washington.edu> <557DCBED.2010804@fastmail.net> <887CD9C6-9807-48AF-A7A6-B33F91901414@gmail.com> To: Adrian Chadd X-Mailman-Approved-At: Sun, 14 Jun 2015 23:03:27 +0000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 19:19:39 -0000 > On Jun 14, 2015, at 12:07, Adrian Chadd wrote: >=20 >> On 14 June 2015 at 12:02, Garrett Cooper wrote: >>=20 >>> On Jun 14, 2015, at 11:53, Adrian Chadd wrote: >>>=20 >>> We have busybox already - it's called bsdbox, and it's in base, and >>> we're already using it, and yes, it does pull in libxo. :) >>>=20 >>> I'm not worried about the size increase of libxo. That's the wrong >>> thing to focus on. If it gets much more bloated then I'll poke people >>> with the big "what are you thinking" stick. The issues people have >>> aren't size related, they're "this API needs improvement and we have >>> bugs introduced into tools." >>>=20 >>> I do like how zero percent of the comments are "hey, maybe we need >>> unit tests that run these tools and ensure they output the right >>> stuff." If this were ${WORK} and I were ${BOSS}, I'd have asked the >>> libxo developers to include unit tests before/after for each thing >>> they broke, so we don't have a repeat of this kind of thing. But, this >>> apparently isn't ${WORK} and I definitely don't want to be anyones >>> boss, so.. >>=20 >> Ugh. I'll write the tests ;(... >=20 > I'm not your boss! >=20 > (but if you go and do it - great! thankyou! This is what should've > been neckbearded, not the rest of the thread!) A part of it, yeah.. Not having manpqges still makes it annoying when I have= to figure out how things work ;(. Next time someone else converts ANYTHING to libxo -- write tests FIRST to ma= ke sure you're not breaking legacy behavior. If you need help figuring out h= ow to do that, I'll be more than happy to document it on a wiki page, with s= imple, concise directions. Thanks!= From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 23:30:09 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D28D590F; Sun, 14 Jun 2015 23:30:09 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0145.outbound.protection.outlook.com [207.46.100.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D5C96FE2; Sun, 14 Jun 2015 23:30:08 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from DM2PR05MB640.namprd05.prod.outlook.com (10.141.157.153) by DM2PR05MB416.namprd05.prod.outlook.com (10.141.102.146) with Microsoft SMTP Server (TLS) id 15.1.190.14; Sun, 14 Jun 2015 21:56:53 +0000 Received: from BY1PR0501CA0008.namprd05.prod.outlook.com (10.162.139.18) by DM2PR05MB640.namprd05.prod.outlook.com (10.141.157.153) with Microsoft SMTP Server (TLS) id 15.1.190.14; Sun, 14 Jun 2015 21:56:52 +0000 Received: from BY2FFO11FD004.protection.gbl (2a01:111:f400:7c0c::110) by BY1PR0501CA0008.outlook.office365.com (2a01:111:e400:4821::18) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Sun, 14 Jun 2015 21:56:52 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BY2FFO11FD004.mail.protection.outlook.com (10.1.14.158) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Sun, 14 Jun 2015 21:56:51 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Sun, 14 Jun 2015 14:56:51 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5ELuoD03444; Sun, 14 Jun 2015 14:56:50 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id 5E27D580A3; Sun, 14 Jun 2015 14:56:50 -0700 (PDT) To: Adrian Chadd CC: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... In-Reply-To: References: <201506131920.t5DJKwMH033508@svn.freebsd.org> Comments: In-reply-to: Adrian Chadd message dated "Sun, 14 Jun 2015 10:40:30 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Sun, 14 Jun 2015 14:56:50 -0700 Message-ID: <17696.1434319010@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD004; 1:abRPzqQmla28lkfPK8HxB9XE8S3oT29+ViWyZ0HRod8ThwGUt9MfmTj2flB5fjWg+CzIcrX3hNteqahrIUyWm7aqhVAuvKAbmXgNlVDEaturHtn2z8yQXqa097BiatCJnUw5Gv2otB9jh/r9lUsweoJ0imEoFb56M04ZikMpbkqj99IMdlblebPV8peeV0hVE1IgrJwQlG5M7/L70ToTsbVIxni9gM92/Vev80lbKKnIeBXjrlqR+K6FVpr3mZC4ThxjSaV0tYd43TD6ph546xJtVDM/URNzDTv7uqnMr28= X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(199003)(24454002)(189002)(86362001)(77096005)(2950100001)(76506005)(50226001)(33716001)(57986006)(77156002)(87936001)(19580395003)(105596002)(19580405001)(450100001)(62966003)(76176999)(92566002)(50986999)(5001960100002)(47776003)(48376002)(117636001)(50466002)(6806004)(46102003)(189998001)(110136002)(106466001)(5001920100001)(42262002)(62816006); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR05MB640; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB640; 2:FW+K7RJBsnkeP3AcL8OmYUrss4D0Lj8hgV2qQSsjmSCYt8No36WD+YvVxjJpUgLX; 2:m70hKH0Pcjr8mnzsY8x+GF9+vK9I9SuoQrRkRrYwc/0lGW+0vRgbHWprjgdSqss6z6k4dQm+mkccodf6+AZZfUO6L07Na6V2svFQoR/e4c+XLm5KI1A6T6tlZi2i9zlg5moPioOd4kllDqAOpTdqzJ8Gv1rS3rxq4nGvFvfPGod63Sn5uIHPeN5WRdJJMENNOh/LKN314EqMSTtXBK2Mwi/rOEVX+BQwEU8aW5GDiRE=; 6:PFUA1mAEyW/ZnDr6ru6VG1Uee8wTBndOhcyXT6pOkXu9LrRO82so61LNvZg5DRZ1KVlrercFwB+JdOyKOyusHliAFfTPZ7vg1A4yyPC6jEAnidldtKpkD5O+UhrBFlgkJAzbLYUVISYMAbpWQ/4KUHB5ObCklVjYgMDHlTPZ477kYy3tC7QI7fgK5kNDWKjGy1gxRGEcNMET//OYTBpXapHdd/LHXvEKn/R7N/eYj0trRnhN8MEka19/aaWSMPu5899jwSODZdmmo4gpJQ2mniWTUWorJqWmD6ITsn2aA9Wzs9sFCB+GRrvC2toHeKzwvacHuJEAtHHw1hkMjCKaB/MgKMnHef2f6SP0Z76bPqLRn/XKCXtUMqWhryvAnMiUAA1pbqIsKli3Wgaxs0xEYfp8pdYlUjI58SlK32Yo5IHzxhDMAhbW//NCWL9WZmbr3yE1x9zF9jnR/XHEjhZHpMvwAFzwPSGQwO/alcAMrKag8Rdjx4cfzkrvnmEeXdKr X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:DM2PR05MB640; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:DM2PR05MB416; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:DM2PR05MB640; BCL:0; PCL:0; RULEID:; SRVR:DM2PR05MB640; X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB640; 3:sE3dh4hlX53cJQi6CEYTjf7fEOU7OsY3V5noLOl5j1zupu2eZcv9xmTidwdtTNJA8EbLNZ4M/dpg4sg3oZONJdGMunXKWRaWvyNA5/qUgTjcMEcAHAJDICLZnXJpG3cC1n2tN8zUxjFzpjf1nEkFtElX3nzOVKKI686sA4lLkW1dDSpLOIvw15SJwjn4KUZA2LvPNja2d3F13bvsQ7PZEysYlzUMNf9QeVg/P5f3Xs/nJbOEgHAydJFepKXi7oz2sXS0AyL02j7i0JNXEuanNB8P2NskEqFX4xy8Jik9yG5KBIfSBk/wF90v+jF53Hwc X-Forefront-PRVS: 06070568C5 X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB640; 9:O08u67y/p4P5kOFoundAg91MxpWHOJM6fox5avn96dFdeF2QIFUK0mMRBSEuuzwBYF5pnU6KWDjr2+gpWwsJlONnYCR+a30+R2z208e3tPdkevVt8Gzd/mOtr5oBiOwCbJPv33a/1Nf9kqcY0NDXlHVYizUPRrwTetMcaf+bvbkH57KbEWAnWisXZAwsA5lYwTjY5HAYUJNDohPzol238u9YyuPd4QN0wF5+OaeQ/j+mLuvgic87nHrWBZeCGSCWLmR5tefm2VjIO4cDifsoiV3EDN4cpJtb55R41AboI/FRTCDL4GA6Kd2VOuuzYIgf3ZyYH0yCEKrzqSshhR20mAgf6Rz96My3Z245ib4FlEmokhfCqupmGpiHP3P22x4i47I89tsfatsYQWyKlOhC4DrAIzeqko1seqV4DtxCR0cgYLTeZI92R8bfsYTOzcqVOi0Z9fxukaB4dDTnbj5Amy/hG/i9rC7fUL+3p7O9SAzrATvW+02VkQwYw93gXnuVjgy4jULUdzeWuZa+tyuRcWyGPzNT56evxZxM+Vc7RqdVob4drHEGGM9IeWStWmSpOGgsLNmAKhENoWz2/WPKeuonTPBNv1rKgZGm5xR/swHJfgIljUIBfnlhbkAGyj0Av1Y0LXahLRb0Lnwe2OUrD1BF7xb298O43VczEG5IJNcW5oAD8nkym7LYBsBMiLcB93s2II1pGap81PBZLxWUi8ZVOY/dL3EVSN3rQrJRCtntaSGixKexfuOegINOeV/2yUhkYO6u1NjC6YH4XFYjy2eEp5GEYIq8LgCHSrruVMInxsddQE7OIY9RSmh+PRpKV0GmZvSPx5lZ6hGetxRy05oitGRIIznCx51mHPDJF7QTpEKETFIqJpeRH2AcHDVxrdjix7pjMHDvu9YVD1+hpA== X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB640; 3:yfh7/QZLyngEZL0GmnMPxvF/D+1ESkRCeeD53lw9UK6M9/eopQlwKsR2ppQgr3T9NE6Tf6zqBTHWtMflNAFpSzDJVdxZnYc+JSkYGqUJWKWqggJKPdgYSzFWhwTYiviK5MdB/W0x7uNBhEktg3oq3w==; 10:VTqm3vdeu2gGI01suNfmjcPTT+RFoqomd4bYnr9RVsxr04puk8fpOnETQdpLNNDD1bvj99ynMfne9uN0a742UvqOu69br0237VfhB0qCg3Y=; 6:+6EPq3nVDHKKD8zTqcAOU2uq6RL+pXI3e57ns9IDzTy1PaDGfwEQ4K/CtcUjmWEW X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2015 21:56:51.9248 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR05MB640 X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB416; 2:H6spey4UEuOfFghskwlltxG68SoE0l8MajF+NFP29tqYivmi9trjJMpMPP1O/JKx; 2:IaT+Y2pKbe9HP1uyrq6taSBWXZSMt8K9U+fXGDyh83jPc8nnahaoWlgwlt+wLWMYXHiywvzTHVpVvfXZuH6Ya9qQ4pwmfnjo89sXLYmH2ieASjp6AxPXuMhRgE2fGt9ekTbvBEEynqKRjQEpWqvVqp8hU9XP4F1G/TeNYyOdM5uD5/sWNUQN2YSxBHQolstyZxfpf4FmNlFITdV0cWYnbOAH24sAWY63lp4o8zG0baE=; 9:DsQe37O1obFUxljm5Z5svdlnYF4ZV7NEZys7XsdfHSE076+PPcNsHXL/joUUqbQB5+TPDcSvObyniG6k4OXKQkJnbno4bUpnW4o9TjtWSZPyieFsEYqqboFeVUeGevMtuQ0YM4Rb8PkC+yLqDENRTQ== X-OriginatorOrg: juniper.net X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 23:30:10 -0000 Adrian Chadd wrote: > Wait a second - y'all committed a bunch of dependencies that we aren't > supposed to edit directly? Yes ;-) If building using the normal buildworld etc you can ignore them. > So what's the process for making sure we don't stomp over the feet of > other people who are using the depend based builds? Don't worry about it. They will pretty much self repair. I've had a lot of practice lately bootstrapping them for netbsd and freebsd ;-) From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 23:53:50 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3AB3BE8A; Sun, 14 Jun 2015 23:53:50 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x230.google.com (mail-ig0-x230.google.com [IPv6:2607:f8b0:4001:c05::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0180C902; Sun, 14 Jun 2015 23:53:50 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igblz2 with SMTP id lz2so39849071igb.1; Sun, 14 Jun 2015 16:53:49 -0700 (PDT) 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=GyCYsk8MEvxhxEWWgVTGnxQ0eFwVcpbYTrbroOeQXd0=; b=M+fCbBDmpsZXKSTzjcmQDs0Fjt0ECPawulSCDUEgCk5IbWou2CRh/45XCLbHAr7LKj sqUcb7BtHmsY9iz/GeiTR3q8xZS/c/WNBUsIzlwYGQtBYnRlAcskGQ4kXzXAKWwEDPl8 0b20rlbYPLt16UzUbrV9y2Qs2yr4usX4cB8g4yIsRm5fa2zFNPuSjKxRqPzRm+J8S1yu 9H4WAzS7gJ7BqyjuWfIcweXMJIIzfjwqE2FW0ggJMmvJC7IUhOPzrqCOLdNUd0YWlrU0 1HoTPbkTcdHQcOKvep48tPkg4uD0MpdBRCshgJYSKJU6tTHa33mTdpkVtUwygqK32AiS kD8A== MIME-Version: 1.0 X-Received: by 10.42.176.8 with SMTP id bc8mr11736677icb.22.1434326029259; Sun, 14 Jun 2015 16:53:49 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Sun, 14 Jun 2015 16:53:49 -0700 (PDT) In-Reply-To: <17696.1434319010@chaos> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <17696.1434319010@chaos> Date: Sun, 14 Jun 2015 16:53:49 -0700 X-Google-Sender-Auth: 9wFEoS5Zg1sOT931ffAksmQl2jc Message-ID: Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... From: Adrian Chadd To: "Simon J. Gerraty" Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 14 Jun 2015 23:53:50 -0000 On 14 June 2015 at 14:56, Simon J. Gerraty wrote: > Adrian Chadd wrote: > >> Wait a second - y'all committed a bunch of dependencies that we aren't >> supposed to edit directly? > > Yes ;-) > If building using the normal buildworld etc you can ignore them. Cool. >> So what's the process for making sure we don't stomp over the feet of >> other people who are using the depend based builds? > > Don't worry about it. > They will pretty much self repair. > I've had a lot of practice lately bootstrapping them for netbsd and > freebsd ;-) Cool. :) Ok, let's see what happens.. -a From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 00:28:23 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C56CB5BE; Mon, 15 Jun 2015 00:28:23 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0136.outbound.protection.outlook.com [65.55.169.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ABF1AF6B; Mon, 15 Jun 2015 00:28:21 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from CO2PR05CA046.namprd05.prod.outlook.com (10.141.241.174) by BY2PR05MB776.namprd05.prod.outlook.com (10.141.224.154) with Microsoft SMTP Server (TLS) id 15.1.184.17; Sun, 14 Jun 2015 21:54:10 +0000 Received: from BN1AFFO11FD040.protection.gbl (2a01:111:f400:7c10::105) by CO2PR05CA046.outlook.office365.com (2a01:111:e400:1429::46) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Sun, 14 Jun 2015 21:54:10 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; FreeBSD.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BN1AFFO11FD040.mail.protection.outlook.com (10.58.52.251) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Sun, 14 Jun 2015 21:54:10 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Sun, 14 Jun 2015 14:54:08 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5ELs8D02482; Sun, 14 Jun 2015 14:54:08 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id 06CAB580A3; Sun, 14 Jun 2015 14:54:08 -0700 (PDT) To: Dimitry Andric CC: , , Subject: Re: svn commit: r284370 - head/usr.bin/kdump In-Reply-To: <038E4912-D9DD-4306-8429-15054B15AFCE@FreeBSD.org> References: <201506140330.t5E3Udm8097264@svn.freebsd.org> <038E4912-D9DD-4306-8429-15054B15AFCE@FreeBSD.org> Comments: In-reply-to: Dimitry Andric message dated "Sun, 14 Jun 2015 18:16:35 +0200." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Sun, 14 Jun 2015 14:54:08 -0700 Message-ID: <20557.1434318848@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD040; 1:/npOptvgvNZT2ZGZzhCW21a2POKO2hatKxZlJVkkbiIELtZa4/8yEEn0FidEf+UbMbsRXTyH1a+vBiYj57tpP1/xE2qNnjFNfTC9cEIR9xuOh9q2HcY9FDsnhjhLJ5sNfucQhIJWNNZo7zzB4riUw7VVTrKrGRjIJQ+rN9Tk1fDBr28V9yhdMKd8hV5zA8AuA0nEwsDYTAKvFsqjll9ybhfdiI6iBCCQUM8Tid1PB0Qhal3QcuBdEU/5bQVWNDRf/ZiSHDZGCQpXuxjnO3619MkvosTnecic6O9n5muIB48= X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(24454002)(51704005)(199003)(189002)(19580405001)(2950100001)(47776003)(50466002)(48376002)(6806004)(33716001)(117636001)(106466001)(77156002)(450100001)(62966003)(77096005)(92566002)(5001960100002)(110136002)(5001920100001)(189998001)(87936001)(19580395003)(86362001)(50226001)(76176999)(50986999)(105596002)(46102003)(76506005)(57986006)(42262002)(62816006); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR05MB776; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR05MB776; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(520003)(5005006)(3002001); SRVR:BY2PR05MB776; BCL:0; PCL:0; RULEID:; SRVR:BY2PR05MB776; X-Forefront-PRVS: 06070568C5 X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2015 21:54:10.0711 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR05MB776 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 00:28:23 -0000 Dimitry Andric wrote: > > head/usr.bin/kdump/Makefile > > Is this supposed to fix things? Even at r284381, I get: I did for me ... > > ===> usr.bin/kdump (depend) > sh /usr/src/usr.bin/kdump/mksubr /usr/obj/usr/src/tmp/usr/include >kdump_subr.c > env MACHINE=i386 CPP="cpp " sh /usr/src/usr.bin/kdump/mkioctls print /usr/obj/usr/src/tmp/usr/include > ioctl.c > :1:10: fatal error: 'cam/cam_compat.h' file not found > #include > ^ > 1 error generated. Yes I saw that too (before these changes IIRC) it appeared to be ignored. > rm -f .depend > CC='cc ' mkdep -f .depend -a -I/usr/src/usr.bin/kdump/../ktrace -I/usr/src/usr.bin/kdump -I/usr/src/usr.bin/kdump/../.. -I. -DHAVE_LIBCAPSICUM -DPF -std=gnu99 kdump_subr.c /usr/src/usr.bin/kdump/kdump.c ioctl.c /usr/src/usr.bin/kdump/../ktrace/subr.c > /usr/src/usr.bin/kdump/kdump.c:153:10: fatal error: 'linux_syscalls.c' file not found That's why I added the explicit target. > #include > ^ > 1 error generated. > mkdep: compile failed Ah, they likely need to be hooked to beforedepend. My flight is boarding, will look when I get back on line. Sorry for the hiccup > Any idea? I obviously do not see any linux_syscalls.c in the objdir. > > -Dimitry > From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 00:59:49 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3F687EEB; Mon, 15 Jun 2015 00:59:49 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2C9EF89C; Mon, 15 Jun 2015 00:59:49 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5F0xnFf047181; Mon, 15 Jun 2015 00:59:49 GMT (envelope-from edwin@FreeBSD.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5F0xmZs047165; Mon, 15 Jun 2015 00:59:48 GMT (envelope-from edwin@FreeBSD.org) Message-Id: <201506150059.t5F0xmZs047165@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: edwin set sender to edwin@FreeBSD.org using -f From: Edwin Groothuis Date: Mon, 15 Jun 2015 00:59:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284397 - head/contrib/tzdata X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 00:59:49 -0000 Author: edwin Date: Mon Jun 15 00:59:47 2015 New Revision: 284397 URL: https://svnweb.freebsd.org/changeset/base/284397 Log: MFV of 284395,tzdata2015e Update to tzdata2015e: Changes affecting future time stamps Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00, not 06-13 and 07-18 as we had guessed. (Thanks to Milamber.) Assume Cayman Islands will observe DST starting next year, using US rules. Although it isn't guaranteed, it is the most likely. Modified: head/contrib/tzdata/africa head/contrib/tzdata/northamerica head/contrib/tzdata/southamerica head/contrib/tzdata/zone1970.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa ============================================================================== --- head/contrib/tzdata/africa Mon Jun 15 00:55:03 2015 (r284396) +++ head/contrib/tzdata/africa Mon Jun 15 00:59:47 2015 (r284397) @@ -338,9 +338,10 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 # time this summer, and carry out studies on the possibility of canceling the # practice altogether in future years." # -# From Paul Eggert (2015-04-20): -# For now, assume DST will be canceled. Any resumption would likely -# use different rules anyway. +# From Paul Eggert (2015-04-24): +# Yesterday the office of Egyptian President El-Sisi announced his +# decision to abandon DST permanently. See Ahram Online 2015-04-24. +# http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx Rule Egypt 2008 only - Aug lastThu 24:00 0 - Rule Egypt 2009 only - Aug 20 24:00 0 - @@ -787,20 +788,41 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # will resume again at 02:00 on Saturday, August 2, 2014.... # http://www.mmsp.gov.ma/fr/actualites.aspx?id=586 -# From Paul Eggert (2014-06-05): -# For now, guess that later spring and fall transitions will use 2014's rules, +# From Milamber (2015-06-08): +# (Google Translation) The hour will thus be delayed 60 minutes +# Sunday, June 14 at 3:00, the ministry said in a statement, adding +# that the time will be advanced again 60 minutes Sunday, July 19, +# 2015 at 2:00. The move comes under 2.12.126 Decree of 26 Jumada I +# 1433 (18 April 2012) and the decision of the Head of Government of +# 16 N. 3-29-15 Chaaban 1435 (4 June 2015). +# Source (french): +# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/ +# +# From Milamber (2015-06-09): +# http://www.mmsp.gov.ma/fr/actualites.aspx?id=863 +# +# From Michael Deckers (2015-06-09): +# [The gov.ma announcement] would (probably) make the switch on 2015-07-19 go +# from 03:00 to 04:00 rather than from 02:00 to 03:00, as in the patch.... +# I think the patch is correct and the quoted text is wrong; the text in +# agrees +# with the patch. + +# From Paul Eggert (2015-06-08): +# For now, guess that later spring and fall transitions will use 2015's rules, # and guess that Morocco will switch to standard time at 03:00 the last -# Saturday before Ramadan, and back to DST at 02:00 the first Saturday after -# Ramadan. To implement this, transition dates for 2015 through 2037 were +# Sunday before Ramadan, and back to DST at 02:00 the first Sunday after +# Ramadan. To implement this, transition dates for 2016 through 2037 were # determined by running the following program under GNU Emacs 24.3, with the # results integrated by hand into the table below. -# (let ((islamic-year 1436)) +# (let ((islamic-year 1437)) +# (require 'cal-islam) # (while (< islamic-year 1460) # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) # (b (calendar-islamic-to-absolute (list 10 1 islamic-year))) -# (saturday 6)) -# (while (/= saturday (mod (setq a (1- a)) 7))) -# (while (/= saturday (mod b 7)) +# (sunday 0)) +# (while (/= sunday (mod (setq a (1- a)) 7))) +# (while (/= sunday (mod b 7)) # (setq b (1+ b))) # (setq a (calendar-gregorian-from-absolute a)) # (setq b (calendar-gregorian-from-absolute b)) @@ -844,32 +866,30 @@ Rule Morocco 2012 only - Aug 20 2:00 1: Rule Morocco 2013 only - Jul 7 3:00 0 - Rule Morocco 2013 only - Aug 10 2:00 1:00 S Rule Morocco 2013 max - Oct lastSun 3:00 0 - -Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S +Rule Morocco 2014 2021 - Mar lastSun 2:00 1:00 S Rule Morocco 2014 only - Jun 28 3:00 0 - Rule Morocco 2014 only - Aug 2 2:00 1:00 S -Rule Morocco 2015 only - Jun 13 3:00 0 - -Rule Morocco 2015 only - Jul 18 2:00 1:00 S -Rule Morocco 2016 only - Jun 4 3:00 0 - -Rule Morocco 2016 only - Jul 9 2:00 1:00 S -Rule Morocco 2017 only - May 20 3:00 0 - -Rule Morocco 2017 only - Jul 1 2:00 1:00 S -Rule Morocco 2018 only - May 12 3:00 0 - -Rule Morocco 2018 only - Jun 16 2:00 1:00 S -Rule Morocco 2019 only - May 4 3:00 0 - -Rule Morocco 2019 only - Jun 8 2:00 1:00 S -Rule Morocco 2020 only - Apr 18 3:00 0 - -Rule Morocco 2020 only - May 30 2:00 1:00 S -Rule Morocco 2021 only - Apr 10 3:00 0 - -Rule Morocco 2021 only - May 15 2:00 1:00 S -Rule Morocco 2022 only - Apr 2 3:00 0 - -Rule Morocco 2022 only - May 7 2:00 1:00 S -Rule Morocco 2023 only - Apr 22 2:00 1:00 S -Rule Morocco 2024 only - Apr 13 2:00 1:00 S -Rule Morocco 2025 only - Apr 5 2:00 1:00 S +Rule Morocco 2015 only - Jun 14 3:00 0 - +Rule Morocco 2015 only - Jul 19 2:00 1:00 S +Rule Morocco 2016 only - Jun 5 3:00 0 - +Rule Morocco 2016 only - Jul 10 2:00 1:00 S +Rule Morocco 2017 only - May 21 3:00 0 - +Rule Morocco 2017 only - Jul 2 2:00 1:00 S +Rule Morocco 2018 only - May 13 3:00 0 - +Rule Morocco 2018 only - Jun 17 2:00 1:00 S +Rule Morocco 2019 only - May 5 3:00 0 - +Rule Morocco 2019 only - Jun 9 2:00 1:00 S +Rule Morocco 2020 only - Apr 19 3:00 0 - +Rule Morocco 2020 only - May 24 2:00 1:00 S +Rule Morocco 2021 only - Apr 11 3:00 0 - +Rule Morocco 2021 only - May 16 2:00 1:00 S +Rule Morocco 2022 only - May 8 2:00 1:00 S +Rule Morocco 2023 only - Apr 23 2:00 1:00 S +Rule Morocco 2024 only - Apr 14 2:00 1:00 S +Rule Morocco 2025 only - Apr 6 2:00 1:00 S Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S -Rule Morocco 2035 only - Oct 27 3:00 0 - -Rule Morocco 2036 only - Oct 18 3:00 0 - -Rule Morocco 2037 only - Oct 10 3:00 0 - +Rule Morocco 2036 only - Oct 19 3:00 0 - +Rule Morocco 2037 only - Oct 4 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 Modified: head/contrib/tzdata/northamerica ============================================================================== --- head/contrib/tzdata/northamerica Mon Jun 15 00:55:03 2015 (r284396) +++ head/contrib/tzdata/northamerica Mon Jun 15 00:59:47 2015 (r284397) @@ -2661,7 +2661,17 @@ Zone Atlantic/Bermuda -4:19:18 - LMT 193 -4:00 US A%sT # Cayman Is -# See America/Panama. + +# From Paul Eggert (2015-05-15): +# The Cayman government has decided to introduce DST in 2016, the idea being +# to keep in sync with New York. The legislation hasn't passed but the change +# seems quite likely. See: Meade B. Cayman 27. +# http://www.cayman27.com.ky/2015/05/15/clock-ticks-toward-daylight-saving-time-in-cayman + +Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown + -5:07:11 - KMT 1912 Feb # Kingston Mean Time + -5:00 - EST 2016 + -5:00 US E%sT # Costa Rica @@ -3184,7 +3194,6 @@ Zone America/Managua -5:45:08 - LMT 1890 Zone America/Panama -5:18:08 - LMT 1890 -5:19:36 - CMT 1908 Apr 22 # Colón Mean Time -5:00 - EST -Link America/Panama America/Cayman # Puerto Rico # There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'. Modified: head/contrib/tzdata/southamerica ============================================================================== --- head/contrib/tzdata/southamerica Mon Jun 15 00:55:03 2015 (r284396) +++ head/contrib/tzdata/southamerica Mon Jun 15 00:59:47 2015 (r284397) @@ -30,7 +30,7 @@ # I suggest the use of _Summer time_ instead of the more cumbersome # _daylight-saving time_. _Summer time_ seems to be in general use # in Europe and South America. -# -- E O Cutler, _New York Times_ (1937-02-14), quoted in +# -- E O Cutler, _New York Times_ (1937-02-14), quoted in # H L Mencken, _The American Language: Supplement I_ (1960), p 466 # # Earlier editions of these tables also used the North American style Modified: head/contrib/tzdata/zone1970.tab ============================================================================== --- head/contrib/tzdata/zone1970.tab Mon Jun 15 00:55:03 2015 (r284396) +++ head/contrib/tzdata/zone1970.tab Mon Jun 15 00:59:47 2015 (r284397) @@ -207,6 +207,7 @@ KI -0308-17105 Pacific/Enderbury Phoenix KI +0152-15720 Pacific/Kiritimati Line Islands KP +3901+12545 Asia/Pyongyang KR +3733+12658 Asia/Seoul +KY +1918-08123 America/Cayman KZ +4315+07657 Asia/Almaty most locations KZ +4448+06528 Asia/Qyzylorda Qyzylorda (Kyzylorda, Kzyl-Orda) KZ +5017+05710 Asia/Aqtobe Aqtobe (Aktobe) @@ -260,7 +261,7 @@ NR -0031+16655 Pacific/Nauru NU -1901-16955 Pacific/Niue NZ,AQ -3652+17446 Pacific/Auckland New Zealand time NZ -4357-17633 Pacific/Chatham Chatham Islands -PA,KY +0858-07932 America/Panama +PA +0858-07932 America/Panama PE -1203-07703 America/Lima PF -1732-14934 Pacific/Tahiti Society Islands PF -0900-13930 Pacific/Marquesas Marquesas Islands From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 02:29:07 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 69B921C7; Mon, 15 Jun 2015 02:29:07 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pd0-x22c.google.com (mail-pd0-x22c.google.com [IPv6:2607:f8b0:400e:c02::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 39661E0D; Mon, 15 Jun 2015 02:29:07 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by pdbki1 with SMTP id ki1so61937031pdb.1; Sun, 14 Jun 2015 19:29:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=zZ4OzD/X09WenH/7ga7HAo8Pz8PXYx+SS0j3QmYEWiE=; b=nrZAKvhCn4MGGGcf35F9oQVdsxXWRh7TlgZudB8hnqKvFhDo0S+ymd5naBK9VW9t37 GyTNmCRtUBRQVKTMw0KD3LIZQXlPDcOsk35rdOJHYh2kGqckwEJl16EzZWhi8R3CbRBs xB0fuYdGczfThDHlG/vAkx3s5rh1x00Te5p1n+57WDp/PUJdRIRaFD1mBWzyQqjRXYYn ky6dmpxvrD1VeTTCaaDSdDqBDsbayKDokPnT/J8bQ12eq52jhOzYABMHzyHm+jmBLwhi IegSaF30mrpU9DrFoltdoFMS6Z4i5HNodrFA8lpN2adSGZfSKlWOzEfMrnrbmTc6Ao9h v2WA== X-Received: by 10.70.124.165 with SMTP id mj5mr25304121pdb.159.1434335346696; Sun, 14 Jun 2015 19:29:06 -0700 (PDT) Received: from [33.171.226.134] (m862036d0.tmodns.net. [208.54.32.134]) by mx.google.com with ESMTPSA id de4sm10351005pbb.95.2015.06.14.19.29.05 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 14 Jun 2015 19:29:06 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r284394 - head From: Garrett Cooper X-Mailer: iPhone Mail (12F70) In-Reply-To: <201506142236.t5EMaSG2076476@svn.freebsd.org> Date: Sun, 14 Jun 2015 19:29:04 -0700 Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <92B39E07-0843-44B0-9773-38B762729000@gmail.com> References: <201506142236.t5EMaSG2076476@svn.freebsd.org> To: Craig Rodrigues X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 02:29:07 -0000 That won't fix fmake... > On Jun 14, 2015, at 15:36, Craig Rodrigues wrote: >=20 > Author: rodrigc > Date: Sun Jun 14 22:36:27 2015 > New Revision: 284394 > URL: https://svnweb.freebsd.org/changeset/base/284394 >=20 > Log: > If MK_META_MODE is unset, assume a value of no. >=20 > This is needed to build HEAD on FreeBSD 10.1, > which has bmake, but does not have > /usr/share/mk/src.opts.mk >=20 > Reviewed by: sjg > Reported by: jenkins >=20 > Modified: > head/Makefile >=20 > Modified: head/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/Makefile Sun Jun 14 22:14:00 2015 (r284393) > +++ head/Makefile Sun Jun 14 22:36:27 2015 (r284394) > @@ -99,7 +99,7 @@ > # > # For more information, see the build(7) manual page. > # > -.if ${MK_META_MODE} =3D=3D "yes" > +.if ${MK_META_MODE:Uno} =3D=3D "yes" > # targets/Makefile plays the role of top-level > .include "targets/Makefile" > .else >=20 From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 03:27:34 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 570A2FAF; Mon, 15 Jun 2015 03:27:34 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-yk0-x22e.google.com (mail-yk0-x22e.google.com [IPv6:2607:f8b0:4002:c07::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 13FF0FA4; Mon, 15 Jun 2015 03:27:34 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: by ykfr66 with SMTP id r66so46768123ykf.0; Sun, 14 Jun 2015 20:27:33 -0700 (PDT) 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=SU35wxYKEwWzKboFwDl4zugTguP09kLSn1sO7l+pwEg=; b=r3ozxH5zbf5GPIuluve3fulZmJysi1dlxr3gN2sl1XbobD52g4EH3KiRJ4kp/XIFNb kmN1gte6fCjYbfBuAh70eCS4Ltl+uKeT99uIBztobzPklYN+QLK4PI9SBtcdO5jJ0kfG qVMbJVafDu7vPNHyhjVJxB9KhAvRVonSyLfQfU6GvBP7IYoIdDoxsHW9dM0IBItr/oEC l4lMWb0EFoqrxHelA6mJKqjA0ykFB5SaKxLYHVwMKvTpcFjzppM0VK2npt2zSgEok3Qn rGuAn+YarTL3cdWehqJh1gp+fR/FRmOCoNv2eF9zYqaW8YZDMkcXkg+Ww6IbRA+dDnDI b4SQ== MIME-Version: 1.0 X-Received: by 10.170.95.3 with SMTP id m3mr27405364yka.0.1434338853175; Sun, 14 Jun 2015 20:27:33 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.37.39.130 with HTTP; Sun, 14 Jun 2015 20:27:33 -0700 (PDT) In-Reply-To: <038E4912-D9DD-4306-8429-15054B15AFCE@FreeBSD.org> References: <201506140330.t5E3Udm8097264@svn.freebsd.org> <038E4912-D9DD-4306-8429-15054B15AFCE@FreeBSD.org> Date: Sun, 14 Jun 2015 20:27:33 -0700 X-Google-Sender-Auth: 9_Yj3HgFqMNRBOqqHEZJ4yNkjLQ Message-ID: Subject: Re: svn commit: r284370 - head/usr.bin/kdump From: Craig Rodrigues To: Dimitry Andric Cc: "Simon J. Gerraty" , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 03:27:34 -0000 On Sun, Jun 14, 2015 at 9:16 AM, Dimitry Andric wrote: > > ===> usr.bin/kdump (depend) > sh /usr/src/usr.bin/kdump/mksubr /usr/obj/usr/src/tmp/usr/include > >kdump_subr.c > env MACHINE=i386 CPP="cpp " sh /usr/src/usr.bin/kdump/mkioctls print > /usr/obj/usr/src/tmp/usr/include > ioctl.c > :1:10: fatal error: 'cam/cam_compat.h' file not found > #include > I got the same errors here: https://jenkins.freebsd.org/job/FreeBSD_HEAD/2869/consoleFull --- ioctl.c --- :1:10: fatal error: 'cam/cam_compat.h' file not found #include ^ 1 error generated. --- depend_subdir_kdump --- /builds/FreeBSD_HEAD/usr.bin/kdump/kdump.c:153:10: fatal error: 'linux_syscalls.c' file not found #include ^ -- Craig From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 03:48:47 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4952F5DA for ; Mon, 15 Jun 2015 03:48:47 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 2633F63A for ; Mon, 15 Jun 2015 03:48:47 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from jre-mbp.elischer.org (ppp121-45-248-228.lns20.per4.internode.on.net [121.45.248.228]) (authenticated bits=0) by vps1.elischer.org (8.14.9/8.14.9) with ESMTP id t5F3mYf2087036 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sun, 14 Jun 2015 20:48:37 -0700 (PDT) (envelope-from julian@freebsd.org) Message-ID: <557E4B0C.4080600@freebsd.org> Date: Mon, 15 Jun 2015 11:48:28 +0800 From: Julian Elischer User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Marcel Moolenaar CC: David Chisnall , Ian Lepore , Steve Kargl , Alexander Kabaev , Marcel Moolenaar , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284198 - head/bin/ls References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> In-Reply-To: <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 03:48:47 -0000 On 6/14/15 2:40 AM, Marcel Moolenaar wrote: >> On Jun 13, 2015, at 1:19 PM, Julian Elischer wrote: >> >> On 6/13/15 11:38 PM, David Chisnall wrote: >>> On 13 Jun 2015, at 11:17, Ian Lepore wrote: >>>> If you would have told me a year ago that you had a simple scheme that >>>> could make 30 years of experience maintaining code for unix-like systems >>>> completely worthless I would have been skeptical, but it seems we're >>>> well on our way. >>> There is a lot of heckling and unhelpful hyperbole in this thread. Reading the xo_emit format strings takes a little bit of getting used to, but the same is true of printf - it’s just that we’re already used to printf. The structured parts (xo_open_container, xo_close_container and friends) are clear and descriptive. The changes are fairly invasive, but the benefits are also very large for anyone who is wanting to automate administration of FreeBSD systems. >>> >>> If you have suggestions for how the libxo APIs could be improved, then please let us know - Phil is very reception to suggestions but objections along the lines of ‘it’s not what I’m used to and changes sometimes break things so we should never have changes’ are not helpful. >>> >>> David >>> >> I made a suggestion for an alternate path in the previous thread. >> >> https://lists.freebsd.org/pipermail/freebsd-current/2015-March/054855.html >> >> but I have a job and kids so I can't object if I'm not listened to.. >> (no time to actually follow my own advice and produce working code.) > Not wanting to change all programs and instead write grammars for all > programs seems like a worse solution. The scope is the same (same > number of programs), but since the grammars and programs are two > distinct entities, it’s actually fairly hard to make sure both are > changed at the same time when so needed. It’s also not at all a > given that screen scrubbing is always easy enough to do that it > isn’t causing some sort of problems in specific situations. If > one wants to output JSON, XML and HTML you find that screen > scrubbing doesn’t even give you all the information you need. It’s > very natural to come to the conclusion that it’s easier to get the > data from the source and skip the entire non-lossless translation > phase. But once you have the framework for handling grammars you can make grammars for OTHER utilities that are not part of FreeBSD, and will NEVER EVER EVER have libxo support. And as a bonus you leave the existing programs alone entirely. I believe that in the end if you want to follow the path of automatic harvesting of data, you'll need the grammar handler anyway because all the 3rd party apps still require handling. It's a tricky task but It would be a really fascinating project. Especially tools that would look at existing output and allow the user to interactively identify tokens and landmarks of interest and generate grammars. We did this 20 years ago with scanned images.. So I'm sure it be done with ascii text. Come to think of it, there must be some out there already.. > -- > Marcel Moolenaar > marcel@xcllnt.net > From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 03:53:45 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 507D66B4; Mon, 15 Jun 2015 03:53:45 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 1E6F2895; Mon, 15 Jun 2015 03:53:44 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from jre-mbp.elischer.org (ppp121-45-248-228.lns20.per4.internode.on.net [121.45.248.228]) (authenticated bits=0) by vps1.elischer.org (8.14.9/8.14.9) with ESMTP id t5F3rcMA087050 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sun, 14 Jun 2015 20:53:42 -0700 (PDT) (envelope-from julian@freebsd.org) Message-ID: <557E4C3D.5080602@freebsd.org> Date: Mon, 15 Jun 2015 11:53:33 +0800 From: Julian Elischer User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Adrian Chadd , Craig Rodrigues CC: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Marcel Moolenaar Subject: Re: svn commit: r284198 - head/bin/ls References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 03:53:45 -0000 On 6/14/15 10:48 AM, Adrian Chadd wrote: > On 13 June 2015 at 18:22, Craig Rodrigues wrote: >> >> On Sat, Jun 13, 2015 at 6:00 PM, Adrian Chadd wrote: >>>> I guarantee that no matter what you've worked on, there's >>>> approximately five orders of magnitude of shipping devices whose >>>> entire storage space can be measured in 1 digit megabytes. Each year. >>> (And yes - there's an appreciable set of them for which freebsd boots, >>> runs and keeps running on them.0 >>> >>> You can buy em too, some of them even under $60. >> >> Can FreeBSD now not run on these systems because of libxo? > It's a tight squeeze as it is. Running in 8MB of flash (even if it's > compressed) is still an exercise in "what can you cut out." > > My point isn't that it isn't running because of libxo; my point is > that arguing about "embedded" involving "lots of storage" is woefully > incorrect and will continue to be until those gigabytes of storage are > available for a penny. Which yes, I'm guessing will happen in my > career - but it's also quite likely code bloat will continue to chase > that upward. do we have a WITHOUT_LIBXO option on sources? I believe we should.. > > > > -adrian > > From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 04:17:03 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AFD3BB54; Mon, 15 Jun 2015 04:17:03 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 83E5FCFC; Mon, 15 Jun 2015 04:17:03 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from jre-mbp.elischer.org (ppp121-45-248-228.lns20.per4.internode.on.net [121.45.248.228]) (authenticated bits=0) by vps1.elischer.org (8.14.9/8.14.9) with ESMTP id t5F4GvTT087132 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sun, 14 Jun 2015 21:17:00 -0700 (PDT) (envelope-from julian@freebsd.org) Message-ID: <557E51B4.1000102@freebsd.org> Date: Mon, 15 Jun 2015 12:16:52 +0800 From: Julian Elischer User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: "Simon J. Gerraty" , Dimitry Andric CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <24490.1434318198@chaos> In-Reply-To: <24490.1434318198@chaos> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 04:17:03 -0000 On 6/15/15 5:43 AM, Simon J. Gerraty wrote: > Dimitry Andric wrote: >> Some questions about this commit, which I'm sure more people must have: > Sure, good questions and as you say, many likely thinking the same. > >> * Was it really necessary to commit hundreds of clearly generated files? > Short answer is "yes" - since they are actually what makes the build > work. > >> * Couldn't these be generated on the fly, or with some "make depend" like command? > The whole point is to avoid that overhead. As long as there is a REALLY EASY WAY to regenerate them and it's well documented, (preferably in each generated file) and regenerating them generates EXACTLY the same output each time unless there is a source change, (so svn doesn't see a change if there is none) then I guess having them checked in is ok. (though a bit "yucky"). I'd like the ability to make a full make however that DOES regenerate them if I feel I have the time. > >> * How to update these files, if you change anything in the 'real' Makefiles? > For now don't worry about it, those of us that want to build/play with > meta mode will take care of updating them. > > Simply building in meta mode is all that is needed to update them. > >> * Or are you now the maintainer of these .depend files? :-) > For now, yes. > I think that's the only reasonable approach at this early stage. > > Thanks > --sjg > > > > From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 04:18:30 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 595DAC98; Mon, 15 Jun 2015 04:18:30 +0000 (UTC) (envelope-from gshapiro@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 47663D03; Mon, 15 Jun 2015 04:18:30 +0000 (UTC) (envelope-from gshapiro@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5F4IUUw047329; Mon, 15 Jun 2015 04:18:30 GMT (envelope-from gshapiro@FreeBSD.org) Received: (from gshapiro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5F4IUJh047328; Mon, 15 Jun 2015 04:18:30 GMT (envelope-from gshapiro@FreeBSD.org) Message-Id: <201506150418.t5F4IUJh047328@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gshapiro set sender to gshapiro@FreeBSD.org using -f From: Gregory Neil Shapiro Date: Mon, 15 Jun 2015 04:18:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284403 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 04:18:30 -0000 Author: gshapiro Date: Mon Jun 15 04:18:29 2015 New Revision: 284403 URL: https://svnweb.freebsd.org/changeset/base/284403 Log: Add a quick (?) note for users who may be having sendmail interoperability issues due to the recent (FreeBSD-SA-15:10.openssl) OpenSSL change to reject 512 bit DH parameters. Affects 11-CURRENT and 10-STABLE. Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Jun 15 01:04:01 2015 (r284402) +++ head/UPDATING Mon Jun 15 04:18:29 2015 (r284403) @@ -31,6 +31,30 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150614: + The import of openssl to address the FreeBSD-SA-15:10.openssl + security advisory includes a change which rejects handshakes + with DH parameters below 768 bits. sendmail releases prior + to 8.15.2 (not yet released), defaulted to a 512 bit + DH parameter setting for client connections. To work around + this interoperability, sendmail can be configured to use a + 2048 bit DH parameter by: + + 1. Edit /etc/mail/`hostname`.mc + 2. If a setting for confDH_PARAMETERS does not exist or + exists and is set to a string beginning with '5', + replace it with '2'. + 3. If a setting for confDH_PARAMETERS exists and is set to + a file path, create a new file with: + openssl dhparam -out /path/to/file 2048 + 4. Rebuild the .cf file: + cd /etc/mail/; make; make install + 5. Restart sendmail: + cd /etc/mail/; make restart + + A sendmail patch is coming, at which time this file will be + updated. + 20150604: Generation of legacy formatted entries have been disabled by default in pwd_mkdb(8), as all base system consumers of the legacy formatted From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 04:30:25 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2AB69340; Mon, 15 Jun 2015 04:30:25 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 04C65FE6; Mon, 15 Jun 2015 04:30:24 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from jre-mbp.elischer.org (ppp121-45-248-228.lns20.per4.internode.on.net [121.45.248.228]) (authenticated bits=0) by vps1.elischer.org (8.14.9/8.14.9) with ESMTP id t5F4UJ9L087191 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sun, 14 Jun 2015 21:30:21 -0700 (PDT) (envelope-from julian@freebsd.org) Message-ID: <557E54D5.7080004@freebsd.org> Date: Mon, 15 Jun 2015 12:30:13 +0800 From: Julian Elischer User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Craig Rodrigues , Adrian Chadd CC: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <24490.1434318198@chaos> In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 04:30:25 -0000 On 6/15/15 6:56 AM, Craig Rodrigues wrote: > On Sun, Jun 14, 2015 at 3:37 PM, Adrian Chadd > wrote: > > Hi, > > I'm happy for this to be your baby and see how it all pans out > in the > tree, but I thought we as a project learnt some lessons about > checking > in autogenerated files. > > > > Well, I would like to give Simon the benefit of the doubt here. > When I worked at Juniper, I worked first with John Birrell on the > early jbuild prototype, and later with Simon on the bmake + meta-mode > work. > > Simon gave this presentation + video on meta-mode at BSDCan 2014: > http://www.bsdcan.org/2014/schedule/track/Hacking/460.en.html > > I gave this preso on jbuild at BSDCan 2010: > https://www.bsdcan.org/2010/schedule/events/198.en.html > > Inside Juniper, there were concerns expressed about checking in > generated dependency files. I'm seeing the same concerns expressed by > the FreeBSD community. :) > > It turns out that checking in the dependency files was the right way > to go. > This has been battle tested inside Juniper, and it does work....I've > seen it. > > It turns out that running a dependency generation step at the beginning > of the build takes a long time. When you are building something > on the scale of an operating system, like FreeBSD, or > something even huger, like JUNOS, this takes a non-trivial amount of > time, > and gets worse as the size of the code grows. > > Checking in the dependencies allows you to do some pretty amazing > stuff with the build, especially when you start integrating manifests > and packaging of the base system. > > Now I will agree with Adrian on a couple of points: > > (1) For the initial go around, if Simon babysits the > Makefile.depend files > in HEAD that would be OK. They are turned off by default > anyways. > > (2) In the long run, having better documentation, tooling and > procedures to > update the > Makefile.depend files will be definitely needed. > Using automation systems like Jenkins would definitely help, > but that's not the only way to do things. I think a make MAKE_MAKEFILE_DEPENDS=1 (build)world is an important step requirement.. i.e. starting with what is there, regenerate ALL of them.. Since the source tree is supposed to be read-only this has to not happen by default but if it is possibe to force it, then svn (or p4 or git) can easily figure out which ones changed (as long as two runs of the generation pass produce identical output) and check in any that changed. > > -- > Craig From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 05:34:54 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8C42082F; Mon, 15 Jun 2015 05:34:54 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pa0-x231.google.com (mail-pa0-x231.google.com [IPv6:2607:f8b0:400e:c03::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4E01FFC1; Mon, 15 Jun 2015 05:34:54 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by padev16 with SMTP id ev16so58535879pad.0; Sun, 14 Jun 2015 22:34:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:mime-version:content-type:from:in-reply-to:date:cc :message-id:references:to; bh=Swn/FoT7W8ei4sGEnAA8Pl6icRouKv0zvQ7ulhBdZYo=; b=yarTtaToDRO9GQ5C5DdAhH3Ui8IsGxaCEvyjvC8lfbh45sdgiSGeBtD2x9oa2MNz3w ZpBPS2wOZGGLYzP0Px2dkAIBYjhMWkoSDoy1Ail4kXKb7HD+qiFlIvcuu6gzVNOMUdcO XbiuQz4ydCe5tS7g5SlrH+RiSkV2lkRMvtPKgBBOPG7I6yT1mpTozSHcNzIztolYA+Xb oNChMt6J2a6XD6xOtVHq2itVfOIZ+4FpcFSXpEIUOflQfl3q/Z9cJ3wJNksiJVIy0iL1 sxF0s9Cq16IaD4UsMHCyXQsc5dC2XJ7I2V0lVSxoaf9nkTdoRnkLkFMNU9TkwkKfvhiE AbOQ== X-Received: by 10.68.179.228 with SMTP id dj4mr44361973pbc.141.1434346493440; Sun, 14 Jun 2015 22:34:53 -0700 (PDT) Received: from ?IPv6:2601:8:ab80:7d6:1db2:335c:64d8:4632? ([2601:8:ab80:7d6:1db2:335c:64d8:4632]) by mx.google.com with ESMTPSA id pj4sm5346808pbb.29.2015.06.14.22.34.51 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 14 Jun 2015 22:34:52 -0700 (PDT) Subject: Re: svn commit: r284198 - head/bin/ls Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Content-Type: multipart/signed; boundary="Apple-Mail=_3906508C-3992-43C8-AE35-9E9AD1CC1093"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5 From: Garrett Cooper In-Reply-To: <557E4C3D.5080602@freebsd.org> Date: Sun, 14 Jun 2015 22:34:49 -0700 Cc: Adrian Chadd , Craig Rodrigues , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Marcel Moolenaar Message-Id: <2CFE8F01-98B8-403C-BE1F-57D6F2368BE3@gmail.com> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> <557E4C3D.5080602@freebsd.org> To: Julian Elischer X-Mailer: Apple Mail (2.1878.6) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 05:34:54 -0000 --Apple-Mail=_3906508C-3992-43C8-AE35-9E9AD1CC1093 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On Jun 14, 2015, at 20:53, Julian Elischer wrote: > On 6/14/15 10:48 AM, Adrian Chadd wrote: >> On 13 June 2015 at 18:22, Craig Rodrigues = wrote: >>>=20 >>> On Sat, Jun 13, 2015 at 6:00 PM, Adrian Chadd = wrote: >>>>> I guarantee that no matter what you've worked on, there's >>>>> approximately five orders of magnitude of shipping devices whose >>>>> entire storage space can be measured in 1 digit megabytes. Each = year. >>>> (And yes - there's an appreciable set of them for which freebsd = boots, >>>> runs and keeps running on them.0 >>>>=20 >>>> You can buy em too, some of them even under $60. >>>=20 >>> Can FreeBSD now not run on these systems because of libxo? >> It's a tight squeeze as it is. Running in 8MB of flash (even if it's >> compressed) is still an exercise in "what can you cut out." >>=20 >> My point isn't that it isn't running because of libxo; my point is >> that arguing about "embedded" involving "lots of storage" is woefully >> incorrect and will continue to be until those gigabytes of storage = are >> available for a penny. Which yes, I'm guessing will happen in my >> career - but it's also quite likely code bloat will continue to chase >> that upward. >=20 > do we have a WITHOUT_LIBXO option on sources? I believe we should.. +1. I would be more than happy to implement it by stubbing out the = majority of the macros to something less invasive, but it might be a bit = before I do that. Thanks, --Apple-Mail=_3906508C-3992-43C8-AE35-9E9AD1CC1093 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJVfmP5AAoJEMZr5QU6S73eUGAH/A6wnFSAZXd49Tlcn73D7rW1 FyLrInmzgc8bc5Q4e6cT5xmASEwNTMZqJOv/9vydb083lsMgUssfRoZgmQch0afe gayL5OTV9D/SsVuNzgmPzpmMJGqIdepvgndfvNy7J0Op4PKfu5v/wWtC0vMcmFra RTiSR173f/GrmPTb8DaRVip/y/bNGNHuRpAs0W2HlDSH3hdxpvy9jpFn6DvqoqRI KeedfqonfPI2Hbms+H8zq60yj6k2VZwEpcsPwrHlpE8+W1jw//ZQrMbUX/FwbP/f aGVB8J/Apk8ZFIyaKH9AG238JkGOtGmbn6jRRhWshKlDzonWVdrlT9576Z08ErQ= =RyI1 -----END PGP SIGNATURE----- --Apple-Mail=_3906508C-3992-43C8-AE35-9E9AD1CC1093-- From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 06:39:00 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6B7DF613; Mon, 15 Jun 2015 06:39:00 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 59953F54; Mon, 15 Jun 2015 06:39:00 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5F6d0me016199; Mon, 15 Jun 2015 06:39:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5F6cx63016190; Mon, 15 Jun 2015 06:38:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201506150638.t5F6cx63016190@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 15 Jun 2015 06:38:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284405 - in head: . share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 06:39:00 -0000 Author: ngie Date: Mon Jun 15 06:38:59 2015 New Revision: 284405 URL: https://svnweb.freebsd.org/changeset/base/284405 Log: Remove ALLOW_DEPRECATED_ATF_TOOLS/ATFFILE support from atf.test.mk The legacy atf tools were removed in atf 0.20 MFC after: 2 weeks Modified: head/UPDATING head/share/mk/atf.test.mk Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Jun 15 04:20:32 2015 (r284404) +++ head/UPDATING Mon Jun 15 06:38:59 2015 (r284405) @@ -32,6 +32,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 "ln -s 'abort:false,junk:false' /etc/malloc.conf".) 20150614: + ALLOW_DEPRECATED_ATF_TOOLS/ATFFILE support has been removed from + atf.test.mk (included from bsd.test.mk). Please upgrade devel/atf + and devel/kyua to version 0.20+ and adjust any calling code to work + with Kyuafile and kyua. + +20150614: The import of openssl to address the FreeBSD-SA-15:10.openssl security advisory includes a change which rejects handshakes with DH parameters below 768 bits. sendmail releases prior Modified: head/share/mk/atf.test.mk ============================================================================== --- head/share/mk/atf.test.mk Mon Jun 15 04:20:32 2015 (r284404) +++ head/share/mk/atf.test.mk Mon Jun 15 06:38:59 2015 (r284405) @@ -22,28 +22,10 @@ ATF_TESTS_C?= ATF_TESTS_CXX?= ATF_TESTS_SH?= -# Whether to allow using the deprecated ATF tools or not. -# -# If 'yes', this file will generate Atffiles when requested and will also -# support using the deprecated atf-run tool to execute the tests. -ALLOW_DEPRECATED_ATF_TOOLS?= no - -# Knob to control the handling of the Atffile for this Makefile. -# -# If 'yes', an Atffile exists in the source tree and is installed into -# TESTSDIR. -# -# If 'auto', an Atffile is automatically generated based on the list of test -# programs built by the Makefile and is installed into TESTSDIR. This is the -# default and is sufficient in the majority of the cases. -# -# If 'no', no Atffile is installed. -ATFFILE?= auto - # Path to the prefix of the installed ATF tools, if any. # # If atf-run and atf-report are installed from ports, we automatically define a -# realtest target below to run the tests using these tools. The tools are +# realregress target below to run the tests using these tools. The tools are # searched for in the hierarchy specified by this variable. ATF_PREFIX?= /usr/local @@ -121,67 +103,3 @@ ${_T}: ${ATF_TESTS_SH_SRC_${_T}} mv ${.TARGET}.tmp ${.TARGET} .endfor .endif - -.if ${ALLOW_DEPRECATED_ATF_TOOLS} != "no" - -.if ${ATFFILE:tl} != "no" -FILES+= Atffile -FILESDIR_Atffile= ${TESTSDIR} - -.if ${ATFFILE:tl} == "auto" -CLEANFILES+= Atffile Atffile.tmp - -Atffile: Makefile - @{ echo 'Content-Type: application/X-atf-atffile; version="1"'; \ - echo; \ - echo '# Automatically generated by atf-test.mk.'; \ - echo; \ - echo 'prop: test-suite = "'${TESTSUITE}'"'; \ - echo; \ - for tp in ${ATF_TESTS_C} ${ATF_TESTS_CXX} ${ATF_TESTS_SH} \ - ${TESTS_SUBDIRS}; \ - do \ - echo "tp: $${tp}"; \ - done; } >Atffile.tmp - @mv Atffile.tmp Atffile -.endif -.endif - -ATF_REPORT?= ${ATF_PREFIX}/bin/atf-report -ATF_RUN?= ${ATF_PREFIX}/bin/atf-run -.if exists(${ATF_RUN}) && exists(${ATF_REPORT}) -# Definition of the "make test" target and supporting variables. -# -# This target, by necessity, can only work for native builds (i.e. a freeBSD -# host building a release for the same system). The target runs ATF, which is -# not in the toolchain, and the tests execute code built for the target host. -# -# Due to the dependencies of the binaries built by the source tree and how they -# are used by tests, it is highly possible for a execution of "make test" to -# report bogus results unless the new binaries are put in place. -_TESTS_FIFO= ${.OBJDIR}/atf-run.fifo -_TESTS_LOG= ${.OBJDIR}/atf-run.log -CLEANFILES+= ${_TESTS_FIFO} ${_TESTS_LOG} -realtest: .PHONY - @set -e; \ - if [ -z "${TESTSDIR}" ]; then \ - echo "*** No TESTSDIR defined; nothing to do."; \ - exit 0; \ - fi; \ - cd ${DESTDIR}${TESTSDIR}; \ - rm -f ${_TESTS_FIFO}; \ - mkfifo ${_TESTS_FIFO}; \ - tee ${_TESTS_LOG} < ${_TESTS_FIFO} | ${TESTS_ENV} ${ATF_REPORT} & \ - set +e; \ - ${TESTS_ENV} ${ATF_RUN} >> ${_TESTS_FIFO}; \ - result=$${?}; \ - wait; \ - rm -f ${_TESTS_FIFO}; \ - echo; \ - echo "*** The verbatim output of atf-run has been saved to ${_TESTS_LOG}"; \ - echo "***"; \ - echo "*** WARNING: atf-run is deprecated; please install kyua instead"; \ - exit $${result} -.endif - -.endif From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 06:44:23 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B77D7CC; Mon, 15 Jun 2015 06:44:23 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49BCD1BD; Mon, 15 Jun 2015 06:44:23 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5F6iNPD020569; Mon, 15 Jun 2015 06:44:23 GMT (envelope-from rodrigc@FreeBSD.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5F6iNbO020568; Mon, 15 Jun 2015 06:44:23 GMT (envelope-from rodrigc@FreeBSD.org) Message-Id: <201506150644.t5F6iNbO020568@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rodrigc set sender to rodrigc@FreeBSD.org using -f From: Craig Rodrigues Date: Mon, 15 Jun 2015 06:44:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284406 - head/usr.bin/kdump X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 06:44:23 -0000 Author: rodrigc Date: Mon Jun 15 06:44:22 2015 New Revision: 284406 URL: https://svnweb.freebsd.org/changeset/base/284406 Log: Use cpp -I$includedir "cpp -I$1" was expanding to "cpp -Iprint" which was not the proper directory of header files. Modified: head/usr.bin/kdump/mkioctls Modified: head/usr.bin/kdump/mkioctls ============================================================================== --- head/usr.bin/kdump/mkioctls Mon Jun 15 06:38:59 2015 (r284405) +++ head/usr.bin/kdump/mkioctls Mon Jun 15 06:44:22 2015 (r284406) @@ -39,7 +39,7 @@ case "${MACHINE}" in esac awk -v x="$ioctl_includes" 'BEGIN {print x}' | - $CPP -nostdinc -I$1 -dM -DCOMPAT_43TTY - | + $CPP -nostdinc -I$includedir -dM -DCOMPAT_43TTY - | awk -v ioctl_includes="$ioctl_includes" -v style="$style" ' BEGIN { print "/* XXX obnoxious prerequisites. */" From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 06:48:43 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E4AB795F; Mon, 15 Jun 2015 06:48:43 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D317A1D7; Mon, 15 Jun 2015 06:48:43 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5F6mhr5021181; Mon, 15 Jun 2015 06:48:43 GMT (envelope-from rodrigc@FreeBSD.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5F6mhLV021180; Mon, 15 Jun 2015 06:48:43 GMT (envelope-from rodrigc@FreeBSD.org) Message-Id: <201506150648.t5F6mhLV021180@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rodrigc set sender to rodrigc@FreeBSD.org using -f From: Craig Rodrigues Date: Mon, 15 Jun 2015 06:48:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284407 - head/usr.bin/kdump X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 06:48:44 -0000 Author: rodrigc Date: Mon Jun 15 06:48:43 2015 New Revision: 284407 URL: https://svnweb.freebsd.org/changeset/base/284407 Log: Add ioctl.c, linux_syscalls.c, linux32_syscalls.c to beforedepend target. These files need to be generated before mkdep is run. Modified: head/usr.bin/kdump/Makefile Modified: head/usr.bin/kdump/Makefile ============================================================================== --- head/usr.bin/kdump/Makefile Mon Jun 15 06:44:22 2015 (r284406) +++ head/usr.bin/kdump/Makefile Mon Jun 15 06:48:43 2015 (r284407) @@ -23,7 +23,11 @@ NO_WERROR?= YES CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h +beforedepend: ioctl.c + .if (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386") +beforedepend: linux_syscalls.c + CLEANFILES+= linux_syscalls.c kdump.o: linux_syscalls.c linux_syscalls.c: linux_syscalls.conf @@ -31,6 +35,8 @@ linux_syscalls.c: linux_syscalls.conf ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux/syscalls.master ${.CURDIR}/linux_syscalls.conf .endif .if (${MACHINE_ARCH} == "amd64") +beforedepend: linux32_syscalls.c + CLEANFILES+= linux32_syscalls.c kdump.o: linux32_syscalls.c linux32_syscalls.c: linux32_syscalls.conf From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 07:04:00 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 52C67E80; Mon, 15 Jun 2015 07:04:00 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0113.outbound.protection.outlook.com [207.46.100.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 76988897; Mon, 15 Jun 2015 07:03:58 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from BL2PR05CA0046.namprd05.prod.outlook.com (10.255.226.46) by DM2PR05MB782.namprd05.prod.outlook.com (10.141.179.142) with Microsoft SMTP Server (TLS) id 15.1.190.14; Mon, 15 Jun 2015 07:03:51 +0000 Received: from BN1BFFO11FD009.protection.gbl (2a01:111:f400:7c10::1:112) by BL2PR05CA0046.outlook.office365.com (2a01:111:e400:c04::46) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Mon, 15 Jun 2015 07:03:51 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BN1BFFO11FD009.mail.protection.outlook.com (10.58.144.72) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Mon, 15 Jun 2015 07:03:51 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Mon, 15 Jun 2015 00:03:28 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5F73SD37404; Mon, 15 Jun 2015 00:03:28 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id CB3D8580A3; Mon, 15 Jun 2015 00:03:27 -0700 (PDT) To: Adrian Chadd CC: Dimitry Andric , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... In-Reply-To: References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <24490.1434318198@chaos> Comments: In-reply-to: Adrian Chadd message dated "Sun, 14 Jun 2015 15:37:02 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Mon, 15 Jun 2015 00:03:27 -0700 Message-ID: <27819.1434351807@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD009; 1:6f5gMk9vvGLfgyzqFRYNWelZm5LcpYXPX7bRd8nuNry+Z1i0kve+m3VLGafVtLwOl1lXwoRTUOPYOA1MPGYJKfxT1VwqbaDnEvslwWzwQsKW0JHNnGMiWGyP7UaOwLXDCHAXohgXPVUTKh0krX382V2Efz4fCHiO7a5W0rkGpzvRIhDW2YwJtS1ulsvNe47UzZzBUlTMv5iRlMvl32ud8gRWynXEMQ4L2Nr5bYbeeYTlBIni9etjrUr60BKbKFUSPI1z5eg2F7opeJe29T6v/VmksDxLfJEHmn1Ac7NajqU= X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(24454002)(50466002)(106466001)(117636001)(48376002)(189998001)(93886004)(47776003)(5001960100002)(6806004)(110136002)(46102003)(50226001)(76506005)(2950100001)(57986006)(33716001)(77096005)(86362001)(92566002)(76176999)(19580405001)(77156002)(19580395003)(105596002)(50986999)(450100001)(62966003)(87936001)(62816006)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR05MB782; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB782; 2:rr+7JfHyY9dV3wsmVytoQa8VpjTFcKgge1jt63ws7VI4KPez6M116RbtgUYu0auk; 2:m3YrHT62hiAbKwg7sHeVR+P5WHxB2WV5tZknmJr+Qf+FtpsUIlSNJlMDYzTQkogbZRqD85NCBhxTeuX+0857I9phrkp5jDdIuPHjQgt2ggjs/15J9GKXCgLPlbe63fadNfBtXBkAFImuXiHs50n9ejyiaKU1me/OXehJtEQLnWlSOjkqSZ64DMk3S2sZQFbjTvxYvybpdIgRJcu9ik/6Qd0Kytb6By8l6JGrsmVZBlY=; 6:5Q78wsv9HOllv/Q7tOTAUSUFo3uPGwKWN4RsgmG3fEpYIDrZuyxN0k4ZiHkrrsQE2785+kE4+R/10nOS78TyWLquaQxC+FtoCoSQ35zhXy7Qi/pCdI1oi0Fb1REAJEGx8I5Ipw8urSLrwNtql3t0qT+Ndpzktainj7gCkLXKaKyVAkRHSiuyAiPDrS8jiX6DIe43zKss4TXxyjzwgieGhCyz77tPw24Zy7xe00b4DfUWeYEZyghrOeZwIqxTPIrT8y5H5OTSBHqwEytx86GEmEsNNLPkw1DKb8d+tGQjvSO9Jc3d2LAPbRBkdiTNV5eUO4RnT/bceiCwvfJu1bjm/1A4EK1A0Jqe9nPWE2qn9OcfLZHKItnge2jPx/kOGM9sicPwv1D6Fo6qAYMEw72eFlAB1oBDvH+AV9HFi1b+CQ54C4MAhdDUut8GpmNOqk9t9yF9Y+pKrTxy580nyct9qQyMY0KgfSzo09HHK6eySIFT11bpyF1d66TAMreeUZfV X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR05MB782; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:DM2PR05MB782; BCL:0; PCL:0; RULEID:; SRVR:DM2PR05MB782; X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB782; 3:/Jl0QLw5NzzsY3WxLQlBUV/nk7Rzxf2vV1jeUHTSCiFToTieywoYccfPL48xF4J5Cdn/GXl4fFdHinv+AavC8N628yGOmgYt05EEeFeGpq85GBx58GUjYIeTtHNr9sUbTD09Uv6RyKQTkYRo2Z174USKB1I8tOg68BddpFlHRcsyHSnK93rSUVBnJ5M7gWb9LKNaQ2DJQ86qp3IMJmPtQnCBF4WzqUewjRs2KyM0za0v4tohbHMUl+qxvc9cKn9EBo64y/fAfpExA8DesH5xqRh73+uXLufkv9BehOHST4cHqe25ZIBp2iNVNqXVb3Em X-Forefront-PRVS: 0608DEDB67 X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB782; 9:fxHuGBig22pkEnPVsM0E9afpcpXkjcl8PVToTjxo+CuRT48pWjjxcmrFP5fPMDjJ5DHa/IpA3NTxGeefdFRbna+rGcj+PBoZXKK7AbLtI0modeGufJ6MJA/V336/X6M6jqs6QDAwonsQqXsEYrDPb8ETM8kSt4nfbxERozu7I9iFSiIL3WEjkI5yOWxhcJAbr3hLVGMpQA9EBDAVMilPMh/2iJUAH/inP/4y6UJG2p13Wdf/1MwBAWcG/g13QwuqKXnZJbMRSJ72RlclIxXCA0ZNTFHJNdrbfPsyg/9G/lLB3AnFU/XF8llspy1Q1whZF7nMzv7PdHxAHlerdxwk+q0dohwstrm8SwWRoMEngTd9IAZW/jZLebr98Pw3WR9NBE20Jc3OM6JAKE5Wcj7MWpXnzwSUcY6Ko2P7OUk7JjHXoB5V39AlzLcdTJpaYDVBSCyPqejXOSY1ZxDw7wBdH9SiJhhN6XxRujrHraEuBmhuhZmsqBuGtgTg+aD+/k3bV+/GSsbYjxMi2jokTl4muPi46XRO/nJqPUzFBH9pSfBWHWJGN3bDN4YoO8yGzmMefcQae7/KXt+Q341XKroZPVqccvgQaWldarGnmxxTWmHYzWjDmD74j3N/RtULrRmxc9La7RLBrX4/ANuDHzmK9tkRuPxNoDAyqA2shsSESkWerwa64hg66WIrierI3NI7yjI5cT1uRw7YShXgDU7JKTlzYWY1rsAx2QnKjZiK7nLkCg64eyCIH6NinJH8e6nxMX5mGjddZzNoAWDB8HLjUh2rphrL8GZ1bxTTvthC7Wf/sFg+7PBLhtvvBoVDXB9JmR6qO17J0f6KRu0jzu4ewDlZRlpyiCfWmSit+6EF0jm/8svp0y/XWl92Rm318afy2HssTT5pBIZpx53Ph+3NOQ== X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB782; 3:TJM5IaXDXP6ifhuShQ3QWm7lAUx0d18IIaEnCrcPwbdyU6E2Pv1qkXxzLMG6HXQFpLzlWkBdUaDrr7GhuEtJiimywPLI3ZbtrvxeIlj09Tv+YJ2f+lMf7bIGbg8At6kl5h2NkqdgtJg2ddMXVv919w==; 10:fdlS4+cR3grFP/6nXrjsZ07wLdL+vLEQH14JQBUF4UL/XbkBYRpwrOkmiO+8CoilTRzN1ZxRVtFP56ofZaTnuF1q26P9OJgF2Clptmma3ec=; 6:lxPlSFetx13ucTe+jx1bVTiIztrguva0m3Rksb8fmp6UojJYlY5PunAtv8WPXEpA X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2015 07:03:51.5049 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR05MB782 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 07:04:00 -0000 Adrian Chadd wrote: > I'm happy for this to be your baby and see how it all pans out in the > tree, but I thought we as a project learnt some lessons about checking > in autogenerated files. Sorry I don't have the history on that, but I thought it had been made clear for 4 years now that this was a key part of the deal. (Yes it has taken 4 years to get to this point ;-) Until the project decides to make this the default build (assuming that ever happens), you can happily ignore them - I for one won't bitch about needing to fix them from time to time. My tree should have finished updating I'll go check if there is anything I need to fix. Thanks --sjg From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 07:04:55 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EA7BB105; Mon, 15 Jun 2015 07:04:55 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pd0-x22b.google.com (mail-pd0-x22b.google.com [IPv6:2607:f8b0:400e:c02::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B7ABB8A3; Mon, 15 Jun 2015 07:04:55 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by pdjm12 with SMTP id m12so66304225pdj.3; Mon, 15 Jun 2015 00:04:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:mime-version:content-type:from:in-reply-to:date:cc :message-id:references:to; bh=OI60ELnQgWqX6ChAzqJ9x5kNjBFPqq4IGfnBCTcJk0A=; b=xzjAP1nfgEGX8Z3KBjEHHUjLTKKTYmXNxRZ7ip0LrQqHE3UEOpyrh/+OYWH+HgmIH1 plLMH0krmxCveuJiGOxbW0uJfa2Bjecqn4gRQSNOXotXyxCo8WRFHlsh8Cv1kEeUpl1+ hUBpHSwEMgJvHFbDe+s6AEzx5S+HpSGHWvpuUXmtws52fi3zP4Z3UnSlHSnqoPuzKvYJ p5PsN5e3JNhv/tYkeiNz4t4Fqpm89oCx7vwm43eTcUexA4tbl7j9sA1q47VFl5NV3KGw 3ESHKOH64tMuOProjWNygTRtJ5V1cAx61c/ZM8yyl/QvdNu/ysgCo6DtQwA+3y9pArhf ZQeQ== X-Received: by 10.70.39.103 with SMTP id o7mr45481566pdk.122.1434351895425; Mon, 15 Jun 2015 00:04:55 -0700 (PDT) Received: from ?IPv6:2601:8:ab80:7d6:1db2:335c:64d8:4632? ([2601:8:ab80:7d6:1db2:335c:64d8:4632]) by mx.google.com with ESMTPSA id xq9sm6175462pac.3.2015.06.15.00.04.54 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Jun 2015 00:04:54 -0700 (PDT) Subject: Re: svn commit: r284407 - head/usr.bin/kdump Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Content-Type: multipart/signed; boundary="Apple-Mail=_0935D90C-1F65-415C-A90F-0B6C3B83CF3C"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5 From: Garrett Cooper In-Reply-To: <201506150648.t5F6mhLV021180@svn.freebsd.org> Date: Mon, 15 Jun 2015 00:04:51 -0700 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <771B8E77-0CEF-4200-80D2-E7B7025F3BB4@gmail.com> References: <201506150648.t5F6mhLV021180@svn.freebsd.org> To: Craig Rodrigues X-Mailer: Apple Mail (2.1878.6) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 07:04:56 -0000 --Apple-Mail=_0935D90C-1F65-415C-A90F-0B6C3B83CF3C Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Jun 14, 2015, at 23:48, Craig Rodrigues wrote: > Author: rodrigc > Date: Mon Jun 15 06:48:43 2015 > New Revision: 284407 > URL: https://svnweb.freebsd.org/changeset/base/284407 >=20 > Log: > Add ioctl.c, linux_syscalls.c, linux32_syscalls.c to beforedepend = target. >=20 > These files need to be generated before mkdep is run. This is wrong (I=92ve had to fix a lot of this at $work recently). They = need to be added to DPSRCS so they will always be regenerated as a = dependency of DPADD. --Apple-Mail=_0935D90C-1F65-415C-A90F-0B6C3B83CF3C Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJVfnkVAAoJEMZr5QU6S73esDkH/2V/WS+TTCtVSSw3nM0AehoL I9A6CHR0cZIYsfvoNTEGkXztPkGa834iICNnVVgwsP2FUGRsyvW0jjVIwttUy7nM h+cKY6EWKMXcZ+lyaiye8szqo4UZoZbgx5WSzFNFtzPxdT/FbvAuFFyKE9SBwj2a GRl9HvxFWlkQPU7LXU2qMBeV1wJyZoTDY41jfnw/yuV0QK3O6qy9hjVfjBS49b8o 4pe/qEYcc7hHO0jQHHptGnlTL96UKZhrijw1dvqutQsFDByvVrxFZ/DM7tAqmb+l ZAm7vKvoEcGSPVzxEq0APcUfSGg97Kg6/9ughLOd0ka+ElXjyF4COTqNHCqF8KU= =jIQ8 -----END PGP SIGNATURE----- --Apple-Mail=_0935D90C-1F65-415C-A90F-0B6C3B83CF3C-- From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 07:07:35 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 600382B0; Mon, 15 Jun 2015 07:07:35 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pd0-x22c.google.com (mail-pd0-x22c.google.com [IPv6:2607:f8b0:400e:c02::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2ACD88C5; Mon, 15 Jun 2015 07:07:35 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by pdbki1 with SMTP id ki1so66507291pdb.1; Mon, 15 Jun 2015 00:07:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:mime-version:content-type:from:in-reply-to:date:cc :message-id:references:to; bh=l+BT7T1goOzZpVpYHzpSDOj8P5pEFvTDJOBFE+eSvNM=; b=e055ROoPpfMSSskCeXC85cP00kwxFR85plC51c0xY9bOIxDCoRsDdVVX+fdaj9y7u1 KZV+W78o4yz+tcusm0L87q8AROhMaKy77DrUmrzL3YnjjUZX3Jqkw0ZwwON2VsIwy8XX DDKHO0D2bbpKLKe8ZgDbV97S3ZlkrPRoVJgZd3mofQfhJ1PUHvVhM7atT87U3kL4+O9w Q8pVwNXwtTchJpAasNiHA/aak2w+gHZte5l+galbhlIkdi8wv2k18PX/vTiYSV5o14ki 0/JHTP73qHUlLNYF0EdVdmXe6ZHPZ90VEXD7djuwG57QMxC8ZX0M1T9IoJhst+UyCv2w IIgA== X-Received: by 10.68.223.34 with SMTP id qr2mr45050424pbc.140.1434352054657; Mon, 15 Jun 2015 00:07:34 -0700 (PDT) Received: from ?IPv6:2601:8:ab80:7d6:1db2:335c:64d8:4632? ([2601:8:ab80:7d6:1db2:335c:64d8:4632]) by mx.google.com with ESMTPSA id pw7sm11161233pab.40.2015.06.15.00.07.33 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Jun 2015 00:07:34 -0700 (PDT) Subject: Re: svn commit: r284407 - head/usr.bin/kdump Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Content-Type: multipart/signed; boundary="Apple-Mail=_21D82B40-71A2-4845-8249-53BC294EB3ED"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5 From: Garrett Cooper In-Reply-To: <771B8E77-0CEF-4200-80D2-E7B7025F3BB4@gmail.com> Date: Mon, 15 Jun 2015 00:07:31 -0700 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <3CCCC6B2-C867-4BD3-9E70-BD2F7B66080C@gmail.com> References: <201506150648.t5F6mhLV021180@svn.freebsd.org> <771B8E77-0CEF-4200-80D2-E7B7025F3BB4@gmail.com> To: Craig Rodrigues X-Mailer: Apple Mail (2.1878.6) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 07:07:35 -0000 --Apple-Mail=_21D82B40-71A2-4845-8249-53BC294EB3ED Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Jun 15, 2015, at 0:04, Garrett Cooper wrote: > On Jun 14, 2015, at 23:48, Craig Rodrigues = wrote: >=20 >> Author: rodrigc >> Date: Mon Jun 15 06:48:43 2015 >> New Revision: 284407 >> URL: https://svnweb.freebsd.org/changeset/base/284407 >>=20 >> Log: >> Add ioctl.c, linux_syscalls.c, linux32_syscalls.c to beforedepend = target. >>=20 >> These files need to be generated before mkdep is run. >=20 > This is wrong (I=92ve had to fix a lot of this at $work recently). = They need to be added to DPSRCS so they will always be regenerated as a = dependency of DPADD. DPADD -> DEPENDFILE --Apple-Mail=_21D82B40-71A2-4845-8249-53BC294EB3ED Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJVfnmzAAoJEMZr5QU6S73eVFsIALX9AaLZRpeb+FzdEWrWXn5W xjTZxa1GkVxGxTjTd9+fvyizQs7fPwTVG1RDI5R4h3mX5bILkVjfZffmF9Oui8yC blva5/ZkvMopmFli5LPMitcpZblqy0tya9DN2KbjZjfpDzRpiUp2HAeG2uh6AGU0 cXPFeHjUjMLAbrCmaWktE5lRbIRUndsDqiEyXZjGsOQPHHGblhqVjAnlZPxdjSGR /inF/7DMotmVWdGvhHOP3qJz7RApDgjQ0vGp6oj6hNZHRXvg7aCr4T9lGiIYCcII D8fP3UDYbweUq1Oy9LYBVjESN9AMr9BAj69XrqWyL7W4+yRZyjmhPOnrPozPbeM= =RQvJ -----END PGP SIGNATURE----- --Apple-Mail=_21D82B40-71A2-4845-8249-53BC294EB3ED-- From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 07:13:24 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 507C74E5; Mon, 15 Jun 2015 07:13:24 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3EDADB19; Mon, 15 Jun 2015 07:13:24 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5F7DOrY035204; Mon, 15 Jun 2015 07:13:24 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5F7DOZ1035203; Mon, 15 Jun 2015 07:13:24 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201506150713.t5F7DOZ1035203@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 15 Jun 2015 07:13:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284408 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 07:13:24 -0000 Author: ngie Date: Mon Jun 15 07:13:23 2015 New Revision: 284408 URL: https://svnweb.freebsd.org/changeset/base/284408 Log: Ensure TESTSDIR is defined before bsd.test.mk is .include'd MFC after: 1 week Modified: head/share/mk/bsd.test.mk Modified: head/share/mk/bsd.test.mk ============================================================================== --- head/share/mk/bsd.test.mk Mon Jun 15 06:48:43 2015 (r284407) +++ head/share/mk/bsd.test.mk Mon Jun 15 07:13:23 2015 (r284408) @@ -10,6 +10,10 @@ ____: +.ifndef TESTSDIR +.error "Please define TESTSDIR when including bsd.test.mk" +.endif + # List of subdirectories containing tests into which to recurse. This has the # same semantics as SUBDIR at build-time. However, the directories listed here # get registered into the run-time test suite definitions so that the test From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 07:13:31 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E4AA61E; Mon, 15 Jun 2015 07:13:31 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bbn0109.outbound.protection.outlook.com [157.56.111.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BB466B1B; Mon, 15 Jun 2015 07:13:29 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from CO2PR05MB777.namprd05.prod.outlook.com (10.141.226.139) by CO2PR05MB748.namprd05.prod.outlook.com (10.141.227.150) with Microsoft SMTP Server (TLS) id 15.1.190.14; Mon, 15 Jun 2015 07:13:22 +0000 Received: from CO2PR05CA035.namprd05.prod.outlook.com (10.141.241.163) by CO2PR05MB777.namprd05.prod.outlook.com (10.141.226.139) with Microsoft SMTP Server (TLS) id 15.1.184.17; Mon, 15 Jun 2015 07:13:21 +0000 Received: from BY2FFO11FD002.protection.gbl (2a01:111:f400:7c0c::156) by CO2PR05CA035.outlook.office365.com (2a01:111:e400:1429::35) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Mon, 15 Jun 2015 07:13:21 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BY2FFO11FD002.mail.protection.outlook.com (10.1.14.124) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Mon, 15 Jun 2015 07:13:21 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Mon, 15 Jun 2015 00:13:20 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5F7DKD41559; Mon, 15 Jun 2015 00:13:20 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id CE7E1580A3; Mon, 15 Jun 2015 00:13:19 -0700 (PDT) To: Craig Rodrigues CC: Adrian Chadd , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... In-Reply-To: References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <24490.1434318198@chaos> Comments: In-reply-to: Craig Rodrigues message dated "Sun, 14 Jun 2015 15:56:50 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Date: Mon, 15 Jun 2015 00:13:19 -0700 Message-ID: <13146.1434352399@chaos> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD002; 1:TDzXj7dXlAaHhmTibYOBDxDDuBTMl5RhUBFKwej4OggYaADB5/hJDF7QT8q2CUFEcq1+Wln7mxNoegVdSku1JFtw/yH3HBvL6k87CTvSWkxx/tZver8/XSHD77fCeiqts8P8QNJ4KHBuJM1jMgjiLzMJUv9KPidF8pmYrbaQU0VKcv7xktW9+NMe3Qx95JTbDVbL2k/WPeyWNriznxRdYr8r6KgIQ3ghWYw/No3tEcBzNRyaqqn7zm85wHRppYErz5RoZow/HZtkpQQHKhZ+7sEkDd0fjtvAaAECX2DO4PI= X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(24454002)(52314003)(23756003)(76176999)(77096005)(19580405001)(117636001)(93886004)(50986999)(46102003)(19580395003)(62966003)(47776003)(33716001)(106466001)(92566002)(105596002)(6806004)(57986006)(110136002)(76506005)(86362001)(5001960100002)(50466002)(2950100001)(189998001)(450100001)(87936001)(77156002)(50226001)(62816006)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:CO2PR05MB777; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:CO2PR05MB777; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:CO2PR05MB748; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:CO2PR05MB777; BCL:0; PCL:0; RULEID:; SRVR:CO2PR05MB777; X-Forefront-PRVS: 0608DEDB67 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2015 07:13:21.1493 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR05MB777 X-Microsoft-Exchange-Diagnostics: 1; CO2PR05MB748; 2:7uIjIp/tGJf/Qdk5Mpxy1J3HnezBpx27HDFLeKfSgGXAAKYprzTCgPK+9ybSzoZi; 2:DddhR02K9iT2y/QgzIwaRitIFb+2KmDGvstL/gRxmUyhkjS7b0ajIKfVI+wKeJJGnwHVOfkLaNKcYZKelMrAyDyxa4VDtcwdQg8rykTCQmHeqpkCqsT04DU13wguNVuK1JsyOqLX6oC3X9Q0NoX5qklrLDyMkbtTvRCznzbSNpBWZiRDnUYqxAUdsPtN1vDeaLbIhMEWCSIFc18KIOQgsbA+StZToD4GfWxrVdlfa04=; 9:CR1UYToecsxSxQRU38glkvp/aohDgz4qilkPpdHPggPtAiFhsRjSyeXOrC8te/JhFzpJr56EmDECImq6Pf9NSuoCEQbl1dpIbjeeJ9jUIg7RGnfHIx5ECLJDf+yQU+yGOeSrSTEq+brCZU0tJTeuYg== X-OriginatorOrg: juniper.net X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 07:13:31 -0000 Craig Rodrigues wrote: Thanks Craig, > (2)=A0 In the long run, having better documentation, tooling and procedur= es to > =A0 =A0 =A0 update the > =A0=A0=A0=A0=A0 Makefile.depend files will be definitely needed. The only thing needed to update them is a successful build (in meta mode), it is so painless that many developers at Juniper remain completely ignorant of them ;-) > =A0=A0=A0=A0=A0 Using automation systems like Jenkins would definitely he= lp, > =A0=A0=A0=A0=A0 but that's not the only way to do things. Only if it builds in meta mode I think. You can generate meta files during a normal build but they are valuable for debugging mostly. Perhaps with a heavy set of filtering they might be used to glean correct tree dependencies - but building in meta mode is simpler. Note, and out of date Makefile.depend does not guarantee a build faliure, it introduces a race condition though, each race has its own likelyhood of win/lose of course, so there is often quite a bit of tollerance for out of date dependencies. Anyway, it's a bit early to be worrying about that. Thanks --sjg From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 07:15:49 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A6647A1; Mon, 15 Jun 2015 07:15:49 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bbn0109.outbound.protection.outlook.com [157.56.111.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3004EB43; Mon, 15 Jun 2015 07:15:47 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from BLUPR05MB769.namprd05.prod.outlook.com (10.141.209.19) by BLUPR05MB935.namprd05.prod.outlook.com (10.255.190.155) with Microsoft SMTP Server (TLS) id 15.1.184.17; Mon, 15 Jun 2015 07:15:46 +0000 Received: from CO2PR05CA047.namprd05.prod.outlook.com (10.141.241.175) by BLUPR05MB769.namprd05.prod.outlook.com (10.141.209.19) with Microsoft SMTP Server (TLS) id 15.1.190.14; Mon, 15 Jun 2015 07:15:46 +0000 Received: from BY2FFO11OLC010.protection.gbl (2a01:111:f400:7c0c::198) by CO2PR05CA047.outlook.office365.com (2a01:111:e400:1429::47) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Mon, 15 Jun 2015 07:15:45 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; FreeBSD.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BY2FFO11OLC010.mail.protection.outlook.com (10.1.15.21) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Mon, 15 Jun 2015 07:15:44 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Mon, 15 Jun 2015 00:15:44 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5F7FhD43003; Mon, 15 Jun 2015 00:15:43 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id BEFBA580A3; Mon, 15 Jun 2015 00:15:42 -0700 (PDT) To: Craig Rodrigues CC: Dimitry Andric , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284370 - head/usr.bin/kdump In-Reply-To: References: <201506140330.t5E3Udm8097264@svn.freebsd.org> <038E4912-D9DD-4306-8429-15054B15AFCE@FreeBSD.org> Comments: In-reply-to: Craig Rodrigues message dated "Sun, 14 Jun 2015 20:27:33 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Mon, 15 Jun 2015 00:15:42 -0700 Message-ID: <2474.1434352542@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC010; 1:FrSPgqlUqOKZ6TOt3CpzPuDvryM4ePL4GJGTqEE9ODbcMZbgtH/p4s0OpWXb7s7ZzyVlrCWdtiVy6baGZKhHMJEgi5vPUoSxlJWLp1sjQ+gF8EsS/Pso4EGCH3C5cHBiXeOL9LWh5L71x8mT9cyp3ZPaKf5Nv4Il6lKeubZfoKMJrH9cUOzFTki2+H5BwSsrJXF2EjIyydFDsuzJ3GeUIlRTdKYcMdAxk0LQDF8LoKRjih1MToAxWqgxNYvRRhaEgMNWN+5lisDX21b1cbdZnho1LKXRyqEw/Frm5XF+yVo= X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(24454002)(199003)(189002)(51704005)(450100001)(62966003)(77156002)(19580395003)(19580405001)(6806004)(2950100001)(76176999)(117636001)(106466001)(50986999)(77096005)(15975445007)(86362001)(558084003)(189998001)(87936001)(110136002)(5001960100002)(48376002)(50226001)(33716001)(50466002)(47776003)(57986006)(76506005)(92566002)(46102003)(105596002)(62816006)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR05MB769; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB769; 2:vHjiOViGQ+shncW4VVhj+gP+gPG4Db1uoJr+qvOYWS+QPPdYNOtEZm6QqjDSr4l+; 2:IoqkYkPoZi0EPOeDxHJySn7RQDQSsK46B6kuN73uLFf9cJ+P5RLXuqblDDWICBhI/P9uhPdC8OmLYUogbC0lqoW9VHpvfFge8IiL9I8kMThsmw4y7r8bFq7hVVY63STfR7dKEuBJOom4haHy9KBORhmbaw8bsZuifHCTuGsL25Bqa4Jr71zv0x7HKbmQ+bMgt4ETBohWpiJTnIu2hPljJh2uax0B4kZ6HSwONDH8Izo=; 6:fVhfnRujGwYc3K/0/uQ5HkcSbKIteQvaxXtd/rI5LgYbXN7O5b7PCifjBsoxtvqZf5IOK7DCvIFjgKOzTu07m6HCy4YUG6P+72daSRUwtQKFm/amcBa97ycr59EkZ5H10wD9Pdud0lqf57Ldq9GqtJkYFCdalZXVvn3QcuERIKQ0mSxX8+JZVBHJyuQQMJ+IUm+JeM184eLHL8wIdUsoQm2P/H8JBCImxFy3iqEFuDxFhi1MIuRFAjOOWNFyVY1TJwfIMnBHvvPPIy0EPgZGLuDXI/At/8HwVVxqQObLCvMlBFg66h26AAjQ5TdwXohEkOopF15KTrzW8vthfKSlVHoR0Bs/snO+Z1hwpCdU9XRATYi2/6g+9ibjTB/N7fbOU7wn+wfsx14qF3Yr6tbmVx0JlOAcBSNE4hbU0xix88lv0+R9LF4OV+akBBgJdLk4jnBxNVslVCr21eXnUvxphqeuwhQiN8iz34DuxuNwiTwqI6oox7Eu+4RlP2UugUBu X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BLUPR05MB769; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BLUPR05MB935; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(520003)(5005006)(3002001); SRVR:BLUPR05MB769; BCL:0; PCL:0; RULEID:; SRVR:BLUPR05MB769; X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB769; 3:VKiMAuN4hvWy6Q+FQxdS7NbT7g5VUx/O2/6k/e72Nd/O74zTUOTPIVTfKbKN8S7J1luQob5C1llJbL/YTagLtsToZ47iUmaB7QZ2v6wve1LOqQRjYbbSNl7Bo/m1hMfuA8fvCkkO/kTmsQb5oqdtzee0dr228WHid3UHOjqCUB0Kej7et7a6Ew3I0WF9IVPjtGucNLGmXVMtqhL4fraI4PkNDBOmEjw2mU+BW7NgGn2MW1WX4ccrKoOPBREPE8xR5WIafJvbwMPqozHc8pBhCsfJqNaYEBHJXuvwrejg5/Y0dNTiFsOWn7w79hrJg8Gc X-Forefront-PRVS: 0608DEDB67 X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB769; 9:MMM46XMylkD7LrNyK4R+Z9XxJjoqfOQ4r4OBjPWusCtcPNXMbsGgR3+fG8gynUktGFeS0Xz8T/SiCLQhISzR/5WWaG6DuoBkD/Uk141JfjnIwIHEi/Deb0VgaNZIGzpt0md8e4HXyCDBKL20aUZ3X9A6NhLcTrBQGWmCKoFJG2KfEsUha/zIKenDdVfMb9NcOCCFwEi//vFdSAZ3aYDHG9QISNDbhDS+jie4bqeTM8TR63s99Hqy9cjGHrWUi6VdX4iZ+F28A8PH1QlvsbXnyipStqI62vITPM7DJ6ewT1hUS4Z7q56gr2A9dYl4roKROMQLB06p20GXH70KzdPvE95GzNff5YUn3FeKsv0aveQ4bub/vB+Ez1Pxq9xXZ/QW/UntgkaeX23W/kPEoVDEhCLoWNQLoPy/uOLpCRrQ3UKIL9wogaDHq1SYcnjk+pg2udDVmWvJ4w9cHpoO6aneOxg3ULo6D1PbrmApL5xdYGz+MHX2e+RCQR4n2xMo6h2RtwWcopITb1Ftoqntq6fh5EejhwZA1FApFqWXvhixhxWtRt8ujXVRoX/gpgJv5dvRf0EAiw+YvdRf3tgOP3jKxAXDB6arwqnAroOXBMSJbl7tTViLth+QvCPjQse5ddxgSlq+8ri92QldFbBVJ8E+/EAIygtaI3I3O6U+xNRPaF5QqBX6p9cOJRRvqAPG68cgJKcybxmngUZXuT1WoXQ5Roe/DHEutWLD6TUUI3aQEwq2DfspiQUXyR8++Kl5o7sLe6StwSyL+NByNpvgU/rHUlshk1Zz0G7UIx5hkuf4TGpgLrv7m0tvcZjlZdZYJBMofo1w4+ra9GA2IQYTLiexSmYqGk043vLNXYl2UUkfNgek0zd1xT0qmzENUZ2nHAuASmQqCAxnv/wVa6lB09ULgfrosDw3qD7U8xtsH5nFpsLNYd6S/OOybxyg3XYY/FIF X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB769; 3:QA9Wb5SW8UDf/rz/bdynljzWKPHXKmeeTDVBkggLGUm+JCkpJAXVk1iTVF0nPSFfXAN5L7qQK2AmaZ8ZBYfYf88RUSg69nA4UTVpYteKGjvZGt4HQzoXPeLlhtgg3AOX9a6+Q5PIqU9CRoYvLB5zHg==; 10:1g0BfUBcocuCHZYJXqwZB4f9cN1MEDiiZ3OTDxgCc/RjNszafDrcd265lR5TLeeuYVcgmaSw/kmc7Qk46JBj8QExSsy2ulxDqf6BwMtDvK0=; 6:UNGyYDQ2b0guZ1kjIoCCZXv6oEZlrWnqfSjPySGLzVa38//edkAk8ltkWIEnY75o X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2015 07:15:44.9695 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR05MB769 X-OriginatorOrg: juniper.net X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 07:15:49 -0000 Craig Rodrigues wrote: > I got the same errors here: > > https://jenkins.freebsd.org/job/FreeBSD_HEAD/2869/consoleFull Looks like you fixed it - thanks From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 07:25:53 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AD291B2F; Mon, 15 Jun 2015 07:25:53 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0102.outbound.protection.outlook.com [65.55.169.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D2DD1E46; Mon, 15 Jun 2015 07:25:51 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from BL2PR05CA0015.namprd05.prod.outlook.com (10.255.226.15) by DM2PR05MB719.namprd05.prod.outlook.com (10.141.177.151) with Microsoft SMTP Server (TLS) id 15.1.190.14; Mon, 15 Jun 2015 07:25:44 +0000 Received: from BL2FFO11FD054.protection.gbl (2a01:111:f400:7c09::159) by BL2PR05CA0015.outlook.office365.com (2a01:111:e400:c04::15) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Mon, 15 Jun 2015 07:25:44 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BL2FFO11FD054.mail.protection.outlook.com (10.173.161.182) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Mon, 15 Jun 2015 07:25:43 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Mon, 15 Jun 2015 00:25:42 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5F7PfD47077; Mon, 15 Jun 2015 00:25:42 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id ADBC8580A3; Mon, 15 Jun 2015 00:25:41 -0700 (PDT) To: Julian Elischer CC: Dimitry Andric , , , Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... In-Reply-To: <557E51B4.1000102@freebsd.org> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <24490.1434318198@chaos> <557E51B4.1000102@freebsd.org> Comments: In-reply-to: Julian Elischer message dated "Mon, 15 Jun 2015 12:16:52 +0800." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Mon, 15 Jun 2015 00:25:41 -0700 Message-ID: <25709.1434353141@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD054; 1:MYjLcQpOa6PLcKouRxh3VRIVvGIv2oxxtd8iwPmoYP4tAPn+J+nat3HZ6oMdExryV1O80igxZLQ5ABjD7OKJRmabTo/qh1UzDeslESsVYWpI7Mz5w/fGO5WIKI/LuLBnkZ9RlP7PtQ/TvmnZjFEgNnnWvSVPaahD/kfIDC3k5UrWOkNQleoywysHjQaMpHgdReLRlcHXsAJPICqWvMJOaS+Je0z4Fq/xlxE+Jz7JB+HKcLGAH6ZGm7cDAMVLnmDf+VohSicC9Vy1dfsyNooPO7pOoc458tslnjHfpzQfegM= X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(24454002)(86362001)(33716001)(77156002)(5001960100002)(110136002)(76506005)(47776003)(92566002)(57986006)(50226001)(6806004)(2950100001)(77096005)(117636001)(450100001)(62966003)(46102003)(93886004)(105596002)(106466001)(19580405001)(50986999)(87936001)(48376002)(50466002)(19580395003)(76176999)(189998001)(42262002)(62816006); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR05MB719; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB719; 2:R0ykzvrB/kfqsrvy4rxoEDr/mHjLWXN8wfMkIrTKB4syBn6DWUHp3b/n2HBN7MiJ; 2:c3l7qqSTBizM0FoL4IFbCG43xpJtUfPCAIDnG3JgVyTflsCNh8NGrha0IdBCKK8DBTvnbtP893w2k6xQwhV3Oi2EMBI1DUogeu/rrXhvDapIiS3RkM+b8PO279OwiF1+fOZlQwli2aOl8hi5ew+2Ss0w0fVHCYTlmGiJCZHj7wqNIY5nVhNVG3wGoi3TmWH+Fqp1uVTHtLGsnZkN4078rlSpQFK5JiJNEy9e+G98Qwc=; 6:Y2OghH3qYWjFsjJA95YAxsG1dvaalAqx9PtsVJy4Trn2u1BBvmj8pEMWXbRouCr1JTMr5nfa8aAfyyWcCOJiFj7JE8ZfZ+fTY6do3YPzm3iUabWCmxilJw0uP71YPV+a7mPGCXrAVv7o6iFYhKaV+ZEHAJEt3Rjdhsp9vmMAlQUpvmn3NS4rrCJ25d6jU+TcPtuomDiUQBlM1BGj3KyOK5zO+Cw223YEeb7k/gKcjy7euZH0qsQSeuoozo0Txoy9ItnTHwjU0Yf/p+G5yH/1ikM6P0AHYNLCkHhg1tm+Xe4Qpv2LY2c17jB+H2Uc2Cz/84GtXMSvbSZlPc2urohOFajB5GYUqAEq01oUcy/AmX14QUmU6+4lOxX9IV00p4FjP1cafczdM4NImSVP3PAP/aZcvVg6bSnq0V4G/eFr0PbhS8DT8SmdmDWfVO2q+c7xG7JfXKDLNDGF7NBQeg7udswRZaoyOdSOpSx3Oyo2gbCCtQUf0iuBqoAKUzAeNS2e X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR05MB719; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:DM2PR05MB719; BCL:0; PCL:0; RULEID:; SRVR:DM2PR05MB719; X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB719; 3:ykxVgROm8VigimXM+Y3tpC4sCNQLl00T3VaWAmbvq6Nv8SvfDy2TOiErvmva5Kapk47PtbjwZE3oZIkftlJSrw+qCvVw+rLPhRr7lNp7K8bK8F4+9rNcv30r2ekZ8FWGkFTv76SEVMbmXvHl7MpNSp0FKGT4Vf6DAW/c6qAz7pI33/kd8v3JKKi59cZZePsywMYIixrIxsxkRPj2OZPnXd3/knQsGZ6wccV3vGCj4wENQxz9X35HEn223DgzaHcJo3mvz+xcHRgH6654e2pgWpBcTeZTxTKlVj7lhsEiezGKVBlhuGWFjf+t5ixvKUIm X-Forefront-PRVS: 0608DEDB67 X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB719; 9:bUxEH/ogEKQqHidbZHfxAh2zZqMezT/mycHbC81HXzfAKMOX/0kQtj4QNuDo6rbtIcSjht+Bh7uMbW+GZz7cdmKzqLwe+00A/2Y/JFvLIKFt5ESlMwkJwtZb/5VGCFrDnuIdrNJzwEVvq+dv72sT4F3sjZPy0cVZo5Fs3PlsJSiuo1irS4RBv/EETDm/UXyJgDdkkP0kUXgx5Q3sD3c2kuA+U1AjO9yA7A3J2kXcfaO4YRshcxnNfLoc4L4x3Yy6b6WJgAWbWwJRaxvBvUFHoxCFavZWlfFXJQU+s8W60h4nYS+feVvVsSoqvTvhJoAtf9ojrPOvYAIrVHcbb8PRCazLfDkhS1VyW9pLRQ9WW6JUPgTGHIrIWupbuw79lILhNBJIdGEFRVY0zXZq1p8j/UtHCZehg/WPUnwdXkmTU0lmeCflJb8ROlQKY3MY2n336o3vD51lZ/SO3Xm9pNlfHQVFSsp/BZfAdvlxGlcH0z+Ejqhlr170EQgzCw7e1SzQk/JrD+X3TTjvmccETMhjRdM5D6RdAoBMfD2NevhNbQiCZ3zcwhtuPT76cL5AvkJyD30nZdNVgbfZ0kB2N7BbYQHxS1TLV0wQND5K/jMZEdICoxDIPw9akmjpi+hiUCFuiO32gh3nTSpGq2QWxCDE9Eu4R1FnD43po5X4YHeBJDmTM8FbhiSwXdmgzMLiGJqxjdJW1FznbYt5RBR+OIeXS6cvk6Nb46DzmRCEzli1LLbyPNOeE9r/SMa0hi/Ii6n8qvRD388FTdR9HyVs9wMEQCrK4+D0Q3U53IUmZ2vYqZ9249BYj6Lzi+mrWcfPaMZFgVWoXwUHccIUz8pJW07LGbew2MK8HQ7axjq3VeZraD6zAl96otWc38gj48MJ8KWyWPFrGwK3KxuRrgACvQnpTQ== X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB719; 3:fVfazANJOsf2UHwPbqjB72otT0zw6sXhVqtKklY7CbMu/36AKnWvB/mT/zLj1c6lMgut1nakpWrmM5a9oUO29L3NRETa9brklqli/2dVFeg3NoAWAV0XUeFkOeI3tNi5Ow5oXO/a4TnWVRf2vQVAuA==; 10:IWn5Zj/gfKwS8h1rxCjQt/PR3sEDq73uBj59LtUP1bLRg8+rH2paYYpYeuDT6eTSLAy6c5LwF2tc/NLqx588BoMQw+/6N2nA3V9zy/2Wv+o=; 6:WbUdzc7nIKxA+c4aL26Tzf/JDpOlQxrdTNBvKf2MZagxdzLp41vIER9RsvJo34y+ X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2015 07:25:43.9368 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR05MB719 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 07:25:53 -0000 Julian Elischer wrote: > As long as there is a REALLY EASY WAY to regenerate them and it's well > documented, Building each directory (in meta mode) is all that is/should be needed. > EXACTLY the same output > each time unless there is a source change, (so svn doesn't see a > change if there is none) Yes the results are stable - in the absense of bugs in makefiles. I think I fixed all those in the projects/bmake branch, but it is easy to introduce new issues. Anytime a makefile changes its behavior based on the existance of something it risks churning the dependencies b/w clean/update build. This same tech has been used by 1000+ engineers daily for a number of years now, it has made it much harder for them to break the build. > then I guess having them checked in is ok. (though a bit "yucky"). > I'd like the ability to make a full make however that DOES regenerate > them if I feel I have the time. When we've added targets to build system packages etc, then that should be simple. I still need to catch up with what bapt has been doing on that front though. Thanks --sjg From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 07:49:17 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0D529F3E; Mon, 15 Jun 2015 07:49:17 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0124.outbound.protection.outlook.com [207.46.100.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C751237D; Mon, 15 Jun 2015 07:49:15 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from CO2PR05CA026.namprd05.prod.outlook.com (10.141.241.154) by CO2PR05MB713.namprd05.prod.outlook.com (10.141.228.147) with Microsoft SMTP Server (TLS) id 15.1.184.17; Mon, 15 Jun 2015 07:33:46 +0000 Received: from BL2FFO11FD005.protection.gbl (2a01:111:f400:7c09::153) by CO2PR05CA026.outlook.office365.com (2a01:111:e400:1429::26) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Mon, 15 Jun 2015 07:33:46 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BL2FFO11FD005.mail.protection.outlook.com (10.173.161.1) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Mon, 15 Jun 2015 07:33:45 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Mon, 15 Jun 2015 00:33:40 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5F7XdD51042; Mon, 15 Jun 2015 00:33:39 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id 7C445580A3; Mon, 15 Jun 2015 00:33:39 -0700 (PDT) To: Julian Elischer CC: Craig Rodrigues , Adrian Chadd , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... In-Reply-To: <557E54D5.7080004@freebsd.org> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <24490.1434318198@chaos> <557E54D5.7080004@freebsd.org> Comments: In-reply-to: Julian Elischer message dated "Mon, 15 Jun 2015 12:30:13 +0800." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Mon, 15 Jun 2015 00:33:39 -0700 Message-ID: <3687.1434353619@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD005; 1:Jhmdxptw7B6K4WkWQknQEo2vCHa6qaZyFmMF1MJeIA6bx2eEJcJZml2B1LsNOZuVn8XK2ToWYR6AzHlluOVWs50VJCMuHuyukHoSv+kAXTT06j3CR0xBOsn5KbDeP6YS9yh++QelDCc7GzYOoyzvNqYjEnEzCmmg/UDtws1Sqs74CfslTi/SVgSg4ie+0bwsLzsiQrv6LWthQSvCcOHXPOnsbgOXU7qoBIjKz258xNJKi+YQaQj+EPcnru87mdgDYoBFKA9KT81bDVwJo8IEuaQNHCn3vhktuNwnvlb9+fw= X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(199003)(24454002)(189002)(5001960100002)(450100001)(92566002)(62966003)(87936001)(189998001)(77156002)(110136002)(2950100001)(19580405001)(47776003)(19580395003)(50986999)(93886004)(77096005)(76176999)(46102003)(86362001)(57986006)(6806004)(117636001)(105596002)(50226001)(48376002)(76506005)(50466002)(106466001)(33716001)(62816006)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:CO2PR05MB713; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR05MB713; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:CO2PR05MB713; BCL:0; PCL:0; RULEID:; SRVR:CO2PR05MB713; X-Forefront-PRVS: 0608DEDB67 X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2015 07:33:45.5272 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR05MB713 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 07:49:17 -0000 Julian Elischer wrote: > I think a make MAKE_MAKEFILE_DEPENDS=1 (build)world is an important step > requirement.. You can do 'make buildwork -DWITH_META_FILES' and it will produce meta files - they can be very handy for debugging issues - like headers comming from places you didn't expect. My original plan was in fact to do just what you suggest - to use that for seeding the dependencies. That's what we did with the Junos build and it was very painless, but it already worked the way we wanted it to (visiting leaf dirs once only, and in the correct order). Buildworld works nothing like that, so I soon gave up on trying to extract useful tree dependencies from it. It is theoretically possble to add enough filtering to extract useful results from it, but it is far easier to just use the meta mode build to update itself. Which is what I've been doing on the projects/bmake branch for the last few years. From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 08:01:35 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0331C2A9; Mon, 15 Jun 2015 08:01:35 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0104.outbound.protection.outlook.com [207.46.100.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6C4B39A4; Mon, 15 Jun 2015 08:01:33 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from BL2PR05CA0025.namprd05.prod.outlook.com (10.255.226.25) by CO2PR05MB713.namprd05.prod.outlook.com (10.141.228.147) with Microsoft SMTP Server (TLS) id 15.1.184.17; Mon, 15 Jun 2015 08:01:25 +0000 Received: from BN1AFFO11OLC002.protection.gbl (2a01:111:f400:7c10::155) by BL2PR05CA0025.outlook.office365.com (2a01:111:e400:c04::25) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Mon, 15 Jun 2015 08:01:24 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BN1AFFO11OLC002.mail.protection.outlook.com (10.58.53.73) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Mon, 15 Jun 2015 08:01:24 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Mon, 15 Jun 2015 01:01:22 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5F81LD63674; Mon, 15 Jun 2015 01:01:21 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id 77F02580A3; Mon, 15 Jun 2015 01:01:21 -0700 (PDT) To: Oliver Pinter CC: Garrett Cooper , Craig Rodrigues , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Baptiste Daroussin Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... In-Reply-To: References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <950C4B23-B625-4173-A7C4-A4F1B2C5771D@gmail.com> <306889B5-3417-467C-965F-B011866E6F15@gmail.com> <450D8D9A-CBF2-445A-8221-4CD353591549@gmail.com> <16996.1434316874@chaos> <094A5FA6-7DB8-485E-84A8-C15D2A0BC9F6@gmail.com> <4710.1434319205@chaos> Comments: In-reply-to: Oliver Pinter message dated "Mon, 15 Jun 2015 00:06:15 +0200." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Mon, 15 Jun 2015 01:01:21 -0700 Message-ID: <26116.1434355281@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11OLC002; 1:D86t4pEXLNtnjL1F8Xx0SmMa13iRr9E5mJe+ocHM3nTqhmSM3vvNe+H5232KcVudftlHT2X7tqL56yaaFVWUWurFsREQo/D7G3mvHt2VsCK+q7o+FazXRRGb+BQbvLk/Q7DJX0aayXO8tzvB7V3+prbunSIq/VLM2MPRI/4IjZChHqvc9N04d1QBHwdUGi3jRUAARpXIgLbrTWej5J0oKu8qF8aBzsi//xKulzgzghwFW2T1d8COv6bRT0CMFjeYwehT7/i2KSbX77rly9r5A8FWLXmI/F/qM9ZYIrgB5cbLILf3zhpNjU41x8ZZQh3sJQpK+PsjlNEvexMkQvqOHw== X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(199003)(51704005)(24454002)(479174004)(189002)(92566002)(5001960100002)(62966003)(87936001)(189998001)(77156002)(110136002)(2950100001)(19580405001)(47776003)(19580395003)(50986999)(93886004)(77096005)(76176999)(46102003)(86362001)(57986006)(6806004)(117636001)(105596002)(50226001)(48376002)(76506005)(50466002)(106466001)(33716001)(62816006)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:CO2PR05MB713; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR05MB713; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:CO2PR05MB713; BCL:0; PCL:0; RULEID:; SRVR:CO2PR05MB713; X-Forefront-PRVS: 0608DEDB67 X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2015 08:01:24.2821 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR05MB713 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 08:01:35 -0000 Oliver Pinter wrote: > On 6/15/15, Simon J. Gerraty wrote: > > Garrett Cooper wrote: > > > >> Breaking source upgrades to later versions is painful. We want to make > >> sure fmake at least works with upgrade_checks so people can upgrade > >> from earlier versions of 8/9/10 to 11 without having to deal with a > >> lot of pain. > > > > I agree but 8 -> 11 is a very big jump. > > Simon, how can I update these dependency files? Is there any exact > command or make target or something magic-tool? They are updated as a side effect of building (successfully). But that requires -DWITH_META_MODE and the filemon module loaded. Since there are not yet any targets for people to build what they are used to (and the fix for filemon to trace openat needs to be MFC'd) I don't expect anyone but me to be updating these any time soon. Thanks --sjg From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 09:39:39 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BBA08C53; Mon, 15 Jun 2015 09:39:39 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0133.outbound.protection.outlook.com [157.56.111.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BF2011F7; Mon, 15 Jun 2015 09:39:37 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from BLUPR05CA0059.namprd05.prod.outlook.com (10.141.20.29) by CO2PR05MB778.namprd05.prod.outlook.com (10.141.226.151) with Microsoft SMTP Server (TLS) id 15.1.184.17; Mon, 15 Jun 2015 08:06:26 +0000 Received: from BN1AFFO11FD042.protection.gbl (2a01:111:f400:7c10::142) by BLUPR05CA0059.outlook.office365.com (2a01:111:e400:855::29) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Mon, 15 Jun 2015 08:06:27 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BN1AFFO11FD042.mail.protection.outlook.com (10.58.52.253) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Mon, 15 Jun 2015 08:06:26 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Mon, 15 Jun 2015 01:06:24 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5F86OD65321; Mon, 15 Jun 2015 01:06:24 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id 24AD6580A3; Mon, 15 Jun 2015 01:06:24 -0700 (PDT) To: Oliver Pinter CC: Dimitry Andric , , , Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... In-Reply-To: References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <24490.1434318198@chaos> Comments: In-reply-to: Oliver Pinter message dated "Mon, 15 Jun 2015 00:19:41 +0200." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Mon, 15 Jun 2015 01:06:24 -0700 Message-ID: <15939.1434355584@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD042; 1:eP1LU/09OWvKFVY3cWXQxpi+sWo1rEygx9qd1viW1Mxr+osLd0akynoPOGoys4JLpP9ePVH0DDSdOgzIN/Kf6b58OQT0PgZaiOGPNSHB+Y1Cop6fHcf6mR0FT9EiF61ohBY8gIoHfJOuCq/Lhbt4vJkDqiH+4SePNMbEQ7FIhkV8cumyj+eOBRSZxfEhe9qSa0+hK/b7Og182D7FXdq30u5HD3bay2RIPyeZU5WUW7bhGMX1C4Dwc6mF8s3pyOLIZR4Nm8Z3A63vw9NlDd6Fm8+dmwvv/Cg02l1HYQrLRxAo3GslUMsNJOl5RyHSnrKsw91/SDPmpTN6S270nFIpNw== X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(279900001)(24454002)(189002)(199003)(51444003)(51704005)(117636001)(2950100001)(77096005)(87936001)(19580395003)(57986006)(93886004)(189998001)(6806004)(86362001)(50986999)(5001960100002)(105596002)(76176999)(46102003)(19580405001)(33716001)(92566002)(47776003)(106466001)(15975445007)(19625305001)(50226001)(76506005)(110136002)(48376002)(50466002)(62966003)(77156002)(62816006)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:CO2PR05MB778; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR05MB778; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:CO2PR05MB778; BCL:0; PCL:0; RULEID:; SRVR:CO2PR05MB778; X-Forefront-PRVS: 0608DEDB67 X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2015 08:06:26.1000 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR05MB778 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 09:39:40 -0000 Oliver Pinter wrote: > >> * Or are you now the maintainer of these .depend files? :-) > > > > For now, yes. > > I think that's the only reasonable approach at this early stage. > > Cool! What is you github account? I like to add your access to our > repo, and please fix this issue: > http://jenkins.hardenedbsd.org:8180/jenkins/job/HardenedBSD-master-amd64/133/consoleFull > > Craig already fixed that - nothing to do with Makefile.depend btw From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 10:48:49 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 934F87FF; Mon, 15 Jun 2015 10:48:49 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7FAC26EC; Mon, 15 Jun 2015 10:48:49 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FAmnMD039080; Mon, 15 Jun 2015 10:48:49 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FAmnF0039077; Mon, 15 Jun 2015 10:48:49 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506151048.t5FAmnF0039077@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 15 Jun 2015 10:48:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284409 - in head/cddl/lib: libzfs libzfs_core X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 10:48:49 -0000 Author: bapt Date: Mon Jun 15 10:48:48 2015 New Revision: 284409 URL: https://svnweb.freebsd.org/changeset/base/284409 Log: Fix circular dependency between libzfs and libzfs_core libzfs_core is the wrapper around kernel ioctls, the ioctl compat code belongs to it Modified: head/cddl/lib/libzfs/Makefile head/cddl/lib/libzfs_core/Makefile Modified: head/cddl/lib/libzfs/Makefile ============================================================================== --- head/cddl/lib/libzfs/Makefile Mon Jun 15 07:13:23 2015 (r284408) +++ head/cddl/lib/libzfs/Makefile Mon Jun 15 10:48:48 2015 (r284409) @@ -37,7 +37,6 @@ SRCS+= libzfs_changelist.c \ zfs_comutil.c \ zfs_deleg.c \ zfs_fletcher.c \ - zfs_ioctl_compat.c \ zfs_namecheck.c \ zfs_prop.c \ zpool_prop.c \ Modified: head/cddl/lib/libzfs_core/Makefile ============================================================================== --- head/cddl/lib/libzfs_core/Makefile Mon Jun 15 07:13:23 2015 (r284408) +++ head/cddl/lib/libzfs_core/Makefile Mon Jun 15 10:48:48 2015 (r284409) @@ -11,7 +11,8 @@ DPADD= ${LIBNVPAIR} LDADD= -lnvpair SRCS= libzfs_core.c \ - libzfs_core_compat.c + libzfs_core_compat.c \ + zfs_ioctl_compat.c SRCS+= libzfs_compat.c From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 11:13:30 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 489CE16F; Mon, 15 Jun 2015 11:13:30 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0148.outbound.protection.outlook.com [157.56.111.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 78AECE32; Mon, 15 Jun 2015 11:13:28 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from SN1PR0501CA0015.namprd05.prod.outlook.com (10.163.126.153) by DM2PR05MB784.namprd05.prod.outlook.com (10.141.179.155) with Microsoft SMTP Server (TLS) id 15.1.190.14; Mon, 15 Jun 2015 07:39:53 +0000 Received: from BL2FFO11FD010.protection.gbl (2a01:111:f400:7c09::119) by SN1PR0501CA0015.outlook.office365.com (2a01:111:e400:52fe::25) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Mon, 15 Jun 2015 07:39:53 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BL2FFO11FD010.mail.protection.outlook.com (10.173.161.16) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Mon, 15 Jun 2015 07:39:52 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Mon, 15 Jun 2015 00:39:51 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5F7doD52310; Mon, 15 Jun 2015 00:39:50 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id 75329580A3; Mon, 15 Jun 2015 00:39:50 -0700 (PDT) To: Garrett Cooper CC: Craig Rodrigues , , , Subject: Re: svn commit: r284407 - head/usr.bin/kdump In-Reply-To: <771B8E77-0CEF-4200-80D2-E7B7025F3BB4@gmail.com> References: <201506150648.t5F6mhLV021180@svn.freebsd.org> <771B8E77-0CEF-4200-80D2-E7B7025F3BB4@gmail.com> Comments: In-reply-to: Garrett Cooper message dated "Mon, 15 Jun 2015 00:04:51 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Date: Mon, 15 Jun 2015 00:39:50 -0700 Message-ID: <27213.1434353990@chaos> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD010; 1:wxTlUSyn/UQ5rSKqcyFYgG+g3WaJcu+OxCZMr8Ae9fa9G3moh6Iffaa0+J1eccxRMTZ9EyS4GGDXI5uxsdqs7KLTjDByhLq2OfBQv5voLfTuWC1BAF6gJ4ppxnGIiHyrIzDZxGCEuZiSlTTk4Zw4cRu5Hbn7aLb8X4TPZIz4GYQosnxuqv1505xazvj2s2XzfufOGgj1WrtzLu4i04DXClyHzEMybVwJfaSnZREYiXv8VBP8SDrmH+N4hTjwENhkn6MonjGSRB2tpPywIISHqTq5HdAs4P/4HFGgT6IdKSNUNhyZyT5DyQS0uaNhz6635btEczG4zck3u/Y2g+M5Ug== X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(24454002)(51704005)(199003)(189002)(92566002)(23676002)(47776003)(77096005)(117636001)(57986006)(62966003)(46102003)(110136002)(2950100001)(33716001)(77156002)(189998001)(5001960100002)(6806004)(87936001)(76176999)(50466002)(76506005)(50226001)(19580405001)(105596002)(106466001)(86362001)(50986999)(19580395003)(42262002)(62816006); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR05MB784; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB784; 2:b0H+dOCpCOWEq9RFBXTyxSIvWtUFYFoRDIkJsrY2/IUhApWP7fOAAeJ5zaHrWz3I; 2:timukCQ5bAPg1V1Mt/49GcEGZ01TAlNWOU0B8PdoAhvD728dF6+vjB3M4ATUAgsuRDDibOXVyuGWCRrgJKMPXIo2KaX80nxspRyOX4Ghvg+sVrpHyoJ56MUc3mz9MjN3VwWwx7teb/q2fMqryPkY/P/mxU4iS3/SBT+u9VYGWMEJskc3ulBj9uUlp6cibiPOcItBvEs43UKmc/cXNQgZ/ZgD+F7+1IC4CgBJ0OfJn1U=; 6:HSx7fgCThpsVwfjLxhp9fYNZF4SMHGBIIbIBRX7Imq7uoGX57nFHv91N2EUd0h+MQEeYYg1g3Q3NuO5aMl0wIsXMlAGXGYtyjsegX8IQHf6/p3U1lNEdmtYboAwClElBDTjkqoVeIl25aK7hcJQsvrKignsL/YMe/gT7d8jcOmbCsY7cRomho4PhIBNzj/ngFVHxb7/V7XE3rCLse5GC+EIqatYBjHuP5xJOOA4sXelvxgu4MZCirf6tqNeoCMeXGFWvkJSr0ZJk93NdI/S5EbEQE8vpy6gJ5nkyy1FvgPvKX8VPIiRBxPu/6u6DdzubcEfz+Dv1/lB9kh9uAFrURd5ApMoyzj7s6HGj89KYqBChKI9M3q10Jbkg4NaDJJVO8g+3fZoSVk9VJOQTdxG3ErS7BqeNWJK9gZqEKVxMC3iX4n6N72+kyygSeXhkNe0gz1JAI3FfMddOBKDGYQQ6LZWJi+XqySAEbDoa5IeEE+BT+TB17UFz52HI9pCnbmxl X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR05MB784; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:DM2PR05MB784; BCL:0; PCL:0; RULEID:; SRVR:DM2PR05MB784; X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB784; 3:pzQ5WyATRNjRBm/PdUvrtGIje/IOpHDD4fs21kd+3dfZ2M5Iw6deR2ClZ1EjQerP7c2pXg5zJBAupBN1+0dEW/8YBgXrNxpWImkyF5JaVpzA+oEJ26vSTui92XvubxVKmSZ5HScxt97wcQZ8yT4Ei8XDriLVlybUQ0/+Z682tM/5ZzaCqmShtu8HCq1APiarwIs2KQqSjfXMOzcUZYSPndy7JIrc+fS9f2v/XWT9iDUn0m3Aoz3SLcqZ6Se9G55H2Rm6TGXFYpCj+a9myVw5APFzGFRnPVXyvvR4dZtAe7HxFQ6bBepKBPWsBaqFYBOb X-Forefront-PRVS: 0608DEDB67 X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB784; 9:0j9d3eqReV/IpTUPOC1gZx7V30HAw/VAVCzv4hhI5/TyAUPSG3jLw4nDt8FsoQp6ddvcntmICHFhn3oGtfD05u1/JFh3Hm6gOragvIuU76cN8Oc47EYkmMtp2WssIrCayPVOKf3ewknAsOpcPWy6I/TGX/5rSkylCzxWkWsxsflwcobYWdU6AV4jxLq3Y0+usqmifn5U3aS5OOxKU0TNJzOyczVbBgkUZXmU5fTsZIyRNy+hUvBh1VdB4upNCY3S4TF1FifDOoqKGfGG9c4JBVOir6WrfS85RtA7XmTARGIvfHk5yCbnLd86G3gCT9x2esgzR88O5SYrPTDVTSE+55DHGq0x/Lyp3oml5DzvkdisIulWGfYlYluMEK+3F3ivvU+uN3C+E7mOwWTo+LO/6OBY9wqKnh9dwQ0WkGSJcaGA47x6aDoVZR0NLnOSjqIalC8mYzYul7Y8IKYM5PLaFUVYVyVkVfm4FCAG5T3tk48SGgyMuPsmCpVGDqbYmvS288k24OF2EXaCmwQd49Yy7OZqEkDrPnKakkO2e5lvBJTvLSUiWZHOHB3U/NGFzlh9yvA4Cezhrm/ImfHAQ4qNPjcoNqAzbXHjSzP7rnjyJdRjynfgYCJmDNCWluQRwVZz9DvVOmPMOojorXZomch79s0rQH9HsfnSDrv9YRaWbzPtRgvSQgGjcdjtMDxoCN5jGGu0Ie/UmAv3e8xH6NY/T907XMpC210iUxf8Hoj3hb4ciQRFcW7vB1fFcsirg9JMDXE2zhNZYhRd5LMhNSIsU1jPoOsOG/qjv3EKc3e3rlRtLI8+OBF+R83KI+DK7atNSSC9WiboKQZcWtmjyL8QSTaDw1JazOEB/jTihol4KOk4npFbQPtMqcIcTbgagX4W X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB784; 3:+s3xmJNt/5YREC9aAzyh5hlU/4unTNnOjGhkdABh+ZdauFb7BJOtdZ6lsSmNGcCGgWTkhpee6N7ozgQh5ZMBBb12ifofmsrJpYxIXD3gol4sDxXMHn4YbTW3uUf7WbM7TNGJd90gdtVWYELEiTXG6w==; 10:YyBAKEKwHk2caxanWdAJkxAvxyeibn59/7ZRyy+N2UGT2D+UCNOsdcm+8lkN3PdOtevv49fOf/7mj29VPEgTdqKtgc02JFOv8bminvlBah8=; 6:atXOuxBCvH0sAHtlk/mnMKUgOwR8YySVbL0M+tMJGryM4pmoDrEe8v6JiMKdMf19 X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2015 07:39:52.7424 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR05MB784 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 11:13:30 -0000 Garrett Cooper wrote: > > These files need to be generated before mkdep is run. >=20 > This is wrong (I=E2=80=99ve had to fix a lot of this at $work recently). = They > need to be added to DPSRCS so they will always be regenerated as a > dependency of DPADD. Not in this case. These things are never compiled by themselves, they are #included, so mkdep should work fine. Adding them to DPSRCS would probably be wrong. From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 11:54:16 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9269C29C; Mon, 15 Jun 2015 11:54:16 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id DF3ABA4D; Mon, 15 Jun 2015 11:54:14 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id OAA15602; Mon, 15 Jun 2015 14:54:12 +0300 (EEST) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1Z4Sxv-0008ko-V4; Mon, 15 Jun 2015 14:54:11 +0300 Message-ID: <557EBCAB.3010505@FreeBSD.org> Date: Mon, 15 Jun 2015 14:53:15 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Baptiste Daroussin , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Subject: Re: svn commit: r284409 - in head/cddl/lib: libzfs libzfs_core References: <201506151048.t5FAmnF0039077@svn.freebsd.org> In-Reply-To: <201506151048.t5FAmnF0039077@svn.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 11:54:16 -0000 On 15/06/2015 13:48, Baptiste Daroussin wrote: > Author: bapt > Date: Mon Jun 15 10:48:48 2015 > New Revision: 284409 > URL: https://svnweb.freebsd.org/changeset/base/284409 > > Log: > Fix circular dependency between libzfs and libzfs_core > > libzfs_core is the wrapper around kernel ioctls, the ioctl compat code belongs > to it This is not 100% correct description. libzfs_core provides a stable, committed interface, so it has a number of functions that wrap ioctls, but libzfs calls many ioctls directly as well. So that compat code is needed equally by both, but given that libzfs uses libzfs_core your change moves things in the right direction. P.S. My personal preference would be to drop that compat code and to convince ZFS/FreeBSD users to always use boot environments, so that their kernel and userland never fall out of sync :) > Modified: > head/cddl/lib/libzfs/Makefile > head/cddl/lib/libzfs_core/Makefile > > Modified: head/cddl/lib/libzfs/Makefile > ============================================================================== > --- head/cddl/lib/libzfs/Makefile Mon Jun 15 07:13:23 2015 (r284408) > +++ head/cddl/lib/libzfs/Makefile Mon Jun 15 10:48:48 2015 (r284409) > @@ -37,7 +37,6 @@ SRCS+= libzfs_changelist.c \ > zfs_comutil.c \ > zfs_deleg.c \ > zfs_fletcher.c \ > - zfs_ioctl_compat.c \ > zfs_namecheck.c \ > zfs_prop.c \ > zpool_prop.c \ > > Modified: head/cddl/lib/libzfs_core/Makefile > ============================================================================== > --- head/cddl/lib/libzfs_core/Makefile Mon Jun 15 07:13:23 2015 (r284408) > +++ head/cddl/lib/libzfs_core/Makefile Mon Jun 15 10:48:48 2015 (r284409) > @@ -11,7 +11,8 @@ DPADD= ${LIBNVPAIR} > LDADD= -lnvpair > > SRCS= libzfs_core.c \ > - libzfs_core_compat.c > + libzfs_core_compat.c \ > + zfs_ioctl_compat.c > > SRCS+= libzfs_compat.c > > -- Andriy Gapon From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 13:43:24 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4076394; Mon, 15 Jun 2015 13:43:24 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 859799A6; Mon, 15 Jun 2015 13:43:24 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FDhOZC051848; Mon, 15 Jun 2015 13:43:24 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FDhO3n051847; Mon, 15 Jun 2015 13:43:24 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201506151343.t5FDhO3n051847@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 15 Jun 2015 13:43:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284416 - head/sys/dev/drm2/ttm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 13:43:24 -0000 Author: avg Date: Mon Jun 15 13:43:23 2015 New Revision: 284416 URL: https://svnweb.freebsd.org/changeset/base/284416 Log: ttm_vm_page_alloc: use vm_page_alloc for pages without dma32 restriction This change re-organizes code a little bit to extract common pieces of ttm_alloc_new_pages() and ttm_get_pages() into dedicated functions. Also, for requests without address restrictions regular vm_page_alloc() is used. Lastly, when vm_page_alloc_contig() fails we call VM_WAIT before calling vm_pageout_grow_cache() to ensure that there is enough free pages at all. Reviewed by: kib MFC after: 15 days Modified: head/sys/dev/drm2/ttm/ttm_page_alloc.c Modified: head/sys/dev/drm2/ttm/ttm_page_alloc.c ============================================================================== --- head/sys/dev/drm2/ttm/ttm_page_alloc.c Mon Jun 15 13:27:57 2015 (r284415) +++ head/sys/dev/drm2/ttm/ttm_page_alloc.c Mon Jun 15 13:43:23 2015 (r284416) @@ -155,6 +155,66 @@ ttm_caching_state_to_vm(enum ttm_caching panic("caching state %d\n", cstate); } +static vm_page_t +ttm_vm_page_alloc_dma32(int req, vm_memattr_t memattr) +{ + vm_page_t p; + int tries; + + for (tries = 0; ; tries++) { + p = vm_page_alloc_contig(NULL, 0, req, 1, 0, 0xffffffff, + PAGE_SIZE, 0, memattr); + if (p != NULL || tries > 2) + return (p); + + /* + * Before growing the cache see if this is just a normal + * memory shortage. + */ + VM_WAIT; + vm_pageout_grow_cache(tries, 0, 0xffffffff); + } +} + +static vm_page_t +ttm_vm_page_alloc_any(int req, vm_memattr_t memattr) +{ + vm_page_t p; + + while (1) { + p = vm_page_alloc(NULL, 0, req); + if (p != NULL) + break; + VM_WAIT; + } + pmap_page_set_memattr(p, memattr); + return (p); +} + +static vm_page_t +ttm_vm_page_alloc(int flags, enum ttm_caching_state cstate) +{ + vm_page_t p; + vm_memattr_t memattr; + int req; + + memattr = ttm_caching_state_to_vm(cstate); + req = VM_ALLOC_NORMAL | VM_ALLOC_WIRED | VM_ALLOC_NOOBJ; + if ((flags & TTM_PAGE_FLAG_ZERO_ALLOC) != 0) + req |= VM_ALLOC_ZERO; + + if ((flags & TTM_PAGE_FLAG_DMA32) != 0) + p = ttm_vm_page_alloc_dma32(req, memattr); + else + p = ttm_vm_page_alloc_any(req, memattr); + + if (p != NULL) { + p->oflags &= ~VPO_UNMANAGED; + p->flags |= PG_FICTITIOUS; + } + return (p); +} + static void ttm_pool_kobj_release(struct ttm_pool_manager *m) { @@ -461,14 +521,6 @@ static void ttm_handle_caching_state_fai } } -static vm_paddr_t -ttm_alloc_high_bound(int ttm_alloc_flags) -{ - - return ((ttm_alloc_flags & TTM_PAGE_FLAG_DMA32) ? 0xffffffff : - VM_MAX_ADDRESS); -} - /** * Allocate new pages with correct caching. * @@ -481,32 +533,17 @@ static int ttm_alloc_new_pages(struct pg vm_page_t *caching_array; vm_page_t p; int r = 0; - unsigned i, cpages, aflags; + unsigned i, cpages; unsigned max_cpages = min(count, (unsigned)(PAGE_SIZE/sizeof(vm_page_t))); - int tries; - aflags = VM_ALLOC_NORMAL | VM_ALLOC_WIRED | VM_ALLOC_NOOBJ | - ((ttm_alloc_flags & TTM_PAGE_FLAG_ZERO_ALLOC) != 0 ? - VM_ALLOC_ZERO : 0); - /* allocate array for page caching change */ caching_array = malloc(max_cpages * sizeof(vm_page_t), M_TEMP, M_WAITOK | M_ZERO); for (i = 0, cpages = 0; i < count; ++i) { - tries = 0; -retry: - p = vm_page_alloc_contig(NULL, 0, aflags, 1, 0, - ttm_alloc_high_bound(ttm_alloc_flags), - PAGE_SIZE, 0, ttm_caching_state_to_vm(cstate)); + p = ttm_vm_page_alloc(ttm_alloc_flags, cstate); if (!p) { - if (tries < 3) { - vm_pageout_grow_cache(tries, 0, - ttm_alloc_high_bound(ttm_alloc_flags)); - tries++; - goto retry; - } printf("[TTM] Unable to get page %u\n", i); /* store already allocated pages in the pool after @@ -522,8 +559,6 @@ retry: r = -ENOMEM; goto out; } - p->oflags &= ~VPO_UNMANAGED; - p->flags |= PG_FICTITIOUS; #ifdef CONFIG_HIGHMEM /* KIB: nop */ /* gfp flags of highmem page should never be dma32 so we @@ -705,34 +740,18 @@ static int ttm_get_pages(vm_page_t *page struct ttm_page_pool *pool = ttm_get_pool(flags, cstate); struct pglist plist; vm_page_t p = NULL; - int gfp_flags, aflags; + int gfp_flags; unsigned count; int r; - int tries; - - aflags = VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | - ((flags & TTM_PAGE_FLAG_ZERO_ALLOC) != 0 ? VM_ALLOC_ZERO : 0); /* No pool for cached pages */ if (pool == NULL) { for (r = 0; r < npages; ++r) { - tries = 0; -retry: - p = vm_page_alloc_contig(NULL, 0, aflags, 1, 0, - ttm_alloc_high_bound(flags), PAGE_SIZE, - 0, ttm_caching_state_to_vm(cstate)); + p = ttm_vm_page_alloc(flags, cstate); if (!p) { - if (tries < 3) { - vm_pageout_grow_cache(tries, 0, - ttm_alloc_high_bound(flags)); - tries++; - goto retry; - } printf("[TTM] Unable to allocate page\n"); return -ENOMEM; } - p->oflags &= ~VPO_UNMANAGED; - p->flags |= PG_FICTITIOUS; pages[r] = p; } return 0; From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 14:37:48 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 18F8F252; Mon, 15 Jun 2015 14:37:48 +0000 (UTC) (envelope-from mahrens@gmail.com) Received: from mail-lb0-x22a.google.com (mail-lb0-x22a.google.com [IPv6:2a00:1450:4010:c04::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 926A5832; Mon, 15 Jun 2015 14:37:47 +0000 (UTC) (envelope-from mahrens@gmail.com) Received: by lblr1 with SMTP id r1so28391042lbl.0; Mon, 15 Jun 2015 07:37:45 -0700 (PDT) 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=BrDfx30/+cRFyJZ0JZI4HD3xLLTC6O1bGGSqk56K7rM=; b=UbKb1QzQ7YEytUE1r4VaqgFu8UPOx537JZC1S7b0SlHnTECpGP4+wP1v+77hM8yPY+ cJO8MR0V1r0ClyvOrrKkYXKFqbjT17uATxHEwSvsDOX0BYS37L/37g09mJyj4/dOEHPZ /rIJ90JVYCIEXqINps875ekXLAiEXmMzVC8eZimXtipkfrZa7KTCRTs6YrPZGJVY8GW4 uC6m8ezB9nfbxbT4G4/H0DULGZzofZnhmJT9cHbTfViwc8uJFJELNFyc9qf/GhFURnuF MsU+nDbUhz+jXTrVlLLRZUJSvTbtaZx2/5as0tt0zu61CZMPpCeeEFrD5qnFs8jq8O6l OR4w== MIME-Version: 1.0 X-Received: by 10.152.9.104 with SMTP id y8mr6148574laa.104.1434379065387; Mon, 15 Jun 2015 07:37:45 -0700 (PDT) Sender: mahrens@gmail.com Received: by 10.112.163.65 with HTTP; Mon, 15 Jun 2015 07:37:45 -0700 (PDT) In-Reply-To: <557EBCAB.3010505@FreeBSD.org> References: <201506151048.t5FAmnF0039077@svn.freebsd.org> <557EBCAB.3010505@FreeBSD.org> Date: Mon, 15 Jun 2015 10:37:45 -0400 X-Google-Sender-Auth: EYzzLNVxHxgtezKNjgiKivhKiQA Message-ID: Subject: Re: svn commit: r284409 - in head/cddl/lib: libzfs libzfs_core From: Matthew Ahrens To: Andriy Gapon Cc: Baptiste Daroussin , "src-committers@freebsd.org" , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 14:37:48 -0000 On Mon, Jun 15, 2015 at 7:53 AM, Andriy Gapon wrote: > > P.S. > My personal preference would be to drop that compat code and to convince > ZFS/FreeBSD users to always use boot environments, so that their kernel and > userland never fall out of sync :) > Me too :-) --matt From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 15:34:31 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6F940C80; Mon, 15 Jun 2015 15:34:31 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B1AD8E0; Mon, 15 Jun 2015 15:34:31 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FFYVXq009161; Mon, 15 Jun 2015 15:34:31 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FFYLi4009100; Mon, 15 Jun 2015 15:34:21 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506151534.t5FFYLi4009100@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 15 Jun 2015 15:34:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284417 - in head: cddl/lib gnu/lib/libgcc gnu/lib/libssp lib/libalias/libalias lib/libalias/modules lib/libbegemot lib/libc lib/libcam lib/libcapsicum lib/libcasper lib/libcrypt lib/li... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 15:34:31 -0000 Author: bapt Date: Mon Jun 15 15:34:20 2015 New Revision: 284417 URL: https://svnweb.freebsd.org/changeset/base/284417 Log: Enforce overwritting SHLIBDIR Since METAMODE has been added, sys.mk loads bsd.mkopt.mk which ends load loading bsd.own.mk which then defines SHLIBDIR before all the Makefile.inc everywhere. This makes /lib being populated again. Reported by: many Modified: head/cddl/lib/Makefile.inc head/gnu/lib/libgcc/Makefile head/gnu/lib/libssp/Makefile head/lib/libalias/libalias/Makefile head/lib/libalias/modules/Makefile.inc head/lib/libbegemot/Makefile head/lib/libc/Makefile head/lib/libcam/Makefile head/lib/libcapsicum/Makefile head/lib/libcasper/Makefile head/lib/libcrypt/Makefile head/lib/libcxxrt/Makefile head/lib/libedit/Makefile head/lib/libexpat/Makefile head/lib/libgeom/Makefile head/lib/libipsec/Makefile head/lib/libjail/Makefile head/lib/libkiconv/Makefile head/lib/libkvm/Makefile head/lib/libmd/Makefile head/lib/libmt/Makefile head/lib/libnv/Makefile head/lib/libpcap/Makefile head/lib/libpjdlog/Makefile head/lib/libsbuf/Makefile head/lib/libthr/Makefile head/lib/libufs/Makefile head/lib/libulog/Makefile head/lib/libutil/Makefile head/lib/libxo/Makefile head/lib/libz/Makefile head/lib/msun/Makefile head/lib/ncurses/ncurses/Makefile head/sbin/geom/class/Makefile.inc head/secure/lib/libcrypto/Makefile Modified: head/cddl/lib/Makefile.inc ============================================================================== --- head/cddl/lib/Makefile.inc Mon Jun 15 13:43:23 2015 (r284416) +++ head/cddl/lib/Makefile.inc Mon Jun 15 15:34:20 2015 (r284417) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib SHLIB_MAJOR?= 2 .include "../Makefile.inc" Modified: head/gnu/lib/libgcc/Makefile ============================================================================== --- head/gnu/lib/libgcc/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/gnu/lib/libgcc/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -4,7 +4,7 @@ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SHLIB_NAME= libgcc_s.so.1 -SHLIBDIR?= /lib +SHLIBDIR= /lib .include # Modified: head/gnu/lib/libssp/Makefile ============================================================================== --- head/gnu/lib/libssp/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/gnu/lib/libssp/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib MK_PROFILE= no MK_SSP= no Modified: head/lib/libalias/libalias/Makefile ============================================================================== --- head/lib/libalias/libalias/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libalias/libalias/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../sys/netinet/libalias LIB= alias -SHLIBDIR?= /lib +SHLIBDIR= /lib SHLIB_MAJOR= 7 MAN= libalias.3 SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c Modified: head/lib/libalias/modules/Makefile.inc ============================================================================== --- head/lib/libalias/modules/Makefile.inc Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libalias/modules/Makefile.inc Mon Jun 15 15:34:20 2015 (r284417) @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../../../../sys/netinet/libalias -SHLIBDIR?= /lib +SHLIBDIR= /lib LIB?= alias_${NAME} SHLIB_NAME?=libalias_${NAME}.so WARNS?= 1 Modified: head/lib/libbegemot/Makefile ============================================================================== --- head/lib/libbegemot/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libbegemot/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -6,7 +6,7 @@ LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/ LIB= begemot SHLIB_MAJOR= 4 -SHLIBDIR?= /lib +SHLIBDIR= /lib CFLAGS+= -DUSE_SELECT -DQUADFMT='"ll"' SRCS= rpoll.c Modified: head/lib/libc/Makefile ============================================================================== --- head/lib/libc/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libc/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -1,7 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib .include Modified: head/lib/libcam/Makefile ============================================================================== --- head/lib/libcam/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libcam/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= cam -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS= camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c \ ata_all.c smp_all.c INCS= camlib.h Modified: head/lib/libcapsicum/Makefile ============================================================================== --- head/lib/libcapsicum/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libcapsicum/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -3,7 +3,7 @@ LIB= capsicum SHLIB_MAJOR= 0 -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS= libcapsicum.c SRCS+= libcapsicum_dns.c Modified: head/lib/libcasper/Makefile ============================================================================== --- head/lib/libcasper/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libcasper/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -3,7 +3,7 @@ LIB= casper SHLIB_MAJOR= 0 -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS= libcasper.c INCS= libcasper.h Modified: head/lib/libcrypt/Makefile ============================================================================== --- head/lib/libcrypt/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libcrypt/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -2,7 +2,7 @@ # $FreeBSD$ # -SHLIBDIR?= /lib +SHLIBDIR= /lib .include Modified: head/lib/libcxxrt/Makefile ============================================================================== --- head/lib/libcxxrt/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libcxxrt/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -3,7 +3,7 @@ SRCDIR= ${.CURDIR}/../../contrib/libcxxrt SHLIB_MAJOR= 1 -SHLIBDIR?= /lib +SHLIBDIR= /lib .PATH: ${SRCDIR} Modified: head/lib/libedit/Makefile ============================================================================== --- head/lib/libedit/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libedit/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -4,7 +4,7 @@ LIB= edit SHLIB_MAJOR= 7 -SHLIBDIR?= /lib +SHLIBDIR= /lib OSRCS= chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \ hist.c keymacro.c map.c chartype.c \ Modified: head/lib/libexpat/Makefile ============================================================================== --- head/lib/libexpat/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libexpat/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -3,7 +3,7 @@ EXPAT= ${.CURDIR}/../../contrib/expat LIB= bsdxml -SHLIBDIR?= /lib +SHLIBDIR= /lib SHLIB_MAJOR= 4 SRCS= xmlparse.c xmlrole.c xmltok.c INCS= bsdxml.h bsdxml_external.h Modified: head/lib/libgeom/Makefile ============================================================================== --- head/lib/libgeom/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libgeom/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= geom -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS+= geom_getxml.c SRCS+= geom_stats.c SRCS+= geom_xml2tree.c Modified: head/lib/libipsec/Makefile ============================================================================== --- head/lib/libipsec/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libipsec/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -27,7 +27,7 @@ # # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib .include Modified: head/lib/libjail/Makefile ============================================================================== --- head/lib/libjail/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libjail/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= jail -SHLIBDIR?= /lib +SHLIBDIR= /lib SHLIB_MAJOR= 1 SRCS= jail.c jail_getid.c INCS= jail.h Modified: head/lib/libkiconv/Makefile ============================================================================== --- head/lib/libkiconv/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libkiconv/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib .include Modified: head/lib/libkvm/Makefile ============================================================================== --- head/lib/libkvm/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libkvm/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -16,7 +16,7 @@ CFLAGS+=-DCROSS_LIBKVM LIB= kvm .endif -SHLIBDIR?= /lib +SHLIBDIR= /lib SHLIB_MAJOR= 6 CFLAGS+=-DLIBC_SCCS -I${.CURDIR} Modified: head/lib/libmd/Makefile ============================================================================== --- head/lib/libmd/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libmd/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -2,7 +2,7 @@ LIB= md SHLIB_MAJOR= 6 -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS= md4c.c md5c.c md4hl.c md5hl.c \ rmd160c.c rmd160hl.c \ sha0c.c sha0hl.c sha1c.c sha1hl.c \ Modified: head/lib/libmt/Makefile ============================================================================== --- head/lib/libmt/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libmt/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= mt -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS= mtlib.c INCS= mtlib.h Modified: head/lib/libnv/Makefile ============================================================================== --- head/lib/libnv/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libnv/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib .include Modified: head/lib/libpcap/Makefile ============================================================================== --- head/lib/libpcap/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libpcap/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -1,7 +1,7 @@ # Makefile for libpcap # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib .include Modified: head/lib/libpjdlog/Makefile ============================================================================== --- head/lib/libpjdlog/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libpjdlog/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -2,7 +2,7 @@ # $FreeBSD$ # -SHLIBDIR?= /lib +SHLIBDIR= /lib .include Modified: head/lib/libsbuf/Makefile ============================================================================== --- head/lib/libsbuf/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libsbuf/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= sbuf -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS= subr_prf.c subr_sbuf.c SHLIB_MAJOR = 6 Modified: head/lib/libthr/Makefile ============================================================================== --- head/lib/libthr/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libthr/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -8,7 +8,7 @@ # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -SHLIBDIR?= /lib +SHLIBDIR= /lib .include MK_SSP= no Modified: head/lib/libufs/Makefile ============================================================================== --- head/lib/libufs/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libufs/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= ufs -SHLIBDIR?= /lib +SHLIBDIR= /lib SHLIB_MAJOR= 6 SRCS= block.c cgroup.c inode.c sblock.c type.c ffs_subr.c ffs_tables.c Modified: head/lib/libulog/Makefile ============================================================================== --- head/lib/libulog/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libulog/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?=/lib +SHLIBDIR=/lib .include Modified: head/lib/libutil/Makefile ============================================================================== --- head/lib/libutil/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libutil/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib .include Modified: head/lib/libxo/Makefile ============================================================================== --- head/lib/libxo/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libxo/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -7,7 +7,7 @@ LIBXO= ${.CURDIR:H:H}/contrib/libxo LIB= xo SHLIB_MAJOR=0 -SHLIBDIR?= /lib +SHLIBDIR= /lib SRCS= libxo.c Modified: head/lib/libz/Makefile ============================================================================== --- head/lib/libz/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/libz/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -3,7 +3,7 @@ # LIB= z -SHLIBDIR?= /lib +SHLIBDIR= /lib SHLIB_MAJOR= 6 MAN= zlib.3 zopen.3 Modified: head/lib/msun/Makefile ============================================================================== --- head/lib/msun/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/msun/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -42,7 +42,7 @@ CFLAGS+= -I${.CURDIR}/${ARCH_SUBDIR} .PATH: ${.CURDIR}/man LIB= m -SHLIBDIR?= /lib +SHLIBDIR= /lib SHLIB_MAJOR= 5 WARNS?= 1 IGNORE_PRAGMA= Modified: head/lib/ncurses/ncurses/Makefile ============================================================================== --- head/lib/ncurses/ncurses/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/lib/ncurses/ncurses/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib .if !defined(ENABLE_WIDEC) # Override any MAN= setting below.. Modified: head/sbin/geom/class/Makefile.inc ============================================================================== --- head/sbin/geom/class/Makefile.inc Mon Jun 15 13:43:23 2015 (r284416) +++ head/sbin/geom/class/Makefile.inc Mon Jun 15 15:34:20 2015 (r284417) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?=${GEOM_CLASS_DIR} +SHLIBDIR=${GEOM_CLASS_DIR} SHLIB_NAME?=geom_${GEOM_CLASS}.so LINKS= ${BINDIR}/geom ${BINDIR}/g${GEOM_CLASS} MAN= g${GEOM_CLASS}.8 Modified: head/secure/lib/libcrypto/Makefile ============================================================================== --- head/secure/lib/libcrypto/Makefile Mon Jun 15 13:43:23 2015 (r284416) +++ head/secure/lib/libcrypto/Makefile Mon Jun 15 15:34:20 2015 (r284417) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib +SHLIBDIR= /lib SUBDIR= engines .include From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 15:54:32 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 053B7488; Mon, 15 Jun 2015 15:54:32 +0000 (UTC) (envelope-from peter@wemm.org) Received: from smtp2.wemm.org (smtp2.wemm.org [192.203.228.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp2.wemm.org", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 830DCE3A; Mon, 15 Jun 2015 15:54:31 +0000 (UTC) (envelope-from peter@wemm.org) Received: from overcee.wemm.org (canning.wemm.org [192.203.228.65]) by smtp2.wemm.org (Postfix) with ESMTP id 4AB0CEDB; Mon, 15 Jun 2015 08:54:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wemm.org; s=m20140428; t=1434383671; bh=aqEe+DSYTvAfKeomNcppruwl9uAcpq0JZ1uukw4vFgg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HBNQcuILgybNwbwZjYWiIKIvPcwbIKtXrJyjI662mI6oL+rn6KFucpHiRjC6Uoqoj HvpUNxUgXAPFwwaa/NuHJXBRRVXWW9xyiRLbuZINAUwDJSvYR9V4idWDx+VBnpqPwo +QHc78fK1l9zD2rgof/fOSZuRwRCgz1NbW9H2X1M= From: Peter Wemm To: Baptiste Daroussin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284417 - in head: cddl/lib gnu/lib/libgcc gnu/lib/libssp lib/libalias/libalias lib/libalias/modules lib/libbegemot lib/libc lib/libcam lib/libcapsicum lib/libcasper lib/libcrypt lib/li... Date: Mon, 15 Jun 2015 08:54:25 -0700 Message-ID: <1777112.8e3tShFMbn@overcee.wemm.org> User-Agent: KMail/4.14.3 (FreeBSD/11.0-CURRENT; KDE/4.14.3; amd64; ; ) In-Reply-To: <201506151534.t5FFYLi4009100@svn.freebsd.org> References: <201506151534.t5FFYLi4009100@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart239114964.QJiO53Y870"; micalg="pgp-sha256"; protocol="application/pgp-signature" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 15:54:32 -0000 --nextPart239114964.QJiO53Y870 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="us-ascii" On Monday, June 15, 2015 03:34:21 PM Baptiste Daroussin wrote: > Author: bapt > Date: Mon Jun 15 15:34:20 2015 > New Revision: 284417 > URL: https://svnweb.freebsd.org/changeset/base/284417 >=20 > Log: > Enforce overwritting SHLIBDIR >=20 > Since METAMODE has been added, sys.mk loads bsd.mkopt.mk which ends= load > loading bsd.own.mk which then defines SHLIBDIR before all the Makefil= e.inc > everywhere. >=20 > This makes /lib being populated again. >=20 > Reported by:=09many I don't understand how this metamode crap could possibly have been test= ed with=20 things of this magnitude turning up. =2D-=20 Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI= 6FJV UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246 --nextPart239114964.QJiO53Y870 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABCAAGBQJVfvUyAAoJEDXWlwnsgJ4EM4wH/0d6c8S3XNeFn3w/xAXQH8LB oq9z2kpLRmnL1M89XAlPog3hm6DvfunpLgjWF5zPzPzMr22bIxfQ0BXt1Brryhfm lLvX+G0BDUzpl5rh1rLiTonPlh/DidsLtS6sa1PKPI5ZwTVblcbe6mrqU/K81IGA B7wEuxI3d8Pz7t5rUpQKRyuNY5UNhj9pQZAzOfwFXiKn2HVOIRXXoJyhc8jWuZc+ vtjQ5qZ6y4Etp/qCuFBT0Vb/d5nk5hWHKhKKpP/xUPcEPXEOHmZsfc8DCQDbl+jr fOmPdaO7OY0SRBQbOa4s+bZUU/aMB29YRu1gR6LcurYOPiFrLh61e/TzhCpsrvU= =T966 -----END PGP SIGNATURE----- --nextPart239114964.QJiO53Y870-- From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 16:06:29 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 613E0D00 for ; Mon, 15 Jun 2015 16:06:29 +0000 (UTC) (envelope-from anonymous@server12.teknosurf.it) Received: from server12.teknosurf.it (ru000377.widhost.net [195.225.169.144]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Parallels Panel", Issuer "Parallels Panel" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id A872B1DC for ; Mon, 15 Jun 2015 16:06:27 +0000 (UTC) (envelope-from anonymous@server12.teknosurf.it) Received: (qmail 30656 invoked by uid 502); 15 Jun 2015 17:59:43 +0200 To: svn-src-head@freebsd.org Subject: We could not deliver your parcel, #000234607 X-PHP-Originating-Script: 10087:post.php(1) : eval()'d code Date: Mon, 15 Jun 2015 17:59:43 +0200 From: "FedEx 2Day A.M." Reply-To: "FedEx 2Day A.M." Message-ID: <22b60744f898a46e74fe5be7bac864ad@ru000377.widhost.net> X-Priority: 3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 16:06:29 -0000 Dear Customer, This is to confirm that one or more of your parcels has been shipped. Shipment Label is attached to this email. Regards, Dean Winter, Sr. Delivery Agent. From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 16:10:32 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 26C9EDC9; Mon, 15 Jun 2015 16:10:32 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wg0-x22e.google.com (mail-wg0-x22e.google.com [IPv6:2a00:1450:400c:c00::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B527826F; Mon, 15 Jun 2015 16:10:31 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: by wgbhy7 with SMTP id hy7so39631786wgb.2; Mon, 15 Jun 2015 09:10:29 -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=SMyTY3UtEIvHiK+4GO6Ribo+dp/mqJMSWyKDylH5SSs=; b=mKzcZvzjOqZ1/drmQhNxIuHEu2jOdbGfvn/83iF3nUeDX7pHZvOL5bCo0aXowYofwp S4Rdao8BymDFvov41q3E8+hXBf3QFlzcKw3Ds3DVU8pau2R+YgGx1pPanjnB6Oyg7Hsx NqdB4XpooJ+1vG3uePByjFcQEijTYIqC5QYsNJkkVdSeIOZdU9rvLLYkUD9j2pc6BT8Z OBLb7EeeCMjy4cSnPcyFFHKRgoQuX7uN2z/p1w+ALQDVnflaud3XJwpmbPAsPdT+27cJ ni27LcJlWhZFjzJeCemqjT8P1F0rAHUnyvj1KKPBZ4Nmb+zlThfZSPT2SZOWlov/mMSB A/fQ== X-Received: by 10.180.77.193 with SMTP id u1mr32424787wiw.50.1434384629846; Mon, 15 Jun 2015 09:10:29 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id ul1sm19628759wjc.30.2015.06.15.09.10.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jun 2015 09:10:28 -0700 (PDT) Sender: Baptiste Daroussin Date: Mon, 15 Jun 2015 18:10:26 +0200 From: Baptiste Daroussin To: Peter Wemm Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r284417 - in head: cddl/lib gnu/lib/libgcc gnu/lib/libssp lib/libalias/libalias lib/libalias/modules lib/libbegemot lib/libc lib/libcam lib/libcapsicum lib/libcasper lib/libcrypt lib/li... Message-ID: <20150615161026.GH925@ivaldir.etoilebsd.net> References: <201506151534.t5FFYLi4009100@svn.freebsd.org> <1777112.8e3tShFMbn@overcee.wemm.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="0XMZdl/q8hSSmFeD" Content-Disposition: inline In-Reply-To: <1777112.8e3tShFMbn@overcee.wemm.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 16:10:32 -0000 --0XMZdl/q8hSSmFeD Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 15, 2015 at 08:54:25AM -0700, Peter Wemm wrote: > On Monday, June 15, 2015 03:34:21 PM Baptiste Daroussin wrote: > > Author: bapt > > Date: Mon Jun 15 15:34:20 2015 > > New Revision: 284417 > > URL: https://svnweb.freebsd.org/changeset/base/284417 > >=20 > > Log: > > Enforce overwritting SHLIBDIR > >=20 > > Since METAMODE has been added, sys.mk loads bsd.mkopt.mk which ends l= oad > > loading bsd.own.mk which then defines SHLIBDIR before all the Makefile.= inc > > everywhere. > >=20 > > This makes /lib being populated again. > >=20 > > Reported by: many >=20 > I don't understand how this metamode crap could possibly have been tested= with=20 > things of this magnitude turning up. You may also notice that my "fix" does not work for lib32 and I don't know = how to fix lib32 at this point Bapt --0XMZdl/q8hSSmFeD Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlV++PIACgkQ8kTtMUmk6EzNlgCfbxYCeH0PoTY5/1K+WoRR/JJP Qa8AnjGj3GsrePfgvKYUJ5Brl9P5qdnD =2u1S -----END PGP SIGNATURE----- --0XMZdl/q8hSSmFeD-- From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 16:14:58 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 304B6F73; Mon, 15 Jun 2015 16:14:58 +0000 (UTC) (envelope-from ler@lerctr.org) Received: from thebighonker.lerctr.org (thebighonker.lerctr.org [IPv6:2001:470:1f0f:3ad:223:7dff:fe9e:6e8a]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "thebighonker.lerctr.org", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7BACF635; Mon, 15 Jun 2015 16:14:57 +0000 (UTC) (envelope-from ler@lerctr.org) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lerctr.org; s=lerami; h=Message-ID:References:In-Reply-To:Subject:Cc:To:From:Date:Content-Transfer-Encoding:Content-Type:MIME-Version; bh=xnYjDkJLV2rykYsSJ3Hu4kXdmqTLb4AMZeji4Zy4rog=; b=p0QOXxad8Wgj10Zgfm5Hu6/pBr9FaS5C56XqbEqSgUydSLrsqH6axd/7c9uM6xbaWuKUSgzI4SoQWSRQeL9oz/lMeImFaEnYA7lHCA+d+6X3Ft+RV4CgKYHZeV0cjEKLaqZbcsfBWW9ih1JeBhCXyS2of27IQNKf+SxOHeSmYPg=; Received: from thebighonker.lerctr.org ([2001:470:1f0f:3ad:223:7dff:fe9e:6e8a]:20959 helo=webmail.lerctr.org) by thebighonker.lerctr.org with esmtpsa (TLSv1:DHE-RSA-AES128-SHA:128) (Exim 4.85 (FreeBSD)) (envelope-from ) id 1Z4X2F-000CI9-Th; Mon, 15 Jun 2015 11:14:56 -0500 Received: from proxy.lucent.com ([135.245.49.12]) by webmail.lerctr.org with HTTP (HTTP/1.1 POST); Mon, 15 Jun 2015 11:14:55 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Mon, 15 Jun 2015 11:14:55 -0500 From: Larry Rosenman To: Baptiste Daroussin Cc: Peter Wemm , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, owner-svn-src-all@freebsd.org Subject: Re: svn commit: r284417 - in head: cddl/lib gnu/lib/libgcc gnu/lib/libssp lib/libalias/libalias lib/libalias/modules lib/libbegemot lib/libc lib/libcam lib/libcapsicum lib/libcasper lib/libcrypt lib/li... In-Reply-To: <20150615161026.GH925@ivaldir.etoilebsd.net> References: <201506151534.t5FFYLi4009100@svn.freebsd.org> <1777112.8e3tShFMbn@overcee.wemm.org> <20150615161026.GH925@ivaldir.etoilebsd.net> Message-ID: <9a300acad76a6e3e06689b2fab00490f@thebighonker.lerctr.org> X-Sender: ler@lerctr.org User-Agent: Roundcube Webmail/1.1.1 X-Spam-Score: -1.0 (-) X-LERCTR-Spam-Score: -1.0 (-) X-Spam-Report: SpamScore (-1.0/5.0) ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 X-LERCTR-Spam-Report: SpamScore (-1.0/5.0) ALL_TRUSTED=-1, SHORTCIRCUIT=-0.0001 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 16:14:58 -0000 On 2015-06-15 11:10, Baptiste Daroussin wrote: > On Mon, Jun 15, 2015 at 08:54:25AM -0700, Peter Wemm wrote: >> On Monday, June 15, 2015 03:34:21 PM Baptiste Daroussin wrote: >> > Author: bapt >> > Date: Mon Jun 15 15:34:20 2015 >> > New Revision: 284417 >> > URL: https://svnweb.freebsd.org/changeset/base/284417 >> > >> > Log: >> > Enforce overwritting SHLIBDIR >> > >> > Since METAMODE has been added, sys.mk loads bsd.mkopt.mk which ends load >> > loading bsd.own.mk which then defines SHLIBDIR before all the Makefile.inc >> > everywhere. >> > >> > This makes /lib being populated again. >> > >> > Reported by: many >> >> I don't understand how this metamode crap could possibly have been >> tested with >> things of this magnitude turning up. > > You may also notice that my "fix" does not work for lib32 and I don't > know how > to fix lib32 at this point > > Bapt I'm STILL getting weird failures at 284417 -- trying a clean build (not -DNO_CLEAN). -- Larry Rosenman http://www.lerctr.org/~ler Phone: +1 214-642-9640 E-Mail: ler@lerctr.org US Mail: 108 Turvey Cove, Hutto, TX 78634-5688 From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 16:18:16 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AB370341; Mon, 15 Jun 2015 16:18:16 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8E799676; Mon, 15 Jun 2015 16:18:16 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FGIG5s006701; Mon, 15 Jun 2015 16:18:16 GMT (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 054CC98BC; Mon, 15 Jun 2015 16:18:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id ECuMDXxasPC8; Mon, 15 Jun 2015 16:18:14 +0000 (UTC) Message-ID: <557EFAC2.7050009@FreeBSD.org> DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com AD02C98B8 Date: Mon, 15 Jun 2015 12:18:10 -0400 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Adrian Chadd , "Simon J. Gerraty" CC: Dimitry Andric , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <24490.1434318198@chaos> In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 16:18:16 -0000 On 6/14/15 6:37 PM, Adrian Chadd wrote: > Hi, > > I'm happy for this to be your baby and see how it all pans out in the > tree, but I thought we as a project learnt some lessons about checking > in autogenerated files. > > You either commit these files or inline the DEPENDS lines in the Makefiles and maintain them by hand as we do in ports. Pick one. -- Regards, Bryan Drewery From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 16:19:07 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8865A49D; Mon, 15 Jun 2015 16:19:07 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6BA07685; Mon, 15 Jun 2015 16:19:07 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FGJ7dv006716; Mon, 15 Jun 2015 16:19:07 GMT (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 29BF598CA; Mon, 15 Jun 2015 16:19:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id oNivYX1woklE; Mon, 15 Jun 2015 16:19:05 +0000 (UTC) Message-ID: <557EFAF8.20000@FreeBSD.org> DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com DC35B98C3 Date: Mon, 15 Jun 2015 12:19:04 -0400 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Adrian Chadd , "Simon J. Gerraty" CC: Dimitry Andric , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <24490.1434318198@chaos> <557EFAC2.7050009@FreeBSD.org> In-Reply-To: <557EFAC2.7050009@FreeBSD.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 16:19:07 -0000 On 6/15/15 12:18 PM, Bryan Drewery wrote: > On 6/14/15 6:37 PM, Adrian Chadd wrote: >> Hi, >> >> I'm happy for this to be your baby and see how it all pans out in the >> tree, but I thought we as a project learnt some lessons about checking >> in autogenerated files. >> >> > > You either commit these files or inline the DEPENDS lines in the > Makefiles and maintain them by hand as we do in ports. Pick one. > > Sorry no, that isn't right since they need to be included by other files. Still, it's not that different from ports, it is just metadata moved into a separate file to remove the recursive make needs. -- Regards, Bryan Drewery From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 16:27:10 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6C5A0B87; Mon, 15 Jun 2015 16:27:10 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x235.google.com (mail-ig0-x235.google.com [IPv6:2607:f8b0:4001:c05::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 338B29A4; Mon, 15 Jun 2015 16:27:10 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igbzc4 with SMTP id zc4so58585184igb.0; Mon, 15 Jun 2015 09:27:09 -0700 (PDT) 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=bVHhu15h5xIkwjF8J+PsZ2DGWPpbQny4DQaFf8xSJr4=; b=bs9ictb69M/tGN+ABCKg/xTgC/DMov9+yVntN6DYLqL0tp9w4IsWM2Epr/5OeUrXT6 2FXj40MD0Ag6StZ3dHS/KSw37NgonLQVmxX+kewfk2KQIHTvi4DiQoZgwCV0N51CyNsA 5XoNqRu1V0UPCeGUrYVLQxhV3UTmjYCu0IZ3oH0ihG0vzfhd0wV1oiGYL3RR93XjIRGJ YPwgSsIR8pdAusimMShB/HGkRkPx4KfuY6aYLZ2SGxx2I5obp7nlGGvyOsrGvk8myRZX KrR1qgkl//H4+A6XwzVgUOL5U69XUT5M76kdrFgUWBqlF4vlpo+SNF6tP0Z6oUds5GNh rmwQ== MIME-Version: 1.0 X-Received: by 10.107.155.74 with SMTP id d71mr35236123ioe.29.1434385629624; Mon, 15 Jun 2015 09:27:09 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Mon, 15 Jun 2015 09:27:09 -0700 (PDT) In-Reply-To: <201506151534.t5FFYLi4009100@svn.freebsd.org> References: <201506151534.t5FFYLi4009100@svn.freebsd.org> Date: Mon, 15 Jun 2015 09:27:09 -0700 X-Google-Sender-Auth: yOTJ0IvxgcjlFSXpgCfhPwACVoY Message-ID: Subject: Re: svn commit: r284417 - in head: cddl/lib gnu/lib/libgcc gnu/lib/libssp lib/libalias/libalias lib/libalias/modules lib/libbegemot lib/libc lib/libcam lib/libcapsicum lib/libcasper lib/libcrypt lib/li... From: Adrian Chadd To: Baptiste Daroussin Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 16:27:10 -0000 ... this feels like the wrong solution. A really, really wrong solution. I was just about to use SHLIBDIR overriding for doing something for cross-builds, and now I can't. -adrian From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 16:35:27 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5FE79A9; Mon, 15 Jun 2015 16:35:27 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wi0-x236.google.com (mail-wi0-x236.google.com [IPv6:2a00:1450:400c:c05::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E4C66C14; Mon, 15 Jun 2015 16:35:26 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: by wiga1 with SMTP id a1so83636775wig.0; Mon, 15 Jun 2015 09:35:25 -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=+t3X6MQCalt6Fca4IkpkA18vINofgnjDpLOfWtR4u5w=; b=NuVg37LbNcphqp9rvyodOAekO92BD+FkcQdJehjxn8U7Ypx0NgUlknx8sB2ebCqrP2 1Et37i0LrmADma/5jtGz19lYpjwXtle7u/9AZTB9RObnFOzqjIZV4cCxi8SPWIVwFFmE GFQgQxNMtT4KH+37NUIQUDokjJOVtJbS7/IG9coQQDl33ldTj1hLB4pC8U2zQQbwZ/pt v/Xz3uHFrd8ybO7jcsxHHX1dU/y3isNE0Q9z3EmNW5woBDhU+SylJEuKEbsUZs+5egNz SkT5ozCmTjdsvIvHpM2wo83tjJOPN7Hr9v/ZsBfvhYUX4vOSZkOurx4MazWobADCM7l7 nEMg== X-Received: by 10.194.76.132 with SMTP id k4mr52174807wjw.77.1434386125274; Mon, 15 Jun 2015 09:35:25 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id f8sm16610165wiy.7.2015.06.15.09.35.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jun 2015 09:35:24 -0700 (PDT) Sender: Baptiste Daroussin Date: Mon, 15 Jun 2015 18:35:22 +0200 From: Baptiste Daroussin To: Adrian Chadd Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" Subject: Re: svn commit: r284417 - in head: cddl/lib gnu/lib/libgcc gnu/lib/libssp lib/libalias/libalias lib/libalias/modules lib/libbegemot lib/libc lib/libcam lib/libcapsicum lib/libcasper lib/libcrypt lib/li... Message-ID: <20150615163521.GI925@ivaldir.etoilebsd.net> References: <201506151534.t5FFYLi4009100@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ONvqYzh+7ST5RsLk" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 16:35:27 -0000 --ONvqYzh+7ST5RsLk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 15, 2015 at 09:27:09AM -0700, Adrian Chadd wrote: > ... this feels like the wrong solution. A really, really wrong solution. >=20 > I was just about to use SHLIBDIR overriding for doing something for > cross-builds, and now I can't. yes but I didn't want to revert metamode at this point, I wanted to give a change for Simon to fix the issue my commit log explains. Btw https://people.freebsd.org/~bapt/lib32.diff should fix the lib32 part, = I do prefer to keep the tree broken at this point and not risk to break it even = more. My commit was an intent to prevent people to end up with a empty /lib and definitly not the right solution. =46rom now I won't touch even more that. (this commit is btw made to be rev= erted once someone can fix the issue raised in the log) Best regards, Bapt --ONvqYzh+7ST5RsLk Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlV+/skACgkQ8kTtMUmk6Ey4LACgoHuXiwFEjamNVy0JhkbYEoYS cHwAn06FLi0/Kgb2tI6csbVP+X3MgaMt =UxSX -----END PGP SIGNATURE----- --ONvqYzh+7ST5RsLk-- From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 16:46:15 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 36F2F644; Mon, 15 Jun 2015 16:46:15 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 18173E99; Mon, 15 Jun 2015 16:46:15 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FGkEEL016018; Mon, 15 Jun 2015 16:46:14 GMT (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 73F199984; Mon, 15 Jun 2015 16:46:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id 52j_L31a-Pvk; Mon, 15 Jun 2015 16:46:11 +0000 (UTC) Message-ID: <557F0152.60300@FreeBSD.org> DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 4A625997F Date: Mon, 15 Jun 2015 12:46:10 -0400 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Craig Rodrigues , Steve Kargl CC: Marcel Moolenaar , Marcel Moolenaar , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284198 - head/bin/ls References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 16:46:15 -0000 On 6/13/15 8:40 PM, Craig Rodrigues wrote: > For people building embedded products these days, > storage of gigabytes and even terabytes is often available, I wish this was true. I recently was feeling good about finding a few hundred KB here and there to save space on an embedded system. -- Regards, Bryan Drewery From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 16:49:36 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 949998F9; Mon, 15 Jun 2015 16:49:36 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 75D9CEB7; Mon, 15 Jun 2015 16:49:36 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FGnahU016089; Mon, 15 Jun 2015 16:49:36 GMT (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 1828E9993; Mon, 15 Jun 2015 16:49:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id UIeJ-KFjfRaM; Mon, 15 Jun 2015 16:49:33 +0000 (UTC) Message-ID: <557F021C.1000509@FreeBSD.org> DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 10D83998B Date: Mon, 15 Jun 2015 12:49:32 -0400 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Steve Kargl , Craig Rodrigues CC: Marcel Moolenaar , Marcel Moolenaar , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284198 - head/bin/ls References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> <20150614012924.GA2965@troutmask.apl.washington.edu> In-Reply-To: <20150614012924.GA2965@troutmask.apl.washington.edu> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 16:49:36 -0000 On 6/13/15 9:29 PM, Steve Kargl wrote: > On Sat, Jun 13, 2015 at 05:40:59PM -0700, Craig Rodrigues wrote: >> On Sat, Jun 13, 2015 at 5:26 PM, Steve Kargl < >> sgk@troutmask.apl.washington.edu> wrote: >>> >>> Given the horrid state of the manpages, which I showed >>> in March, one can only wonder about the internals of >>> the libxo itself. >>> >> >> Are you talking about this comment you made? >> https://lists.freebsd.org/pipermail/freebsd-current/2015-March/054899.html >> >> I can't make heads or tails of what you wrote, other than you seemed very >> angry. >> > > I wasn't very angry. I'm simply pointing out that the libxo > manpages, which should document what libxo is/does, are > horrible documentation. If the quality of the manpages > matches the quality of library, and the brokeness that > we have been witnesses bears this out, should be questioned. > > % cd src/contrib/libxo/libxo > % grep Nd *.3 | grep formatted > xo_attr.3:.Nd emit formatted output based on format string and arguments > xo_create.3:.Nd emit formatted output based on format string and arguments > xo_emit.3:.Nd emit formatted output based on format string and arguments > xo_finish.3:.Nd emit formatted output based on format string and arguments > xo_flush.3:.Nd emit formatted output based on format string and arguments > xo_open_list.3:.Nd emit formatted output based on format string and arguments > xo_set_allocator.3:.Nd emit formatted output based on format string and arguments > xo_set_flags.3:.Nd emit formatted output based on format string and arguments > xo_set_info.3:.Nd emit formatted output based on format string and arguments > xo_set_style.3:.Nd emit formatted output based on format string and arguments > xo_set_writer.3:.Nd emit formatted output based on format string and arguments > > Do you really believe that the Nd entries for these manpages are > correct? > I also found that from simple 'man ls' (etc) there is no real mention of what --libxo even is or how it works. Following the manpage cross-references leads me to have to go to a webpage to see what params --libxo even takes. The --libxo flag needs much more documentation in these manpages. -- Regards, Bryan Drewery From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 16:36:20 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BBEFC2C0 for ; Mon, 15 Jun 2015 16:36:20 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from mail-ie0-f176.google.com (mail-ie0-f176.google.com [209.85.223.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 79898C2B for ; Mon, 15 Jun 2015 16:36:20 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: by iecrd14 with SMTP id rd14so34771199iec.3 for ; Mon, 15 Jun 2015 09:36:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:mime-version:content-type:from :in-reply-to:date:cc:message-id:references:to; bh=D/l0rWRYQVnMoufC2/9AbACI/zcoQb1iSZ/ZBGG3OY8=; b=k+BIdC+Jb/+6x2xfUnYY5UWNWBBCgRcU2NW/IycgEDkF4I3FjVpBGTsL74TdP72Y4Q HtJFQa2E+jnbfT9lh8dWf7IAXOsVkTMauf/8x8xW2npjupiM43Nmukbv575VuSvqjSMZ 6U/LAqka9sG3vRIbiOEXNakKsLgOFN1Eyrovz/4Urm7D9v9FRiW477Z9NtL/V9HM1WZr 1IEMtR7eV8xv2GJvsbk2p+YnzyFYkJe78ja0erBX46nfTcu76a2MUvRoZrgfiskHLp7L VIFoT/l55O5okRgEeommx3tk1h1zpUVvruj4hwaFsP8wybFkk47Lk1+bzofis5nhsUJs vaYQ== X-Gm-Message-State: ALoCoQkfAiKY5aKnhVBDUlQ0cZZ8JB7Gk2Z+QvjSSpO7/M112PIjaFWXdXMd+vaBk0EM2tAHV1CG X-Received: by 10.107.38.149 with SMTP id m143mr36019667iom.49.1434386173892; Mon, 15 Jun 2015 09:36:13 -0700 (PDT) Received: from netflix-mac-wired.bsdimp.com ([50.253.99.174]) by mx.google.com with ESMTPSA id f82sm2672297ioj.37.2015.06.15.09.36.12 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Jun 2015 09:36:13 -0700 (PDT) Sender: Warner Losh Subject: Re: svn commit: r284198 - head/bin/ls Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_9D9DFC0E-743E-4CC5-B95F-37446BFCABF8"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5b6 From: Warner Losh In-Reply-To: Date: Mon, 15 Jun 2015 10:36:12 -0600 Cc: Bruce Simpson , Steve Kargl , Slawa Olhovchenkov , Craig Rodrigues , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Message-Id: <39A1D5A9-1BD9-4828-B10D-D347771CBAD2@bsdimp.com> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> <20150614171031.GA5857@troutmask.apl.washington.edu> <557DCBED.2010804@fastmail.net> To: Adrian Chadd X-Mailer: Apple Mail (2.2098) X-Mailman-Approved-At: Mon, 15 Jun 2015 16:50:07 +0000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 16:36:20 -0000 --Apple-Mail=_9D9DFC0E-743E-4CC5-B95F-37446BFCABF8 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Jun 14, 2015, at 12:53 PM, Adrian Chadd wrote: >=20 > I do like how zero percent of the comments are "hey, maybe we need > unit tests that run these tools and ensure they output the right > stuff." If this were ${WORK} and I were ${BOSS}, I'd have asked the > libxo developers to include unit tests before/after for each thing > they broke, so we don't have a repeat of this kind of thing. But, this > apparently isn't ${WORK} and I definitely don't want to be anyones > boss, so.. gstat still produces the right output. It simply has been broken in that you can=E2=80=99t just hit =E2=80=98q=E2=80=99 anymore. So while = necessary, it wouldn=E2=80=99t be sufficient. Warner --Apple-Mail=_9D9DFC0E-743E-4CC5-B95F-37446BFCABF8 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJVfv78AAoJEGwc0Sh9sBEAV8MP/jG+cXUdMMWiw0rXUS/bzE1Q Wbz+g4pIf7mFp3VKHbfBFd5PNJKl1Oo6lYDcMLdfSSoABAZeVRU6MattQwuUQ2PX ScEtibYtNsTMY+sGtYd3N6fcH+MIZ0mw5ZV6DvQuBcVN5HR9c5JlJVBl+ORR0L6i JLa5ZkH+evuj91AlKK4b92TfXej0/epbzufIiqrJXMEXrPromNcxNMu0Fd5MTgBn q1u9pxwY3KgHbXiT7YCiINMOzc4ul+1pwahZfl92najaLm0wmFE7PIXYs5Ibl21c eiM+phaeA/Ej4qpGoLvt6VvE1qeLWcnwQ8Z98cvPaJaBDgiEQ8LHFJYt5jeDhgyD 6LLEFw86gU8PByXYvSI9V2bGFMlAZNqv5mA7gkJ37Nf8b2peOo7/7KcaCLH95CMm k6+cTv95wEhpxahFXqMuKyH3clskB7auJhsYQ1eANEp8RF9lFMJdX9gJOaqaA3zA Ov+UF78WHVNeZLCFYzsqHCpHMyADfsjbHZytQu8I0/cVRb7kJMRwzQyeSgdk0og/ eZQcwCCCA0I2sMh0zsh6d854KEu9TvoE3IVNtX/41xjVP7NMPsDg2L/dhTcit9hh +9z7EHG4BKLeyId2DW6VWU+ZvUlXtQJNM2N5nhUJsdRbWnJC5bCuF0A0N9AEMh/w rA4Q/XK1CjzZqxye2i61 =D+Mg -----END PGP SIGNATURE----- --Apple-Mail=_9D9DFC0E-743E-4CC5-B95F-37446BFCABF8-- From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 16:54:23 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DCDFCCE8; Mon, 15 Jun 2015 16:54:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A50BD179; Mon, 15 Jun 2015 16:54:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FGsM1p019055; Mon, 15 Jun 2015 16:54:22 GMT (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 6882399CC; Mon, 15 Jun 2015 16:54:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id vO2fOXfHpIiK; Mon, 15 Jun 2015 16:54:19 +0000 (UTC) Message-ID: <557F033A.1060006@FreeBSD.org> DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 2F30199C9 Date: Mon, 15 Jun 2015 09:54:18 -0700 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Garrett Cooper , Slawa Olhovchenkov CC: Craig Rodrigues , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Subject: Re: svn commit: r284198 - head/bin/ls References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <45B665F4-B81F-439B-89DC-6D27BA96F87D@gmail.com> In-Reply-To: <45B665F4-B81F-439B-89DC-6D27BA96F87D@gmail.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 16:54:24 -0000 On 6/14/15 3:17 AM, Garrett Cooper wrote: > On Jun 14, 2015, at 3:00, Slawa Olhovchenkov > wrote: >=20 >> On Sat, Jun 13, 2015 at 05:13:31PM -0700, Craig Rodrigues wrote: >>=20 >>> The people I talk to use scripting languages like Python or >>> Ruby, and devops frameworks like Ansible, Saltstack, Puppet, >>> and Chef. They may do some quick prototyping and UI work with >>> Javascript and HTML/CSS. Being able to generate JSON directly >>> from system-level tools, and then analyze that in a Python >>> script, >>=20 >> You need JSON from system-level tools for analyze that in a >> Python script? Realy? Not plain text? or tab/space separated? >=20 > Having written a bunch of tools that parse plaintext, it=92s a pain > in the rear. It=92s far easier to have JSON and a schema for working > with that JSON when developing tools to parse things out. >=20 > Programmers are inherently lazy =97 the more we have to make them > work, the more pushback we=92re going to get from them as far as > integrating FreeBSD=92s concerned. >=20 > Thanks! >=20 For 'w' it makes sense, for 'ls' why? Most, all?, scripting languages have globbing and file listing functions already so there's no need to run /bin/ls and parse it. --=20 Regards, Bryan Drewery From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 17:03:42 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EE3F5262; Mon, 15 Jun 2015 17:03:41 +0000 (UTC) (envelope-from peter@wemm.org) Received: from smtp2.wemm.org (smtp2.wemm.org [192.203.228.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp2.wemm.org", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id D0DD85FE; Mon, 15 Jun 2015 17:03:41 +0000 (UTC) (envelope-from peter@wemm.org) Received: from overcee.wemm.org (canning.wemm.org [192.203.228.65]) by smtp2.wemm.org (Postfix) with ESMTP id 47070F76; Mon, 15 Jun 2015 10:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wemm.org; s=m20140428; t=1434387821; bh=Wr8iUCYvfksYWMXaYwwrQFELxqEp5mfE8LSgKYg7tuY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kLAVZWNBJe4JOrrlnzXCbNJvK3UqAcDYyuXWYMOT/5xy9g6EcaiWeBDXFZEBqF37X /E6S6krhcZoVAl3vCTZmh4vVw/E2mB1EfnvmLrEGjcD4rhhXqI7DJt9BQU5EKxs2o4 KRygF44rBb1YbhJEhAua9BITun0rgAJTDRc+FuG0= From: Peter Wemm To: Adrian Chadd Cc: Baptiste Daroussin , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284417 - in head: cddl/lib gnu/lib/libgcc gnu/lib/libssp lib/libalias/libalias lib/libalias/modules lib/libbegemot lib/libc lib/libcam lib/libcapsicum lib/libcasper lib/libcrypt lib/li... Date: Mon, 15 Jun 2015 10:03:35 -0700 Message-ID: <13210540.7KD1epFrEA@overcee.wemm.org> User-Agent: KMail/4.14.3 (FreeBSD/11.0-CURRENT; KDE/4.14.3; amd64; ; ) In-Reply-To: References: <201506151534.t5FFYLi4009100@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart26130797.W3CVULgh9K"; micalg="pgp-sha256"; protocol="application/pgp-signature" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 17:03:42 -0000 --nextPart26130797.W3CVULgh9K Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="us-ascii" On Monday, June 15, 2015 09:27:09 AM Adrian Chadd wrote: > ... this feels like the wrong solution. A really, really wrong soluti= on. >=20 > I was just about to use SHLIBDIR overriding for doing something for > cross-builds, and now I can't. >=20 >=20 >=20 > -adrian FWIW; you can usually use the "I really mean it" override.. SHLIBDIR :=3D /somewhere Like Baptiste said, this was just to buy time to prevent people from ge= tting=20 trashed as a result of doing an installworld when running zfs. It's mo= re than=20 just ZFS, but that's the most visible failure mode. The failure is that the zfs libraries and libnvpair get installed into=20= /usr/lib, but the /sbin zfs binaries use the ones from /lib. Depending= on the=20 age of the now-stale copies in /lib, you get undefined symbols. And if= you get=20 rid of them, you now have a boot failure if /usr is its own dataset. d= elete- old-libs doesn't help because it thinks that the /lib version is the co= rrect=20 one. =2D-=20 Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI= 6FJV UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246 --nextPart26130797.W3CVULgh9K Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABCAAGBQJVfwVnAAoJEDXWlwnsgJ4EKzcH/3hUw3iIC0/t0FEtJT+FeKfP agoViwne5bV/hRLYTMBRKPc6+13aovoZ2OluUttuqvrS5XPeEvv3dqhEJoD0pQxv E/Bmele8ytH57UwQm1vI5x7QG2jzJArhzFnEa1BULsPUgOHFr+8p48S/wBOIRCJC gETMSyPTUE/auk4+FzVKXRol35bi4XmXnnQnZ7grZ0/ZXjOdoGH9sAsasQ+hPzz7 baHB3LLcokQxDasieDfsDVysPt5BkdxsrJtF1Gt3/L7MlOFrCsNKobzHp5nGUe04 taU4+LZRwAyxNKjECWRhiHHzCLzKV4++PwVtRICX8d/lXZCZgQYu5arwzhVDlfY= =e8o9 -----END PGP SIGNATURE----- --nextPart26130797.W3CVULgh9K-- From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 17:08:09 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EDAC44D5; Mon, 15 Jun 2015 17:08:08 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wi0-x231.google.com (mail-wi0-x231.google.com [IPv6:2a00:1450:400c:c05::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7E013669; Mon, 15 Jun 2015 17:08:08 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: by wibdq8 with SMTP id dq8so85357474wib.1; Mon, 15 Jun 2015 10:08:07 -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=IIgbQPQO0xOoxjxxJh+oGdjm1EmLlMBsgdnCTmLmxuo=; b=scVT5jYd/KkGKH1padbJRcO8x898N6/PmXNvB9jmTgHOs3gstHk25k+Pp3DY7j4Zwj Okhv80Bs/8rWuFa35u1/FbqKqCfk+jD8BsXsT3WKREAItKyjk37W3E83aOKXeM/ZGnfr lv/dGG4wv+ozGzKOKEn/8s8t7q2c+u1a+AsSiLw+CWVfm0DERrev4MIjZOKA4EaQugEi yC2eMNVB++n24w0OV6fvOjcKi1KscJrCqbMR8ke5I7fbKC5MaA0vFak5KpjXnxSdRVl3 B4rQDqV8swflL9KObnum3WxAb9gSCuD4hnAicmHtuNk58asBRgltZGxmv0rNXiFIZFe+ urJA== X-Received: by 10.180.11.174 with SMTP id r14mr33644812wib.72.1434388087080; Mon, 15 Jun 2015 10:08:07 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id o6sm16760549wiz.24.2015.06.15.10.08.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jun 2015 10:08:06 -0700 (PDT) Sender: Baptiste Daroussin Date: Mon, 15 Jun 2015 19:08:04 +0200 From: Baptiste Daroussin To: Peter Wemm Cc: Adrian Chadd , "svn-src-head@freebsd.org" , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" Subject: Re: svn commit: r284417 - in head: cddl/lib gnu/lib/libgcc gnu/lib/libssp lib/libalias/libalias lib/libalias/modules lib/libbegemot lib/libc lib/libcam lib/libcapsicum lib/libcasper lib/libcrypt lib/li... Message-ID: <20150615170804.GJ925@ivaldir.etoilebsd.net> References: <201506151534.t5FFYLi4009100@svn.freebsd.org> <13210540.7KD1epFrEA@overcee.wemm.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="+HmK7y6O+lKZIGkr" Content-Disposition: inline In-Reply-To: <13210540.7KD1epFrEA@overcee.wemm.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 17:08:09 -0000 --+HmK7y6O+lKZIGkr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 15, 2015 at 10:03:35AM -0700, Peter Wemm wrote: > On Monday, June 15, 2015 09:27:09 AM Adrian Chadd wrote: > > ... this feels like the wrong solution. A really, really wrong solution. > >=20 > > I was just about to use SHLIBDIR overriding for doing something for > > cross-builds, and now I can't. > >=20 > >=20 > >=20 > > -adrian >=20 > FWIW; you can usually use the "I really mean it" override.. > SHLIBDIR :=3D /somewhere Or just pass SHLIBDIR in argument instead of env far, this is exactly meant= for that. >=20 > Like Baptiste said, this was just to buy time to prevent people from gett= ing=20 > trashed as a result of doing an installworld when running zfs. It's more= than=20 > just ZFS, but that's the most visible failure mode. >=20 > The failure is that the zfs libraries and libnvpair get installed into=20 > /usr/lib, but the /sbin zfs binaries use the ones from /lib. Depending o= n the=20 > age of the now-stale copies in /lib, you get undefined symbols. And if y= ou get=20 > rid of them, you now have a boot failure if /usr is its own dataset. del= ete- > old-libs doesn't help because it thinks that the /lib version is the corr= ect=20 > one. > --=20 > Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI6F= JV > UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246 --+HmK7y6O+lKZIGkr Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlV/BnQACgkQ8kTtMUmk6EzAwwCZARPWCIvHG+nkKzjCHy7pIQ9w loYAoIbY80yktbBQLEbDLyIkxEij9F5b =H9Wl -----END PGP SIGNATURE----- --+HmK7y6O+lKZIGkr-- From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 17:24:25 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E314DDCF; Mon, 15 Jun 2015 17:24:25 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-yh0-x234.google.com (mail-yh0-x234.google.com [IPv6:2607:f8b0:4002:c01::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9B7DDB6B; Mon, 15 Jun 2015 17:24:25 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: by yhan67 with SMTP id n67so47473787yha.3; Mon, 15 Jun 2015 10:24:24 -0700 (PDT) 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=Odisdtktx7qNPGY+it8l29BYfS9Hv/vhiftMkf7sI7c=; b=uiEBvJ83+zgQsi+HnGD97BNKbdAx1juH+XzwIULPnuN4z4eYhdPPkHlsg0JIuSi5QE hPtRhxQq90INUWkvbWF6D5KBJAnDi/ItX8ifl+rTGJYt3qs27Db1sXy5p9BQm7d28Bai 4FUIEvgX+irqKrbRhVBqYWlCP/wvkFzQdKqTgW9N54yWBEaY0bsVybl5vqCOCvWtQ94u YV1WXn8HmrtASAmsKbP/XZn9oenRKW5B5N0YQ2hSiv1JeXnLeDGVKWc9kjlgBQPdX8tC OEMX/zV3de8hIb91YJHxNVROqACDP1JFBJWIPrvzdu4itm8REdLYlPXdThWk+6b7sv39 AH8g== MIME-Version: 1.0 X-Received: by 10.170.167.2 with SMTP id j2mr35933240ykd.113.1434389064556; Mon, 15 Jun 2015 10:24:24 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.37.39.130 with HTTP; Mon, 15 Jun 2015 10:24:24 -0700 (PDT) In-Reply-To: <20150615171208.GW1647@zxy.spb.ru> References: <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> <20150614171031.GA5857@troutmask.apl.washington.edu> <557DCBED.2010804@fastmail.net> <39A1D5A9-1BD9-4828-B10D-D347771CBAD2@bsdimp.com> <20150615171208.GW1647@zxy.spb.ru> Date: Mon, 15 Jun 2015 10:24:24 -0700 X-Google-Sender-Auth: Gx3cjkDE8Im5itJ16pkKP42dljM Message-ID: Subject: Re: svn commit: r284198 - head/bin/ls From: Craig Rodrigues To: Slawa Olhovchenkov Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 17:24:26 -0000 On Mon, Jun 15, 2015 at 10:12 AM, Slawa Olhovchenkov wrote: > > No unification. This is more vital, I think. > And no tools for collect correlation data -- for example collect at > same time CPU load by core, i/o load by disk and network load by > inetrface. You may talk about Graphite, but graffit is crap: > http://grisha.org/blog/2015/05/04/recording-time-series/ > A few years ago, Alfred Perlstein wrote a tool called Eagleeye: https://github.com/splbio/eagleeye This tool did a few things: -> ran various tools like netstat, vmstat, gstat -> parsed the output of the various tools -> produce web based reports for doing correlation of the data This was very useful for performance analysis. Since the code for Eagleeye is on GitHub, maybe some FreeBSD coders who have interest can update Eagleeye to produce output from the system with libxo. Having more tools use libxo will definitely make it easier to write tools like Eagleeye. -- Craig -- Craig From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 17:12:19 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1516671F; Mon, 15 Jun 2015 17:12:19 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB9278C0; Mon, 15 Jun 2015 17:12:18 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from slw by zxy.spb.ru with local (Exim 4.84 (FreeBSD)) (envelope-from ) id 1Z4Xvc-000OG0-L4; Mon, 15 Jun 2015 20:12:08 +0300 Date: Mon, 15 Jun 2015 20:12:08 +0300 From: Slawa Olhovchenkov To: Warner Losh Cc: Adrian Chadd , Bruce Simpson , Steve Kargl , Craig Rodrigues , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Subject: Re: svn commit: r284198 - head/bin/ls Message-ID: <20150615171208.GW1647@zxy.spb.ru> References: <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> <20150614171031.GA5857@troutmask.apl.washington.edu> <557DCBED.2010804@fastmail.net> <39A1D5A9-1BD9-4828-B10D-D347771CBAD2@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline In-Reply-To: <39A1D5A9-1BD9-4828-B10D-D347771CBAD2@bsdimp.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false X-Mailman-Approved-At: Mon, 15 Jun 2015 17:28:30 +0000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 17:12:19 -0000 On Mon, Jun 15, 2015 at 10:36:12AM -0600, Warner Losh wrote: > > > On Jun 14, 2015, at 12:53 PM, Adrian Chadd wrote: > > > > I do like how zero percent of the comments are "hey, maybe we need > > unit tests that run these tools and ensure they output the right > > stuff." If this were ${WORK} and I were ${BOSS}, I'd have asked the > > libxo developers to include unit tests before/after for each thing > > they broke, so we don't have a repeat of this kind of thing. But, this > > apparently isn't ${WORK} and I definitely don't want to be anyones > > boss, so.. > > gstat still produces the right output. It simply has been broken in that > you can't just hit 'q' anymore. So while necessary, it wouldn't be > sufficient. I am about initial gstat behavior: you can't be do `gstat > output_log`, wait hour, press ^C and analyse output -- gstat exit after one ineration. I am talk all utilites have different behavior -- some exits by pressing 'q', some only by ^C (systat), some can be infinitly output to file|pipe, some -- not. Some have looped mode, some -- not, some can handle multiple obejcts (gstat, iostat), some -- not (netstat -nbI). And more: ix show network statics in netmap mode, igb -- don't show. No unification. This is more vital, I think. And no tools for collect correlation data -- for example collect at same time CPU load by core, i/o load by disk and network load by inetrface. You may talk about Graphite, but graffit is crap: http://grisha.org/blog/2015/05/04/recording-time-series/ From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 17:34:57 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9376C591; Mon, 15 Jun 2015 17:34:57 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "troutmask", Issuer "troutmask" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 6D645DE3; Mon, 15 Jun 2015 17:34:57 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.14.9/8.14.9) with ESMTP id t5FHYpMQ076797 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 15 Jun 2015 10:34:51 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.9/8.14.9/Submit) id t5FHYpU2076796; Mon, 15 Jun 2015 10:34:51 -0700 (PDT) (envelope-from sgk) Date: Mon, 15 Jun 2015 10:34:50 -0700 From: Steve Kargl To: Craig Rodrigues Cc: Slawa Olhovchenkov , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" Subject: Re: svn commit: r284198 - head/bin/ls Message-ID: <20150615173450.GA76624@troutmask.apl.washington.edu> References: <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> <20150614171031.GA5857@troutmask.apl.washington.edu> <557DCBED.2010804@fastmail.net> <39A1D5A9-1BD9-4828-B10D-D347771CBAD2@bsdimp.com> <20150615171208.GW1647@zxy.spb.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 17:34:57 -0000 On Mon, Jun 15, 2015 at 10:24:24AM -0700, Craig Rodrigues wrote: > > Having more tools use libxo will definitely make it easier to write tools > like Eagleeye. > Having more tools use libxo means having more broken tools. % w --libxo w: missing libxo option OK. Let's check the manpage. % man w SYNOPSIS w [--libxo] [-dhin] [-M core] [-N system] [user ...] --libxo doesn't take an optarg. The only other use of libxo in w(1) is the libxo(3) cross-reference. % man 3 libxo (search on --libxo) Output can then be generated in various style, using the "--libxo" option. The only appearance of --libxo is in the above sentence. Great. So, what are these fictitious optargs and why are they not documented? -- Steve From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 18:06:41 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 269EAF7F for ; Mon, 15 Jun 2015 18:06:41 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from mail-ig0-f181.google.com (mail-ig0-f181.google.com [209.85.213.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E36DC7C8 for ; Mon, 15 Jun 2015 18:06:40 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: by igbiq7 with SMTP id iq7so24574812igb.1 for ; Mon, 15 Jun 2015 11:06:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:mime-version:content-type:from :in-reply-to:date:cc:message-id:references:to; bh=psE/Y1/Sm4uD/jgNroSr1fEF/t4POCqOjiegi1+dDz4=; b=hA5+Rt1ScF4UOGAhp7gIFnr4EcbPZkwTwKR1nAQsziPudv07IHxYF09nOWesJ37XfT q6N3wbQpcSCj1DwH29hNyHOcyVzawogr0ix5t+sTORXQovnFKhrb5BQdunjAPeuKI+Sk W7j47qTzITD3zZ/aagnMgXyZVpgXf8XkS8c3tNSzIXXPeOXkaWdRhhspe1RF8tpz9NWl jYuLQQfQDsA4mBGbxevHstNtCYkJyHCu8oMrpjCJfaiEFUR5bAWGGUdyROj3hU7bB4xk df6t2vwJz2t/yk5ehGjCrFJh+fYJNWrEN0W0y53vYB8flf8phODDqp2cIf8sPDrqSA/m gOYQ== X-Gm-Message-State: ALoCoQmSYpNj+cj8X2ohPe6v2Q0KbdkM6z43KpGQ7IYC0XvcQij1ZRx5z9Rl2UOruRJx5PuciEPm X-Received: by 10.43.162.136 with SMTP id mk8mr31250349icc.28.1434391600076; Mon, 15 Jun 2015 11:06:40 -0700 (PDT) Received: from netflix-mac-wired.bsdimp.com ([50.253.99.174]) by mx.google.com with ESMTPSA id d4sm8083474igl.1.2015.06.15.11.06.38 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Jun 2015 11:06:39 -0700 (PDT) Sender: Warner Losh Subject: Re: svn commit: r284409 - in head/cddl/lib: libzfs libzfs_core Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_29E5B696-B34D-49E9-BF4B-01F28D34C342"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5 From: Warner Losh In-Reply-To: Date: Mon, 15 Jun 2015 12:06:35 -0600 Cc: Andriy Gapon , Baptiste Daroussin , "src-committers@freebsd.org" , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: References: <201506151048.t5FAmnF0039077@svn.freebsd.org> <557EBCAB.3010505@FreeBSD.org> To: Matthew Ahrens X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 18:06:41 -0000 --Apple-Mail=_29E5B696-B34D-49E9-BF4B-01F28D34C342 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Jun 15, 2015, at 8:37 AM, Matthew Ahrens wrote: >=20 >=20 >=20 > On Mon, Jun 15, 2015 at 7:53 AM, Andriy Gapon wrote: >=20 > P.S. > My personal preference would be to drop that compat code and to = convince > ZFS/FreeBSD users to always use boot environments, so that their = kernel and > userland never fall out of sync :) >=20 > Me too :-) Sadly, there are a number of upgrade scenarios where this simply isn=E2=80= =99t possible. But looking at the file, it appears to be full of stuff to do the 8.x -> = 9.x upgrade of ZFS to format 28. Perhaps that can now be removed? These libraries appear to be versioned, rather than symbol versioned = otherwise Baptiste=E2=80=99s commit would have been bad=E2=80=A6 but I wonder if = maybe a version bump is in order=E2=80=A6 Warner --Apple-Mail=_29E5B696-B34D-49E9-BF4B-01F28D34C342 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJVfxQrAAoJEGwc0Sh9sBEAEVcQAOhUZyWsVDPuzbZWU9yYbEQU wHxmpCIPtdoqLamDGHZQAUKu3/PNrKl7BzZizXT8oLtMD7xhcAp+3ju5HqosD9kS 0dFJMRMP5D/G9THX03M1LFmLOMyxqHmFKtOIGobIseXn3MVTahJFmDCzYNamyG1M uETScehHH14Rum+hfO3bw8tfAuleoWX34mMJ+5i3yQKT/xzPVStKVZ0nB9PRAQOC ATe2rPAJ3PhtB72r6gBGcAjsSVebRR4xfzVf6njR166j+5Fk2zzVfStgE7Knpgop AIAnOTXIUrRZcdMzXWe5/+94FSJESz0xIBoOnOA+k4vxJs/I/KK2ztAkS46Ply/Y HKwjsuOEfe2qw2OlDUMpmjEBKjVlq6KUAb1SnOhHPBKz/Lwmqii++2g5AAw/tFbx jYg6eiiTezDlW5BQ9np3J8bLhxejKiMreqgYcmQghJGh3O44UhvQBhzNtSIfbf9H vRQRWGU9SSpc6Q+W8urKgIKXzVcNp15yb7caZDqWjJGuNS9sz92AH1zphF/qMSQs BB9ANj3dmvJ48AkjCccPoJCoEDCmeFg5U8c80lGKLQHwy7NiN3HGxef9tbHhtSSR AJoza/s24ba/gshBymUlQ9uPYQNRGLFr/kyeoO8HPHG1C3xpNpKNpuLBcw4Ta44H 3St1htvfihCbmRgrM7yx =MHUF -----END PGP SIGNATURE----- --Apple-Mail=_29E5B696-B34D-49E9-BF4B-01F28D34C342-- From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 18:43:32 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC790CC9; Mon, 15 Jun 2015 18:43:32 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BAC38180; Mon, 15 Jun 2015 18:43:32 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FIhW4H003013; Mon, 15 Jun 2015 18:43:32 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FIhW89003012; Mon, 15 Jun 2015 18:43:32 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506151843.t5FIhW89003012@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Mon, 15 Jun 2015 18:43:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284419 - head/sys/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 18:43:32 -0000 Author: sjg Date: Mon Jun 15 18:43:32 2015 New Revision: 284419 URL: https://svnweb.freebsd.org/changeset/base/284419 Log: Don't use ${.OBJDIR}/ to qualify target that isn't specified that way Modified: head/sys/conf/kmod.mk Modified: head/sys/conf/kmod.mk ============================================================================== --- head/sys/conf/kmod.mk Mon Jun 15 18:16:23 2015 (r284418) +++ head/sys/conf/kmod.mk Mon Jun 15 18:43:32 2015 (r284419) @@ -239,7 +239,7 @@ beforedepend: ${_ILINKS} # causes all the modules to be rebuilt when the directory pointed to changes. .for _link in ${_ILINKS} .if !exists(${.OBJDIR}/${_link}) -${OBJS}: ${.OBJDIR}/${_link} +${OBJS}: ${_link} .endif .endfor From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 18:49:51 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6C7C81D1 for ; Mon, 15 Jun 2015 18:49:51 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from mail-ie0-f181.google.com (mail-ie0-f181.google.com [209.85.223.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 30C281D6 for ; Mon, 15 Jun 2015 18:49:51 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: by iebmu5 with SMTP id mu5so68746587ieb.1 for ; Mon, 15 Jun 2015 11:49:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:mime-version:content-type:from :in-reply-to:date:cc:message-id:references:to; bh=ziLr7bf9CEdNXpOzrWIA7IHF1YMXlim9Sb1QXrsYMKs=; b=QipW+dg1LqkrUWeisgC6C7diFGt8vdBSkWr5p3dOLfUMMbk3LD3v8c/PSskgArq5nn 1XLWboimrUxFb8inUy5HwMhpNoIEEDlB3k5kWdHF75JCsjfjcXcLImpjeU8iNcqPAnau ti7c02rID0CiZ7xOxNDxqTubBq/yPIkSyrLxWJPui6KW+WFKsZK4RSDbT0Vdd+CTSy0V oaMZYFJSbB8EPMGwTYPLIsFQ/WtTrKcgyBznSKAoo74CFF3RWaUwILrkk+Bn3QQsZqsu gpxO+rCCZaLVctbDYe34e1OLSq7ggg/5m0aC1KAE6mDd01z79bdGHUtrSJIgYCVRIerN lOhA== X-Gm-Message-State: ALoCoQljs+xnTe6jkIJYnpDt8FJFG03nvhvvYr6MlFShmczxagjEZfcbkZm+TPUm702rHEs4o3qw X-Received: by 10.50.78.199 with SMTP id d7mr23058414igx.18.1434394184293; Mon, 15 Jun 2015 11:49:44 -0700 (PDT) Received: from netflix-mac-wired.bsdimp.com ([50.253.99.174]) by mx.google.com with ESMTPSA id c20sm9415751ioc.40.2015.06.15.11.49.42 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Jun 2015 11:49:43 -0700 (PDT) Sender: Warner Losh Subject: Re: svn commit: r284198 - head/bin/ls Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_3B9757B2-3F82-4F7F-BDA9-E3CBCCCF15C9"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5 From: Warner Losh In-Reply-To: <557F033A.1060006@FreeBSD.org> Date: Mon, 15 Jun 2015 12:49:40 -0600 Cc: Garrett Cooper , Slawa Olhovchenkov , Craig Rodrigues , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Message-Id: References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <45B665F4-B81F-439B-89DC-6D27BA96F87D@gmail.com> <557F033A.1060006@FreeBSD.org> To: Bryan Drewery X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 18:49:51 -0000 --Apple-Mail=_3B9757B2-3F82-4F7F-BDA9-E3CBCCCF15C9 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 > On Jun 15, 2015, at 10:54 AM, Bryan Drewery = wrote: >=20 > On 6/14/15 3:17 AM, Garrett Cooper wrote: >> On Jun 14, 2015, at 3:00, Slawa Olhovchenkov >> wrote: >>=20 >>> On Sat, Jun 13, 2015 at 05:13:31PM -0700, Craig Rodrigues wrote: >>>=20 >>>> The people I talk to use scripting languages like Python or >>>> Ruby, and devops frameworks like Ansible, Saltstack, Puppet, >>>> and Chef. They may do some quick prototyping and UI work with >>>> Javascript and HTML/CSS. Being able to generate JSON directly >>>> from system-level tools, and then analyze that in a Python >>>> script, >>>=20 >>> You need JSON from system-level tools for analyze that in a >>> Python script? Realy? Not plain text? or tab/space separated? >>=20 >> Having written a bunch of tools that parse plaintext, it=92s a pain >> in the rear. It=92s far easier to have JSON and a schema for working >> with that JSON when developing tools to parse things out. >>=20 >> Programmers are inherently lazy =97 the more we have to make them >> work, the more pushback we=92re going to get from them as far as >> integrating FreeBSD=92s concerned. >>=20 >> Thanks! >>=20 >=20 > For 'w' it makes sense, for 'ls' why? Most, all?, scripting languages > have globbing and file listing functions already so there's no need to > run /bin/ls and parse it. I=92ve yet to see why ls =97libxo is better than a separate program = articulated anywhere other than "libxo all the things.=94 Having a clear statement = about why it is needed, why changing it vs having a separate program, etc = would help. But is seems overly gratuitous with little benefit. Warner --Apple-Mail=_3B9757B2-3F82-4F7F-BDA9-E3CBCCCF15C9 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJVfx5EAAoJEGwc0Sh9sBEAg5IP/0+9sySz7canFQSIlBBQtyWb xazhjKCCyBmtRFCQkkYb+rzrakVvLCU0cmrvpJN4jQu8rWSjymRox4Por+w8LdFl +iHltorPVqSl8FUWUuZP6O0jbjXNs8MgAuJK8OJ8ti21RMpqZb0WAC0u1Wa1uADH A1yJeiRREQ+TF2UTwj7WesRqXeOFiI7mURa+orxSMf4xIarO4jOy4AyvSKb8h7LT 3OYeoS4nrXb7qkqVUj2aOSqgxmd/TnUAzMzElNeBaB5GYWfDlmMfLCHr3G0xhSqF 5pZ410PGe66K8oojSNgy8ufus0gjMMaVqFD6i8AuZmucQGXa+0bV0QvCWePL0zMU oyCta9TayxB7GYTrMH8t1ahkx1mKFGHHQUQeIjgZylBW06C7H52k0o0Nnkqe41k6 1fgVIo80Cj0v6g/VfuSUeAqLZLQOcRgx67xBYF2NuIxLEbzSwvcQiNGQSj6zOUuA 98zYwQOjI2mBIKzIzzTG9JSqrMok45pua4wOQlAUNMhyS81kcH9rTLzBSGJ+IWoB CszxwnNDO6fEX3ZtPa3s4VSrnBuU02GGgaa5xZp+xrQ61ApZSnsLN93LuMvDTWMG eidODvvVxCJ2IPPnsBSJSCvVRWLx8jsWrA/1EZWu6GwOtR/jxVM/8Clb1jOLep25 u02QgcMO9MsQT/5WtPE4 =3BHr -----END PGP SIGNATURE----- --Apple-Mail=_3B9757B2-3F82-4F7F-BDA9-E3CBCCCF15C9-- From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 19:23:48 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 135CA560; Mon, 15 Jun 2015 19:23:48 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 01B3DDAA; Mon, 15 Jun 2015 19:23:48 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FJNljh023271; Mon, 15 Jun 2015 19:23:47 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FJNla8023270; Mon, 15 Jun 2015 19:23:47 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506151923.t5FJNla8023270@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Mon, 15 Jun 2015 19:23:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284420 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 19:23:48 -0000 Author: sjg Date: Mon Jun 15 19:23:47 2015 New Revision: 284420 URL: https://svnweb.freebsd.org/changeset/base/284420 Log: do not include src.opts.mk from here Modified: head/share/mk/local.init.mk Modified: head/share/mk/local.init.mk ============================================================================== --- head/share/mk/local.init.mk Mon Jun 15 18:43:32 2015 (r284419) +++ head/share/mk/local.init.mk Mon Jun 15 19:23:47 2015 (r284420) @@ -1,7 +1,5 @@ # $FreeBSD$ -.include "src.opts.mk" - .if ${.MAKE.MODE:Unormal:Mmeta*} != "" .if !empty(SUBDIR) && !defined(LIB) && !defined(PROG) && ${.MAKE.MAKEFILES:M*bsd.prog.mk} == "" .if ${.MAKE.MODE:Mleaf*} != "" From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 19:28:19 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 23E537EB; Mon, 15 Jun 2015 19:28:19 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0FDAEDDD; Mon, 15 Jun 2015 19:28:19 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FJSJhp023954; Mon, 15 Jun 2015 19:28:19 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FJS8Ab023897; Mon, 15 Jun 2015 19:28:08 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506151928.t5FJS8Ab023897@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 15 Jun 2015 19:28:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284421 - in head: . cddl/lib gnu/lib/libgcc gnu/lib/libssp lib/libalias/libalias lib/libalias/modules lib/libbegemot lib/libc lib/libcam lib/libcapsicum lib/libcasper lib/libcrypt lib/... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 19:28:19 -0000 Author: bapt Date: Mon Jun 15 19:28:07 2015 New Revision: 284421 URL: https://svnweb.freebsd.org/changeset/base/284421 Log: Revert r284417 it is not necessary anymore Modified: head/Makefile.inc1 head/cddl/lib/Makefile.inc head/gnu/lib/libgcc/Makefile head/gnu/lib/libssp/Makefile head/lib/libalias/libalias/Makefile head/lib/libalias/modules/Makefile.inc head/lib/libbegemot/Makefile head/lib/libc/Makefile head/lib/libcam/Makefile head/lib/libcapsicum/Makefile head/lib/libcasper/Makefile head/lib/libcrypt/Makefile head/lib/libcxxrt/Makefile head/lib/libedit/Makefile head/lib/libexpat/Makefile head/lib/libgeom/Makefile head/lib/libipsec/Makefile head/lib/libjail/Makefile head/lib/libkiconv/Makefile head/lib/libkvm/Makefile head/lib/libmd/Makefile head/lib/libmt/Makefile head/lib/libnv/Makefile head/lib/libpcap/Makefile head/lib/libpjdlog/Makefile head/lib/libsbuf/Makefile head/lib/libthr/Makefile head/lib/libufs/Makefile head/lib/libulog/Makefile head/lib/libutil/Makefile head/lib/libxo/Makefile head/lib/libz/Makefile head/lib/msun/Makefile head/lib/ncurses/ncurses/Makefile head/sbin/geom/class/Makefile.inc head/secure/lib/libcrypto/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Mon Jun 15 19:23:47 2015 (r284420) +++ head/Makefile.inc1 Mon Jun 15 19:28:07 2015 (r284421) @@ -451,6 +451,8 @@ LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${LIB32 LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \ CXX="${XCXX} ${LIB32FLAGS}" \ DESTDIR=${LIB32TMP} \ + SHLIBDIR=/usr/lib32 \ + LIBDIR=/usr/lib32 \ -DCOMPAT_32BIT \ -DLIBRARIES_ONLY \ -DNO_CPU_CFLAGS \ Modified: head/cddl/lib/Makefile.inc ============================================================================== --- head/cddl/lib/Makefile.inc Mon Jun 15 19:23:47 2015 (r284420) +++ head/cddl/lib/Makefile.inc Mon Jun 15 19:28:07 2015 (r284421) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib SHLIB_MAJOR?= 2 .include "../Makefile.inc" Modified: head/gnu/lib/libgcc/Makefile ============================================================================== --- head/gnu/lib/libgcc/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/gnu/lib/libgcc/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -4,7 +4,7 @@ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SHLIB_NAME= libgcc_s.so.1 -SHLIBDIR= /lib +SHLIBDIR?= /lib .include # Modified: head/gnu/lib/libssp/Makefile ============================================================================== --- head/gnu/lib/libssp/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/gnu/lib/libssp/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib MK_PROFILE= no MK_SSP= no Modified: head/lib/libalias/libalias/Makefile ============================================================================== --- head/lib/libalias/libalias/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libalias/libalias/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../sys/netinet/libalias LIB= alias -SHLIBDIR= /lib +SHLIBDIR?= /lib SHLIB_MAJOR= 7 MAN= libalias.3 SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c Modified: head/lib/libalias/modules/Makefile.inc ============================================================================== --- head/lib/libalias/modules/Makefile.inc Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libalias/modules/Makefile.inc Mon Jun 15 19:28:07 2015 (r284421) @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../../../../sys/netinet/libalias -SHLIBDIR= /lib +SHLIBDIR?= /lib LIB?= alias_${NAME} SHLIB_NAME?=libalias_${NAME}.so WARNS?= 1 Modified: head/lib/libbegemot/Makefile ============================================================================== --- head/lib/libbegemot/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libbegemot/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -6,7 +6,7 @@ LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/ LIB= begemot SHLIB_MAJOR= 4 -SHLIBDIR= /lib +SHLIBDIR?= /lib CFLAGS+= -DUSE_SELECT -DQUADFMT='"ll"' SRCS= rpoll.c Modified: head/lib/libc/Makefile ============================================================================== --- head/lib/libc/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libc/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -1,7 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib .include Modified: head/lib/libcam/Makefile ============================================================================== --- head/lib/libcam/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libcam/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= cam -SHLIBDIR= /lib +SHLIBDIR?= /lib SRCS= camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c \ ata_all.c smp_all.c INCS= camlib.h Modified: head/lib/libcapsicum/Makefile ============================================================================== --- head/lib/libcapsicum/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libcapsicum/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -3,7 +3,7 @@ LIB= capsicum SHLIB_MAJOR= 0 -SHLIBDIR= /lib +SHLIBDIR?= /lib SRCS= libcapsicum.c SRCS+= libcapsicum_dns.c Modified: head/lib/libcasper/Makefile ============================================================================== --- head/lib/libcasper/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libcasper/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -3,7 +3,7 @@ LIB= casper SHLIB_MAJOR= 0 -SHLIBDIR= /lib +SHLIBDIR?= /lib SRCS= libcasper.c INCS= libcasper.h Modified: head/lib/libcrypt/Makefile ============================================================================== --- head/lib/libcrypt/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libcrypt/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -2,7 +2,7 @@ # $FreeBSD$ # -SHLIBDIR= /lib +SHLIBDIR?= /lib .include Modified: head/lib/libcxxrt/Makefile ============================================================================== --- head/lib/libcxxrt/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libcxxrt/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -3,7 +3,7 @@ SRCDIR= ${.CURDIR}/../../contrib/libcxxrt SHLIB_MAJOR= 1 -SHLIBDIR= /lib +SHLIBDIR?= /lib .PATH: ${SRCDIR} Modified: head/lib/libedit/Makefile ============================================================================== --- head/lib/libedit/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libedit/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -4,7 +4,7 @@ LIB= edit SHLIB_MAJOR= 7 -SHLIBDIR= /lib +SHLIBDIR?= /lib OSRCS= chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \ hist.c keymacro.c map.c chartype.c \ Modified: head/lib/libexpat/Makefile ============================================================================== --- head/lib/libexpat/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libexpat/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -3,7 +3,7 @@ EXPAT= ${.CURDIR}/../../contrib/expat LIB= bsdxml -SHLIBDIR= /lib +SHLIBDIR?= /lib SHLIB_MAJOR= 4 SRCS= xmlparse.c xmlrole.c xmltok.c INCS= bsdxml.h bsdxml_external.h Modified: head/lib/libgeom/Makefile ============================================================================== --- head/lib/libgeom/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libgeom/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= geom -SHLIBDIR= /lib +SHLIBDIR?= /lib SRCS+= geom_getxml.c SRCS+= geom_stats.c SRCS+= geom_xml2tree.c Modified: head/lib/libipsec/Makefile ============================================================================== --- head/lib/libipsec/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libipsec/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -27,7 +27,7 @@ # # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib .include Modified: head/lib/libjail/Makefile ============================================================================== --- head/lib/libjail/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libjail/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= jail -SHLIBDIR= /lib +SHLIBDIR?= /lib SHLIB_MAJOR= 1 SRCS= jail.c jail_getid.c INCS= jail.h Modified: head/lib/libkiconv/Makefile ============================================================================== --- head/lib/libkiconv/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libkiconv/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib .include Modified: head/lib/libkvm/Makefile ============================================================================== --- head/lib/libkvm/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libkvm/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -16,7 +16,7 @@ CFLAGS+=-DCROSS_LIBKVM LIB= kvm .endif -SHLIBDIR= /lib +SHLIBDIR?= /lib SHLIB_MAJOR= 6 CFLAGS+=-DLIBC_SCCS -I${.CURDIR} Modified: head/lib/libmd/Makefile ============================================================================== --- head/lib/libmd/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libmd/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -2,7 +2,7 @@ LIB= md SHLIB_MAJOR= 6 -SHLIBDIR= /lib +SHLIBDIR?= /lib SRCS= md4c.c md5c.c md4hl.c md5hl.c \ rmd160c.c rmd160hl.c \ sha0c.c sha0hl.c sha1c.c sha1hl.c \ Modified: head/lib/libmt/Makefile ============================================================================== --- head/lib/libmt/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libmt/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= mt -SHLIBDIR= /lib +SHLIBDIR?= /lib SRCS= mtlib.c INCS= mtlib.h Modified: head/lib/libnv/Makefile ============================================================================== --- head/lib/libnv/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libnv/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib .include Modified: head/lib/libpcap/Makefile ============================================================================== --- head/lib/libpcap/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libpcap/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -1,7 +1,7 @@ # Makefile for libpcap # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib .include Modified: head/lib/libpjdlog/Makefile ============================================================================== --- head/lib/libpjdlog/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libpjdlog/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -2,7 +2,7 @@ # $FreeBSD$ # -SHLIBDIR= /lib +SHLIBDIR?= /lib .include Modified: head/lib/libsbuf/Makefile ============================================================================== --- head/lib/libsbuf/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libsbuf/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= sbuf -SHLIBDIR= /lib +SHLIBDIR?= /lib SRCS= subr_prf.c subr_sbuf.c SHLIB_MAJOR = 6 Modified: head/lib/libthr/Makefile ============================================================================== --- head/lib/libthr/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libthr/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -8,7 +8,7 @@ # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -SHLIBDIR= /lib +SHLIBDIR?= /lib .include MK_SSP= no Modified: head/lib/libufs/Makefile ============================================================================== --- head/lib/libufs/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libufs/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= ufs -SHLIBDIR= /lib +SHLIBDIR?= /lib SHLIB_MAJOR= 6 SRCS= block.c cgroup.c inode.c sblock.c type.c ffs_subr.c ffs_tables.c Modified: head/lib/libulog/Makefile ============================================================================== --- head/lib/libulog/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libulog/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR=/lib +SHLIBDIR?=/lib .include Modified: head/lib/libutil/Makefile ============================================================================== --- head/lib/libutil/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libutil/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib .include Modified: head/lib/libxo/Makefile ============================================================================== --- head/lib/libxo/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libxo/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -7,7 +7,7 @@ LIBXO= ${.CURDIR:H:H}/contrib/libxo LIB= xo SHLIB_MAJOR=0 -SHLIBDIR= /lib +SHLIBDIR?= /lib SRCS= libxo.c Modified: head/lib/libz/Makefile ============================================================================== --- head/lib/libz/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/libz/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -3,7 +3,7 @@ # LIB= z -SHLIBDIR= /lib +SHLIBDIR?= /lib SHLIB_MAJOR= 6 MAN= zlib.3 zopen.3 Modified: head/lib/msun/Makefile ============================================================================== --- head/lib/msun/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/msun/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -42,7 +42,7 @@ CFLAGS+= -I${.CURDIR}/${ARCH_SUBDIR} .PATH: ${.CURDIR}/man LIB= m -SHLIBDIR= /lib +SHLIBDIR?= /lib SHLIB_MAJOR= 5 WARNS?= 1 IGNORE_PRAGMA= Modified: head/lib/ncurses/ncurses/Makefile ============================================================================== --- head/lib/ncurses/ncurses/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/lib/ncurses/ncurses/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib .if !defined(ENABLE_WIDEC) # Override any MAN= setting below.. Modified: head/sbin/geom/class/Makefile.inc ============================================================================== --- head/sbin/geom/class/Makefile.inc Mon Jun 15 19:23:47 2015 (r284420) +++ head/sbin/geom/class/Makefile.inc Mon Jun 15 19:28:07 2015 (r284421) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR=${GEOM_CLASS_DIR} +SHLIBDIR?=${GEOM_CLASS_DIR} SHLIB_NAME?=geom_${GEOM_CLASS}.so LINKS= ${BINDIR}/geom ${BINDIR}/g${GEOM_CLASS} MAN= g${GEOM_CLASS}.8 Modified: head/secure/lib/libcrypto/Makefile ============================================================================== --- head/secure/lib/libcrypto/Makefile Mon Jun 15 19:23:47 2015 (r284420) +++ head/secure/lib/libcrypto/Makefile Mon Jun 15 19:28:07 2015 (r284421) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR= /lib +SHLIBDIR?= /lib SUBDIR= engines .include From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 19:48:29 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C56A0240; Mon, 15 Jun 2015 19:48:29 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3BE2266; Mon, 15 Jun 2015 19:48:29 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FJmTAj032973; Mon, 15 Jun 2015 19:48:29 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FJmTdH032972; Mon, 15 Jun 2015 19:48:29 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201506151948.t5FJmTdH032972@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Mon, 15 Jun 2015 19:48:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284422 - head/usr.sbin/crunch/crunchgen X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 19:48:29 -0000 Author: tijl Date: Mon Jun 15 19:48:28 2015 New Revision: 284422 URL: https://svnweb.freebsd.org/changeset/base/284422 Log: Change -Wl,-r back to -r so gcc doesn't pass --relax to the linker on some architectures. PR: 200881 Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c ============================================================================== --- head/usr.sbin/crunch/crunchgen/crunchgen.c Mon Jun 15 19:28:07 2015 (r284421) +++ head/usr.sbin/crunch/crunchgen/crunchgen.c Mon Jun 15 19:48:28 2015 (r284422) @@ -1110,7 +1110,7 @@ prog_makefile_rules(FILE *outmk, prog_t fprintf(outmk, " $(%s_LIBS)", p->ident); fprintf(outmk, "\n"); - fprintf(outmk, "\t$(CC) -nostdlib -Wl,-dc -Wl,-r -o %s.lo %s_stub.o $(%s_OBJPATHS)", + fprintf(outmk, "\t$(CC) -nostdlib -Wl,-dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", p->name, p->name, p->ident); if (p->libs) fprintf(outmk, " $(%s_LIBS)", p->ident); From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 20:11:07 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70768C2D; Mon, 15 Jun 2015 20:11:07 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 51899A4C; Mon, 15 Jun 2015 20:11:07 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FKB7eS046412; Mon, 15 Jun 2015 20:11:07 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FKB65U046410; Mon, 15 Jun 2015 20:11:06 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201506152011.t5FKB65U046410@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Mon, 15 Jun 2015 20:11:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284423 - head/lib/msun/src X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 20:11:07 -0000 Author: tijl Date: Mon Jun 15 20:11:06 2015 New Revision: 284423 URL: https://svnweb.freebsd.org/changeset/base/284423 Log: Fix some exceptional cases where the sign of the result is unspecified but must still satisfy ccosh(conj(z)) == conj(ccosh(z)) and ccosh(-z) == ccosh(z). In collaboration with: bde Modified: head/lib/msun/src/s_ccosh.c head/lib/msun/src/s_ccoshf.c Modified: head/lib/msun/src/s_ccosh.c ============================================================================== --- head/lib/msun/src/s_ccosh.c Mon Jun 15 19:48:28 2015 (r284422) +++ head/lib/msun/src/s_ccosh.c Mon Jun 15 20:11:06 2015 (r284423) @@ -32,6 +32,8 @@ * * Exceptional values are noted in the comments within the source code. * These values and the return value were taken from n1124.pdf. + * The sign of the result for some exceptional values is unspecified but + * must satisfy both cosh(conj(z)) == conj(cosh(z)) and cosh(-z) == cosh(z). */ #include @@ -63,7 +65,7 @@ ccosh(double complex z) if (ix < 0x7ff00000 && iy < 0x7ff00000) { if ((iy | ly) == 0) return (CMPLX(cosh(x), x * y)); - if (ix < 0x40360000) /* small x: normal case */ + if (ix < 0x40360000) /* |x| < 22: normal case */ return (CMPLX(cosh(x) * cos(y), sinh(x) * sin(y))); /* |x| >= 22, so cosh(x) ~= exp(|x|) */ @@ -83,28 +85,27 @@ ccosh(double complex z) } /* - * cosh(+-0 +- I Inf) = dNaN + I sign(d(+-0, dNaN))0. - * The sign of 0 in the result is unspecified. Choice = normally - * the same as dNaN. Raise the invalid floating-point exception. - * - * cosh(+-0 +- I NaN) = d(NaN) + I sign(d(+-0, NaN))0. - * The sign of 0 in the result is unspecified. Choice = normally - * the same as d(NaN). + * cosh(+-0 +- I Inf) = dNaN + I (+-)(+-)0. + * The sign of 0 in the result is unspecified. Choice = product + * of the signs of the argument. Raise the invalid floating-point + * exception. + * + * cosh(+-0 +- I NaN) = d(NaN) + I (+-)(+-)0. + * The sign of 0 in the result is unspecified. Choice = product + * of the signs of the argument. */ - if ((ix | lx) == 0 && iy >= 0x7ff00000) - return (CMPLX(y - y, copysign(0, x * (y - y)))); + if ((ix | lx) == 0) /* && iy >= 0x7ff00000 */ + return (CMPLX(y - y, x * copysign(0, y))); /* * cosh(+-Inf +- I 0) = +Inf + I (+-)(+-)0. * - * cosh(NaN +- I 0) = d(NaN) + I sign(d(NaN, +-0))0. - * The sign of 0 in the result is unspecified. + * cosh(NaN +- I 0) = d(NaN) + I (+-)(+-)0. + * The sign of 0 in the result is unspecified. Choice = product + * of the signs of the argument. */ - if ((iy | ly) == 0 && ix >= 0x7ff00000) { - if (((hx & 0xfffff) | lx) == 0) - return (CMPLX(x * x, copysign(0, x) * y)); - return (CMPLX(x * x, copysign(0, (x + x) * y))); - } + if ((iy | ly) == 0) /* && ix >= 0x7ff00000 */ + return (CMPLX(x * x, copysign(0, x) * y)); /* * cosh(x +- I Inf) = dNaN + I dNaN. @@ -114,7 +115,7 @@ ccosh(double complex z) * Optionally raises the invalid floating-point exception for finite * nonzero x. Choice = don't raise (except for signaling NaNs). */ - if (ix < 0x7ff00000 && iy >= 0x7ff00000) + if (ix < 0x7ff00000) /* && iy >= 0x7ff00000 */ return (CMPLX(y - y, x * (y - y))); /* @@ -126,10 +127,10 @@ ccosh(double complex z) * * cosh(+-Inf + I y) = +Inf cos(y) +- I Inf sin(y) */ - if (ix >= 0x7ff00000 && ((hx & 0xfffff) | lx) == 0) { + if (ix == 0x7ff00000 && lx == 0) { if (iy >= 0x7ff00000) - return (CMPLX(x * x, x * (y - y))); - return (CMPLX((x * x) * cos(y), x * sin(y))); + return (CMPLX(INFINITY, x * (y - y))); + return (CMPLX(INFINITY * cos(y), x * sin(y))); } /* Modified: head/lib/msun/src/s_ccoshf.c ============================================================================== --- head/lib/msun/src/s_ccoshf.c Mon Jun 15 19:48:28 2015 (r284422) +++ head/lib/msun/src/s_ccoshf.c Mon Jun 15 20:11:06 2015 (r284423) @@ -25,7 +25,7 @@ */ /* - * Hyperbolic cosine of a complex argument. See s_ccosh.c for details. + * Float version of ccosh(). See s_ccosh.c for details. */ #include @@ -56,13 +56,13 @@ ccoshf(float complex z) if (ix < 0x7f800000 && iy < 0x7f800000) { if (iy == 0) return (CMPLXF(coshf(x), x * y)); - if (ix < 0x41100000) /* small x: normal case */ + if (ix < 0x41100000) /* |x| < 9: normal case */ return (CMPLXF(coshf(x) * cosf(y), sinhf(x) * sinf(y))); /* |x| >= 9, so cosh(x) ~= exp(|x|) */ if (ix < 0x42b17218) { /* x < 88.7: expf(|x|) won't overflow */ - h = expf(fabsf(x)) * 0.5f; + h = expf(fabsf(x)) * 0.5F; return (CMPLXF(h * cosf(y), copysignf(h, x) * sinf(y))); } else if (ix < 0x4340b1e7) { /* x < 192.7: scale to avoid overflow */ @@ -75,22 +75,19 @@ ccoshf(float complex z) } } - if (ix == 0 && iy >= 0x7f800000) - return (CMPLXF(y - y, copysignf(0, x * (y - y)))); + if (ix == 0) /* && iy >= 0x7f800000 */ + return (CMPLXF(y - y, x * copysignf(0, y))); - if (iy == 0 && ix >= 0x7f800000) { - if ((hx & 0x7fffff) == 0) - return (CMPLXF(x * x, copysignf(0, x) * y)); - return (CMPLXF(x * x, copysignf(0, (x + x) * y))); - } + if (iy == 0) /* && ix >= 0x7f800000 */ + return (CMPLXF(x * x, copysignf(0, x) * y)); - if (ix < 0x7f800000 && iy >= 0x7f800000) + if (ix < 0x7f800000) /* && iy >= 0x7f800000 */ return (CMPLXF(y - y, x * (y - y))); - if (ix >= 0x7f800000 && (hx & 0x7fffff) == 0) { + if (ix == 0x7f800000) { if (iy >= 0x7f800000) - return (CMPLXF(x * x, x * (y - y))); - return (CMPLXF((x * x) * cosf(y), x * sinf(y))); + return (CMPLXF(INFINITY, x * (y - y))); + return (CMPLXF(INFINITY * cosf(y), x * sinf(y))); } return (CMPLXF((x * x) * (y - y), (x + x) * (y - y))); From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 20:11:17 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 597A2D6A; Mon, 15 Jun 2015 20:11:17 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C024A62; Mon, 15 Jun 2015 20:11:17 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FKBHZn046496; Mon, 15 Jun 2015 20:11:17 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FKBGSV046492; Mon, 15 Jun 2015 20:11:16 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506152011.t5FKBGSV046492@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Mon, 15 Jun 2015 20:11:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284424 - in head: lib/libelftc targets/pseudo/toolchain usr.bin/elfcopy X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 20:11:17 -0000 Author: sjg Date: Mon Jun 15 20:11:15 2015 New Revision: 284424 URL: https://svnweb.freebsd.org/changeset/base/284424 Log: Pay attention to MK_ELFTOOLCHAIN_TOOLS so we build the desired tools. Added: head/lib/libelftc/Makefile.depend (contents, props changed) head/usr.bin/elfcopy/Makefile.depend (contents, props changed) Modified: head/targets/pseudo/toolchain/Makefile.depend Added: head/lib/libelftc/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libelftc/Makefile.depend Mon Jun 15 20:11:15 2015 (r284424) @@ -0,0 +1,14 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libelf \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Modified: head/targets/pseudo/toolchain/Makefile.depend ============================================================================== --- head/targets/pseudo/toolchain/Makefile.depend Mon Jun 15 20:11:06 2015 (r284423) +++ head/targets/pseudo/toolchain/Makefile.depend Mon Jun 15 20:11:15 2015 (r284424) @@ -7,21 +7,38 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,, .if !defined(MK_CLANG) .include "${SRCTOP}/share/mk/src.opts.mk" .endif +DIRDEPS= + +.if ${MK_ELFTOOLCHAIN_TOOLS} == "yes" +DIRDEPS+= \ + usr.bin/addr2line \ + usr.bin/cxxflit \ + usr.bin/elfcopy \ + usr.bin/nm \ + usr.bin/readelf \ + usr.bin/size \ + usr.bin/strip \ + usr.bin/strings \ + +.else +DIRDEPS+= \ + gnu/usr.bin/binutils/addr2line \ + gnu/usr.bin/binutils/nm \ + gnu/usr.bin/binutils/readelf \ + gnu/usr.bin/binutils/size \ + gnu/usr.bin/binutils/strip \ + gnu/usr.bin/binutils/strings \ + +.endif DIRDEPS= \ usr.bin/xinstall \ - gnu/usr.bin/binutils/addr2line \ gnu/usr.bin/binutils/ar \ gnu/usr.bin/binutils/as \ gnu/usr.bin/binutils/ld \ - gnu/usr.bin/binutils/nm \ gnu/usr.bin/binutils/objcopy \ gnu/usr.bin/binutils/objdump \ gnu/usr.bin/binutils/ranlib \ - gnu/usr.bin/binutils/readelf \ - gnu/usr.bin/binutils/size \ - gnu/usr.bin/binutils/strings \ - gnu/usr.bin/binutils/strip \ .if ${MK_CLANG} == "yes" Added: head/usr.bin/elfcopy/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/elfcopy/Makefile.depend Mon Jun 15 20:11:15 2015 (r284424) @@ -0,0 +1,25 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + lib/${CSU_DIR} \ + lib/libarchive \ + lib/libbz2 \ + lib/libc \ + lib/libcompiler_rt \ + lib/libelf \ + lib/libelftc \ + lib/libexpat \ + lib/liblzma \ + lib/libthr \ + lib/libz \ + secure/lib/libcrypto \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 20:12:16 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 147D3EF0; Mon, 15 Jun 2015 20:12:16 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 02A3CBB3; Mon, 15 Jun 2015 20:12:16 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FKCFf2047193; Mon, 15 Jun 2015 20:12:15 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FKCF08047192; Mon, 15 Jun 2015 20:12:15 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201506152012.t5FKCF08047192@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Mon, 15 Jun 2015 20:12:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284425 - head/usr.sbin/freebsd-update X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 20:12:16 -0000 Author: delphij Date: Mon Jun 15 20:12:15 2015 New Revision: 284425 URL: https://svnweb.freebsd.org/changeset/base/284425 Log: Skip src component if /usr/src is empty. Differential Revision: https://reviews.freebsd.org/D2364 Submitted by: kczekirda Reviewed by: cperciva, delphij, nwhitehorn, allanjude MFC after: 2 weeks Modified: head/usr.sbin/freebsd-update/freebsd-update.sh Modified: head/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- head/usr.sbin/freebsd-update/freebsd-update.sh Mon Jun 15 20:11:15 2015 (r284424) +++ head/usr.sbin/freebsd-update/freebsd-update.sh Mon Jun 15 20:12:15 2015 (r284425) @@ -216,7 +216,15 @@ config_KeepModifiedMetadata () { # Add to the list of components which should be kept updated. config_Components () { for C in $@; do - COMPONENTS="${COMPONENTS} ${C}" + if [ "$C" = "src" ]; then + if [ -e /usr/src/COPYRIGHT ]; then + COMPONENTS="${COMPONENTS} ${C}" + else + echo "src component not installed, skipped" + fi + else + COMPONENTS="${COMPONENTS} ${C}" + fi done } @@ -2642,10 +2650,10 @@ install_unschg () { while read F; do if ! [ -e ${BASEDIR}/${F} ]; then continue + else + echo ${BASEDIR}/${F} fi - - chflags noschg ${BASEDIR}/${F} || return 1 - done < filelist + done < filelist | xargs chflags noschg || return 1 # Clean up rm filelist From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 20:16:54 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5AC5F125; Mon, 15 Jun 2015 20:16:54 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 48364BF9; Mon, 15 Jun 2015 20:16:54 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FKGsw6047858; Mon, 15 Jun 2015 20:16:54 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FKGrvW047856; Mon, 15 Jun 2015 20:16:53 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201506152016.t5FKGrvW047856@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Mon, 15 Jun 2015 20:16:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284426 - head/lib/msun/src X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 20:16:54 -0000 Author: tijl Date: Mon Jun 15 20:16:53 2015 New Revision: 284426 URL: https://svnweb.freebsd.org/changeset/base/284426 Log: Fix some exceptional cases where the sign of the result is unspecified but must still satisfy csinh(conj(z)) == conj(csinh(z)) and csinh(-z) == -csinh(z). This allows eliminating two negations from csin(z). In collaboration with: bde Modified: head/lib/msun/src/s_csinh.c head/lib/msun/src/s_csinhf.c Modified: head/lib/msun/src/s_csinh.c ============================================================================== --- head/lib/msun/src/s_csinh.c Mon Jun 15 20:12:15 2015 (r284425) +++ head/lib/msun/src/s_csinh.c Mon Jun 15 20:16:53 2015 (r284426) @@ -32,6 +32,8 @@ * * Exceptional values are noted in the comments within the source code. * These values and the return value were taken from n1124.pdf. + * The sign of the result for some exceptional values is unspecified but + * must satisfy both sinh(conj(z)) == conj(sinh(z)) and sinh(-z) == -sinh(z). */ #include @@ -63,7 +65,7 @@ csinh(double complex z) if (ix < 0x7ff00000 && iy < 0x7ff00000) { if ((iy | ly) == 0) return (CMPLX(sinh(x), y)); - if (ix < 0x40360000) /* small x: normal case */ + if (ix < 0x40360000) /* |x| < 22: normal case */ return (CMPLX(sinh(x) * cos(y), cosh(x) * sin(y))); /* |x| >= 22, so cosh(x) ~= exp(|x|) */ @@ -83,27 +85,24 @@ csinh(double complex z) } /* - * sinh(+-0 +- I Inf) = sign(d(+-0, dNaN))0 + I dNaN. - * The sign of 0 in the result is unspecified. Choice = normally - * the same as dNaN. Raise the invalid floating-point exception. - * - * sinh(+-0 +- I NaN) = sign(d(+-0, NaN))0 + I d(NaN). - * The sign of 0 in the result is unspecified. Choice = normally - * the same as d(NaN). + * sinh(+-0 +- I Inf) = +-0 + I dNaN. + * The sign of 0 in the result is unspecified. Choice = same sign + * as the argument. Raise the invalid floating-point exception. + * + * sinh(+-0 +- I NaN) = +-0 + I d(NaN). + * The sign of 0 in the result is unspecified. Choice = same sign + * as the argument. */ - if ((ix | lx) == 0 && iy >= 0x7ff00000) - return (CMPLX(copysign(0, x * (y - y)), y - y)); + if ((ix | lx) == 0) /* && iy >= 0x7ff00000 */ + return (CMPLX(x, y - y)); /* * sinh(+-Inf +- I 0) = +-Inf + I +-0. * * sinh(NaN +- I 0) = d(NaN) + I +-0. */ - if ((iy | ly) == 0 && ix >= 0x7ff00000) { - if (((hx & 0xfffff) | lx) == 0) - return (CMPLX(x, y)); - return (CMPLX(x, copysign(0, y))); - } + if ((iy | ly) == 0) /* && ix >= 0x7ff00000 */ + return (CMPLX(x + x, y)); /* * sinh(x +- I Inf) = dNaN + I dNaN. @@ -113,45 +112,45 @@ csinh(double complex z) * Optionally raises the invalid floating-point exception for finite * nonzero x. Choice = don't raise (except for signaling NaNs). */ - if (ix < 0x7ff00000 && iy >= 0x7ff00000) - return (CMPLX(y - y, x * (y - y))); + if (ix < 0x7ff00000) /* && iy >= 0x7ff00000 */ + return (CMPLX(y - y, y - y)); /* * sinh(+-Inf + I NaN) = +-Inf + I d(NaN). - * The sign of Inf in the result is unspecified. Choice = normally - * the same as d(NaN). + * The sign of Inf in the result is unspecified. Choice = same sign + * as the argument. * - * sinh(+-Inf +- I Inf) = +Inf + I dNaN. - * The sign of Inf in the result is unspecified. Choice = always +. - * Raise the invalid floating-point exception. + * sinh(+-Inf +- I Inf) = +-Inf + I dNaN. + * The sign of Inf in the result is unspecified. Choice = same sign + * as the argument. Raise the invalid floating-point exception. * * sinh(+-Inf + I y) = +-Inf cos(y) + I Inf sin(y) */ - if (ix >= 0x7ff00000 && ((hx & 0xfffff) | lx) == 0) { + if (ix == 0x7ff00000 && lx == 0) { if (iy >= 0x7ff00000) - return (CMPLX(x * x, x * (y - y))); + return (CMPLX(x, y - y)); return (CMPLX(x * cos(y), INFINITY * sin(y))); } /* - * sinh(NaN + I NaN) = d(NaN) + I d(NaN). + * sinh(NaN1 + I NaN2) = d(NaN1, NaN2) + I d(NaN1, NaN2). * - * sinh(NaN +- I Inf) = d(NaN) + I d(NaN). + * sinh(NaN +- I Inf) = d(NaN, dNaN) + I d(NaN, dNaN). * Optionally raises the invalid floating-point exception. * Choice = raise. * - * sinh(NaN + I y) = d(NaN) + I d(NaN). + * sinh(NaN + I y) = d(NaN) + I d(NaN). * Optionally raises the invalid floating-point exception for finite * nonzero y. Choice = don't raise (except for signaling NaNs). */ - return (CMPLX((x * x) * (y - y), (x + x) * (y - y))); + return (CMPLX((x + x) * (y - y), (x * x) * (y - y))); } double complex csin(double complex z) { - /* csin(z) = -I * csinh(I * z) */ - z = csinh(CMPLX(-cimag(z), creal(z))); - return (CMPLX(cimag(z), -creal(z))); + /* csin(z) = -I * csinh(I * z) = I * conj(csinh(I * conj(z))). */ + z = csinh(CMPLX(cimag(z), creal(z))); + return (CMPLX(cimag(z), creal(z))); } Modified: head/lib/msun/src/s_csinhf.c ============================================================================== --- head/lib/msun/src/s_csinhf.c Mon Jun 15 20:12:15 2015 (r284425) +++ head/lib/msun/src/s_csinhf.c Mon Jun 15 20:16:53 2015 (r284426) @@ -25,7 +25,7 @@ */ /* - * Hyperbolic sine of a complex argument z. See s_csinh.c for details. + * Float version of csinh(). See s_csinh.c for details. */ #include @@ -56,13 +56,13 @@ csinhf(float complex z) if (ix < 0x7f800000 && iy < 0x7f800000) { if (iy == 0) return (CMPLXF(sinhf(x), y)); - if (ix < 0x41100000) /* small x: normal case */ + if (ix < 0x41100000) /* |x| < 9: normal case */ return (CMPLXF(sinhf(x) * cosf(y), coshf(x) * sinf(y))); /* |x| >= 9, so cosh(x) ~= exp(|x|) */ if (ix < 0x42b17218) { /* x < 88.7: expf(|x|) won't overflow */ - h = expf(fabsf(x)) * 0.5f; + h = expf(fabsf(x)) * 0.5F; return (CMPLXF(copysignf(h, x) * cosf(y), h * sinf(y))); } else if (ix < 0x4340b1e7) { /* x < 192.7: scale to avoid overflow */ @@ -75,31 +75,28 @@ csinhf(float complex z) } } - if (ix == 0 && iy >= 0x7f800000) - return (CMPLXF(copysignf(0, x * (y - y)), y - y)); + if (ix == 0) /* && iy >= 0x7f800000 */ + return (CMPLXF(x, y - y)); - if (iy == 0 && ix >= 0x7f800000) { - if ((hx & 0x7fffff) == 0) - return (CMPLXF(x, y)); - return (CMPLXF(x, copysignf(0, y))); - } + if (iy == 0) /* && ix >= 0x7f800000 */ + return (CMPLXF(x + x, y)); - if (ix < 0x7f800000 && iy >= 0x7f800000) - return (CMPLXF(y - y, x * (y - y))); + if (ix < 0x7f800000) /* && iy >= 0x7f800000 */ + return (CMPLXF(y - y, y - y)); - if (ix >= 0x7f800000 && (hx & 0x7fffff) == 0) { + if (ix == 0x7f800000) { if (iy >= 0x7f800000) - return (CMPLXF(x * x, x * (y - y))); + return (CMPLXF(x, y - y)); return (CMPLXF(x * cosf(y), INFINITY * sinf(y))); } - return (CMPLXF((x * x) * (y - y), (x + x) * (y - y))); + return (CMPLXF((x + x) * (y - y), (x * x) * (y - y))); } float complex csinf(float complex z) { - z = csinhf(CMPLXF(-cimagf(z), crealf(z))); - return (CMPLXF(cimagf(z), -crealf(z))); + z = csinhf(CMPLXF(cimagf(z), crealf(z))); + return (CMPLXF(cimagf(z), crealf(z))); } From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 20:40:46 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F255EB15; Mon, 15 Jun 2015 20:40:45 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E065322D; Mon, 15 Jun 2015 20:40:45 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FKejWp059640; Mon, 15 Jun 2015 20:40:45 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FKejiB059636; Mon, 15 Jun 2015 20:40:45 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201506152040.t5FKejiB059636@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Mon, 15 Jun 2015 20:40:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284427 - head/lib/msun/src X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 20:40:46 -0000 Author: tijl Date: Mon Jun 15 20:40:44 2015 New Revision: 284427 URL: https://svnweb.freebsd.org/changeset/base/284427 Log: - Change comments to be more consistent with s_ccosh.c and s_csinh.c. - Fix a case where NaNs were not mixed correctly and signalling NaNs were not converted to quiet NaNs. - Eliminate two negations from ctan(z). In collaboration with: bde Modified: head/lib/msun/src/s_ctanh.c head/lib/msun/src/s_ctanhf.c Modified: head/lib/msun/src/s_ctanh.c ============================================================================== --- head/lib/msun/src/s_ctanh.c Mon Jun 15 20:16:53 2015 (r284426) +++ head/lib/msun/src/s_ctanh.c Mon Jun 15 20:40:44 2015 (r284427) @@ -25,7 +25,7 @@ */ /* - * Hyperbolic tangent of a complex argument z = x + i y. + * Hyperbolic tangent of a complex argument z = x + I y. * * The algorithm is from: * @@ -44,15 +44,15 @@ * * tanh(z) = sinh(z) / cosh(z) * - * sinh(x) cos(y) + i cosh(x) sin(y) + * sinh(x) cos(y) + I cosh(x) sin(y) * = --------------------------------- - * cosh(x) cos(y) + i sinh(x) sin(y) + * cosh(x) cos(y) + I sinh(x) sin(y) * - * cosh(x) sinh(x) / cos^2(y) + i tan(y) + * cosh(x) sinh(x) / cos^2(y) + I tan(y) * = ------------------------------------- * 1 + sinh^2(x) / cos^2(y) * - * beta rho s + i t + * beta rho s + I t * = ---------------- * 1 + beta s^2 * @@ -85,16 +85,16 @@ ctanh(double complex z) ix = hx & 0x7fffffff; /* - * ctanh(NaN + i 0) = NaN + i 0 + * ctanh(NaN +- I 0) = d(NaN) +- I 0 * - * ctanh(NaN + i y) = NaN + i NaN for y != 0 + * ctanh(NaN + I y) = d(NaN,y) + I d(NaN,y) for y != 0 * * The imaginary part has the sign of x*sin(2*y), but there's no * special effort to get this right. * - * ctanh(+-Inf +- i Inf) = +-1 +- 0 + * ctanh(+-Inf +- I Inf) = +-1 +- I 0 * - * ctanh(+-Inf + i y) = +-1 + 0 sin(2y) for y finite + * ctanh(+-Inf + I y) = +-1 + I 0 sin(2y) for y finite * * The imaginary part of the sign is unspecified. This special * case is only needed to avoid a spurious invalid exception when @@ -102,24 +102,25 @@ ctanh(double complex z) */ if (ix >= 0x7ff00000) { if ((ix & 0xfffff) | lx) /* x is NaN */ - return (CMPLX(x, (y == 0 ? y : x * y))); + return (CMPLX((x + 0) * (y + 0), + y == 0 ? y : (x + 0) * (y + 0))); SET_HIGH_WORD(x, hx - 0x40000000); /* x = copysign(1, x) */ return (CMPLX(x, copysign(0, isinf(y) ? y : sin(y) * cos(y)))); } /* - * ctanh(x + i NAN) = NaN + i NaN - * ctanh(x +- i Inf) = NaN + i NaN + * ctanh(x + I NaN) = d(NaN) + I d(NaN) + * ctanh(x +- I Inf) = dNaN + I dNaN */ if (!isfinite(y)) return (CMPLX(y - y, y - y)); /* - * ctanh(+-huge + i +-y) ~= +-1 +- i 2sin(2y)/exp(2x), using the + * ctanh(+-huge +- I y) ~= +-1 +- I 2sin(2y)/exp(2x), using the * approximation sinh^2(huge) ~= exp(2*huge) / 4. * We use a modified formula to avoid spurious overflow. */ - if (ix >= 0x40360000) { /* x >= 22 */ + if (ix >= 0x40360000) { /* |x| >= 22 */ double exp_mx = exp(-fabs(x)); return (CMPLX(copysign(1, x), 4 * sin(y) * cos(y) * exp_mx * exp_mx)); @@ -138,7 +139,7 @@ double complex ctan(double complex z) { - /* ctan(z) = -I * ctanh(I * z) */ - z = ctanh(CMPLX(-cimag(z), creal(z))); - return (CMPLX(cimag(z), -creal(z))); + /* ctan(z) = -I * ctanh(I * z) = I * conj(ctanh(I * conj(z))) */ + z = ctanh(CMPLX(cimag(z), creal(z))); + return (CMPLX(cimag(z), creal(z))); } Modified: head/lib/msun/src/s_ctanhf.c ============================================================================== --- head/lib/msun/src/s_ctanhf.c Mon Jun 15 20:16:53 2015 (r284426) +++ head/lib/msun/src/s_ctanhf.c Mon Jun 15 20:40:44 2015 (r284427) @@ -60,7 +60,7 @@ ctanhf(float complex z) if (!isfinite(y)) return (CMPLXF(y - y, y - y)); - if (ix >= 0x41300000) { /* x >= 11 */ + if (ix >= 0x41300000) { /* |x| >= 11 */ float exp_mx = expf(-fabsf(x)); return (CMPLXF(copysignf(1, x), 4 * sinf(y) * cosf(y) * exp_mx * exp_mx)); @@ -78,7 +78,7 @@ float complex ctanf(float complex z) { - z = ctanhf(CMPLXF(-cimagf(z), crealf(z))); - return (CMPLXF(cimagf(z), -crealf(z))); + z = ctanhf(CMPLXF(cimagf(z), crealf(z))); + return (CMPLXF(cimagf(z), crealf(z))); } From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 20:47:27 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09141DBC; Mon, 15 Jun 2015 20:47:27 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EC9415F4; Mon, 15 Jun 2015 20:47:26 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FKlQ6I062964; Mon, 15 Jun 2015 20:47:26 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FKlQ4I062963; Mon, 15 Jun 2015 20:47:26 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201506152047.t5FKlQ4I062963@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Mon, 15 Jun 2015 20:47:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284428 - head/lib/msun/src X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 20:47:27 -0000 Author: tijl Date: Mon Jun 15 20:47:26 2015 New Revision: 284428 URL: https://svnweb.freebsd.org/changeset/base/284428 Log: Follow up to r284427: fix NaN mixing for ctanhf too. Modified: head/lib/msun/src/s_ctanhf.c Modified: head/lib/msun/src/s_ctanhf.c ============================================================================== --- head/lib/msun/src/s_ctanhf.c Mon Jun 15 20:40:44 2015 (r284427) +++ head/lib/msun/src/s_ctanhf.c Mon Jun 15 20:47:26 2015 (r284428) @@ -51,7 +51,8 @@ ctanhf(float complex z) if (ix >= 0x7f800000) { if (ix & 0x7fffff) - return (CMPLXF(x, (y == 0 ? y : x * y))); + return (CMPLXF((x + 0) * (y + 0), + y == 0 ? y : (x + 0) * (y + 0))); SET_FLOAT_WORD(x, hx - 0x40000000); return (CMPLXF(x, copysignf(0, isinf(y) ? y : sinf(y) * cosf(y)))); From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 21:09:19 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 66D61C1A; Mon, 15 Jun 2015 21:09:19 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 554DEB57; Mon, 15 Jun 2015 21:09:19 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FL9JOd074042; Mon, 15 Jun 2015 21:09:19 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FL9J3I074040; Mon, 15 Jun 2015 21:09:19 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506152109.t5FL9J3I074040@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Mon, 15 Jun 2015 21:09:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284430 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 21:09:19 -0000 Author: sjg Date: Mon Jun 15 21:09:18 2015 New Revision: 284430 URL: https://svnweb.freebsd.org/changeset/base/284430 Log: Skip MAKE_PRINT_VAR_ON_ERROR unless we are doing META_MODE with all the recursion in normal build it is too much noise. Modified: head/share/mk/local.sys.mk Modified: head/share/mk/local.sys.mk ============================================================================== --- head/share/mk/local.sys.mk Mon Jun 15 21:08:08 2015 (r284429) +++ head/share/mk/local.sys.mk Mon Jun 15 21:09:18 2015 (r284430) @@ -29,6 +29,7 @@ M_whence = ${M_type}:M/*:[1] # convert a path to a valid shell variable M_P2V = tu:C,[./-],_,g +.if ${MK_META_MODE} == "yes" MAKE_PRINT_VAR_ON_ERROR+= \ .CURDIR \ .MAKE \ @@ -48,6 +49,7 @@ MAKE_PRINT_VAR_ON_ERROR+= \ .if ${.MAKE.LEVEL} > 0 MAKE_PRINT_VAR_ON_ERROR += .MAKE.MAKEFILES .PATH .endif +.endif # these are handy # we can use this for a cheap timestamp at the start of a target's script, From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 21:20:22 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8213816C; Mon, 15 Jun 2015 21:20:22 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7039FDB4; Mon, 15 Jun 2015 21:20:22 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FLKMVO079407; Mon, 15 Jun 2015 21:20:22 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FLKMjH079406; Mon, 15 Jun 2015 21:20:22 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506152120.t5FLKMjH079406@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 15 Jun 2015 21:20:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284431 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 21:20:22 -0000 Author: bapt Date: Mon Jun 15 21:20:21 2015 New Revision: 284431 URL: https://svnweb.freebsd.org/changeset/base/284431 Log: Register libpanel into the available libraries Modified: head/share/mk/src.libnames.mk Modified: head/share/mk/src.libnames.mk ============================================================================== --- head/share/mk/src.libnames.mk Mon Jun 15 21:09:18 2015 (r284430) +++ head/share/mk/src.libnames.mk Mon Jun 15 21:20:21 2015 (r284431) @@ -123,6 +123,8 @@ _LIBRARIES= \ nv \ opie \ pam \ + panel \ + panelw \ pcap \ pcsclite \ pjdlog \ From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 21:20:53 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 47C382B1; Mon, 15 Jun 2015 21:20:53 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 36238EA3; Mon, 15 Jun 2015 21:20:53 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FLKrLS080660; Mon, 15 Jun 2015 21:20:53 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FLKrQ9080659; Mon, 15 Jun 2015 21:20:53 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506152120.t5FLKrQ9080659@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 15 Jun 2015 21:20:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284432 - head/usr.bin/clang/lldb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 21:20:53 -0000 Author: bapt Date: Mon Jun 15 21:20:52 2015 New Revision: 284432 URL: https://svnweb.freebsd.org/changeset/base/284432 Log: Convert to LIBADD Modified: head/usr.bin/clang/lldb/Makefile Modified: head/usr.bin/clang/lldb/Makefile ============================================================================== --- head/usr.bin/clang/lldb/Makefile Mon Jun 15 21:20:21 2015 (r284431) +++ head/usr.bin/clang/lldb/Makefile Mon Jun 15 21:20:52 2015 (r284432) @@ -16,8 +16,7 @@ SRCS= Driver.cpp \ lldb.1: ln -fs ${LLDB_SRCS}/docs/lldb.1 ${.TARGET} -DPADD= ${LIBEDIT} ${LIBNCURSESW} ${LIBEXECINFO} ${LIBPANEL} ${LIBZ} -LDADD= -ledit -lncursesw -lexecinfo -lpanel -lz +LIBADD= edit panel ncursesw execinfo z LLDB_LIBS=\ lldb \ From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 21:55:48 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 499FC3CB for ; Mon, 15 Jun 2015 21:55:48 +0000 (UTC) (envelope-from jbeich@vfemail.net) Received: from vfemail.net (ninezero.vfemail.net [96.30.253.190]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0750995E for ; Mon, 15 Jun 2015 21:55:47 +0000 (UTC) (envelope-from jbeich@vfemail.net) Received: (qmail 4346 invoked by uid 89); 15 Jun 2015 21:55:46 -0000 Received: from localhost (HELO freequeue.vfemail.net) (127.0.0.1) by localhost with (DHE-RSA-AES256-SHA encrypted) SMTP; 15 Jun 2015 21:55:46 -0000 Received: (qmail 4319 invoked by uid 89); 15 Jun 2015 21:55:29 -0000 Received: by simscan 1.3.1 ppid: 4311, pid: 4315, t: 0.0043s scanners:none Received: from unknown (HELO smtp102-2.vfemail.net) (172.16.100.62) by FreeQueue with SMTP; 15 Jun 2015 21:55:29 -0000 Received: (qmail 17758 invoked by uid 89); 15 Jun 2015 21:55:29 -0000 Received: by simscan 1.4.0 ppid: 17736, pid: 17754, t: 0.5693s scanners:none Received: from unknown (HELO nil) (amJlaWNoQHZmZW1haWwubmV0@172.16.100.27) by 172.16.100.62 with ESMTPA; 15 Jun 2015 21:55:28 -0000 From: Jan Beich To: Baptiste Daroussin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284421 - in head: . cddl/lib gnu/lib/libgcc gnu/lib/libssp lib/libalias/libalias lib/libalias/modules lib/libbegemot lib/libc lib/libcam lib/libcapsicum lib/libcasper lib/libcrypt lib/... References: <201506151928.t5FJS8Ab023897@svn.freebsd.org> Date: Mon, 15 Jun 2015 23:55:18 +0200 In-Reply-To: <201506151928.t5FJS8Ab023897@svn.freebsd.org> (Baptiste Daroussin's message of "Mon, 15 Jun 2015 19:28:08 +0000 (UTC)") Message-ID: <381s-4oxl-wny@vfemail.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 21:55:48 -0000 --=-=-= Content-Type: text/plain Baptiste Daroussin writes: > Author: bapt > Date: Mon Jun 15 19:28:07 2015 > New Revision: 284421 > URL: https://svnweb.freebsd.org/changeset/base/284421 > > Log: > Revert r284417 it is not necessary anymore [...] > Modified: head/Makefile.inc1 > ============================================================================== > --- head/Makefile.inc1 Mon Jun 15 19:23:47 2015 (r284420) > +++ head/Makefile.inc1 Mon Jun 15 19:28:07 2015 (r284421) > @@ -451,6 +451,8 @@ LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${LIB32 > LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \ > CXX="${XCXX} ${LIB32FLAGS}" \ > DESTDIR=${LIB32TMP} \ > + SHLIBDIR=/usr/lib32 \ > + LIBDIR=/usr/lib32 \ This is not part of r284417. Did you forget to revert uncommitted patch? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQF8BAEBCgBmBQJVf0nHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3blM0IALefR3gOu56kMZ9xiR9EvAWe oPx0IgGvK3Jxhslot/Uwr/FQ39dfCuo2b1jfLjxnPMjCcIGlIOqJdkZa6RbDctlI Ry5ZJlruUmX9tFvkSrtO4qUBvbfS1ZASq1mybbS9+iyHDqoXCi0w5cjxWqLnfsDO HqDPGzNPzcNVM2EYRlDKLjG0/zfxY7NzGS3yMTndmBshEq5sN0HdKvEDiQDx6ZlP 772Us73tqExDpDkek/TJuFi9MhIWDL2Vbgxjzk9mluLMKxXqqn341tIZnLnUX7yI LgC/IoYwFJSIaN21w7Swg8CQ5zIyFrMZgcn1QmYXqSD4v7JM0NriQpbwl4s2jLw= =Fb/b -----END PGP SIGNATURE----- --=-=-=-- From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 22:04:30 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AA2705BF; Mon, 15 Jun 2015 22:04:30 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 987A9B86; Mon, 15 Jun 2015 22:04:30 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FM4Uol003600; Mon, 15 Jun 2015 22:04:30 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FM4UjG003599; Mon, 15 Jun 2015 22:04:30 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506152204.t5FM4UjG003599@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Mon, 15 Jun 2015 22:04:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284433 - head/usr.bin/xlint/llib X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 22:04:30 -0000 Author: sjg Date: Mon Jun 15 22:04:29 2015 New Revision: 284433 URL: https://svnweb.freebsd.org/changeset/base/284433 Log: Remove extra blank lines Modified: head/usr.bin/xlint/llib/Makefile Modified: head/usr.bin/xlint/llib/Makefile ============================================================================== --- head/usr.bin/xlint/llib/Makefile Mon Jun 15 21:20:52 2015 (r284432) +++ head/usr.bin/xlint/llib/Makefile Mon Jun 15 22:04:29 2015 (r284433) @@ -8,8 +8,6 @@ FILESDIR= ${LINTLIBDIR} CLEANFILES+= ${LIBS} - - llib-lposix.ln: llib-lposix ${LINT} ${LINTFLAGS} -Cposix ${.ALLSRC} From owner-svn-src-head@FreeBSD.ORG Mon Jun 15 23:30:54 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB9BCB56; Mon, 15 Jun 2015 23:30:54 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DA01F162; Mon, 15 Jun 2015 23:30:54 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FNUspU045233; Mon, 15 Jun 2015 23:30:54 GMT (envelope-from pluknet@FreeBSD.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FNUsNJ045232; Mon, 15 Jun 2015 23:30:54 GMT (envelope-from pluknet@FreeBSD.org) Message-Id: <201506152330.t5FNUsNJ045232@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pluknet set sender to pluknet@FreeBSD.org using -f From: Sergey Kandaurov Date: Mon, 15 Jun 2015 23:30:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284434 - head/share/man/man9 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 15 Jun 2015 23:30:55 -0000 Author: pluknet Date: Mon Jun 15 23:30:54 2015 New Revision: 284434 URL: https://svnweb.freebsd.org/changeset/base/284434 Log: Deshallify. Modified: head/share/man/man9/ifnet.9 Modified: head/share/man/man9/ifnet.9 ============================================================================== --- head/share/man/man9/ifnet.9 Mon Jun 15 22:04:29 2015 (r284433) +++ head/share/man/man9/ifnet.9 Mon Jun 15 23:30:54 2015 (r284434) @@ -1172,7 +1172,7 @@ structure to be the first element in tha (A pointer to this address structure is saved in the .Vt ifnet -structure and shall be accessed by the +structure and is accessed by the .Fn ifaddr_byindex function.) The From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 01:46:54 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7870F932; Tue, 16 Jun 2015 01:46:54 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 2C4D47A8; Tue, 16 Jun 2015 01:46:53 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from Julian-MBP3.local (50-196-156-133-static.hfc.comcastbusiness.net [50.196.156.133]) (authenticated bits=0) by vps1.elischer.org (8.14.9/8.14.9) with ESMTP id t5G1kkCv091760 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Mon, 15 Jun 2015 18:46:50 -0700 (PDT) (envelope-from julian@freebsd.org) Message-ID: <557F8001.4020401@freebsd.org> Date: Tue, 16 Jun 2015 09:46:41 +0800 From: Julian Elischer User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Garrett Cooper CC: Adrian Chadd , Craig Rodrigues , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Marcel Moolenaar Subject: Re: svn commit: r284198 - head/bin/ls References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> <557E4C3D.5080602@freebsd.org> <2CFE8F01-98B8-403C-BE1F-57D6F2368BE3@gmail.com> In-Reply-To: <2CFE8F01-98B8-403C-BE1F-57D6F2368BE3@gmail.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 01:46:54 -0000 On 6/15/15 1:34 PM, Garrett Cooper wrote: > On Jun 14, 2015, at 20:53, Julian Elischer wrote: > >> On 6/14/15 10:48 AM, Adrian Chadd wrote: >>> On 13 June 2015 at 18:22, Craig Rodrigues wrote: >>>> On Sat, Jun 13, 2015 at 6:00 PM, Adrian Chadd wrote: >>>>>> I guarantee that no matter what you've worked on, there's >>>>>> approximately five orders of magnitude of shipping devices whose >>>>>> entire storage space can be measured in 1 digit megabytes. Each year. >>>>> (And yes - there's an appreciable set of them for which freebsd boots, >>>>> runs and keeps running on them.0 >>>>> >>>>> You can buy em too, some of them even under $60. >>>> Can FreeBSD now not run on these systems because of libxo? >>> It's a tight squeeze as it is. Running in 8MB of flash (even if it's >>> compressed) is still an exercise in "what can you cut out." >>> >>> My point isn't that it isn't running because of libxo; my point is >>> that arguing about "embedded" involving "lots of storage" is woefully >>> incorrect and will continue to be until those gigabytes of storage are >>> available for a penny. Which yes, I'm guessing will happen in my >>> career - but it's also quite likely code bloat will continue to chase >>> that upward. >> do we have a WITHOUT_LIBXO option on sources? I believe we should.. > +1. I would be more than happy to implement it by stubbing out the majority of the macros to something less invasive, but it might be a bit before I do that. > Thanks, but that wouldn't remove the bloat within the apps.. just make it use null calls. From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 02:58:51 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2DB3941E; Tue, 16 Jun 2015 02:58:51 +0000 (UTC) (envelope-from gshapiro@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B92CA7F; Tue, 16 Jun 2015 02:58:51 +0000 (UTC) (envelope-from gshapiro@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5G2woZU055793; Tue, 16 Jun 2015 02:58:50 GMT (envelope-from gshapiro@FreeBSD.org) Received: (from gshapiro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5G2wo3a055792; Tue, 16 Jun 2015 02:58:50 GMT (envelope-from gshapiro@FreeBSD.org) Message-Id: <201506160258.t5G2wo3a055792@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gshapiro set sender to gshapiro@FreeBSD.org using -f From: Gregory Neil Shapiro Date: Tue, 16 Jun 2015 02:58:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284436 - head/contrib/sendmail/src X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 02:58:51 -0000 Author: gshapiro Date: Tue Jun 16 02:58:50 2015 New Revision: 284436 URL: https://svnweb.freebsd.org/changeset/base/284436 Log: The import of openssl to address the FreeBSD-SA-15:10.openssl security advisory includes a change which rejects handshakes with DH parameters below 768 bits. sendmail releases prior to 8.15.2 (not yet released), defaulted to a 512 bit DH parameter setting for client connections. This commit chages that default to 1024 bits. sendmail 8.15.2, when released well use a default of 2048 bits. MFC after: 1 day Modified: head/contrib/sendmail/src/tls.c Modified: head/contrib/sendmail/src/tls.c ============================================================================== --- head/contrib/sendmail/src/tls.c Tue Jun 16 02:31:11 2015 (r284435) +++ head/contrib/sendmail/src/tls.c Tue Jun 16 02:58:50 2015 (r284436) @@ -650,7 +650,7 @@ inittls(ctx, req, options, srv, certfile ** 1024 generate 1024 bit parameters ** 2048 generate 2048 bit parameters ** /file/name read parameters from /file/name - ** default is: 1024 for server, 512 for client (OK? XXX) + ** default is: 1024 */ if (bitset(TLS_I_TRY_DH, req)) @@ -676,8 +676,8 @@ inittls(ctx, req, options, srv, certfile } if (dhparam == NULL) { - dhparam = srv ? "1" : "5"; - req |= (srv ? TLS_I_DH1024 : TLS_I_DH512); + dhparam = "1"; + req |= TLS_I_DH1024; } else if (*dhparam == '/') { From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 03:03:27 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 813258C6; Tue, 16 Jun 2015 03:03:27 +0000 (UTC) (envelope-from gshapiro@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6F7C4D39; Tue, 16 Jun 2015 03:03:27 +0000 (UTC) (envelope-from gshapiro@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5G33Rx5061038; Tue, 16 Jun 2015 03:03:27 GMT (envelope-from gshapiro@FreeBSD.org) Received: (from gshapiro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5G33RH9061037; Tue, 16 Jun 2015 03:03:27 GMT (envelope-from gshapiro@FreeBSD.org) Message-Id: <201506160303.t5G33RH9061037@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gshapiro set sender to gshapiro@FreeBSD.org using -f From: Gregory Neil Shapiro Date: Tue, 16 Jun 2015 03:03:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284437 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 03:03:27 -0000 Author: gshapiro Date: Tue Jun 16 03:03:26 2015 New Revision: 284437 URL: https://svnweb.freebsd.org/changeset/base/284437 Log: The fix for the issue described in the 20150614 sendmail entry has been been committed in revision 284436. MFC after: 1 day Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Jun 16 02:58:50 2015 (r284436) +++ head/UPDATING Tue Jun 16 03:03:26 2015 (r284437) @@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150615: + The fix for the issue described in the 20150614 sendmail entry + below has been been committed in revision 284436. The work + around described in that entry is no longer needed unless the + default setting is overridden by a confDH_PARAMETERS configuration + setting of '5' or pointing to a 512 bit DH parameter file. + 20150614: ALLOW_DEPRECATED_ATF_TOOLS/ATFFILE support has been removed from atf.test.mk (included from bsd.test.mk). Please upgrade devel/atf From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 04:58:02 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2630C7D2; Tue, 16 Jun 2015 04:58:02 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-qc0-x236.google.com (mail-qc0-x236.google.com [IPv6:2607:f8b0:400d:c01::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CDDD9B1A; Tue, 16 Jun 2015 04:58:01 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by qcbfz6 with SMTP id fz6so1477220qcb.0; Mon, 15 Jun 2015 21:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=iq05hNOqySidNYjILJ2ioBphm8nN7onYl8e3uvH1J9w=; b=CNy6IQSW3xXNL3dLQ9fcOTjvCou7h19IAw0G66faVZSrds44Xw2+Dzf9+QoyOV9hfN fZVq0n2r5c4jRNw8eFZTtK0tVIeECnSaCOr6oW7gkXFLwgQFCD8Jhzed4uBb9q1IyKOB tkosdVNN3oxA7l1WsH0TMg2mVtmgSu77AfNEIs58Td7iDGIdUE6mczvYznX2s/Flt2T3 rCIZTzwjLJ8rGiNT7fppYlmsapGAExnq1Gh57ZXnoa8AwFWH4eR8iLvnnJdawYCC4ecw BRayJ5NwRd1JuWAPdpsROdfUUk12XQDFFjk64CHWzdY7VXBA6n+Hq/y+IgvWH5w4R6vf GmPQ== MIME-Version: 1.0 X-Received: by 10.140.91.23 with SMTP id y23mr1333921qgd.90.1434430680880; Mon, 15 Jun 2015 21:58:00 -0700 (PDT) Received: by 10.140.98.73 with HTTP; Mon, 15 Jun 2015 21:58:00 -0700 (PDT) In-Reply-To: <557F8001.4020401@freebsd.org> References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> <557E4C3D.5080602@freebsd.org> <2CFE8F01-98B8-403C-BE1F-57D6F2368BE3@gmail.com> <557F8001.4020401@freebsd.org> Date: Mon, 15 Jun 2015 21:58:00 -0700 Message-ID: Subject: Re: svn commit: r284198 - head/bin/ls From: NGie Cooper To: Julian Elischer Cc: Adrian Chadd , Craig Rodrigues , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Marcel Moolenaar Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 04:58:02 -0000 On Mon, Jun 15, 2015 at 6:46 PM, Julian Elischer wrote: > On 6/15/15 1:34 PM, Garrett Cooper wrote: >> >> On Jun 14, 2015, at 20:53, Julian Elischer wrote: >> >>> On 6/14/15 10:48 AM, Adrian Chadd wrote: >>>> >>>> On 13 June 2015 at 18:22, Craig Rodrigues wrote: >>>>> >>>>> On Sat, Jun 13, 2015 at 6:00 PM, Adrian Chadd >>>>> wrote: >>>>>>> >>>>>>> I guarantee that no matter what you've worked on, there's >>>>>>> approximately five orders of magnitude of shipping devices whose >>>>>>> entire storage space can be measured in 1 digit megabytes. Each year. >>>>>> >>>>>> (And yes - there's an appreciable set of them for which freebsd boots, >>>>>> runs and keeps running on them.0 >>>>>> >>>>>> You can buy em too, some of them even under $60. >>>>> >>>>> Can FreeBSD now not run on these systems because of libxo? >>>> >>>> It's a tight squeeze as it is. Running in 8MB of flash (even if it's >>>> compressed) is still an exercise in "what can you cut out." >>>> >>>> My point isn't that it isn't running because of libxo; my point is >>>> that arguing about "embedded" involving "lots of storage" is woefully >>>> incorrect and will continue to be until those gigabytes of storage are >>>> available for a penny. Which yes, I'm guessing will happen in my >>>> career - but it's also quite likely code bloat will continue to chase >>>> that upward. >>> >>> do we have a WITHOUT_LIBXO option on sources? I believe we should.. >> >> +1. I would be more than happy to implement it by stubbing out the >> majority of the macros to something less invasive, but it might be a bit >> before I do that. >> Thanks, > > but that wouldn't remove the bloat within the apps.. just make it use null > calls. That was the idea. Make it like "libnxo" or something, a dummy library like libnetbsd with weak symbols that can be optimized away by the compiler... From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 06:37:00 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2ED91ED6; Tue, 16 Jun 2015 06:37:00 +0000 (UTC) (envelope-from joel@vnode.se) Received: from smtp.vnode.se (smtp.vnode.se [192.121.62.123]) by mx1.freebsd.org (Postfix) with ESMTP id E3BDF83D; Tue, 16 Jun 2015 06:36:59 +0000 (UTC) (envelope-from joel@vnode.se) Received: from ymer.vnode.se (h71n10-th-c-d4.ias.bredband.telia.com [81.234.63.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.vnode.se (Postfix) with ESMTPSA id 7C0EF146E1; Tue, 16 Jun 2015 08:36:56 +0200 (CEST) Date: Tue, 16 Jun 2015 08:36:54 +0200 From: Joel Dahl To: Xin LI Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284425 - head/usr.sbin/freebsd-update Message-ID: <20150616063654.GA8741@ymer.vnode.se> Mail-Followup-To: Xin LI , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201506152012.t5FKCF08047192@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201506152012.t5FKCF08047192@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 06:37:00 -0000 On Mon, Jun 15, 2015 at 08:12:15PM +0000, Xin LI wrote: > Author: delphij > Date: Mon Jun 15 20:12:15 2015 > New Revision: 284425 > URL: https://svnweb.freebsd.org/changeset/base/284425 > > Log: > Skip src component if /usr/src is empty. > > Submitted by: kczekirda I can't find anyone with that freebsd login id. If it's a non-committer, please use a real name or email address, or at least something that doesn't look like a freebsd login id. -- Joel From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 09:08:31 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1D68CD9; Tue, 16 Jun 2015 09:08:31 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 90693BD; Tue, 16 Jun 2015 09:08:31 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5G98VVN041411; Tue, 16 Jun 2015 09:08:31 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5G98Vxk041410; Tue, 16 Jun 2015 09:08:31 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201506160908.t5G98Vxk041410@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 16 Jun 2015 09:08:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284442 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 09:08:31 -0000 Author: mjg Date: Tue Jun 16 09:08:30 2015 New Revision: 284442 URL: https://svnweb.freebsd.org/changeset/base/284442 Log: fd: don't unnecessary copy capabilities in _fget Modified: head/sys/kern/kern_descrip.c Modified: head/sys/kern/kern_descrip.c ============================================================================== --- head/sys/kern/kern_descrip.c Tue Jun 16 08:36:57 2015 (r284441) +++ head/sys/kern/kern_descrip.c Tue Jun 16 09:08:30 2015 (r284442) @@ -2433,11 +2433,9 @@ _fget(struct thread *td, int fd, struct *fpp = NULL; fdp = td->td_proc->p_fd; - if (needrightsp != NULL) - needrights = *needrightsp; - else - cap_rights_init(&needrights); - error = fget_unlocked(fdp, fd, &needrights, &fp, seqp); + if (needrightsp == NULL) + needrightsp = cap_rights_init(&needrights); + error = fget_unlocked(fdp, fd, needrightsp, &fp, seqp); if (error != 0) return (error); if (fp->f_ops == &badfileops) { From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 09:52:38 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3CE14B31; Tue, 16 Jun 2015 09:52:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1E017EA9; Tue, 16 Jun 2015 09:52:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5G9qbFf065728; Tue, 16 Jun 2015 09:52:37 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5G9qbFK065723; Tue, 16 Jun 2015 09:52:37 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201506160952.t5G9qbFK065723@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 16 Jun 2015 09:52:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284443 - in head/sys: compat/svr4 kern ofed/include/linux security/audit X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 09:52:38 -0000 Author: mjg Date: Tue Jun 16 09:52:36 2015 New Revision: 284443 URL: https://svnweb.freebsd.org/changeset/base/284443 Log: fd: make rights a mandatory argument to fget_unlocked Modified: head/sys/compat/svr4/svr4_misc.c head/sys/kern/kern_descrip.c head/sys/ofed/include/linux/file.h head/sys/security/audit/audit_arg.c Modified: head/sys/compat/svr4/svr4_misc.c ============================================================================== --- head/sys/compat/svr4/svr4_misc.c Tue Jun 16 09:08:30 2015 (r284442) +++ head/sys/compat/svr4/svr4_misc.c Tue Jun 16 09:52:36 2015 (r284443) @@ -622,6 +622,7 @@ svr4_sys_fchroot(td, uap) struct thread *td; struct svr4_sys_fchroot_args *uap; { + cap_rights_t rights; struct filedesc *fdp = td->td_proc->p_fd; struct vnode *vp; struct file *fp; @@ -630,7 +631,7 @@ svr4_sys_fchroot(td, uap) if ((error = priv_check(td, PRIV_VFS_FCHROOT)) != 0) return error; /* XXX: we have the chroot priv... what cap might we need? all? */ - if ((error = getvnode(fdp, uap->fd, 0, &fp)) != 0) + if ((error = getvnode(fdp, uap->fd, cap_rights_init(&rights), &fp)) != 0) return error; vp = fp->f_vnode; VREF(vp); Modified: head/sys/kern/kern_descrip.c ============================================================================== --- head/sys/kern/kern_descrip.c Tue Jun 16 09:08:30 2015 (r284442) +++ head/sys/kern/kern_descrip.c Tue Jun 16 09:52:36 2015 (r284443) @@ -746,7 +746,8 @@ kern_fcntl(struct thread *td, int fd, in arg = arg ? 128 * 1024: 0; /* FALLTHROUGH */ case F_READAHEAD: - error = fget_unlocked(fdp, fd, NULL, &fp, NULL); + error = fget_unlocked(fdp, fd, + cap_rights_init(&rights), &fp, NULL); if (error != 0) break; if (fp->f_type != DTYPE_VNODE) { @@ -2368,11 +2369,9 @@ fget_unlocked(struct filedesc *fdp, int if (fp == NULL) return (EBADF); #ifdef CAPABILITIES - if (needrightsp != NULL) { - error = cap_check(&haverights, needrightsp); - if (error != 0) - return (error); - } + error = cap_check(&haverights, needrightsp); + if (error != 0) + return (error); #endif retry: count = fp->f_count; Modified: head/sys/ofed/include/linux/file.h ============================================================================== --- head/sys/ofed/include/linux/file.h Tue Jun 16 09:08:30 2015 (r284442) +++ head/sys/ofed/include/linux/file.h Tue Jun 16 09:52:36 2015 (r284443) @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -46,10 +47,11 @@ extern struct fileops linuxfileops; static inline struct linux_file * linux_fget(unsigned int fd) { + cap_rights_t rights; struct file *file; - if (fget_unlocked(curthread->td_proc->p_fd, fd, NULL, &file, - NULL) != 0) { + if (fget_unlocked(curthread->td_proc->p_fd, fd, + cap_rights_init(&rights), &file, NULL) != 0) { return (NULL); } return (struct linux_file *)file->f_data; @@ -71,10 +73,11 @@ fput(struct linux_file *filp) static inline void put_unused_fd(unsigned int fd) { + cap_rights_t rights; struct file *file; - if (fget_unlocked(curthread->td_proc->p_fd, fd, NULL, &file, - NULL) != 0) { + if (fget_unlocked(curthread->td_proc->p_fd, fd, + cap_rights_init(&rights), &file, NULL) != 0) { return; } /* @@ -91,10 +94,11 @@ put_unused_fd(unsigned int fd) static inline void fd_install(unsigned int fd, struct linux_file *filp) { + cap_rights_t rights; struct file *file; - if (fget_unlocked(curthread->td_proc->p_fd, fd, NULL, &file, - NULL) != 0) { + if (fget_unlocked(curthread->td_proc->p_fd, fd, + cap_rights_init(&rights), &file, NULL) != 0) { file = NULL; } filp->_file = file; Modified: head/sys/security/audit/audit_arg.c ============================================================================== --- head/sys/security/audit/audit_arg.c Tue Jun 16 09:08:30 2015 (r284442) +++ head/sys/security/audit/audit_arg.c Tue Jun 16 09:52:36 2015 (r284443) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -894,6 +895,7 @@ audit_arg_fcntl_rights(uint32_t fcntlrig void audit_sysclose(struct thread *td, int fd) { + cap_rights_t rights; struct kaudit_record *ar; struct vnode *vp; struct file *fp; @@ -906,7 +908,7 @@ audit_sysclose(struct thread *td, int fd audit_arg_fd(fd); - if (getvnode(td->td_proc->p_fd, fd, 0, &fp) != 0) + if (getvnode(td->td_proc->p_fd, fd, cap_rights_init(&rights), &fp) != 0) return; vp = fp->f_vnode; From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 12:36:31 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EE6B125C; Tue, 16 Jun 2015 12:36:30 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC778AD2; Tue, 16 Jun 2015 12:36:30 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GCaUl5045360; Tue, 16 Jun 2015 12:36:30 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GCaUGw045356; Tue, 16 Jun 2015 12:36:30 GMT (envelope-from np@FreeBSD.org) Message-Id: <201506161236.t5GCaUGw045356@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Tue, 16 Jun 2015 12:36:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284445 - in head/sys/dev/cxgbe: . common X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 12:36:31 -0000 Author: np Date: Tue Jun 16 12:36:29 2015 New Revision: 284445 URL: https://svnweb.freebsd.org/changeset/base/284445 Log: cxgbe(4): Add the ability to dump mailbox commands and replies. It is enabled/disabled via bit 0 of adapter->debug_flags (which is available at dev.t5nex..debug_flags). MFC after: 1 week Modified: head/sys/dev/cxgbe/adapter.h head/sys/dev/cxgbe/common/t4_hw.c head/sys/dev/cxgbe/t4_main.c Modified: head/sys/dev/cxgbe/adapter.h ============================================================================== --- head/sys/dev/cxgbe/adapter.h Tue Jun 16 12:10:55 2015 (r284444) +++ head/sys/dev/cxgbe/adapter.h Tue Jun 16 12:36:29 2015 (r284445) @@ -206,6 +206,9 @@ enum { INTR_OFLD_RXQ = (1 << 5), /* All TOE rxq's take interrupts */ INTR_NM_RXQ = (1 << 6), /* All netmap rxq's take interrupts */ INTR_ALL = (INTR_RXQ | INTR_OFLD_RXQ | INTR_NM_RXQ), + + /* adapter debug_flags */ + DF_DUMP_MBOX = (1 << 0), }; #define IS_DOOMED(pi) ((pi)->flags & DOOMED) @@ -762,6 +765,7 @@ struct adapter { int active_ulds; /* ULDs activated on this adapter */ #endif int flags; + int debug_flags; char ifp_lockname[16]; struct mtx ifp_lock; @@ -846,6 +850,24 @@ struct adapter { #define TXQ_LOCK_ASSERT_OWNED(txq) EQ_LOCK_ASSERT_OWNED(&(txq)->eq) #define TXQ_LOCK_ASSERT_NOTOWNED(txq) EQ_LOCK_ASSERT_NOTOWNED(&(txq)->eq) +#define CH_DUMP_MBOX(sc, mbox, data_reg) \ + do { \ + if (sc->debug_flags & DF_DUMP_MBOX) { \ + log(LOG_NOTICE, \ + "%s mbox %u: %016llx %016llx %016llx %016llx " \ + "%016llx %016llx %016llx %016llx\n", \ + device_get_nameunit(sc->dev), mbox, \ + (unsigned long long)t4_read_reg64(sc, data_reg), \ + (unsigned long long)t4_read_reg64(sc, data_reg + 8), \ + (unsigned long long)t4_read_reg64(sc, data_reg + 16), \ + (unsigned long long)t4_read_reg64(sc, data_reg + 24), \ + (unsigned long long)t4_read_reg64(sc, data_reg + 32), \ + (unsigned long long)t4_read_reg64(sc, data_reg + 40), \ + (unsigned long long)t4_read_reg64(sc, data_reg + 48), \ + (unsigned long long)t4_read_reg64(sc, data_reg + 56)); \ + } \ + } while (0) + #define for_each_txq(pi, iter, q) \ for (q = &pi->adapter->sge.txq[pi->first_txq], iter = 0; \ iter < pi->ntxq; ++iter, ++q) Modified: head/sys/dev/cxgbe/common/t4_hw.c ============================================================================== --- head/sys/dev/cxgbe/common/t4_hw.c Tue Jun 16 12:10:55 2015 (r284444) +++ head/sys/dev/cxgbe/common/t4_hw.c Tue Jun 16 12:36:29 2015 (r284445) @@ -262,6 +262,8 @@ int t4_wr_mbox_meat(struct adapter *adap for (i = 0; i < size; i += 8, p++) t4_write_reg64(adap, data_reg + i, be64_to_cpu(*p)); + CH_DUMP_MBOX(adap, mbox, data_reg); + t4_write_reg(adap, ctl_reg, F_MBMSGVALID | V_MBOWNER(X_MBOWNER_FW)); t4_read_reg(adap, ctl_reg); /* flush write */ @@ -287,6 +289,8 @@ int t4_wr_mbox_meat(struct adapter *adap continue; } + CH_DUMP_MBOX(adap, mbox, data_reg); + res = t4_read_reg64(adap, data_reg); if (G_FW_CMD_OP(res >> 32) == FW_DEBUG_CMD) { fw_asrt(adap, data_reg); Modified: head/sys/dev/cxgbe/t4_main.c ============================================================================== --- head/sys/dev/cxgbe/t4_main.c Tue Jun 16 12:10:55 2015 (r284444) +++ head/sys/dev/cxgbe/t4_main.c Tue Jun 16 12:36:29 2015 (r284445) @@ -585,6 +585,9 @@ t4_attach(device_t dev) sc = device_get_softc(dev); sc->dev = dev; +#ifdef INVARIANTS + sc->debug_flags = DF_DUMP_MBOX; +#endif pci_enable_busmaster(dev); if (pci_find_cap(dev, PCIY_EXPRESS, &i) == 0) { @@ -4603,6 +4606,9 @@ t4_sysctls(struct adapter *sc) SYSCTL_ADD_INT(ctx, children, OID_AUTO, "lro_timeout", CTLFLAG_RW, &sc->lro_timeout, 0, "lro inactive-flush timeout (in us)"); + SYSCTL_ADD_INT(ctx, children, OID_AUTO, "debug_flags", CTLFLAG_RW, + &sc->debug_flags, 0, "flags to enable runtime debugging"); + #ifdef SBUF_DRAIN /* * dev.t4nex.X.misc. Marked CTLFLAG_SKIP to avoid information overload. From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 12:18:23 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BC82FAB1 for ; Tue, 16 Jun 2015 12:18:23 +0000 (UTC) (envelope-from bms@fastmail.net) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 83C6C5F6 for ; Tue, 16 Jun 2015 12:18:22 +0000 (UTC) (envelope-from bms@fastmail.net) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id CD5B220801 for ; Tue, 16 Jun 2015 08:18:16 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 16 Jun 2015 08:18:16 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.net; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=ZPcoULLVoEyDYDdJBKYVA/kfbEE=; b=eaAJrk jexqoFUslcNFReFy50da+Un0ic67iUUHUmYaFqLUtXanntcbs716TZA7hp+w+U3o qW9THfXtrihoNU8jdxZDs5yK8Mwi3cvyGAfXtwlXPgiYmh7ll/318mUdEv7qMFYf LzSSlxFvg+AKzaY8Pwpv819dMySBKnOR2H/Ok= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=ZPcoULLVoEyDYDd JBKYVA/kfbEE=; b=e8hSGikBc8LKBFFJyacwoGoOh1ufTaFsbvfxFpTes8nfA8x jx5W/1PRbUATl6XRgo66TDOiVv5NgBQzUAPj0zc7GgGLFSBZhyiJY7SDiZkh4hzq jGMmGVPvUqd2X7o8bd8vDQRDw4CpnHVuMTqaaPLrWX/ynY+M8QKX8KwjamVc= X-Sasl-enc: +Q53PuNKc/9/trskVp6bSZrl2G/Niyv33VWtWBW19YKJ 1434457096 Received: from [192.168.1.91] (unknown [94.194.112.252]) by mail.messagingengine.com (Postfix) with ESMTPA id 2E6AB6800EB; Tue, 16 Jun 2015 08:18:15 -0400 (EDT) Message-ID: <55801406.5060202@fastmail.net> Date: Tue, 16 Jun 2015 13:18:14 +0100 From: Bruce Simpson User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Warner Losh , Bryan Drewery CC: Garrett Cooper , Slawa Olhovchenkov , Craig Rodrigues , Marcel Moolenaar , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Marcel Moolenaar , "src-committers@freebsd.org" Subject: Re: svn commit: r284198 - head/bin/ls References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <45B665F4-B81F-439B-89DC-6D27BA96F87D@gmail.com> <557F033A.1060006@FreeBSD.org> In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Tue, 16 Jun 2015 12:48:32 +0000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 12:18:23 -0000 On 15/06/2015 19:49, Warner Losh wrote: > I’ve yet to see why ls —libxo is better than a separate program articulated > anywhere other than "libxo all the things.” Having a clear statement about > why it is needed, why changing it vs having a separate program, etc would > help. But is seems overly gratuitous with little benefit. +1, I don't see how libxo-ized ls(1) adds value. e.g. in Python, one can use pathlib and scandir to walk arbitrarily wide and deep hierarchies, much as 'file ... | xargs foo'. It has even (with hard work by koobs) supported FreeBSD's stat.st_flags since 2.3. So anything ls(1) can do, Python could do anyway. From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 13:09:22 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 193E7D86; Tue, 16 Jun 2015 13:09:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 05C7B272; Tue, 16 Jun 2015 13:09:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GD9Lck061251; Tue, 16 Jun 2015 13:09:21 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GD9Jx2061238; Tue, 16 Jun 2015 13:09:19 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201506161309.t5GD9Jx2061238@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 16 Jun 2015 13:09:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284446 - in head/sys: compat/linux compat/svr4 fs/fdescfs i386/ibcs2 kern security/audit sys ufs/ffs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 13:09:22 -0000 Author: mjg Date: Tue Jun 16 13:09:18 2015 New Revision: 284446 URL: https://svnweb.freebsd.org/changeset/base/284446 Log: Replace struct filedesc argument in getvnode with struct thread This is is a step towards removal of spurious arguments. Modified: head/sys/compat/linux/linux_file.c head/sys/compat/svr4/svr4_misc.c head/sys/fs/fdescfs/fdesc_vnops.c head/sys/i386/ibcs2/ibcs2_misc.c head/sys/kern/vfs_acl.c head/sys/kern/vfs_extattr.c head/sys/kern/vfs_syscalls.c head/sys/security/audit/audit_arg.c head/sys/sys/filedesc.h head/sys/ufs/ffs/ffs_alloc.c Modified: head/sys/compat/linux/linux_file.c ============================================================================== --- head/sys/compat/linux/linux_file.c Tue Jun 16 12:36:29 2015 (r284445) +++ head/sys/compat/linux/linux_file.c Tue Jun 16 13:09:18 2015 (r284446) @@ -348,8 +348,7 @@ getdents_common(struct thread *td, struc } else justone = 0; - error = getvnode(td->td_proc->p_fd, args->fd, - cap_rights_init(&rights, CAP_READ), &fp); + error = getvnode(td, args->fd, cap_rights_init(&rights, CAP_READ), &fp); if (error != 0) return (error); Modified: head/sys/compat/svr4/svr4_misc.c ============================================================================== --- head/sys/compat/svr4/svr4_misc.c Tue Jun 16 12:36:29 2015 (r284445) +++ head/sys/compat/svr4/svr4_misc.c Tue Jun 16 13:09:18 2015 (r284446) @@ -262,8 +262,7 @@ svr4_sys_getdents64(td, uap) DPRINTF(("svr4_sys_getdents64(%d, *, %d)\n", uap->fd, uap->nbytes)); - error = getvnode(td->td_proc->p_fd, uap->fd, - cap_rights_init(&rights, CAP_READ), &fp); + error = getvnode(td, uap->fd, cap_rights_init(&rights, CAP_READ), &fp); if (error != 0) return (error); @@ -442,8 +441,7 @@ svr4_sys_getdents(td, uap) if (uap->nbytes < 0) return (EINVAL); - error = getvnode(td->td_proc->p_fd, uap->fd, - cap_rights_init(&rights, CAP_READ), &fp); + error = getvnode(td, uap->fd, cap_rights_init(&rights, CAP_READ), &fp); if (error != 0) return (error); @@ -623,7 +621,6 @@ svr4_sys_fchroot(td, uap) struct svr4_sys_fchroot_args *uap; { cap_rights_t rights; - struct filedesc *fdp = td->td_proc->p_fd; struct vnode *vp; struct file *fp; int error; @@ -631,7 +628,7 @@ svr4_sys_fchroot(td, uap) if ((error = priv_check(td, PRIV_VFS_FCHROOT)) != 0) return error; /* XXX: we have the chroot priv... what cap might we need? all? */ - if ((error = getvnode(fdp, uap->fd, cap_rights_init(&rights), &fp)) != 0) + if ((error = getvnode(td, uap->fd, cap_rights_init(&rights), &fp)) != 0) return error; vp = fp->f_vnode; VREF(vp); Modified: head/sys/fs/fdescfs/fdesc_vnops.c ============================================================================== --- head/sys/fs/fdescfs/fdesc_vnops.c Tue Jun 16 12:36:29 2015 (r284445) +++ head/sys/fs/fdescfs/fdesc_vnops.c Tue Jun 16 13:09:18 2015 (r284446) @@ -482,7 +482,7 @@ fdesc_setattr(ap) /* * Allow setattr where there is an underlying vnode. */ - error = getvnode(td->td_proc->p_fd, fd, + error = getvnode(td, fd, cap_rights_init(&rights, CAP_EXTATTR_SET), &fp); if (error) { /* Modified: head/sys/i386/ibcs2/ibcs2_misc.c ============================================================================== --- head/sys/i386/ibcs2/ibcs2_misc.c Tue Jun 16 12:36:29 2015 (r284445) +++ head/sys/i386/ibcs2/ibcs2_misc.c Tue Jun 16 13:09:18 2015 (r284446) @@ -342,8 +342,7 @@ ibcs2_getdents(td, uap) #define BSD_DIRENT(cp) ((struct dirent *)(cp)) #define IBCS2_RECLEN(reclen) (reclen + sizeof(u_short)) - error = getvnode(td->td_proc->p_fd, uap->fd, - cap_rights_init(&rights, CAP_READ), &fp); + error = getvnode(td, uap->fd, cap_rights_init(&rights, CAP_READ), &fp); if (error != 0) return (error); if ((fp->f_flag & FREAD) == 0) { @@ -498,8 +497,7 @@ ibcs2_read(td, uap) u_long *cookies = NULL, *cookiep; int ncookies; - error = getvnode(td->td_proc->p_fd, uap->fd, - cap_rights_init(&rights, CAP_READ), &fp); + error = getvnode(td, uap->fd, cap_rights_init(&rights, CAP_READ), &fp); if (error != 0) { if (error == EINVAL) return sys_read(td, (struct read_args *)uap); Modified: head/sys/kern/vfs_acl.c ============================================================================== --- head/sys/kern/vfs_acl.c Tue Jun 16 12:36:29 2015 (r284445) +++ head/sys/kern/vfs_acl.c Tue Jun 16 13:09:18 2015 (r284446) @@ -406,7 +406,7 @@ sys___acl_get_fd(struct thread *td, stru cap_rights_t rights; int error; - error = getvnode(td->td_proc->p_fd, uap->filedes, + error = getvnode(td, uap->filedes, cap_rights_init(&rights, CAP_ACL_GET), &fp); if (error == 0) { error = vacl_get_acl(td, fp->f_vnode, uap->type, uap->aclp); @@ -425,7 +425,7 @@ sys___acl_set_fd(struct thread *td, stru cap_rights_t rights; int error; - error = getvnode(td->td_proc->p_fd, uap->filedes, + error = getvnode(td, uap->filedes, cap_rights_init(&rights, CAP_ACL_SET), &fp); if (error == 0) { error = vacl_set_acl(td, fp->f_vnode, uap->type, uap->aclp); @@ -480,7 +480,7 @@ sys___acl_delete_fd(struct thread *td, s cap_rights_t rights; int error; - error = getvnode(td->td_proc->p_fd, uap->filedes, + error = getvnode(td, uap->filedes, cap_rights_init(&rights, CAP_ACL_DELETE), &fp); if (error == 0) { error = vacl_delete(td, fp->f_vnode, uap->type); @@ -535,7 +535,7 @@ sys___acl_aclcheck_fd(struct thread *td, cap_rights_t rights; int error; - error = getvnode(td->td_proc->p_fd, uap->filedes, + error = getvnode(td, uap->filedes, cap_rights_init(&rights, CAP_ACL_CHECK), &fp); if (error == 0) { error = vacl_aclcheck(td, fp->f_vnode, uap->type, uap->aclp); Modified: head/sys/kern/vfs_extattr.c ============================================================================== --- head/sys/kern/vfs_extattr.c Tue Jun 16 12:36:29 2015 (r284445) +++ head/sys/kern/vfs_extattr.c Tue Jun 16 13:09:18 2015 (r284446) @@ -226,7 +226,7 @@ sys_extattr_set_fd(td, uap) return (error); AUDIT_ARG_TEXT(attrname); - error = getvnode(td->td_proc->p_fd, uap->fd, + error = getvnode(td, uap->fd, cap_rights_init(&rights, CAP_EXTATTR_SET), &fp); if (error) return (error); @@ -401,7 +401,7 @@ sys_extattr_get_fd(td, uap) return (error); AUDIT_ARG_TEXT(attrname); - error = getvnode(td->td_proc->p_fd, uap->fd, + error = getvnode(td, uap->fd, cap_rights_init(&rights, CAP_EXTATTR_GET), &fp); if (error) return (error); @@ -545,7 +545,7 @@ sys_extattr_delete_fd(td, uap) return (error); AUDIT_ARG_TEXT(attrname); - error = getvnode(td->td_proc->p_fd, uap->fd, + error = getvnode(td, uap->fd, cap_rights_init(&rights, CAP_EXTATTR_DELETE), &fp); if (error) return (error); @@ -697,7 +697,7 @@ sys_extattr_list_fd(td, uap) AUDIT_ARG_FD(uap->fd); AUDIT_ARG_VALUE(uap->attrnamespace); - error = getvnode(td->td_proc->p_fd, uap->fd, + error = getvnode(td, uap->fd, cap_rights_init(&rights, CAP_EXTATTR_LIST), &fp); if (error) return (error); Modified: head/sys/kern/vfs_syscalls.c ============================================================================== --- head/sys/kern/vfs_syscalls.c Tue Jun 16 12:36:29 2015 (r284445) +++ head/sys/kern/vfs_syscalls.c Tue Jun 16 13:09:18 2015 (r284446) @@ -365,8 +365,7 @@ kern_fstatfs(struct thread *td, int fd, int error; AUDIT_ARG_FD(fd); - error = getvnode(td->td_proc->p_fd, fd, - cap_rights_init(&rights, CAP_FSTATFS), &fp); + error = getvnode(td, fd, cap_rights_init(&rights, CAP_FSTATFS), &fp); if (error != 0) return (error); vp = fp->f_vnode; @@ -737,7 +736,7 @@ sys_fchdir(td, uap) int error; AUDIT_ARG_FD(uap->fd); - error = getvnode(fdp, uap->fd, cap_rights_init(&rights, CAP_FCHDIR), + error = getvnode(td, uap->fd, cap_rights_init(&rights, CAP_FCHDIR), &fp); if (error != 0) return (error); @@ -2671,8 +2670,8 @@ sys_fchflags(td, uap) AUDIT_ARG_FD(uap->fd); AUDIT_ARG_FFLAGS(uap->flags); - error = getvnode(td->td_proc->p_fd, uap->fd, - cap_rights_init(&rights, CAP_FCHFLAGS), &fp); + error = getvnode(td, uap->fd, cap_rights_init(&rights, CAP_FCHFLAGS), + &fp); if (error != 0) return (error); #ifdef AUDIT @@ -3239,8 +3238,7 @@ kern_futimes(struct thread *td, int fd, error = getutimes(tptr, tptrseg, ts); if (error != 0) return (error); - error = getvnode(td->td_proc->p_fd, fd, - cap_rights_init(&rights, CAP_FUTIMES), &fp); + error = getvnode(td, fd, cap_rights_init(&rights, CAP_FUTIMES), &fp); if (error != 0) return (error); #ifdef AUDIT @@ -3275,8 +3273,7 @@ kern_futimens(struct thread *td, int fd, return (error); if (flags & UTIMENS_EXIT) return (0); - error = getvnode(td->td_proc->p_fd, fd, - cap_rights_init(&rights, CAP_FUTIMES), &fp); + error = getvnode(td, fd, cap_rights_init(&rights, CAP_FUTIMES), &fp); if (error != 0) return (error); #ifdef AUDIT @@ -3470,8 +3467,7 @@ sys_fsync(td, uap) int error, lock_flags; AUDIT_ARG_FD(uap->fd); - error = getvnode(td->td_proc->p_fd, uap->fd, - cap_rights_init(&rights, CAP_FSYNC), &fp); + error = getvnode(td, uap->fd, cap_rights_init(&rights, CAP_FSYNC), &fp); if (error != 0) return (error); vp = fp->f_vnode; @@ -3894,8 +3890,7 @@ kern_ogetdirentries(struct thread *td, s /* XXX arbitrary sanity limit on `count'. */ if (uap->count > 64 * 1024) return (EINVAL); - error = getvnode(td->td_proc->p_fd, uap->fd, - cap_rights_init(&rights, CAP_READ), &fp); + error = getvnode(td, uap->fd, cap_rights_init(&rights, CAP_READ), &fp); if (error != 0) return (error); if ((fp->f_flag & FREAD) == 0) { @@ -4058,8 +4053,7 @@ kern_getdirentries(struct thread *td, in if (count > IOSIZE_MAX) return (EINVAL); auio.uio_resid = count; - error = getvnode(td->td_proc->p_fd, fd, - cap_rights_init(&rights, CAP_READ), &fp); + error = getvnode(td, fd, cap_rights_init(&rights, CAP_READ), &fp); if (error != 0) return (error); if ((fp->f_flag & FREAD) == 0) { @@ -4225,12 +4219,12 @@ out: * entry is held upon returning. */ int -getvnode(struct filedesc *fdp, int fd, cap_rights_t *rightsp, struct file **fpp) +getvnode(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp) { struct file *fp; int error; - error = fget_unlocked(fdp, fd, rightsp, &fp, NULL); + error = fget_unlocked(td->td_proc->p_fd, fd, rightsp, &fp, NULL); if (error != 0) return (error); @@ -4247,7 +4241,7 @@ getvnode(struct filedesc *fdp, int fd, c * checking f_ops. */ if (fp->f_vnode == NULL || fp->f_ops == &badfileops) { - fdrop(fp, curthread); + fdrop(fp, td); return (EINVAL); } *fpp = fp; Modified: head/sys/security/audit/audit_arg.c ============================================================================== --- head/sys/security/audit/audit_arg.c Tue Jun 16 12:36:29 2015 (r284445) +++ head/sys/security/audit/audit_arg.c Tue Jun 16 13:09:18 2015 (r284446) @@ -908,7 +908,7 @@ audit_sysclose(struct thread *td, int fd audit_arg_fd(fd); - if (getvnode(td->td_proc->p_fd, fd, cap_rights_init(&rights), &fp) != 0) + if (getvnode(td, fd, cap_rights_init(&rights), &fp) != 0) return; vp = fp->f_vnode; Modified: head/sys/sys/filedesc.h ============================================================================== --- head/sys/sys/filedesc.h Tue Jun 16 12:36:29 2015 (r284445) +++ head/sys/sys/filedesc.h Tue Jun 16 13:09:18 2015 (r284446) @@ -165,7 +165,7 @@ struct filedesc *fdshare(struct filedesc struct filedesc_to_leader * filedesc_to_leader_alloc(struct filedesc_to_leader *old, struct filedesc *fdp, struct proc *leader); -int getvnode(struct filedesc *fdp, int fd, cap_rights_t *rightsp, +int getvnode(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp); void mountcheckdirs(struct vnode *olddp, struct vnode *newdp); Modified: head/sys/ufs/ffs/ffs_alloc.c ============================================================================== --- head/sys/ufs/ffs/ffs_alloc.c Tue Jun 16 12:36:29 2015 (r284445) +++ head/sys/ufs/ffs/ffs_alloc.c Tue Jun 16 13:09:18 2015 (r284446) @@ -2766,7 +2766,7 @@ sysctl_ffs_fsck(SYSCTL_HANDLER_ARGS) return (error); if (cmd.version != FFS_CMD_VERSION) return (ERPCMISMATCH); - if ((error = getvnode(td->td_proc->p_fd, cmd.handle, + if ((error = getvnode(td, cmd.handle, cap_rights_init(&rights, CAP_FSCK), &fp)) != 0) return (error); vp = fp->f_data; @@ -3080,7 +3080,7 @@ sysctl_ffs_fsck(SYSCTL_HANDLER_ARGS) (intmax_t)cmd.value); } #endif /* DEBUG */ - if ((error = getvnode(td->td_proc->p_fd, cmd.value, + if ((error = getvnode(td, cmd.value, cap_rights_init(&rights, CAP_FSCK), &vfp)) != 0) break; if (vfp->f_vnode->v_type != VCHR) { From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 13:27:07 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 80327384; Tue, 16 Jun 2015 13:27:07 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6228896B; Tue, 16 Jun 2015 13:27:07 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GDR7cO071134; Tue, 16 Jun 2015 13:27:07 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GDR7UT071133; Tue, 16 Jun 2015 13:27:07 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201506161327.t5GDR7UT071133@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Tue, 16 Jun 2015 13:27:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284447 - head/sys/dev/mii X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 13:27:07 -0000 Author: marius Date: Tue Jun 16 13:27:06 2015 New Revision: 284447 URL: https://svnweb.freebsd.org/changeset/base/284447 Log: Merge from NetBSD: o rev. 1.10: Nuke trailing whitespace. o rev. 1.15: Fix typo in comment. o rev. 1.16: Add the following registers from IEEE 802.3-2009 Clause 22: - PSE control register (0x0b) - PSE status register (0x0c) - MMD access control register (0x0d) - MMD access address data register (0x0e) o rev. 1.17 (comments only): The bit location of link ability is different between 1000Base-X and others (see Annex 28B.2 and 28D). o rev. 1.18: Nuke dupe word. Obtained from: NetBSD MFC after: 1 week Sponsored by: genua mbh Modified: head/sys/dev/mii/mii.h Modified: head/sys/dev/mii/mii.h ============================================================================== --- head/sys/dev/mii/mii.h Tue Jun 16 13:09:18 2015 (r284446) +++ head/sys/dev/mii/mii.h Tue Jun 16 13:27:06 2015 (r284447) @@ -1,4 +1,4 @@ -/* $NetBSD: mii.h,v 1.9 2001/05/31 03:07:14 thorpej Exp $ */ +/* $NetBSD: mii.h,v 1.18 2014/06/16 14:43:22 msaitoh Exp $ */ /*- * Copyright (c) 1997 Manuel Bouyer. All rights reserved. @@ -87,7 +87,7 @@ /* * Note that the EXTSTAT bit indicates that there is extended status * info available in register 15, but 802.3 section 22.2.4.3 also - * states that that all 1000 Mb/s capable PHYs will set this bit to 1. + * states that all 1000 Mb/s capable PHYs will set this bit to 1. */ #define BMSR_MEDIAMASK (BMSR_100T4|BMSR_100TXFDX|BMSR_100TXHDX| \ @@ -111,6 +111,7 @@ #define ANAR_NP 0x8000 /* Next page (ro) */ #define ANAR_ACK 0x4000 /* link partner abilities acknowledged (ro) */ #define ANAR_RF 0x2000 /* remote fault (ro) */ + /* Annex 28B.2 */ #define ANAR_FC 0x0400 /* local device supports PAUSE */ #define ANAR_T4 0x0200 /* local device supports 100bT4 */ #define ANAR_TX_FD 0x0100 /* local device supports 100bTx FD */ @@ -123,6 +124,7 @@ #define ANAR_PAUSE_ASYM (2 << 10) #define ANAR_PAUSE_TOWARDS (3 << 10) + /* Annex 28D */ #define ANAR_X_FD 0x0020 /* local device supports 1000BASE-X FD */ #define ANAR_X_HD 0x0040 /* local device supports 1000BASE-X HD */ #define ANAR_X_PAUSE_NONE (0 << 7) @@ -184,12 +186,47 @@ #define GTSR_MAN_MS_FLT 0x8000 /* master/slave config fault */ #define GTSR_MS_RES 0x4000 /* result: 1 = master, 0 = slave */ #define GTSR_LRS 0x2000 /* local rx status, 1 = ok */ -#define GTSR_RRS 0x1000 /* remove rx status, 1 = ok */ +#define GTSR_RRS 0x1000 /* remote rx status, 1 = ok */ #define GTSR_LP_1000TFDX 0x0800 /* link partner 1000baseT FDX capable */ #define GTSR_LP_1000THDX 0x0400 /* link partner 1000baseT HDX capable */ #define GTSR_LP_ASM_DIR 0x0200 /* link partner asym. pause dir. capable */ #define GTSR_IDLE_ERR 0x00ff /* IDLE error count */ +#define MII_PSECR 0x0b /* PSE control register */ +#define PSECR_PACTLMASK 0x000c /* pair control mask */ +#define PSECR_PSEENMASK 0x0003 /* PSE enable mask */ +#define PSECR_PINOUTB 0x0008 /* PSE pinout Alternative B */ +#define PSECR_PINOUTA 0x0004 /* PSE pinout Alternative A */ +#define PSECR_FOPOWTST 0x0002 /* Force Power Test Mode */ +#define PSECR_PSEEN 0x0001 /* PSE Enabled */ +#define PSECR_PSEDIS 0x0000 /* PSE Disabled */ + +#define MII_PSESR 0x0c /* PSE status register */ +#define PSESR_PWRDENIED 0x1000 /* Power Denied */ +#define PSESR_VALSIG 0x0800 /* Valid PD signature detected */ +#define PSESR_INVALSIG 0x0400 /* Inalid PD signature detected */ +#define PSESR_SHORTCIRC 0x0200 /* Short circuit condition detected */ +#define PSESR_OVERLOAD 0x0100 /* Overload condition detected */ +#define PSESR_MPSABSENT 0x0080 /* MPS absent condition detected */ +#define PSESR_PDCLMASK 0x0070 /* PD Class mask */ +#define PSESR_STATMASK 0x000e /* PSE Status mask */ +#define PSESR_PAIRCTABL 0x0001 /* PAIR Control Ability */ +#define PSESR_PDCL_4 (4 << 4) /* Class 4 */ +#define PSESR_PDCL_3 (3 << 4) /* Class 3 */ +#define PSESR_PDCL_2 (2 << 4) /* Class 2 */ +#define PSESR_PDCL_1 (1 << 4) /* Class 1 */ +#define PSESR_PDCL_0 (0 << 4) /* Class 0 */ + +#define MII_MMDACR 0x0d /* MMD access control register */ +#define MMDACR_FUNCMASK 0xc000 /* function */ +#define MMDACR_DADDRMASK 0x001f /* device address */ +#define MMDACR_FN_ADDRESS (0 << 14) /* address */ +#define MMDACR_FN_DATANPI (1 << 14) /* data, no post increment */ +#define MMDACR_FN_DATAPIRW (2 << 14) /* data, post increment on r/w */ +#define MMDACR_FN_DATAPIW (3 << 14) /* data, post increment on wr only */ + +#define MII_MMDAADR 0x0e /* MMD access address data register */ + #define MII_EXTSR 0x0f /* Extended status register */ #define EXTSR_1000XFDX 0x8000 /* 1000X full-duplex capable */ #define EXTSR_1000XHDX 0x4000 /* 1000X half-duplex capable */ From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 13:44:02 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2F33F6AF; Tue, 16 Jun 2015 13:44:02 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebius.int.ru", Issuer "cell.glebius.int.ru" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 0F262DEE; Tue, 16 Jun 2015 13:44:00 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.9/8.14.9) with ESMTP id t5GDhql1022609 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 16 Jun 2015 16:43:52 +0300 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.9/8.14.9/Submit) id t5GDhqta022608; Tue, 16 Jun 2015 16:43:52 +0300 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Tue, 16 Jun 2015 16:43:52 +0300 From: Gleb Smirnoff To: Mateusz Guzik Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284211 - in head/sys: kern sys Message-ID: <20150616134352.GI73119@FreeBSD.org> References: <201506100934.t5A9YpoN093925@svn.freebsd.org> <20150610154445.GJ73119@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150610154445.GJ73119@FreeBSD.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 13:44:02 -0000 Mateusz, have you noticed this email? On Wed, Jun 10, 2015 at 06:44:45PM +0300, Gleb Smirnoff wrote: T> On Wed, Jun 10, 2015 at 09:34:51AM +0000, Mateusz Guzik wrote: T> M> Author: mjg T> M> Date: Wed Jun 10 09:34:50 2015 T> M> New Revision: 284211 T> M> URL: https://svnweb.freebsd.org/changeset/base/284211 T> M> T> M> Log: T> M> fd: use atomics to manage fd_refcnt and fd_holcnt T> M> T> M> This gets rid of fdesc_mtx. T> .. T> M> Modified: head/sys/sys/filedesc.h T> M> ============================================================================== T> M> --- head/sys/sys/filedesc.h Wed Jun 10 05:39:48 2015 (r284210) T> M> +++ head/sys/sys/filedesc.h Wed Jun 10 09:34:50 2015 (r284211) T> M> @@ -83,8 +83,8 @@ struct filedesc { T> M> int fd_lastfile; /* high-water mark of fd_ofiles */ T> M> int fd_freefile; /* approx. next free file */ T> M> u_short fd_cmask; /* mask for file creation */ T> M> - u_short fd_refcnt; /* thread reference count */ T> M> - u_short fd_holdcnt; /* hold count on structure + mutex */ T> M> + int fd_refcnt; /* thread reference count */ T> M> + int fd_holdcnt; /* hold count on structure + mutex */ T> M> struct sx fd_sx; /* protects members of this struct */ T> M> struct kqlist fd_kqlist; /* list of kqueues on this filedesc */ T> M> int fd_holdleaderscount; /* block fdfree() for shared close() */ T> T> Shouldn't they be volatile u_int? T> T> -- T> Totus tuus, Glebius. T> -- Totus tuus, Glebius. From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 14:04:42 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 18530E12; Tue, 16 Jun 2015 14:04:42 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pa0-x22d.google.com (mail-pa0-x22d.google.com [IPv6:2607:f8b0:400e:c03::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CF2BC31A; Tue, 16 Jun 2015 14:04:41 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by pabqy3 with SMTP id qy3so13449319pab.3; Tue, 16 Jun 2015 07:04:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:reply-to:subject:references:to:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=zghbWL4PepgWr2Pth2WYQ4Q2GTSjM+7wyPjZRaIXh9k=; b=naAdWAUjJTAI1RHdZ6NIBAV0Ni3z8FBwh6qtrVmunfAH7LHwJcv5tHKnJmowTBj5wF PsUjBERY7VEsMs+74qbg8WtvJRMsk4B/mc3I5ozpn/fgxj0n+pngh8Le4so8dPoDBSIn RFsnHAF39fk4PyOUxXxOuTk475izWcWOJnu0EdPL43dU7a/PaTTIKNc6/35MYxAwaNLj dGbG9DoigjWaZidcR9829z0Ohr6YiWjjqazQSXNP1l9ws9ShSzPO4BNZQCUhrkdoiUbx uUYFxTx5KDb726pJlWtdFuEbjwl9vMzLqnsu5jZQWSs40ITyVBPNGszn7DhL8mBdoOC/ gTmQ== X-Received: by 10.70.131.132 with SMTP id om4mr1068977pdb.30.1434463481348; Tue, 16 Jun 2015 07:04:41 -0700 (PDT) Received: from ?IPv6:2001:44b8:31ae:7b01::1? (2001-44b8-31ae-7b01-0000-0000-0000-0001.static.ipv6.internode.on.net. [2001:44b8:31ae:7b01::1]) by mx.google.com with ESMTPSA id eu5sm1534359pbb.44.2015.06.16.07.04.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2015 07:04:40 -0700 (PDT) Sender: Kubilay Kocak Reply-To: koobs@FreeBSD.org Subject: Re: svn commit: r284198 - head/bin/ls References: <201506100127.t5A1RdX6051959@svn.freebsd.org> <20150612204309.11dd3391@kan> <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614100045.GF58397@zxy.spb.ru> <557D55CB.5050009@fastmail.net> <20150614171031.GA5857@troutmask.apl.washington.edu> <557DCBED.2010804@fastmail.net> <887CD9C6-9807-48AF-A7A6-B33F91901414@gmail.com> To: Garrett Cooper , Adrian Chadd Cc: Craig Rodrigues , Marcel Moolenaar , "svn-src-all@freebsd.org" , Marcel Moolenaar , Bruce Simpson , "src-committers@freebsd.org" , Steve Kargl , Slawa Olhovchenkov , "svn-src-head@freebsd.org" From: Kubilay Kocak Message-ID: <55802CEF.7060007@FreeBSD.org> Date: Wed, 17 Jun 2015 00:04:31 +1000 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Mailman-Approved-At: Tue, 16 Jun 2015 14:42:36 +0000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 14:04:42 -0000 On 15/06/2015 5:19 AM, Garrett Cooper wrote: > > Next time someone else converts ANYTHING to libxo -- write tests > FIRST to make sure you're not breaking legacy behavior. If you need > help figuring out how to do that, I'll be more than happy to document > it on a wiki page, with simple, concise directions. > > Please do so anyway, these kinds of things are great (simple) ways for people inside and outside the project to start contributing to. *Then* perhaps we can hook in some code coverage checks into our CI, publish the numbers and go from there. Koobs From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 15:14:40 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D2EB5366; Tue, 16 Jun 2015 15:14:40 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C15D285A; Tue, 16 Jun 2015 15:14:40 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GFEemr026476; Tue, 16 Jun 2015 15:14:40 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GFEemt026474; Tue, 16 Jun 2015 15:14:40 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201506161514.t5GFEemt026474@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Tue, 16 Jun 2015 15:14:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284449 - head/sys/arm/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 15:14:40 -0000 Author: bz Date: Tue Jun 16 15:14:40 2015 New Revision: 284449 URL: https://svnweb.freebsd.org/changeset/base/284449 Log: Trying to unbreak arm.LINT by properly putting the conditional include for dtrace further down in the include list where it belongs. Reviewed by: andrew Modified: head/sys/arm/arm/trap.c Modified: head/sys/arm/arm/trap.c ============================================================================== --- head/sys/arm/arm/trap.c Tue Jun 16 13:56:16 2015 (r284448) +++ head/sys/arm/arm/trap.c Tue Jun 16 15:14:40 2015 (r284449) @@ -78,10 +78,6 @@ * Created : 28/11/94 */ -#ifdef KDTRACE_HOOKS -#include -#endif - #include __FBSDID("$FreeBSD$"); @@ -109,6 +105,10 @@ __FBSDID("$FreeBSD$"); #include #endif +#ifdef KDTRACE_HOOKS +#include +#endif + extern char fusubailout[]; #ifdef DEBUG From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 15:39:35 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A0994B52; Tue, 16 Jun 2015 15:39:35 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8EBEDD70; Tue, 16 Jun 2015 15:39:35 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GFdZsG036917; Tue, 16 Jun 2015 15:39:35 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GFdZcq036916; Tue, 16 Jun 2015 15:39:35 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201506161539.t5GFdZcq036916@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 16 Jun 2015 15:39:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284450 - head/sys/dev/atkbdc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 15:39:35 -0000 Author: glebius Date: Tue Jun 16 15:39:34 2015 New Revision: 284450 URL: https://svnweb.freebsd.org/changeset/base/284450 Log: Fix miss from r284320. Coverity: 1018895 Modified: head/sys/dev/atkbdc/psm.c Modified: head/sys/dev/atkbdc/psm.c ============================================================================== --- head/sys/dev/atkbdc/psm.c Tue Jun 16 15:14:40 2015 (r284449) +++ head/sys/dev/atkbdc/psm.c Tue Jun 16 15:39:34 2015 (r284450) @@ -5102,7 +5102,7 @@ enable_trackpoint(struct psm_softc *sc, id = read_aux_data(kbdc); if (id < 0x01) return (FALSE); - if (sc != NULL) + if (arg == PROBE) sc->tphw = id; if (!trackpoint_support) return (FALSE); From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 16:40:26 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5E07DC2B; Tue, 16 Jun 2015 16:40:26 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C2E2E68; Tue, 16 Jun 2015 16:40:26 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GGeQnb067241; Tue, 16 Jun 2015 16:40:26 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GGePQ2067239; Tue, 16 Jun 2015 16:40:25 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506161640.t5GGePQ2067239@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 16 Jun 2015 16:40:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284451 - head/lib/libc/arm/aeabi X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 16:40:26 -0000 Author: andrew Date: Tue Jun 16 16:40:25 2015 New Revision: 284451 URL: https://svnweb.freebsd.org/changeset/base/284451 Log: Export the ARM __aeabi_mem* functions from libc, they are needed by the gcc from ports as it doesn't include these in the copy of libgcc it installs uses. Obtained from: ABT Systems Ltd Modified: head/lib/libc/arm/aeabi/Makefile.inc head/lib/libc/arm/aeabi/Symbol.map Modified: head/lib/libc/arm/aeabi/Makefile.inc ============================================================================== --- head/lib/libc/arm/aeabi/Makefile.inc Tue Jun 16 15:39:34 2015 (r284450) +++ head/lib/libc/arm/aeabi/Makefile.inc Tue Jun 16 16:40:25 2015 (r284451) @@ -27,13 +27,5 @@ SRCS+= aeabi_memcmp.S \ aeabi_memmove.S \ aeabi_memset.S -# Mark the functions as hidden so they are not available outside of libc. -CFLAGS.aeabi_memcmp.S= -DVISIBILITY_HIDDEN -CFLAGS.aeabi_memcpy.S= -DVISIBILITY_HIDDEN -CFLAGS.aeabi_memmove.S= -DVISIBILITY_HIDDEN -CFLAGS.aeabi_memset.S= -DVISIBILITY_HIDDEN -CFLAGS+= ${CFLAGS.${.IMPSRC:T}} - - SYM_MAPS+=${LIBC_SRCTOP}/arm/aeabi/Symbol.map Modified: head/lib/libc/arm/aeabi/Symbol.map ============================================================================== --- head/lib/libc/arm/aeabi/Symbol.map Tue Jun 16 15:39:34 2015 (r284450) +++ head/lib/libc/arm/aeabi/Symbol.map Tue Jun 16 16:40:25 2015 (r284451) @@ -52,4 +52,21 @@ FBSDprivate_1.0 { __aeabi_i2d; __aeabi_i2f; + + + __aeabi_memclr; + __aeabi_memclr4; + __aeabi_memclr8; + __aeabi_memcmp; + __aeabi_memcmp4; + __aeabi_memcmp8; + __aeabi_memcpy; + __aeabi_memcpy4; + __aeabi_memcpy8; + __aeabi_memmove; + __aeabi_memmove4; + __aeabi_memmove8; + __aeabi_memset; + __aeabi_memset4; + __aeabi_memset8; }; From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 17:24:20 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EF329643; Tue, 16 Jun 2015 17:24:20 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD7E4C11; Tue, 16 Jun 2015 17:24:20 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GHOKLW090513; Tue, 16 Jun 2015 17:24:20 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GHOKgH090512; Tue, 16 Jun 2015 17:24:20 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506161724.t5GHOKgH090512@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 16 Jun 2015 17:24:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284452 - head/sys/arm/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 17:24:21 -0000 Author: andrew Date: Tue Jun 16 17:24:20 2015 New Revision: 284452 URL: https://svnweb.freebsd.org/changeset/base/284452 Log: Write to the PRRR (Primary Region Remap Register) rather than reading from it during the early boot. Found By: Patrick Wildt Sponsored by: ABT Systems Ltd Modified: head/sys/arm/arm/locore-v6.S Modified: head/sys/arm/arm/locore-v6.S ============================================================================== --- head/sys/arm/arm/locore-v6.S Tue Jun 16 16:40:25 2015 (r284451) +++ head/sys/arm/arm/locore-v6.S Tue Jun 16 17:24:20 2015 (r284452) @@ -240,7 +240,7 @@ ASENTRY_NP(init_mmu) * - All is set to uncacheable memory */ ldr r0, =0xAAAAA - mrc CP15_PRRR(r0) + mcr CP15_PRRR(r0) mov r0, #0 mcr CP15_NMRR(r0) #endif From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 17:27:54 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3BE2E993; Tue, 16 Jun 2015 17:27:54 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A931C43; Tue, 16 Jun 2015 17:27:54 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GHRs62091128; Tue, 16 Jun 2015 17:27:54 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GHRs6S091127; Tue, 16 Jun 2015 17:27:54 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506161727.t5GHRs6S091127@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 16 Jun 2015 17:27:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284453 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 17:27:54 -0000 Author: andrew Date: Tue Jun 16 17:27:53 2015 New Revision: 284453 URL: https://svnweb.freebsd.org/changeset/base/284453 Log: Add a comment to the end of the world and kernel cases in the universe target to help follow the make magic. Obtained from: ABT Systems Ltd Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Tue Jun 16 17:24:20 2015 (r284452) +++ head/Makefile Tue Jun 16 17:27:53 2015 (r284453) @@ -450,7 +450,8 @@ universe_${target}_${target_arch}: unive ${MAKEFAIL})) @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on `LC_ALL=C date`" .endfor -.endif +.endif # !MAKE_JUST_KERNELS + .if !defined(MAKE_JUST_WORLDS) # If we are building world and kernels wait for the required worlds to finish .if !defined(MAKE_JUST_KERNELS) @@ -468,7 +469,7 @@ universe_${target}_kernels: universe_${t .endif @cd ${.CURDIR} && ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \ universe_kernels -.endif +.endif # !MAKE_JUST_WORLDS @echo ">> ${target} completed on `LC_ALL=C date`" .endfor universe_kernels: universe_kernconfs From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 17:55:20 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E8C823F8; Tue, 16 Jun 2015 17:55:20 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D7726641; Tue, 16 Jun 2015 17:55:20 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GHtKTV005755; Tue, 16 Jun 2015 17:55:20 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GHtKec005754; Tue, 16 Jun 2015 17:55:20 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201506161755.t5GHtKec005754@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 16 Jun 2015 17:55:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284454 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 17:55:21 -0000 Author: imp Date: Tue Jun 16 17:55:20 2015 New Revision: 284454 URL: https://svnweb.freebsd.org/changeset/base/284454 Log: A more compatible fix to MK_META_MODE not being defined. Also, encase bmake specific constructs not needed for make bootstrap so fmake doesn't see them. This works with fmake just well enough for us to build bmake to build the rest of the tree without fatal errors. Tested only with fmake package. Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Tue Jun 16 17:27:53 2015 (r284453) +++ head/Makefile Tue Jun 16 17:55:20 2015 (r284454) @@ -99,7 +99,10 @@ # # For more information, see the build(7) manual page. # -.if ${MK_META_MODE:Uno} == "yes" + +# Note: we use this awkward construct to be compatible with FreeBSD's +# old make used in 10.0 and 9.2 and earlier. +.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes" # targets/Makefile plays the role of top-level .include "targets/Makefile" .else @@ -522,6 +525,7 @@ universe_epilogue: buildLINT: ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT +.if defined(.PARSEDIR) # This makefile does not run in meta mode .MAKE.MODE= normal # Normally the things we run from here don't either. @@ -539,5 +543,6 @@ UPDATE_DEPENDFILE= NO MAKE_JOB_ERROR_TOKEN= no .export MAKE_JOB_ERROR_TOKEN .endif +.endif # bmake .endif # META_MODE From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 18:43:09 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6F91F92B; Tue, 16 Jun 2015 18:43:09 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5D381236; Tue, 16 Jun 2015 18:43:09 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GIh9xV030269; Tue, 16 Jun 2015 18:43:09 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GIh9tX030268; Tue, 16 Jun 2015 18:43:09 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506161843.t5GIh9tX030268@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 16 Jun 2015 18:43:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284456 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 18:43:09 -0000 Author: andrew Date: Tue Jun 16 18:43:08 2015 New Revision: 284456 URL: https://svnweb.freebsd.org/changeset/base/284456 Log: Add a universe_${target}_worlds target to simplify the logic to find when to start building kernels. Obtained from: ABT Systems Ltd Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Tue Jun 16 18:39:11 2015 (r284455) +++ head/Makefile Tue Jun 16 18:43:08 2015 (r284456) @@ -438,9 +438,12 @@ universe_epilogue: universe_${target} universe_${target}: universe_${target}_prologue universe_${target}_prologue: universe_prologue @echo ">> ${target} started on `LC_ALL=C date`" +universe_${target}_worlds: + .if !defined(MAKE_JUST_KERNELS) .for target_arch in ${TARGET_ARCHES_${target}} universe_${target}: universe_${target}_${target_arch} +universe_${target}_worlds: universe_${target}_${target_arch} universe_${target}_${target_arch}: universe_${target}_prologue .MAKE @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`" @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ @@ -456,13 +459,8 @@ universe_${target}_${target_arch}: unive .endif # !MAKE_JUST_KERNELS .if !defined(MAKE_JUST_WORLDS) -# If we are building world and kernels wait for the required worlds to finish -.if !defined(MAKE_JUST_KERNELS) -.for target_arch in ${TARGET_ARCHES_${target}} -universe_${target}_kernels: universe_${target}_${target_arch} -.endfor -.endif universe_${target}: universe_${target}_kernels +universe_${target}_kernels: universe_${target}_worlds universe_${target}_kernels: universe_${target}_prologue .MAKE .if exists(${KERNSRCDIR}/${target}/conf/NOTES) @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \ From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 19:23:35 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 653E9650; Tue, 16 Jun 2015 19:23:35 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 537F3D99; Tue, 16 Jun 2015 19:23:35 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GJNZjE050110; Tue, 16 Jun 2015 19:23:35 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GJNZwA050109; Tue, 16 Jun 2015 19:23:35 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506161923.t5GJNZwA050109@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 16 Jun 2015 19:23:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284457 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 19:23:35 -0000 Author: andrew Date: Tue Jun 16 19:23:34 2015 New Revision: 284457 URL: https://svnweb.freebsd.org/changeset/base/284457 Log: Add a new target universe_${target}_done to print the completion message. Without this we could print this message in the wrong place when building with MAKE_JUST_WORLDS is set. Obtained from: ABT Systems Ltd Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Tue Jun 16 18:43:08 2015 (r284456) +++ head/Makefile Tue Jun 16 19:23:34 2015 (r284457) @@ -444,6 +444,7 @@ universe_${target}_worlds: .for target_arch in ${TARGET_ARCHES_${target}} universe_${target}: universe_${target}_${target_arch} universe_${target}_worlds: universe_${target}_${target_arch} +universe_${target}_done: universe_${target}_worlds universe_${target}_${target_arch}: universe_${target}_prologue .MAKE @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`" @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ @@ -460,6 +461,7 @@ universe_${target}_${target_arch}: unive .if !defined(MAKE_JUST_WORLDS) universe_${target}: universe_${target}_kernels +universe_${target}_done: universe_${target}_kernels universe_${target}_kernels: universe_${target}_worlds universe_${target}_kernels: universe_${target}_prologue .MAKE .if exists(${KERNSRCDIR}/${target}/conf/NOTES) @@ -471,6 +473,10 @@ universe_${target}_kernels: universe_${t @cd ${.CURDIR} && ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \ universe_kernels .endif # !MAKE_JUST_WORLDS + +# Tell the user the worlds and kernels have completed +universe_${target}: universe_${target}_done +universe_${target}_done: @echo ">> ${target} completed on `LC_ALL=C date`" .endfor universe_kernels: universe_kernconfs From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 20:19:01 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E976224; Tue, 16 Jun 2015 20:19:01 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5CBBAC5F; Tue, 16 Jun 2015 20:19:01 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GKJ19N076203; Tue, 16 Jun 2015 20:19:01 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GKJ1Vi076201; Tue, 16 Jun 2015 20:19:01 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201506162019.t5GKJ1Vi076201@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Tue, 16 Jun 2015 20:19:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284462 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 20:19:01 -0000 Author: pfg Date: Tue Jun 16 20:19:00 2015 New Revision: 284462 URL: https://svnweb.freebsd.org/changeset/base/284462 Log: Use nitems() macro instead of __arraycount() Modified: head/sys/kern/stack_protector.c Modified: head/sys/kern/stack_protector.c ============================================================================== --- head/sys/kern/stack_protector.c Tue Jun 16 20:01:01 2015 (r284461) +++ head/sys/kern/stack_protector.c Tue Jun 16 20:19:00 2015 (r284462) @@ -17,15 +17,14 @@ __stack_chk_fail(void) panic("stack overflow detected; backtrace may be corrupted"); } -#define __arraycount(__x) (sizeof(__x) / sizeof(__x[0])) static void __stack_chk_init(void *dummy __unused) { size_t i; - long guard[__arraycount(__stack_chk_guard)]; + long guard[nitems(__stack_chk_guard)]; arc4rand(guard, sizeof(guard), 0); - for (i = 0; i < __arraycount(guard); i++) + for (i = 0; i < nitems(guard); i++) __stack_chk_guard[i] = guard[i]; } SYSINIT(stack_chk, SI_SUB_RANDOM, SI_ORDER_ANY, __stack_chk_init, NULL); From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 20:58:35 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 71DA7CE0; Tue, 16 Jun 2015 20:58:35 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 45BF7793; Tue, 16 Jun 2015 20:58:35 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GKwZnl095312; Tue, 16 Jun 2015 20:58:35 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GKwYTD095308; Tue, 16 Jun 2015 20:58:34 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201506162058.t5GKwYTD095308@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 16 Jun 2015 20:58:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284464 - in head: . share/mk usr.bin usr.bin/make X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 20:58:35 -0000 Author: imp Date: Tue Jun 16 20:58:33 2015 New Revision: 284464 URL: https://svnweb.freebsd.org/changeset/base/284464 Log: Remove old fmake. It wasn't built by default for some time. Users that really need it can find it in the devel/fmake port or pkg install fmake. Note: This commit is orthogonal to the question 'can we fmake buildworld'. Differential Revision: https://reviews.freebsd.org/D2840 Deleted: head/usr.bin/make/ Modified: head/UPDATING head/share/mk/src.opts.mk head/usr.bin/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Jun 16 20:34:39 2015 (r284463) +++ head/UPDATING Tue Jun 16 20:58:33 2015 (r284464) @@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150616: + FreeBSD's old make (fmake) has been removed from the system. It is + available as the devel/fmake port or via pkg install fmake. + 20150615: The fix for the issue described in the 20150614 sendmail entry below has been been committed in revision 284436. The work Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Tue Jun 16 20:34:39 2015 (r284463) +++ head/share/mk/src.opts.mk Tue Jun 16 20:58:33 2015 (r284464) @@ -179,7 +179,6 @@ __DEFAULT_NO_OPTIONS = \ BSD_GREP \ CLANG_EXTRAS \ EISA \ - FMAKE \ HESIOD \ LLDB \ NAND \ Modified: head/usr.bin/Makefile ============================================================================== --- head/usr.bin/Makefile Tue Jun 16 20:34:39 2015 (r284463) +++ head/usr.bin/Makefile Tue Jun 16 20:58:33 2015 (r284464) @@ -253,10 +253,6 @@ SUBDIR+= file SUBDIR+= finger .endif -.if ${MK_FMAKE} != "no" -SUBDIR+= make -.endif - .if ${MK_FTP} != "no" SUBDIR+= ftp .endif From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 21:11:32 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 94ECA442; Tue, 16 Jun 2015 21:11:32 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 83DB5B78; Tue, 16 Jun 2015 21:11:32 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GLBWlg004836; Tue, 16 Jun 2015 21:11:32 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GLBWSC004835; Tue, 16 Jun 2015 21:11:32 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506162111.t5GLBWSC004835@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 16 Jun 2015 21:11:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284469 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 21:11:32 -0000 Author: andrew Date: Tue Jun 16 21:11:31 2015 New Revision: 284469 URL: https://svnweb.freebsd.org/changeset/base/284469 Log: Remove unneeded dependencies, these are now handled through the _done target. Obtained from: ABT Systems Ltd Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Tue Jun 16 21:08:25 2015 (r284468) +++ head/Makefile Tue Jun 16 21:11:31 2015 (r284469) @@ -442,7 +442,6 @@ universe_${target}_worlds: .if !defined(MAKE_JUST_KERNELS) .for target_arch in ${TARGET_ARCHES_${target}} -universe_${target}: universe_${target}_${target_arch} universe_${target}_worlds: universe_${target}_${target_arch} universe_${target}_done: universe_${target}_worlds universe_${target}_${target_arch}: universe_${target}_prologue .MAKE @@ -460,7 +459,6 @@ universe_${target}_${target_arch}: unive .endif # !MAKE_JUST_KERNELS .if !defined(MAKE_JUST_WORLDS) -universe_${target}: universe_${target}_kernels universe_${target}_done: universe_${target}_kernels universe_${target}_kernels: universe_${target}_worlds universe_${target}_kernels: universe_${target}_prologue .MAKE From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 21:11:34 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1AF8B48E; Tue, 16 Jun 2015 21:11:33 +0000 (UTC) (envelope-from davidcs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BA835B7B; Tue, 16 Jun 2015 21:11:33 +0000 (UTC) (envelope-from davidcs@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GLBXvP004869; Tue, 16 Jun 2015 21:11:33 GMT (envelope-from davidcs@FreeBSD.org) Received: (from davidcs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GLBX8x004865; Tue, 16 Jun 2015 21:11:33 GMT (envelope-from davidcs@FreeBSD.org) Message-Id: <201506162111.t5GLBX8x004865@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: davidcs set sender to davidcs@FreeBSD.org using -f From: David C Somayajulu Date: Tue, 16 Jun 2015 21:11:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284470 - head/sys/dev/bxe X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 21:11:34 -0000 Author: davidcs Date: Tue Jun 16 21:11:32 2015 New Revision: 284470 URL: https://svnweb.freebsd.org/changeset/base/284470 Log: In bxe_init_mcast_macs_list(): mc_mac->mac needs to point to the multicast mac address In bxe_set_mc_list(): added missing BXE_MCAST_UNLOCK() In __ecore_vlan_mac_h_exec_pending(): need to check for ECORE_PENDING Submitted by:gary.zambrano@qlogic.com Modified: head/sys/dev/bxe/bxe.c head/sys/dev/bxe/ecore_sp.c Modified: head/sys/dev/bxe/bxe.c ============================================================================== --- head/sys/dev/bxe/bxe.c Tue Jun 16 21:11:31 2015 (r284469) +++ head/sys/dev/bxe/bxe.c Tue Jun 16 21:11:32 2015 (r284470) @@ -12525,6 +12525,7 @@ bxe_init_mcast_macs_list(struct bxe_soft BLOGE(sc, "Failed to allocate temp mcast list\n"); return (-1); } + bzero(mta, (sizeof(unsigned char) * ETHER_ADDR_LEN * mc_count)); mc_mac = malloc(sizeof(*mc_mac) * mc_count, M_DEVBUF, (M_NOWAIT | M_ZERO)); @@ -12533,12 +12534,13 @@ bxe_init_mcast_macs_list(struct bxe_soft BLOGE(sc, "Failed to allocate temp mcast list\n"); return (-1); } + bzero(mc_mac, (sizeof(*mc_mac) * mc_count)); if_multiaddr_array(ifp, mta, &mcnt, mc_count); /* mta and mcnt not expected to be different */ for(i=0; i< mcnt; i++) { - bcopy((mta + (i * ETHER_ADDR_LEN)), mc_mac->mac, ETHER_ADDR_LEN); + mc_mac->mac = (uint8_t *)(mta + (i * ETHER_ADDR_LEN)); ECORE_LIST_PUSH_TAIL(&mc_mac->link, &p->mcast_list); BLOGD(sc, DBG_LOAD, @@ -12583,6 +12585,7 @@ bxe_set_mc_list(struct bxe_softc *sc) rc = ecore_config_mcast(sc, &rparam, ECORE_MCAST_CMD_DEL); if (rc < 0) { BLOGE(sc, "Failed to clear multicast configuration: %d\n", rc); + BXE_MCAST_UNLOCK(sc); return (rc); } Modified: head/sys/dev/bxe/ecore_sp.c ============================================================================== --- head/sys/dev/bxe/ecore_sp.c Tue Jun 16 21:11:31 2015 (r284469) +++ head/sys/dev/bxe/ecore_sp.c Tue Jun 16 21:11:32 2015 (r284470) @@ -474,7 +474,7 @@ static void __ecore_vlan_mac_h_exec_pend o->head_exe_request = FALSE; o->saved_ramrod_flags = 0; rc = ecore_exe_queue_step(sc, &o->exe_queue, &ramrod_flags); - if (rc != ECORE_SUCCESS) { + if ((rc != ECORE_SUCCESS) && (rc != ECORE_PENDING)) { ECORE_ERR("execution of pending commands failed with rc %d\n", rc); #ifdef ECORE_STOP_ON_ERROR From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 21:19:19 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65D7D9C8 for ; Tue, 16 Jun 2015 21:19:19 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qk0-f173.google.com (mail-qk0-f173.google.com [209.85.220.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2478AC20 for ; Tue, 16 Jun 2015 21:19:18 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by qkfe185 with SMTP id e185so16071334qkf.3 for ; Tue, 16 Jun 2015 14:19:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:organization:content-type:mime-version; bh=58pzLdbQb8UAlZSl34k9D21tFXdQuUDa4FRiFOxrH1I=; b=Mdps9MC0U3tvzZ+toCgCbm22uBCAlCIIkK3WFjC4pJQ8yAzQkJByvEerO1sjn2nfaO CHYeqYi1Nu2ax6uzDA8jbBJLX3+zw3hw5Vtt8RC+CdzOXmdDAcnnXrdwA+OaWtMsGdg5 BulAovOgSAMhpt/GXAV3LRI6n9ZdupHyvbmGjLkGuOPfCx4qqXgMW51fOh8MqyGsWjI1 jp4tqlHtuvSaRkxy9pZ5eIOU1DSkJt3QWS+i0nzEp9QBDH7yP6mggjX/ezo7my9YIRbW 84HbnKrAGEte3rXUo0JsTPCIfDPLLGQPNg2UZ9HDeY8v336f2Joa1SENdi4AjPE7No5E TEQw== X-Gm-Message-State: ALoCoQmFxfd/few3YXL8zoc5mMD98chVTQTjppeI4mB/C/mVFSLjX/WB9x6mhlBMoqCblqXNyrje X-Received: by 10.55.41.24 with SMTP id p24mr5436835qkh.55.1434487764698; Tue, 16 Jun 2015 13:49:24 -0700 (PDT) Received: from [10.3.0.26] ([63.88.83.66]) by mx.google.com with ESMTPSA id 63sm1046003qgx.25.2015.06.16.13.49.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2015 13:49:23 -0700 (PDT) Message-ID: <1434487758.5828.6.camel@hardenedbsd.org> Subject: Re: svn commit: r284436 - head/contrib/sendmail/src From: Shawn Webb To: Gregory Neil Shapiro Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Tue, 16 Jun 2015 16:49:18 -0400 In-Reply-To: <201506160258.t5G2wo3a055792@svn.freebsd.org> References: <201506160258.t5G2wo3a055792@svn.freebsd.org> Organization: HardenedBSD Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-ON3oJiJYDEQXhbEZfHCO" X-Mailer: Evolution 3.12.10-0ubuntu1~14.10.1 Mime-Version: 1.0 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 21:19:19 -0000 --=-ON3oJiJYDEQXhbEZfHCO Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2015-06-16 at 02:58 +0000, Gregory Neil Shapiro wrote: > Author: gshapiro > Date: Tue Jun 16 02:58:50 2015 > New Revision: 284436 > URL: https://svnweb.freebsd.org/changeset/base/284436 >=20 > Log: > The import of openssl to address the FreeBSD-SA-15:10.openssl security > advisory includes a change which rejects handshakes with DH parameters > below 768 bits. sendmail releases prior to 8.15.2 (not yet released), > defaulted to a 512 bit DH parameter setting for client connections. > This commit chages that default to 1024 bits. sendmail 8.15.2, when > released well use a default of 2048 bits. If upstream will be using 2048 bits, why not simply use that? --=20 Shawn Webb HardenedBSD GPG Key ID: 0x6A84658F52456EEE GPG Key Fingerprint: 2ABA B6BD EF6A F486 BE89 3D9E 6A84 658F 5245 6EEE --=-ON3oJiJYDEQXhbEZfHCO Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCgAGBQJVgIvTAAoJEGqEZY9SRW7uKCoQAIUrVFiaOYURNRjde857s/kt aFef4lz6dLwDIIHiH4/c4mJWLaqJsVVxrGUB0yKoeyO8o2Si+1ogJaqhlSsJwIts fUviZRtF4kEB1vzBn0phzvx1Poxp6Nfe/VI8VxQVydW/PMxcck1hLbMAV+1eicxS bX7WARmrtUlL3CSCGF6RwZwyzNWgB81gSeoBQyK6AKYR/ORlaijPGgxJGIKoB4Z+ fNPBfXgrrXMXX5xzzPD5D38DHmM8nznjyNoQki3iJH6s6EcmiFKiZijLTYPW2EdW JATsEFviZ8PHYcYBd3jj5fdLRVdBzb1r+AO21JzStUHYJO1zj9KfQN37y+U3a2dN IAhqAxQwyQiCX6tJriakuOLVeFY8415GlIH2ts31yXvbHrDKCGM2BrdZGw55/JaS JK7VXKKpUGX2mYMHpTjzb3eEDb0YF/3ORyR78sAI7oTr9uaARA4VGwFM+frzPRlk DMLc+av8Iik+eSldODsQTBNJeC+T3kdx5s8g0HehYCiroAHD/2LX3X85UCaoGrwc yaKrZDyrl/5e8mcpW7bYy4bceOqxKEjJdAwvq1BDJhez7TDMnNoD4FTl5SUfhn43 SyDSvBOSStyzTu2MhMMobLxGlqCzPho1WRM0wZRy8duWjc6qN1syx8wZZ/O4bDMQ rXXl+GXdqFauF87UaH6Y =U1Xz -----END PGP SIGNATURE----- --=-ON3oJiJYDEQXhbEZfHCO-- From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 21:29:47 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99332CA9; Tue, 16 Jun 2015 21:29:47 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 87971E58; Tue, 16 Jun 2015 21:29:47 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GLTltm011231; Tue, 16 Jun 2015 21:29:47 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GLTlP6011230; Tue, 16 Jun 2015 21:29:47 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506162129.t5GLTlP6011230@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 16 Jun 2015 21:29:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284471 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 21:29:47 -0000 Author: andrew Date: Tue Jun 16 21:29:46 2015 New Revision: 284471 URL: https://svnweb.freebsd.org/changeset/base/284471 Log: Move the universe done dependency on the worlds completing out of the loop, we only need to add it once. Obtained from: ABT Systems Ltd Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Tue Jun 16 21:11:32 2015 (r284470) +++ head/Makefile Tue Jun 16 21:29:46 2015 (r284471) @@ -441,9 +441,9 @@ universe_${target}_prologue: universe_pr universe_${target}_worlds: .if !defined(MAKE_JUST_KERNELS) +universe_${target}_done: universe_${target}_worlds .for target_arch in ${TARGET_ARCHES_${target}} universe_${target}_worlds: universe_${target}_${target_arch} -universe_${target}_done: universe_${target}_worlds universe_${target}_${target_arch}: universe_${target}_prologue .MAKE @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`" @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 22:26:23 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E1E87E3E; Tue, 16 Jun 2015 22:26:23 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CFB70E1E; Tue, 16 Jun 2015 22:26:23 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GMQNt5040579; Tue, 16 Jun 2015 22:26:23 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GMQNYR040577; Tue, 16 Jun 2015 22:26:23 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201506162226.t5GMQNYR040577@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Tue, 16 Jun 2015 22:26:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284474 - head/usr.sbin/syslogd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 22:26:24 -0000 Author: rpaulo Date: Tue Jun 16 22:26:22 2015 New Revision: 284474 URL: https://svnweb.freebsd.org/changeset/base/284474 Log: syslogd: support multiple -b options. It's now possible to bind multiple sockets to different IP addresses. PR: 159305 Submitted by: Kurt Lidl Sponsored by: Pi-Coral, Inc. Modified: head/usr.sbin/syslogd/syslogd.8 head/usr.sbin/syslogd/syslogd.c Modified: head/usr.sbin/syslogd/syslogd.8 ============================================================================== --- head/usr.sbin/syslogd/syslogd.8 Tue Jun 16 22:25:08 2015 (r284473) +++ head/usr.sbin/syslogd/syslogd.8 Tue Jun 16 22:26:22 2015 (r284474) @@ -28,7 +28,7 @@ .\" @(#)syslogd.8 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd March 3, 2015 +.Dd June 16, 2015 .Dt SYSLOGD 8 .Os .Sh NAME @@ -194,6 +194,8 @@ The default .Ar service is .Ql syslog . +This option can be specified multiple times to bind to +multiple addresses and/or ports. .It Fl C Create log files that do not exist (permission is set to .Li 0600 ) . Modified: head/usr.sbin/syslogd/syslogd.c ============================================================================== --- head/usr.sbin/syslogd/syslogd.c Tue Jun 16 22:25:08 2015 (r284473) +++ head/usr.sbin/syslogd/syslogd.c Tue Jun 16 22:26:22 2015 (r284474) @@ -124,6 +124,15 @@ const char ctty[] = _PATH_CONSOLE; #define MAXUNAMES 20 /* maximum number of user names */ /* + * List of hosts for binding. + */ +static STAILQ_HEAD(, host) hqueue; +struct host { + char *name; + STAILQ_ENTRY(host) next; +}; + +/* * Unix sockets. * We have two default sockets, one with 666 permissions, * and one for privileged programs. @@ -275,7 +284,7 @@ static int Foreground = 0; /* Run in for static int resolve = 1; /* resolve hostname */ static char LocalHostName[MAXHOSTNAMELEN]; /* our hostname */ static const char *LocalDomain; /* our local domain name */ -static int *finet; /* Internet datagram socket */ +static int *finet; /* Internet datagram sockets */ static int fklog = -1; /* /dev/klog */ static int Initialized; /* set when we have initialized ourselves */ static int MarkInterval = 20 * 60; /* interval between marks in seconds */ @@ -348,10 +357,10 @@ main(int argc, char *argv[]) struct sockaddr_storage frominet; fd_set *fdsr = NULL; char line[MAXLINE + 1]; - char *bindhostname; const char *hname; struct timeval tv, *tvp; struct sigaction sact; + struct host *host; struct funix *fx, *fx1; sigset_t mask; pid_t ppid = 1, spid; @@ -360,7 +369,8 @@ main(int argc, char *argv[]) if (madvise(NULL, 0, MADV_PROTECT) != 0) dprintf("madvise() failed: %s\n", strerror(errno)); - bindhostname = NULL; + STAILQ_INIT(&hqueue); + while ((ch = getopt(argc, argv, "468Aa:b:cCdf:Fkl:m:nNop:P:sS:Tuv")) != -1) switch (ch) { @@ -383,8 +393,13 @@ main(int argc, char *argv[]) usage(); break; case 'b': - bindhostname = optarg; + { + if ((host = malloc(sizeof(struct host))) == NULL) + err(1, "malloc failed"); + host->name = optarg; + STAILQ_INSERT_TAIL(&hqueue, host, next); break; + } case 'c': no_compress++; break; @@ -433,7 +448,7 @@ main(int argc, char *argv[]) if (strlen(name) >= sizeof(sunx.sun_path)) errx(1, "%s path too long, exiting", name); if ((fx = malloc(sizeof(struct funix))) == NULL) - errx(1, "malloc failed"); + err(1, "malloc failed"); fx->s = -1; fx->name = name; fx->mode = mode; @@ -555,8 +570,26 @@ main(int argc, char *argv[]) } increase_rcvbuf(fx->s); } - if (SecureMode <= 1) - finet = socksetup(family, bindhostname); + if (SecureMode <= 1) { + if (STAILQ_EMPTY(&hqueue)) + finet = socksetup(family, NULL); + STAILQ_FOREACH(host, &hqueue, next) { + int *finet0, total; + finet0 = socksetup(family, host->name); + if (finet0 && !finet) { + finet = finet0; + } else if (finet0 && finet) { + total = *finet0 + *finet + 1; + finet = realloc(finet, total * sizeof(int)); + if (finet == NULL) + err(1, "realloc failed"); + for (i = 1; i <= *finet0; i++) { + finet[(*finet)+i] = finet0[i]; + } + *finet = total - 1; + } + } + } if (finet) { if (SecureMode) { @@ -2730,6 +2763,7 @@ socksetup(int af, char *bindhostname) } (*socks)++; + dprintf("socksetup: new socket fd is %d\n", *s); s++; } From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 22:31:38 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C57FDEE; Tue, 16 Jun 2015 22:31:38 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3BA1FD5; Tue, 16 Jun 2015 22:31:38 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GMVclL043914; Tue, 16 Jun 2015 22:31:38 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GMVccO043913; Tue, 16 Jun 2015 22:31:38 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201506162231.t5GMVccO043913@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Tue, 16 Jun 2015 22:31:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284475 - head/usr.sbin/syslogd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 22:31:38 -0000 Author: rpaulo Date: Tue Jun 16 22:31:38 2015 New Revision: 284475 URL: https://svnweb.freebsd.org/changeset/base/284475 Log: syslogd: don't leak finet0. Submitted by: Kurt Lidl Sponsored by: Pi-Coral, Inc. Modified: head/usr.sbin/syslogd/syslogd.c Modified: head/usr.sbin/syslogd/syslogd.c ============================================================================== --- head/usr.sbin/syslogd/syslogd.c Tue Jun 16 22:26:22 2015 (r284474) +++ head/usr.sbin/syslogd/syslogd.c Tue Jun 16 22:31:38 2015 (r284475) @@ -587,6 +587,7 @@ main(int argc, char *argv[]) finet[(*finet)+i] = finet0[i]; } *finet = total - 1; + free(finet0); } } } From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 22:42:19 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9F00459; Tue, 16 Jun 2015 22:42:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C847D2DB; Tue, 16 Jun 2015 22:42:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GMgJf3049843; Tue, 16 Jun 2015 22:42:19 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GMgJk1049842; Tue, 16 Jun 2015 22:42:19 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201506162242.t5GMgJk1049842@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Tue, 16 Jun 2015 22:42:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284476 - head/usr.sbin/syslogd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 22:42:20 -0000 Author: rpaulo Date: Tue Jun 16 22:42:19 2015 New Revision: 284476 URL: https://svnweb.freebsd.org/changeset/base/284476 Log: syslogd: re-read the timezone when receive a SIGHUP. syslogd already re-reads the configuration file and the hostname when receiving a SIGHUP, so it makes sense to reset the timezone. Special care was taken to ensure we don't break installations running with a custom TZ variable. PR: 196905 Submitted by: Kurt Lidl Sponsored by: Pi-Coral, Inc. Modified: head/usr.sbin/syslogd/syslogd.c Modified: head/usr.sbin/syslogd/syslogd.c ============================================================================== --- head/usr.sbin/syslogd/syslogd.c Tue Jun 16 22:31:38 2015 (r284475) +++ head/usr.sbin/syslogd/syslogd.c Tue Jun 16 22:42:19 2015 (r284476) @@ -1603,6 +1603,24 @@ init(int signo) } /* + * Load / reload timezone data (in case it changed). + * + * Just calling tzset() again does not work, the timezone code + * caches the result. However, by setting the TZ variable, one + * can defeat the caching and have the timezone code really + * reload the timezone data. Respect any initial setting of + * TZ, in case the system is configured specially. + */ + dprintf("loading timezone data via tzset()\n"); + if (getenv("TZ")) { + tzset(); + } else { + setenv("TZ", ":/etc/localtime", 1); + tzset(); + unsetenv("TZ"); + } + + /* * Close all open log files. */ Initialized = 0; From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 23:03:16 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 90315EFD; Tue, 16 Jun 2015 23:03:16 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7E72499E; Tue, 16 Jun 2015 23:03:16 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GN3GJs060380; Tue, 16 Jun 2015 23:03:16 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GN3Gan060379; Tue, 16 Jun 2015 23:03:16 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506162303.t5GN3Gan060379@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Tue, 16 Jun 2015 23:03:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284477 - head/sys/dev/filemon X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 23:03:16 -0000 Author: sjg Date: Tue Jun 16 23:03:15 2015 New Revision: 284477 URL: https://svnweb.freebsd.org/changeset/base/284477 Log: Bump the version since we now handle openat Modified: head/sys/dev/filemon/filemon.h Modified: head/sys/dev/filemon/filemon.h ============================================================================== --- head/sys/dev/filemon/filemon.h Tue Jun 16 22:42:19 2015 (r284476) +++ head/sys/dev/filemon/filemon.h Tue Jun 16 23:03:15 2015 (r284477) @@ -30,5 +30,5 @@ #define FILEMON_SET_FD _IOWR('S', 1, int) #define FILEMON_SET_PID _IOWR('S', 2, pid_t) -#define FILEMON_VERSION 4 /* output format +#define FILEMON_VERSION 5 /* output format (bump when adding record types) */ From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 23:06:44 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 06B1B170; Tue, 16 Jun 2015 23:06:44 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E939F9CF; Tue, 16 Jun 2015 23:06:43 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GN6hGu060892; Tue, 16 Jun 2015 23:06:43 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GN6hMD060891; Tue, 16 Jun 2015 23:06:43 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506162306.t5GN6hMD060891@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Tue, 16 Jun 2015 23:06:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284478 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 23:06:44 -0000 Author: sjg Date: Tue Jun 16 23:06:43 2015 New Revision: 284478 URL: https://svnweb.freebsd.org/changeset/base/284478 Log: Normally a staging conflict causes an error. When bootstrapping different options, it is handy to be able to make those warnings. Modified: head/share/mk/meta.stage.mk Modified: head/share/mk/meta.stage.mk ============================================================================== --- head/share/mk/meta.stage.mk Tue Jun 16 23:03:15 2015 (r284477) +++ head/share/mk/meta.stage.mk Tue Jun 16 23:06:43 2015 (r284478) @@ -60,14 +60,23 @@ LN_CP_SCRIPT = LnCp() { \ ln $$1 $$2 2> /dev/null || \ cp -p $$1 $$2; } +# a staging conflict should cause an error +# a warning is handy when bootstapping different options. +STAGE_CONFLICT?= ERROR +.if ${STAGE_CONFLICT:tl} == "error" +STAGE_CONFLICT_ACTION= exit 1; +.else +STAGE_CONFLICT_ACTION= +.endif + # it is an error for more than one src dir to try and stage # the same file STAGE_DIRDEP_SCRIPT = ${LN_CP_SCRIPT}; StageDirdep() { \ t=$$1; \ if [ -s $$t.dirdep ]; then \ cmp -s .dirdep $$t.dirdep && return; \ - echo "ERROR: $$t installed by `cat $$t.dirdep` not ${_dirdep}" >&2; \ - exit 1; \ + echo "${STAGE_CONFLICT}: $$t installed by `cat $$t.dirdep` not ${_dirdep}" >&2; \ + ${STAGE_CONFLICT_ACTION} \ fi; \ LnCp .dirdep $$t.dirdep || exit 1; } From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 23:32:29 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C97F0C53; Tue, 16 Jun 2015 23:32:29 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B80E1A2; Tue, 16 Jun 2015 23:32:29 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GNWTgh076013; Tue, 16 Jun 2015 23:32:29 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GNWTvK076012; Tue, 16 Jun 2015 23:32:29 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506162332.t5GNWTvK076012@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Tue, 16 Jun 2015 23:32:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284479 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 23:32:29 -0000 Author: sjg Date: Tue Jun 16 23:32:28 2015 New Revision: 284479 URL: https://svnweb.freebsd.org/changeset/base/284479 Log: Make mention of make.conf being included earlier and what to do about it. Reviewed by: NGie Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Jun 16 23:06:43 2015 (r284478) +++ head/UPDATING Tue Jun 16 23:32:28 2015 (r284479) @@ -32,6 +32,23 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 "ln -s 'abort:false,junk:false' /etc/malloc.conf".) 20150616: + /etc/make.conf now included earlier. + sys.mk now includes /etc/make.conf and {local,src}.sys.mk earlier + than previously. + This makes it simple to interpose external toolchains etc. + However it may cause problems for users who have things like:: + + INSTALL+= something + + in /etc/make.conf, since INSTALL is not yet defined. + A safe fix for that is to have:: + + INSTALL?= install + INSTALL+= something + + which is equivalent to previous behavior. + +20150616: FreeBSD's old make (fmake) has been removed from the system. It is available as the devel/fmake port or via pkg install fmake. From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 23:36:21 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C0103E52; Tue, 16 Jun 2015 23:36:21 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AE782C6; Tue, 16 Jun 2015 23:36:21 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GNaLAQ076597; Tue, 16 Jun 2015 23:36:21 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GNaLR4076596; Tue, 16 Jun 2015 23:36:21 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506162336.t5GNaLR4076596@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Tue, 16 Jun 2015 23:36:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284480 - head/gnu/lib/libgcc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 23:36:21 -0000 Author: sjg Date: Tue Jun 16 23:36:20 2015 New Revision: 284480 URL: https://svnweb.freebsd.org/changeset/base/284480 Log: Hook extra libs to _LIBS so bsd.lib.mk can do its thing Differential Revision: D2843 Reviewed by: imp Modified: head/gnu/lib/libgcc/Makefile Modified: head/gnu/lib/libgcc/Makefile ============================================================================== --- head/gnu/lib/libgcc/Makefile Tue Jun 16 23:32:28 2015 (r284479) +++ head/gnu/lib/libgcc/Makefile Tue Jun 16 23:36:20 2015 (r284480) @@ -338,7 +338,7 @@ libgcc_eh.a: ${EH_OBJS_T} @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q` ${RANLIB} ${RANLIBFLAGS} ${.TARGET} -all: libgcc_eh.a +_LIBS+= libgcc_eh.a .if ${MK_PROFILE} != "no" libgcc_eh_p.a: ${EH_OBJS_P} @@ -346,7 +346,8 @@ libgcc_eh_p.a: ${EH_OBJS_P} @rm -f ${.TARGET} @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q` ${RANLIB} ${RANLIBFLAGS} ${.TARGET} -all: libgcc_eh_p.a + +_LIBS+= libgcc_eh_p.a .endif _libinstall: _lib-eh-install From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 23:37:26 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 35B90FDA; Tue, 16 Jun 2015 23:37:26 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 20189F5; Tue, 16 Jun 2015 23:37:26 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GNbQCo076812; Tue, 16 Jun 2015 23:37:26 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GNbKDh076776; Tue, 16 Jun 2015 23:37:20 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506162337.t5GNbKDh076776@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Tue, 16 Jun 2015 23:37:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284481 - in head: bin/cat bin/ls gnu/lib/libgcc gnu/usr.bin/binutils/as gnu/usr.bin/binutils/ld gnu/usr.bin/binutils/libbinutils include kerberos5/lib/libasn1 kerberos5/lib/libheimbase... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 23:37:26 -0000 Author: sjg Date: Tue Jun 16 23:37:19 2015 New Revision: 284481 URL: https://svnweb.freebsd.org/changeset/base/284481 Log: new depends Added: head/lib/clang/liblldb/Makefile.depend (contents, props changed) head/lib/clang/liblldbAPI/Makefile.depend (contents, props changed) head/lib/clang/liblldbBreakpoint/Makefile.depend (contents, props changed) head/lib/clang/liblldbCommands/Makefile.depend (contents, props changed) head/lib/clang/liblldbCore/Makefile.depend (contents, props changed) head/lib/clang/liblldbDataFormatters/Makefile.depend (contents, props changed) head/lib/clang/liblldbExpression/Makefile.depend (contents, props changed) head/lib/clang/liblldbHostCommon/Makefile.depend (contents, props changed) head/lib/clang/liblldbHostFreeBSD/Makefile.depend (contents, props changed) head/lib/clang/liblldbHostPOSIX/Makefile.depend (contents, props changed) head/lib/clang/liblldbInterpreter/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginDisassemblerLLVM/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginDynamicLoaderStatic/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginInstructionARM/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginInstructionARM64/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginObjectContainerBSDArchive/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginObjectFileELF/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginObjectFileJIT/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginPlatformFreeBSD/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginPlatformGDB/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginProcessElfCore/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginProcessPOSIX/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginProcessUtility/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginUnwindAssemblyX86/Makefile.depend (contents, props changed) head/lib/clang/liblldbSymbol/Makefile.depend (contents, props changed) head/lib/clang/liblldbTarget/Makefile.depend (contents, props changed) head/lib/clang/liblldbUtility/Makefile.depend (contents, props changed) head/usr.bin/addr2line/Makefile.depend (contents, props changed) head/usr.bin/clang/lldb/Makefile.depend (contents, props changed) head/usr.bin/nm/Makefile.depend (contents, props changed) head/usr.bin/readelf/Makefile.depend (contents, props changed) head/usr.bin/size/Makefile.depend (contents, props changed) head/usr.bin/strings/Makefile.depend (contents, props changed) Modified: head/bin/cat/Makefile.depend head/bin/ls/Makefile.depend head/gnu/lib/libgcc/Makefile.depend head/gnu/usr.bin/binutils/as/Makefile.depend head/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 head/gnu/usr.bin/binutils/libbinutils/Makefile.depend head/include/Makefile.depend head/kerberos5/lib/libasn1/Makefile.depend head/kerberos5/lib/libheimbase/Makefile.depend head/kerberos5/lib/libheimipcc/Makefile.depend head/kerberos5/lib/libhx509/Makefile.depend head/kerberos5/lib/libkrb5/Makefile.depend head/kerberos5/lib/libroken/Makefile.depend head/kerberos5/lib/libwind/Makefile.depend head/lib/clang/libllvmexecutionengine/Makefile.depend head/lib/clang/libllvmmcdisassembler/Makefile.depend head/lib/clang/libllvmmcjit/Makefile.depend head/lib/clang/libllvmruntimedyld/Makefile.depend head/lib/libbegemot/Makefile.depend head/lib/libc/Makefile.depend head/lib/libcom_err/Makefile.depend head/lib/libcrypt/Makefile.depend head/lib/libdwarf/Makefile.depend head/lib/libfetch/Makefile.depend head/lib/libipsec/Makefile.depend head/lib/libldns/Makefile.depend head/lib/liblzma/Makefile.depend head/lib/libmagic/Makefile.depend head/lib/libmd/Makefile.depend head/lib/libmd/Makefile.depend.host head/lib/libmp/Makefile.depend head/lib/libopie/Makefile.depend head/lib/libpam/libpam/Makefile.depend head/lib/libradius/Makefile.depend head/lib/libsbuf/Makefile.depend head/lib/libthr/Makefile.depend head/lib/libthread_db/Makefile.depend head/lib/libutil/Makefile.depend head/lib/libypclnt/Makefile.depend head/lib/libz/Makefile.depend head/lib/msun/Makefile.depend head/lib/ncurses/ncurses/Makefile.depend head/lib/ncurses/ncursesw/Makefile.depend head/lib/ncurses/panel/Makefile.depend head/lib/ncurses/panelw/Makefile.depend head/libexec/rtld-elf/Makefile.depend head/sbin/atm/atmconfig/Makefile.depend head/sbin/devd/Makefile.depend head/sbin/init/Makefile.depend head/secure/lib/libcrypto/Makefile.depend head/secure/lib/libssh/Makefile.depend head/secure/lib/libssl/Makefile.depend head/share/i18n/csmapper/Makefile.depend head/share/i18n/esdb/Makefile.depend head/usr.bin/ar/Makefile.depend head/usr.bin/bmake/Makefile.depend head/usr.bin/clang/clang-tblgen/Makefile.depend head/usr.bin/clang/clang/Makefile.depend head/usr.bin/clang/tblgen/Makefile.depend head/usr.bin/colldef/Makefile.depend head/usr.bin/ee/Makefile.depend head/usr.bin/elfcopy/Makefile.depend head/usr.bin/find/Makefile.depend head/usr.bin/getconf/Makefile.depend head/usr.bin/grep/Makefile.depend head/usr.bin/kdump/Makefile.depend head/usr.bin/less/Makefile.depend head/usr.bin/lessecho/Makefile.depend head/usr.bin/lesskey/Makefile.depend head/usr.bin/mandoc/Makefile.depend head/usr.bin/mklocale/Makefile.depend head/usr.bin/sort/Makefile.depend head/usr.bin/top/Makefile.depend head/usr.bin/truss/Makefile.depend.amd64 head/usr.bin/xinstall/Makefile.depend.host head/usr.bin/xlint/lint1/Makefile.depend head/usr.bin/xlint/llib/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend head/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend head/usr.sbin/crunch/crunchgen/Makefile.depend head/usr.sbin/nologin/Makefile.depend head/usr.sbin/ntp/libntp/Makefile.depend head/usr.sbin/ntp/ntp-keygen/Makefile.depend head/usr.sbin/ntp/ntpd/Makefile.depend head/usr.sbin/ntp/ntpdate/Makefile.depend head/usr.sbin/ntp/ntpdc/Makefile.depend head/usr.sbin/ntp/ntpq/Makefile.depend head/usr.sbin/ntp/sntp/Makefile.depend Modified: head/bin/cat/Makefile.depend ============================================================================== --- head/bin/cat/Makefile.depend Tue Jun 16 23:36:20 2015 (r284480) +++ head/bin/cat/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ Modified: head/bin/ls/Makefile.depend ============================================================================== --- head/bin/ls/Makefile.depend Tue Jun 16 23:36:20 2015 (r284480) +++ head/bin/ls/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -10,6 +10,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libutil \ + lib/libxo \ lib/ncurses/ncursesw \ Modified: head/gnu/lib/libgcc/Makefile.depend ============================================================================== --- head/gnu/lib/libgcc/Makefile.depend Tue Jun 16 23:36:20 2015 (r284480) +++ head/gnu/lib/libgcc/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -7,6 +7,7 @@ DIRDEPS = \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + usr.bin/xinstall.host \ .include Modified: head/gnu/usr.bin/binutils/as/Makefile.depend ============================================================================== --- head/gnu/usr.bin/binutils/as/Makefile.depend Tue Jun 16 23:36:20 2015 (r284480) +++ head/gnu/usr.bin/binutils/as/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -3,6 +3,7 @@ DIRDEPS = \ gnu/lib/csu \ + gnu/lib/libgcc \ gnu/usr.bin/binutils/libbfd \ gnu/usr.bin/binutils/libiberty \ gnu/usr.bin/binutils/libopcodes \ Modified: head/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 ============================================================================== --- head/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 Tue Jun 16 23:36:20 2015 (r284480) +++ head/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 Tue Jun 16 23:37:19 2015 (r284481) @@ -3,6 +3,7 @@ DIRDEPS = \ gnu/lib/csu \ + gnu/lib/libgcc \ gnu/usr.bin/binutils/libbfd \ gnu/usr.bin/binutils/libiberty \ include \ @@ -10,6 +11,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + usr.bin/yacc.host \ .include Modified: head/gnu/usr.bin/binutils/libbinutils/Makefile.depend ============================================================================== --- head/gnu/usr.bin/binutils/libbinutils/Makefile.depend Tue Jun 16 23:36:20 2015 (r284480) +++ head/gnu/usr.bin/binutils/libbinutils/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -5,6 +5,7 @@ DIRDEPS = \ gnu/usr.bin/binutils/libbfd \ include \ include/xlocale \ + usr.bin/yacc.host \ .include Modified: head/include/Makefile.depend ============================================================================== --- head/include/Makefile.depend Tue Jun 16 23:36:20 2015 (r284480) +++ head/include/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -2,6 +2,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + usr.bin/xinstall.host \ .include Modified: head/kerberos5/lib/libasn1/Makefile.depend ============================================================================== --- head/kerberos5/lib/libasn1/Makefile.depend Tue Jun 16 23:36:20 2015 (r284480) +++ head/kerberos5/lib/libasn1/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -12,6 +12,7 @@ DIRDEPS = \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ + usr.bin/xinstall.host \ .include Modified: head/kerberos5/lib/libheimbase/Makefile.depend ============================================================================== --- head/kerberos5/lib/libheimbase/Makefile.depend Tue Jun 16 23:36:20 2015 (r284480) +++ head/kerberos5/lib/libheimbase/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -10,6 +10,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libthr \ + usr.bin/xinstall.host \ .include Modified: head/kerberos5/lib/libheimipcc/Makefile.depend ============================================================================== --- head/kerberos5/lib/libheimipcc/Makefile.depend Tue Jun 16 23:36:20 2015 (r284480) +++ head/kerberos5/lib/libheimipcc/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -14,6 +14,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libthr \ + usr.bin/xinstall.host \ .include Modified: head/kerberos5/lib/libhx509/Makefile.depend ============================================================================== --- head/kerberos5/lib/libhx509/Makefile.depend Tue Jun 16 23:36:20 2015 (r284480) +++ head/kerberos5/lib/libhx509/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -15,6 +15,8 @@ DIRDEPS = \ lib/libcom_err \ lib/libcompiler_rt \ secure/lib/libcrypto \ + usr.bin/xinstall.host \ + usr.bin/yacc.host \ .include Modified: head/kerberos5/lib/libkrb5/Makefile.depend ============================================================================== --- head/kerberos5/lib/libkrb5/Makefile.depend Tue Jun 16 23:36:20 2015 (r284480) +++ head/kerberos5/lib/libkrb5/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -19,6 +19,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libcrypt \ secure/lib/libcrypto \ + usr.bin/xinstall.host \ .include Modified: head/kerberos5/lib/libroken/Makefile.depend ============================================================================== --- head/kerberos5/lib/libroken/Makefile.depend Tue Jun 16 23:36:20 2015 (r284480) +++ head/kerberos5/lib/libroken/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -11,6 +11,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libcrypt \ + usr.bin/xinstall.host \ .include Modified: head/kerberos5/lib/libwind/Makefile.depend ============================================================================== --- head/kerberos5/lib/libwind/Makefile.depend Tue Jun 16 23:36:20 2015 (r284480) +++ head/kerberos5/lib/libwind/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -12,6 +12,7 @@ DIRDEPS = \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ + usr.bin/xinstall.host \ .include Added: head/lib/clang/liblldb/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/clang/liblldb/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -0,0 +1,28 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libc++ \ + lib/msun \ + usr.bin/clang/clang-tblgen.host \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +lldb.o: AttrList.inc.h +lldb.o: Attrs.inc.h +lldb.o: CommentCommandList.inc.h +lldb.o: DeclNodes.inc.h +lldb.o: DiagnosticCommonKinds.inc.h +lldb.o: StmtNodes.inc.h +lldb.po: AttrList.inc.h +lldb.po: Attrs.inc.h +lldb.po: CommentCommandList.inc.h +lldb.po: DeclNodes.inc.h +lldb.po: DiagnosticCommonKinds.inc.h +lldb.po: StmtNodes.inc.h +.endif Added: head/lib/clang/liblldbAPI/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/clang/liblldbAPI/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -0,0 +1,338 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libc++ \ + lib/msun \ + usr.bin/clang/clang-tblgen.host \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +SBAddress.o: CommentCommandList.inc.h +SBAddress.o: DeclNodes.inc.h +SBAddress.o: DiagnosticCommonKinds.inc.h +SBAddress.o: StmtNodes.inc.h +SBAddress.po: CommentCommandList.inc.h +SBAddress.po: DeclNodes.inc.h +SBAddress.po: DiagnosticCommonKinds.inc.h +SBAddress.po: StmtNodes.inc.h +SBBlock.o: DiagnosticCommonKinds.inc.h +SBBlock.po: DiagnosticCommonKinds.inc.h +SBBreakpoint.o: AttrList.inc.h +SBBreakpoint.o: Attrs.inc.h +SBBreakpoint.o: CommentCommandList.inc.h +SBBreakpoint.o: DeclNodes.inc.h +SBBreakpoint.o: DiagnosticCommonKinds.inc.h +SBBreakpoint.o: StmtNodes.inc.h +SBBreakpoint.po: AttrList.inc.h +SBBreakpoint.po: Attrs.inc.h +SBBreakpoint.po: CommentCommandList.inc.h +SBBreakpoint.po: DeclNodes.inc.h +SBBreakpoint.po: DiagnosticCommonKinds.inc.h +SBBreakpoint.po: StmtNodes.inc.h +SBBreakpointLocation.o: AttrList.inc.h +SBBreakpointLocation.o: Attrs.inc.h +SBBreakpointLocation.o: CommentCommandList.inc.h +SBBreakpointLocation.o: DeclNodes.inc.h +SBBreakpointLocation.o: DiagnosticCommonKinds.inc.h +SBBreakpointLocation.o: StmtNodes.inc.h +SBBreakpointLocation.po: AttrList.inc.h +SBBreakpointLocation.po: Attrs.inc.h +SBBreakpointLocation.po: CommentCommandList.inc.h +SBBreakpointLocation.po: DeclNodes.inc.h +SBBreakpointLocation.po: DiagnosticCommonKinds.inc.h +SBBreakpointLocation.po: StmtNodes.inc.h +SBCommandInterpreter.o: AttrList.inc.h +SBCommandInterpreter.o: Attrs.inc.h +SBCommandInterpreter.o: CommentCommandList.inc.h +SBCommandInterpreter.o: DeclNodes.inc.h +SBCommandInterpreter.o: DiagnosticCommonKinds.inc.h +SBCommandInterpreter.o: StmtNodes.inc.h +SBCommandInterpreter.po: AttrList.inc.h +SBCommandInterpreter.po: Attrs.inc.h +SBCommandInterpreter.po: CommentCommandList.inc.h +SBCommandInterpreter.po: DeclNodes.inc.h +SBCommandInterpreter.po: DiagnosticCommonKinds.inc.h +SBCommandInterpreter.po: StmtNodes.inc.h +SBCompileUnit.o: CommentCommandList.inc.h +SBCompileUnit.o: DeclNodes.inc.h +SBCompileUnit.o: DiagnosticCommonKinds.inc.h +SBCompileUnit.o: StmtNodes.inc.h +SBCompileUnit.po: CommentCommandList.inc.h +SBCompileUnit.po: DeclNodes.inc.h +SBCompileUnit.po: DiagnosticCommonKinds.inc.h +SBCompileUnit.po: StmtNodes.inc.h +SBDebugger.o: AttrList.inc.h +SBDebugger.o: Attrs.inc.h +SBDebugger.o: CommentCommandList.inc.h +SBDebugger.o: DeclNodes.inc.h +SBDebugger.o: DiagnosticCommonKinds.inc.h +SBDebugger.o: StmtNodes.inc.h +SBDebugger.po: AttrList.inc.h +SBDebugger.po: Attrs.inc.h +SBDebugger.po: CommentCommandList.inc.h +SBDebugger.po: DeclNodes.inc.h +SBDebugger.po: DiagnosticCommonKinds.inc.h +SBDebugger.po: StmtNodes.inc.h +SBEvent.o: AttrList.inc.h +SBEvent.o: Attrs.inc.h +SBEvent.o: CommentCommandList.inc.h +SBEvent.o: DeclNodes.inc.h +SBEvent.o: DiagnosticCommonKinds.inc.h +SBEvent.o: StmtNodes.inc.h +SBEvent.po: AttrList.inc.h +SBEvent.po: Attrs.inc.h +SBEvent.po: CommentCommandList.inc.h +SBEvent.po: DeclNodes.inc.h +SBEvent.po: DiagnosticCommonKinds.inc.h +SBEvent.po: StmtNodes.inc.h +SBExpressionOptions.o: DiagnosticCommonKinds.inc.h +SBExpressionOptions.po: DiagnosticCommonKinds.inc.h +SBFrame.o: DiagnosticCommonKinds.inc.h +SBFrame.po: DiagnosticCommonKinds.inc.h +SBFunction.o: CommentCommandList.inc.h +SBFunction.o: DeclNodes.inc.h +SBFunction.o: DiagnosticCommonKinds.inc.h +SBFunction.o: StmtNodes.inc.h +SBFunction.po: CommentCommandList.inc.h +SBFunction.po: DeclNodes.inc.h +SBFunction.po: DiagnosticCommonKinds.inc.h +SBFunction.po: StmtNodes.inc.h +SBInstruction.o: CommentCommandList.inc.h +SBInstruction.o: DeclNodes.inc.h +SBInstruction.o: DiagnosticCommonKinds.inc.h +SBInstruction.o: StmtNodes.inc.h +SBInstruction.po: CommentCommandList.inc.h +SBInstruction.po: DeclNodes.inc.h +SBInstruction.po: DiagnosticCommonKinds.inc.h +SBInstruction.po: StmtNodes.inc.h +SBInstructionList.o: CommentCommandList.inc.h +SBInstructionList.o: DeclNodes.inc.h +SBInstructionList.o: DiagnosticCommonKinds.inc.h +SBInstructionList.o: StmtNodes.inc.h +SBInstructionList.po: CommentCommandList.inc.h +SBInstructionList.po: DeclNodes.inc.h +SBInstructionList.po: DiagnosticCommonKinds.inc.h +SBInstructionList.po: StmtNodes.inc.h +SBListener.o: AttrList.inc.h +SBListener.o: Attrs.inc.h +SBListener.o: CommentCommandList.inc.h +SBListener.o: DeclNodes.inc.h +SBListener.o: DiagnosticCommonKinds.inc.h +SBListener.o: StmtNodes.inc.h +SBListener.po: AttrList.inc.h +SBListener.po: Attrs.inc.h +SBListener.po: CommentCommandList.inc.h +SBListener.po: DeclNodes.inc.h +SBListener.po: DiagnosticCommonKinds.inc.h +SBListener.po: StmtNodes.inc.h +SBModule.o: CommentCommandList.inc.h +SBModule.o: DeclNodes.inc.h +SBModule.o: DiagnosticCommonKinds.inc.h +SBModule.o: StmtNodes.inc.h +SBModule.po: CommentCommandList.inc.h +SBModule.po: DeclNodes.inc.h +SBModule.po: DiagnosticCommonKinds.inc.h +SBModule.po: StmtNodes.inc.h +SBModuleSpec.o: CommentCommandList.inc.h +SBModuleSpec.o: DeclNodes.inc.h +SBModuleSpec.o: DiagnosticCommonKinds.inc.h +SBModuleSpec.o: StmtNodes.inc.h +SBModuleSpec.po: CommentCommandList.inc.h +SBModuleSpec.po: DeclNodes.inc.h +SBModuleSpec.po: DiagnosticCommonKinds.inc.h +SBModuleSpec.po: StmtNodes.inc.h +SBPlatform.o: DiagnosticCommonKinds.inc.h +SBPlatform.po: DiagnosticCommonKinds.inc.h +SBProcess.o: AttrList.inc.h +SBProcess.o: Attrs.inc.h +SBProcess.o: CommentCommandList.inc.h +SBProcess.o: DeclNodes.inc.h +SBProcess.o: DiagnosticCommonKinds.inc.h +SBProcess.o: StmtNodes.inc.h +SBProcess.po: AttrList.inc.h +SBProcess.po: Attrs.inc.h +SBProcess.po: CommentCommandList.inc.h +SBProcess.po: DeclNodes.inc.h +SBProcess.po: DiagnosticCommonKinds.inc.h +SBProcess.po: StmtNodes.inc.h +SBQueue.o: DiagnosticCommonKinds.inc.h +SBQueue.po: DiagnosticCommonKinds.inc.h +SBQueueItem.o: DiagnosticCommonKinds.inc.h +SBQueueItem.po: DiagnosticCommonKinds.inc.h +SBSection.o: CommentCommandList.inc.h +SBSection.o: DeclNodes.inc.h +SBSection.o: DiagnosticCommonKinds.inc.h +SBSection.o: StmtNodes.inc.h +SBSection.po: CommentCommandList.inc.h +SBSection.po: DeclNodes.inc.h +SBSection.po: DiagnosticCommonKinds.inc.h +SBSection.po: StmtNodes.inc.h +SBSourceManager.o: AttrList.inc.h +SBSourceManager.o: Attrs.inc.h +SBSourceManager.o: CommentCommandList.inc.h +SBSourceManager.o: DeclNodes.inc.h +SBSourceManager.o: DiagnosticCommonKinds.inc.h +SBSourceManager.o: StmtNodes.inc.h +SBSourceManager.po: AttrList.inc.h +SBSourceManager.po: Attrs.inc.h +SBSourceManager.po: CommentCommandList.inc.h +SBSourceManager.po: DeclNodes.inc.h +SBSourceManager.po: DiagnosticCommonKinds.inc.h +SBSourceManager.po: StmtNodes.inc.h +SBSymbol.o: CommentCommandList.inc.h +SBSymbol.o: DeclNodes.inc.h +SBSymbol.o: DiagnosticCommonKinds.inc.h +SBSymbol.o: StmtNodes.inc.h +SBSymbol.po: CommentCommandList.inc.h +SBSymbol.po: DeclNodes.inc.h +SBSymbol.po: DiagnosticCommonKinds.inc.h +SBSymbol.po: StmtNodes.inc.h +SBSymbolContext.o: CommentCommandList.inc.h +SBSymbolContext.o: DeclNodes.inc.h +SBSymbolContext.o: DiagnosticCommonKinds.inc.h +SBSymbolContext.o: StmtNodes.inc.h +SBSymbolContext.po: CommentCommandList.inc.h +SBSymbolContext.po: DeclNodes.inc.h +SBSymbolContext.po: DiagnosticCommonKinds.inc.h +SBSymbolContext.po: StmtNodes.inc.h +SBTarget.o: AttrList.inc.h +SBTarget.o: Attrs.inc.h +SBTarget.o: CommentCommandList.inc.h +SBTarget.o: DeclNodes.inc.h +SBTarget.o: DiagnosticCommonKinds.inc.h +SBTarget.o: StmtNodes.inc.h +SBTarget.po: AttrList.inc.h +SBTarget.po: Attrs.inc.h +SBTarget.po: CommentCommandList.inc.h +SBTarget.po: DeclNodes.inc.h +SBTarget.po: DiagnosticCommonKinds.inc.h +SBTarget.po: StmtNodes.inc.h +SBThread.o: AttrList.inc.h +SBThread.o: Attrs.inc.h +SBThread.o: CommentCommandList.inc.h +SBThread.o: DeclNodes.inc.h +SBThread.o: DiagnosticCommonKinds.inc.h +SBThread.o: StmtNodes.inc.h +SBThread.po: AttrList.inc.h +SBThread.po: Attrs.inc.h +SBThread.po: CommentCommandList.inc.h +SBThread.po: DeclNodes.inc.h +SBThread.po: DiagnosticCommonKinds.inc.h +SBThread.po: StmtNodes.inc.h +SBThreadPlan.o: AttrList.inc.h +SBThreadPlan.o: Attrs.inc.h +SBThreadPlan.o: CommentCommandList.inc.h +SBThreadPlan.o: DeclNodes.inc.h +SBThreadPlan.o: DiagnosticCommonKinds.inc.h +SBThreadPlan.o: StmtNodes.inc.h +SBThreadPlan.po: AttrList.inc.h +SBThreadPlan.po: Attrs.inc.h +SBThreadPlan.po: CommentCommandList.inc.h +SBThreadPlan.po: DeclNodes.inc.h +SBThreadPlan.po: DiagnosticCommonKinds.inc.h +SBThreadPlan.po: StmtNodes.inc.h +SBType.o: CommentCommandList.inc.h +SBType.o: DeclNodes.inc.h +SBType.o: DiagnosticCommonKinds.inc.h +SBType.o: StmtNodes.inc.h +SBType.po: CommentCommandList.inc.h +SBType.po: DeclNodes.inc.h +SBType.po: DiagnosticCommonKinds.inc.h +SBType.po: StmtNodes.inc.h +SBTypeCategory.o: AttrList.inc.h +SBTypeCategory.o: Attrs.inc.h +SBTypeCategory.o: CommentCommandList.inc.h +SBTypeCategory.o: DeclNodes.inc.h +SBTypeCategory.o: DiagnosticCommonKinds.inc.h +SBTypeCategory.o: StmtNodes.inc.h +SBTypeCategory.po: AttrList.inc.h +SBTypeCategory.po: Attrs.inc.h +SBTypeCategory.po: CommentCommandList.inc.h +SBTypeCategory.po: DeclNodes.inc.h +SBTypeCategory.po: DiagnosticCommonKinds.inc.h +SBTypeCategory.po: StmtNodes.inc.h +SBTypeEnumMember.o: DiagnosticCommonKinds.inc.h +SBTypeEnumMember.po: DiagnosticCommonKinds.inc.h +SBTypeFilter.o: AttrList.inc.h +SBTypeFilter.o: Attrs.inc.h +SBTypeFilter.o: CommentCommandList.inc.h +SBTypeFilter.o: DeclNodes.inc.h +SBTypeFilter.o: DiagnosticCommonKinds.inc.h +SBTypeFilter.o: StmtNodes.inc.h +SBTypeFilter.po: AttrList.inc.h +SBTypeFilter.po: Attrs.inc.h +SBTypeFilter.po: CommentCommandList.inc.h +SBTypeFilter.po: DeclNodes.inc.h +SBTypeFilter.po: DiagnosticCommonKinds.inc.h +SBTypeFilter.po: StmtNodes.inc.h +SBTypeFormat.o: AttrList.inc.h +SBTypeFormat.o: Attrs.inc.h +SBTypeFormat.o: CommentCommandList.inc.h +SBTypeFormat.o: DeclNodes.inc.h +SBTypeFormat.o: DiagnosticCommonKinds.inc.h +SBTypeFormat.o: StmtNodes.inc.h +SBTypeFormat.po: AttrList.inc.h +SBTypeFormat.po: Attrs.inc.h +SBTypeFormat.po: CommentCommandList.inc.h +SBTypeFormat.po: DeclNodes.inc.h +SBTypeFormat.po: DiagnosticCommonKinds.inc.h +SBTypeFormat.po: StmtNodes.inc.h +SBTypeNameSpecifier.o: AttrList.inc.h +SBTypeNameSpecifier.o: Attrs.inc.h +SBTypeNameSpecifier.o: CommentCommandList.inc.h +SBTypeNameSpecifier.o: DeclNodes.inc.h +SBTypeNameSpecifier.o: DiagnosticCommonKinds.inc.h +SBTypeNameSpecifier.o: StmtNodes.inc.h +SBTypeNameSpecifier.po: AttrList.inc.h +SBTypeNameSpecifier.po: Attrs.inc.h +SBTypeNameSpecifier.po: CommentCommandList.inc.h +SBTypeNameSpecifier.po: DeclNodes.inc.h +SBTypeNameSpecifier.po: DiagnosticCommonKinds.inc.h +SBTypeNameSpecifier.po: StmtNodes.inc.h +SBTypeSummary.o: AttrList.inc.h +SBTypeSummary.o: Attrs.inc.h +SBTypeSummary.o: CommentCommandList.inc.h +SBTypeSummary.o: DeclNodes.inc.h +SBTypeSummary.o: DiagnosticCommonKinds.inc.h +SBTypeSummary.o: StmtNodes.inc.h +SBTypeSummary.po: AttrList.inc.h +SBTypeSummary.po: Attrs.inc.h +SBTypeSummary.po: CommentCommandList.inc.h +SBTypeSummary.po: DeclNodes.inc.h +SBTypeSummary.po: DiagnosticCommonKinds.inc.h +SBTypeSummary.po: StmtNodes.inc.h +SBTypeSynthetic.o: AttrList.inc.h +SBTypeSynthetic.o: Attrs.inc.h +SBTypeSynthetic.o: CommentCommandList.inc.h +SBTypeSynthetic.o: DeclNodes.inc.h +SBTypeSynthetic.o: DiagnosticCommonKinds.inc.h +SBTypeSynthetic.o: StmtNodes.inc.h +SBTypeSynthetic.po: AttrList.inc.h +SBTypeSynthetic.po: Attrs.inc.h +SBTypeSynthetic.po: CommentCommandList.inc.h +SBTypeSynthetic.po: DeclNodes.inc.h +SBTypeSynthetic.po: DiagnosticCommonKinds.inc.h +SBTypeSynthetic.po: StmtNodes.inc.h +SBUnixSignals.o: DiagnosticCommonKinds.inc.h +SBUnixSignals.po: DiagnosticCommonKinds.inc.h +SBValue.o: AttrList.inc.h +SBValue.o: Attrs.inc.h +SBValue.o: CommentCommandList.inc.h +SBValue.o: DeclNodes.inc.h +SBValue.o: DiagnosticCommonKinds.inc.h +SBValue.o: StmtNodes.inc.h +SBValue.po: AttrList.inc.h +SBValue.po: Attrs.inc.h +SBValue.po: CommentCommandList.inc.h +SBValue.po: DeclNodes.inc.h +SBValue.po: DiagnosticCommonKinds.inc.h +SBValue.po: StmtNodes.inc.h +SBWatchpoint.o: DiagnosticCommonKinds.inc.h +SBWatchpoint.po: DiagnosticCommonKinds.inc.h +.endif Added: head/lib/clang/liblldbBreakpoint/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/clang/liblldbBreakpoint/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -0,0 +1,88 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libc++ \ + lib/msun \ + usr.bin/clang/clang-tblgen.host \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +Breakpoint.o: CommentCommandList.inc.h +Breakpoint.o: DeclNodes.inc.h +Breakpoint.o: DiagnosticCommonKinds.inc.h +Breakpoint.o: StmtNodes.inc.h +Breakpoint.po: CommentCommandList.inc.h +Breakpoint.po: DeclNodes.inc.h +Breakpoint.po: DiagnosticCommonKinds.inc.h +Breakpoint.po: StmtNodes.inc.h +BreakpointIDList.o: DiagnosticCommonKinds.inc.h +BreakpointIDList.po: DiagnosticCommonKinds.inc.h +BreakpointList.o: DiagnosticCommonKinds.inc.h +BreakpointList.po: DiagnosticCommonKinds.inc.h +BreakpointLocation.o: AttrList.inc.h +BreakpointLocation.o: Attrs.inc.h +BreakpointLocation.o: CommentCommandList.inc.h +BreakpointLocation.o: DeclNodes.inc.h +BreakpointLocation.o: DiagnosticCommonKinds.inc.h +BreakpointLocation.o: StmtNodes.inc.h +BreakpointLocation.po: AttrList.inc.h +BreakpointLocation.po: Attrs.inc.h +BreakpointLocation.po: CommentCommandList.inc.h +BreakpointLocation.po: DeclNodes.inc.h +BreakpointLocation.po: DiagnosticCommonKinds.inc.h +BreakpointLocation.po: StmtNodes.inc.h +BreakpointLocationCollection.o: DiagnosticCommonKinds.inc.h +BreakpointLocationCollection.po: DiagnosticCommonKinds.inc.h +BreakpointLocationList.o: CommentCommandList.inc.h +BreakpointLocationList.o: DeclNodes.inc.h +BreakpointLocationList.o: DiagnosticCommonKinds.inc.h +BreakpointLocationList.o: StmtNodes.inc.h +BreakpointLocationList.po: CommentCommandList.inc.h +BreakpointLocationList.po: DeclNodes.inc.h +BreakpointLocationList.po: DiagnosticCommonKinds.inc.h +BreakpointLocationList.po: StmtNodes.inc.h +BreakpointOptions.o: DiagnosticCommonKinds.inc.h +BreakpointOptions.po: DiagnosticCommonKinds.inc.h +BreakpointResolver.o: DiagnosticCommonKinds.inc.h +BreakpointResolver.po: DiagnosticCommonKinds.inc.h +BreakpointResolverAddress.o: DiagnosticCommonKinds.inc.h +BreakpointResolverAddress.po: DiagnosticCommonKinds.inc.h +BreakpointResolverFileLine.o: CommentCommandList.inc.h +BreakpointResolverFileLine.o: DeclNodes.inc.h +BreakpointResolverFileLine.o: DiagnosticCommonKinds.inc.h +BreakpointResolverFileLine.o: StmtNodes.inc.h +BreakpointResolverFileLine.po: CommentCommandList.inc.h +BreakpointResolverFileLine.po: DeclNodes.inc.h +BreakpointResolverFileLine.po: DiagnosticCommonKinds.inc.h +BreakpointResolverFileLine.po: StmtNodes.inc.h +BreakpointResolverFileRegex.o: DiagnosticCommonKinds.inc.h +BreakpointResolverFileRegex.po: DiagnosticCommonKinds.inc.h +BreakpointResolverName.o: CommentCommandList.inc.h +BreakpointResolverName.o: DeclNodes.inc.h +BreakpointResolverName.o: DiagnosticCommonKinds.inc.h +BreakpointResolverName.o: StmtNodes.inc.h +BreakpointResolverName.po: CommentCommandList.inc.h +BreakpointResolverName.po: DeclNodes.inc.h +BreakpointResolverName.po: DiagnosticCommonKinds.inc.h +BreakpointResolverName.po: StmtNodes.inc.h +BreakpointSite.o: DiagnosticCommonKinds.inc.h +BreakpointSite.po: DiagnosticCommonKinds.inc.h +Watchpoint.o: CommentCommandList.inc.h +Watchpoint.o: DeclNodes.inc.h +Watchpoint.o: DiagnosticCommonKinds.inc.h +Watchpoint.o: StmtNodes.inc.h +Watchpoint.po: CommentCommandList.inc.h +Watchpoint.po: DeclNodes.inc.h +Watchpoint.po: DiagnosticCommonKinds.inc.h +Watchpoint.po: StmtNodes.inc.h +WatchpointList.o: DiagnosticCommonKinds.inc.h +WatchpointList.po: DiagnosticCommonKinds.inc.h +WatchpointOptions.o: DiagnosticCommonKinds.inc.h +WatchpointOptions.po: DiagnosticCommonKinds.inc.h +.endif Added: head/lib/clang/liblldbCommands/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/clang/liblldbCommands/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -0,0 +1,352 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libc++ \ + lib/msun \ + usr.bin/clang/clang-tblgen.host \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +CommandCompletions.o: AttrList.inc.h +CommandCompletions.o: Attrs.inc.h +CommandCompletions.o: CommentCommandList.inc.h +CommandCompletions.o: DeclNodes.inc.h +CommandCompletions.o: DiagnosticCommonKinds.inc.h +CommandCompletions.o: StmtNodes.inc.h +CommandCompletions.po: AttrList.inc.h +CommandCompletions.po: Attrs.inc.h +CommandCompletions.po: CommentCommandList.inc.h +CommandCompletions.po: DeclNodes.inc.h +CommandCompletions.po: DiagnosticCommonKinds.inc.h +CommandCompletions.po: StmtNodes.inc.h +CommandObjectApropos.o: AttrList.inc.h +CommandObjectApropos.o: Attrs.inc.h +CommandObjectApropos.o: CommentCommandList.inc.h +CommandObjectApropos.o: DeclNodes.inc.h +CommandObjectApropos.o: DiagnosticCommonKinds.inc.h +CommandObjectApropos.o: StmtNodes.inc.h +CommandObjectApropos.po: AttrList.inc.h +CommandObjectApropos.po: Attrs.inc.h +CommandObjectApropos.po: CommentCommandList.inc.h +CommandObjectApropos.po: DeclNodes.inc.h +CommandObjectApropos.po: DiagnosticCommonKinds.inc.h +CommandObjectApropos.po: StmtNodes.inc.h +CommandObjectArgs.o: AttrList.inc.h +CommandObjectArgs.o: Attrs.inc.h +CommandObjectArgs.o: CommentCommandList.inc.h +CommandObjectArgs.o: DeclNodes.inc.h +CommandObjectArgs.o: DiagnosticCommonKinds.inc.h +CommandObjectArgs.o: StmtNodes.inc.h +CommandObjectArgs.po: AttrList.inc.h +CommandObjectArgs.po: Attrs.inc.h +CommandObjectArgs.po: CommentCommandList.inc.h +CommandObjectArgs.po: DeclNodes.inc.h +CommandObjectArgs.po: DiagnosticCommonKinds.inc.h +CommandObjectArgs.po: StmtNodes.inc.h +CommandObjectBreakpoint.o: AttrList.inc.h +CommandObjectBreakpoint.o: Attrs.inc.h +CommandObjectBreakpoint.o: CommentCommandList.inc.h +CommandObjectBreakpoint.o: DeclNodes.inc.h +CommandObjectBreakpoint.o: DiagnosticCommonKinds.inc.h +CommandObjectBreakpoint.o: StmtNodes.inc.h +CommandObjectBreakpoint.po: AttrList.inc.h +CommandObjectBreakpoint.po: Attrs.inc.h +CommandObjectBreakpoint.po: CommentCommandList.inc.h +CommandObjectBreakpoint.po: DeclNodes.inc.h +CommandObjectBreakpoint.po: DiagnosticCommonKinds.inc.h +CommandObjectBreakpoint.po: StmtNodes.inc.h +CommandObjectBreakpointCommand.o: AttrList.inc.h +CommandObjectBreakpointCommand.o: Attrs.inc.h +CommandObjectBreakpointCommand.o: CommentCommandList.inc.h +CommandObjectBreakpointCommand.o: DeclNodes.inc.h +CommandObjectBreakpointCommand.o: DiagnosticCommonKinds.inc.h +CommandObjectBreakpointCommand.o: StmtNodes.inc.h +CommandObjectBreakpointCommand.po: AttrList.inc.h +CommandObjectBreakpointCommand.po: Attrs.inc.h +CommandObjectBreakpointCommand.po: CommentCommandList.inc.h +CommandObjectBreakpointCommand.po: DeclNodes.inc.h +CommandObjectBreakpointCommand.po: DiagnosticCommonKinds.inc.h +CommandObjectBreakpointCommand.po: StmtNodes.inc.h +CommandObjectCommands.o: AttrList.inc.h +CommandObjectCommands.o: Attrs.inc.h +CommandObjectCommands.o: CommentCommandList.inc.h +CommandObjectCommands.o: DeclNodes.inc.h +CommandObjectCommands.o: DiagnosticCommonKinds.inc.h +CommandObjectCommands.o: StmtNodes.inc.h +CommandObjectCommands.po: AttrList.inc.h +CommandObjectCommands.po: Attrs.inc.h +CommandObjectCommands.po: CommentCommandList.inc.h +CommandObjectCommands.po: DeclNodes.inc.h +CommandObjectCommands.po: DiagnosticCommonKinds.inc.h +CommandObjectCommands.po: StmtNodes.inc.h +CommandObjectDisassemble.o: AttrList.inc.h +CommandObjectDisassemble.o: Attrs.inc.h +CommandObjectDisassemble.o: CommentCommandList.inc.h +CommandObjectDisassemble.o: DeclNodes.inc.h +CommandObjectDisassemble.o: DiagnosticCommonKinds.inc.h +CommandObjectDisassemble.o: StmtNodes.inc.h +CommandObjectDisassemble.po: AttrList.inc.h +CommandObjectDisassemble.po: Attrs.inc.h +CommandObjectDisassemble.po: CommentCommandList.inc.h +CommandObjectDisassemble.po: DeclNodes.inc.h +CommandObjectDisassemble.po: DiagnosticCommonKinds.inc.h +CommandObjectDisassemble.po: StmtNodes.inc.h +CommandObjectExpression.o: AttrList.inc.h +CommandObjectExpression.o: Attrs.inc.h +CommandObjectExpression.o: CommentCommandList.inc.h +CommandObjectExpression.o: DeclNodes.inc.h +CommandObjectExpression.o: DiagnosticCommonKinds.inc.h +CommandObjectExpression.o: StmtNodes.inc.h +CommandObjectExpression.po: AttrList.inc.h +CommandObjectExpression.po: Attrs.inc.h +CommandObjectExpression.po: CommentCommandList.inc.h +CommandObjectExpression.po: DeclNodes.inc.h +CommandObjectExpression.po: DiagnosticCommonKinds.inc.h +CommandObjectExpression.po: StmtNodes.inc.h +CommandObjectFrame.o: AttrList.inc.h +CommandObjectFrame.o: Attrs.inc.h +CommandObjectFrame.o: CommentCommandList.inc.h +CommandObjectFrame.o: DeclNodes.inc.h +CommandObjectFrame.o: DiagnosticCommonKinds.inc.h +CommandObjectFrame.o: StmtNodes.inc.h +CommandObjectFrame.po: AttrList.inc.h +CommandObjectFrame.po: Attrs.inc.h +CommandObjectFrame.po: CommentCommandList.inc.h +CommandObjectFrame.po: DeclNodes.inc.h +CommandObjectFrame.po: DiagnosticCommonKinds.inc.h +CommandObjectFrame.po: StmtNodes.inc.h +CommandObjectGUI.o: AttrList.inc.h +CommandObjectGUI.o: Attrs.inc.h +CommandObjectGUI.o: CommentCommandList.inc.h +CommandObjectGUI.o: DeclNodes.inc.h +CommandObjectGUI.o: DiagnosticCommonKinds.inc.h +CommandObjectGUI.o: StmtNodes.inc.h +CommandObjectGUI.po: AttrList.inc.h +CommandObjectGUI.po: Attrs.inc.h +CommandObjectGUI.po: CommentCommandList.inc.h +CommandObjectGUI.po: DeclNodes.inc.h +CommandObjectGUI.po: DiagnosticCommonKinds.inc.h +CommandObjectGUI.po: StmtNodes.inc.h +CommandObjectHelp.o: AttrList.inc.h +CommandObjectHelp.o: Attrs.inc.h +CommandObjectHelp.o: CommentCommandList.inc.h +CommandObjectHelp.o: DeclNodes.inc.h +CommandObjectHelp.o: DiagnosticCommonKinds.inc.h +CommandObjectHelp.o: StmtNodes.inc.h +CommandObjectHelp.po: AttrList.inc.h +CommandObjectHelp.po: Attrs.inc.h +CommandObjectHelp.po: CommentCommandList.inc.h +CommandObjectHelp.po: DeclNodes.inc.h +CommandObjectHelp.po: DiagnosticCommonKinds.inc.h +CommandObjectHelp.po: StmtNodes.inc.h +CommandObjectLog.o: AttrList.inc.h +CommandObjectLog.o: Attrs.inc.h +CommandObjectLog.o: CommentCommandList.inc.h +CommandObjectLog.o: DeclNodes.inc.h +CommandObjectLog.o: DiagnosticCommonKinds.inc.h +CommandObjectLog.o: StmtNodes.inc.h +CommandObjectLog.po: AttrList.inc.h +CommandObjectLog.po: Attrs.inc.h +CommandObjectLog.po: CommentCommandList.inc.h +CommandObjectLog.po: DeclNodes.inc.h +CommandObjectLog.po: DiagnosticCommonKinds.inc.h +CommandObjectLog.po: StmtNodes.inc.h +CommandObjectMemory.o: AttrList.inc.h +CommandObjectMemory.o: Attrs.inc.h +CommandObjectMemory.o: CommentCommandList.inc.h +CommandObjectMemory.o: DeclNodes.inc.h +CommandObjectMemory.o: DiagnosticCommonKinds.inc.h +CommandObjectMemory.o: StmtNodes.inc.h +CommandObjectMemory.po: AttrList.inc.h +CommandObjectMemory.po: Attrs.inc.h +CommandObjectMemory.po: CommentCommandList.inc.h +CommandObjectMemory.po: DeclNodes.inc.h +CommandObjectMemory.po: DiagnosticCommonKinds.inc.h +CommandObjectMemory.po: StmtNodes.inc.h +CommandObjectMultiword.o: AttrList.inc.h +CommandObjectMultiword.o: Attrs.inc.h +CommandObjectMultiword.o: CommentCommandList.inc.h +CommandObjectMultiword.o: DeclNodes.inc.h +CommandObjectMultiword.o: DiagnosticCommonKinds.inc.h +CommandObjectMultiword.o: StmtNodes.inc.h +CommandObjectMultiword.po: AttrList.inc.h +CommandObjectMultiword.po: Attrs.inc.h +CommandObjectMultiword.po: CommentCommandList.inc.h +CommandObjectMultiword.po: DeclNodes.inc.h +CommandObjectMultiword.po: DiagnosticCommonKinds.inc.h +CommandObjectMultiword.po: StmtNodes.inc.h +CommandObjectPlatform.o: AttrList.inc.h +CommandObjectPlatform.o: Attrs.inc.h +CommandObjectPlatform.o: CommentCommandList.inc.h +CommandObjectPlatform.o: DeclNodes.inc.h +CommandObjectPlatform.o: DiagnosticCommonKinds.inc.h +CommandObjectPlatform.o: StmtNodes.inc.h +CommandObjectPlatform.po: AttrList.inc.h +CommandObjectPlatform.po: Attrs.inc.h +CommandObjectPlatform.po: CommentCommandList.inc.h +CommandObjectPlatform.po: DeclNodes.inc.h +CommandObjectPlatform.po: DiagnosticCommonKinds.inc.h +CommandObjectPlatform.po: StmtNodes.inc.h +CommandObjectPlugin.o: AttrList.inc.h +CommandObjectPlugin.o: Attrs.inc.h +CommandObjectPlugin.o: CommentCommandList.inc.h +CommandObjectPlugin.o: DeclNodes.inc.h +CommandObjectPlugin.o: DiagnosticCommonKinds.inc.h +CommandObjectPlugin.o: StmtNodes.inc.h +CommandObjectPlugin.po: AttrList.inc.h +CommandObjectPlugin.po: Attrs.inc.h +CommandObjectPlugin.po: CommentCommandList.inc.h +CommandObjectPlugin.po: DeclNodes.inc.h +CommandObjectPlugin.po: DiagnosticCommonKinds.inc.h +CommandObjectPlugin.po: StmtNodes.inc.h +CommandObjectProcess.o: AttrList.inc.h +CommandObjectProcess.o: Attrs.inc.h +CommandObjectProcess.o: CommentCommandList.inc.h +CommandObjectProcess.o: DeclNodes.inc.h +CommandObjectProcess.o: DiagnosticCommonKinds.inc.h +CommandObjectProcess.o: StmtNodes.inc.h +CommandObjectProcess.po: AttrList.inc.h +CommandObjectProcess.po: Attrs.inc.h +CommandObjectProcess.po: CommentCommandList.inc.h +CommandObjectProcess.po: DeclNodes.inc.h +CommandObjectProcess.po: DiagnosticCommonKinds.inc.h +CommandObjectProcess.po: StmtNodes.inc.h +CommandObjectQuit.o: AttrList.inc.h +CommandObjectQuit.o: Attrs.inc.h +CommandObjectQuit.o: CommentCommandList.inc.h +CommandObjectQuit.o: DeclNodes.inc.h +CommandObjectQuit.o: DiagnosticCommonKinds.inc.h +CommandObjectQuit.o: StmtNodes.inc.h +CommandObjectQuit.po: AttrList.inc.h +CommandObjectQuit.po: Attrs.inc.h +CommandObjectQuit.po: CommentCommandList.inc.h +CommandObjectQuit.po: DeclNodes.inc.h +CommandObjectQuit.po: DiagnosticCommonKinds.inc.h +CommandObjectQuit.po: StmtNodes.inc.h +CommandObjectRegister.o: AttrList.inc.h +CommandObjectRegister.o: Attrs.inc.h +CommandObjectRegister.o: CommentCommandList.inc.h +CommandObjectRegister.o: DeclNodes.inc.h +CommandObjectRegister.o: DiagnosticCommonKinds.inc.h +CommandObjectRegister.o: StmtNodes.inc.h +CommandObjectRegister.po: AttrList.inc.h +CommandObjectRegister.po: Attrs.inc.h +CommandObjectRegister.po: CommentCommandList.inc.h +CommandObjectRegister.po: DeclNodes.inc.h +CommandObjectRegister.po: DiagnosticCommonKinds.inc.h +CommandObjectRegister.po: StmtNodes.inc.h +CommandObjectSettings.o: AttrList.inc.h +CommandObjectSettings.o: Attrs.inc.h +CommandObjectSettings.o: CommentCommandList.inc.h +CommandObjectSettings.o: DeclNodes.inc.h +CommandObjectSettings.o: DiagnosticCommonKinds.inc.h +CommandObjectSettings.o: StmtNodes.inc.h +CommandObjectSettings.po: AttrList.inc.h +CommandObjectSettings.po: Attrs.inc.h +CommandObjectSettings.po: CommentCommandList.inc.h +CommandObjectSettings.po: DeclNodes.inc.h +CommandObjectSettings.po: DiagnosticCommonKinds.inc.h +CommandObjectSettings.po: StmtNodes.inc.h +CommandObjectSource.o: AttrList.inc.h +CommandObjectSource.o: Attrs.inc.h +CommandObjectSource.o: CommentCommandList.inc.h +CommandObjectSource.o: DeclNodes.inc.h +CommandObjectSource.o: DiagnosticCommonKinds.inc.h +CommandObjectSource.o: StmtNodes.inc.h +CommandObjectSource.po: AttrList.inc.h +CommandObjectSource.po: Attrs.inc.h +CommandObjectSource.po: CommentCommandList.inc.h +CommandObjectSource.po: DeclNodes.inc.h +CommandObjectSource.po: DiagnosticCommonKinds.inc.h +CommandObjectSource.po: StmtNodes.inc.h +CommandObjectSyntax.o: AttrList.inc.h +CommandObjectSyntax.o: Attrs.inc.h +CommandObjectSyntax.o: CommentCommandList.inc.h +CommandObjectSyntax.o: DeclNodes.inc.h +CommandObjectSyntax.o: DiagnosticCommonKinds.inc.h +CommandObjectSyntax.o: StmtNodes.inc.h +CommandObjectSyntax.po: AttrList.inc.h +CommandObjectSyntax.po: Attrs.inc.h +CommandObjectSyntax.po: CommentCommandList.inc.h +CommandObjectSyntax.po: DeclNodes.inc.h +CommandObjectSyntax.po: DiagnosticCommonKinds.inc.h +CommandObjectSyntax.po: StmtNodes.inc.h +CommandObjectTarget.o: AttrList.inc.h +CommandObjectTarget.o: Attrs.inc.h +CommandObjectTarget.o: CommentCommandList.inc.h +CommandObjectTarget.o: DeclNodes.inc.h +CommandObjectTarget.o: DiagnosticCommonKinds.inc.h +CommandObjectTarget.o: StmtNodes.inc.h +CommandObjectTarget.po: AttrList.inc.h +CommandObjectTarget.po: Attrs.inc.h +CommandObjectTarget.po: CommentCommandList.inc.h +CommandObjectTarget.po: DeclNodes.inc.h +CommandObjectTarget.po: DiagnosticCommonKinds.inc.h +CommandObjectTarget.po: StmtNodes.inc.h +CommandObjectThread.o: AttrList.inc.h +CommandObjectThread.o: Attrs.inc.h +CommandObjectThread.o: CommentCommandList.inc.h +CommandObjectThread.o: DeclNodes.inc.h +CommandObjectThread.o: DiagnosticCommonKinds.inc.h +CommandObjectThread.o: StmtNodes.inc.h +CommandObjectThread.po: AttrList.inc.h +CommandObjectThread.po: Attrs.inc.h +CommandObjectThread.po: CommentCommandList.inc.h +CommandObjectThread.po: DeclNodes.inc.h +CommandObjectThread.po: DiagnosticCommonKinds.inc.h +CommandObjectThread.po: StmtNodes.inc.h +CommandObjectType.o: AttrList.inc.h +CommandObjectType.o: Attrs.inc.h +CommandObjectType.o: CommentCommandList.inc.h +CommandObjectType.o: DeclNodes.inc.h +CommandObjectType.o: DiagnosticCommonKinds.inc.h +CommandObjectType.o: StmtNodes.inc.h +CommandObjectType.po: AttrList.inc.h +CommandObjectType.po: Attrs.inc.h +CommandObjectType.po: CommentCommandList.inc.h +CommandObjectType.po: DeclNodes.inc.h +CommandObjectType.po: DiagnosticCommonKinds.inc.h +CommandObjectType.po: StmtNodes.inc.h +CommandObjectVersion.o: AttrList.inc.h +CommandObjectVersion.o: Attrs.inc.h +CommandObjectVersion.o: CommentCommandList.inc.h +CommandObjectVersion.o: DeclNodes.inc.h +CommandObjectVersion.o: DiagnosticCommonKinds.inc.h +CommandObjectVersion.o: StmtNodes.inc.h +CommandObjectVersion.po: AttrList.inc.h +CommandObjectVersion.po: Attrs.inc.h +CommandObjectVersion.po: CommentCommandList.inc.h +CommandObjectVersion.po: DeclNodes.inc.h +CommandObjectVersion.po: DiagnosticCommonKinds.inc.h +CommandObjectVersion.po: StmtNodes.inc.h +CommandObjectWatchpoint.o: AttrList.inc.h +CommandObjectWatchpoint.o: Attrs.inc.h +CommandObjectWatchpoint.o: CommentCommandList.inc.h +CommandObjectWatchpoint.o: DeclNodes.inc.h +CommandObjectWatchpoint.o: DiagnosticCommonKinds.inc.h +CommandObjectWatchpoint.o: StmtNodes.inc.h +CommandObjectWatchpoint.po: AttrList.inc.h +CommandObjectWatchpoint.po: Attrs.inc.h +CommandObjectWatchpoint.po: CommentCommandList.inc.h +CommandObjectWatchpoint.po: DeclNodes.inc.h +CommandObjectWatchpoint.po: DiagnosticCommonKinds.inc.h +CommandObjectWatchpoint.po: StmtNodes.inc.h +CommandObjectWatchpointCommand.o: AttrList.inc.h +CommandObjectWatchpointCommand.o: Attrs.inc.h +CommandObjectWatchpointCommand.o: CommentCommandList.inc.h +CommandObjectWatchpointCommand.o: DeclNodes.inc.h +CommandObjectWatchpointCommand.o: DiagnosticCommonKinds.inc.h +CommandObjectWatchpointCommand.o: StmtNodes.inc.h +CommandObjectWatchpointCommand.po: AttrList.inc.h +CommandObjectWatchpointCommand.po: Attrs.inc.h +CommandObjectWatchpointCommand.po: CommentCommandList.inc.h +CommandObjectWatchpointCommand.po: DeclNodes.inc.h +CommandObjectWatchpointCommand.po: DiagnosticCommonKinds.inc.h +CommandObjectWatchpointCommand.po: StmtNodes.inc.h +.endif Added: head/lib/clang/liblldbCore/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/clang/liblldbCore/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) @@ -0,0 +1,289 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libc++ \ + lib/libedit \ + lib/msun \ + lib/ncurses/ncursesw \ + lib/ncurses/panelw \ + usr.bin/clang/clang-tblgen.host \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +Address.o: CommentCommandList.inc.h +Address.o: DeclNodes.inc.h +Address.o: DiagnosticCommonKinds.inc.h +Address.o: StmtNodes.inc.h +Address.po: CommentCommandList.inc.h +Address.po: DeclNodes.inc.h +Address.po: DiagnosticCommonKinds.inc.h +Address.po: StmtNodes.inc.h +AddressRange.o: CommentCommandList.inc.h +AddressRange.o: DeclNodes.inc.h +AddressRange.o: DiagnosticCommonKinds.inc.h +AddressRange.o: StmtNodes.inc.h +AddressRange.po: CommentCommandList.inc.h +AddressRange.po: DeclNodes.inc.h *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 23:38:46 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 322B01C0; Tue, 16 Jun 2015 23:38:46 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0667E106; Tue, 16 Jun 2015 23:38:46 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GNcjeL077281; Tue, 16 Jun 2015 23:38:45 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GNcjV0077277; Tue, 16 Jun 2015 23:38:45 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506162338.t5GNcjV0077277@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Tue, 16 Jun 2015 23:38:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284482 - in head/targets/pseudo: clang toolchain userland/gnu X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 23:38:46 -0000 Author: sjg Date: Tue Jun 16 23:38:44 2015 New Revision: 284482 URL: https://svnweb.freebsd.org/changeset/base/284482 Log: Support WITH_LLDB Remove entries from userland/gnu that conflict with toolchain Modified: head/targets/pseudo/clang/Makefile.depend head/targets/pseudo/toolchain/Makefile.depend head/targets/pseudo/userland/gnu/Makefile.depend Modified: head/targets/pseudo/clang/Makefile.depend ============================================================================== --- head/targets/pseudo/clang/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) +++ head/targets/pseudo/clang/Makefile.depend Tue Jun 16 23:38:44 2015 (r284482) @@ -2,6 +2,10 @@ # This file is not autogenerated - take care! +.if !defined(MK_LLDB) +.include +.endif + DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ @@ -11,5 +15,9 @@ DIRDEPS = \ usr.bin/clang/clang-tblgen \ usr.bin/clang/tblgen \ +.if ${MK_LLDB} == "yes" +DIRDEPS+= \ + usr.bin/clang/lldb +.endif .include Modified: head/targets/pseudo/toolchain/Makefile.depend ============================================================================== --- head/targets/pseudo/toolchain/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) +++ head/targets/pseudo/toolchain/Makefile.depend Tue Jun 16 23:38:44 2015 (r284482) @@ -31,7 +31,7 @@ DIRDEPS+= \ .endif -DIRDEPS= \ +DIRDEPS+= \ usr.bin/xinstall \ gnu/usr.bin/binutils/ar \ gnu/usr.bin/binutils/as \ Modified: head/targets/pseudo/userland/gnu/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/gnu/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) +++ head/targets/pseudo/userland/gnu/Makefile.depend Tue Jun 16 23:38:44 2015 (r284482) @@ -16,7 +16,6 @@ DIRDEPS = \ gnu/lib/libssp/libssp_nonshared \ gnu/lib/libstdc++ \ gnu/lib/libsupc++ \ - gnu/usr.bin/binutils/addr2line \ gnu/usr.bin/binutils/ar \ gnu/usr.bin/binutils/as \ gnu/usr.bin/binutils/doc \ @@ -25,14 +24,9 @@ DIRDEPS = \ gnu/usr.bin/binutils/libbinutils \ gnu/usr.bin/binutils/libiberty \ gnu/usr.bin/binutils/libopcodes \ - gnu/usr.bin/binutils/nm \ gnu/usr.bin/binutils/objcopy \ gnu/usr.bin/binutils/objdump \ gnu/usr.bin/binutils/ranlib \ - gnu/usr.bin/binutils/readelf \ - gnu/usr.bin/binutils/size \ - gnu/usr.bin/binutils/strings \ - gnu/usr.bin/binutils/strip \ gnu/usr.bin/dialog \ gnu/usr.bin/diff/doc \ gnu/usr.bin/diff3 \ From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 23:57:29 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EA9C1DC2; Tue, 16 Jun 2015 23:57:29 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D896C832; Tue, 16 Jun 2015 23:57:29 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GNvTQ2087830; Tue, 16 Jun 2015 23:57:29 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GNvTb5087829; Tue, 16 Jun 2015 23:57:29 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <201506162357.t5GNvTb5087829@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Tue, 16 Jun 2015 23:57:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284483 - head/secure/lib/libcrypt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 16 Jun 2015 23:57:30 -0000 Author: allanjude (doc committer) Date: Tue Jun 16 23:57:29 2015 New Revision: 284483 URL: https://svnweb.freebsd.org/changeset/base/284483 Log: Add compatibility with $2y$ bcrypt hashes crypt_blowfish and many implementations based on it (Apache, PHP, PostgreSQL) implemented $2y$ before OpenBSD went with $2b$. This changes marks them as equivalent. http://www.openwall.com/lists/announce/2011/07/17/1 This change is required for applications that use the base crypt() implementation (including nginx) to be able to validate $2y$ hashes Reviewed by: eadler Approved by: delphij MFC after: 1 week Relnotes: yes Sponsored by: ScaleEngine Inc. Differential Revision: https://reviews.freebsd.org/D2742 Modified: head/secure/lib/libcrypt/crypt-blowfish.c Modified: head/secure/lib/libcrypt/crypt-blowfish.c ============================================================================== --- head/secure/lib/libcrypt/crypt-blowfish.c Tue Jun 16 23:38:44 2015 (r284482) +++ head/secure/lib/libcrypt/crypt-blowfish.c Tue Jun 16 23:57:29 2015 (r284483) @@ -167,6 +167,9 @@ crypt_blowfish(const char *key, const ch switch (salt[1]) { case 'a': /* 'ab' should not yield the same as 'abab' */ case 'b': /* cap input length at 72 bytes */ + case 'y': /* same as 'b', for compatibility + * with openwall crypt_blowfish + */ minr = salt[1]; salt++; break; From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 00:26:55 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7CA7195A; Wed, 17 Jun 2015 00:26:55 +0000 (UTC) (envelope-from gshapiro@gshapiro.net) Received: from zim.gshapiro.net (zim.gshapiro.net [IPv6:2001:4f8:3:36::224]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.gshapiro.net", Issuer "Certificate Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 63D88F36; Wed, 17 Jun 2015 00:26:55 +0000 (UTC) (envelope-from gshapiro@gshapiro.net) Received: from C02N93Y5G3QT.corp.proofpoint.com (mx2.proofpoint.com [208.86.202.10]) (authenticated bits=0) by zim.gshapiro.net (8.15.1.30/8.15.1.30) with ESMTPSA id t5H0QmFg093698 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 16 Jun 2015 17:26:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gshapiro.net; s=gatsby.dkim; t=1434500815; bh=SWtWE1IPZzQAWJcsglXkxMTBtyMd1zJNTF6YJDmOIjg=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=Pdj9hODZ/YLR2vslEafj+ThgCqPEFLW4je4fgGIQolF5jQbfPcX9oaif8RYlcbC4D yYQY0eloeiLWFl7xM6X0LNajk6VfeXyAfkB7x/lWBgMLBpOm5dG4GzhWzT0LYNrFVn hLrjKqJGVRSb4nx4sEfmpA46AsyFlouxa3foToro= Date: Tue, 16 Jun 2015 17:26:48 -0700 From: Gregory Shapiro To: Shawn Webb Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284436 - head/contrib/sendmail/src Message-ID: <20150617002637.GN96521@C02N93Y5G3QT.corp.proofpoint.com> References: <201506160258.t5G2wo3a055792@svn.freebsd.org> <1434487758.5828.6.camel@hardenedbsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1434487758.5828.6.camel@hardenedbsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 00:26:55 -0000 > > This commit chages that default to 1024 bits. sendmail 8.15.2, when > > released well use a default of 2048 bits. > > If upstream will be using 2048 bits, why not simply use that? The upstream is going to do this with a precomputed 2048 bit DH parameter. To keep this interim fix simple and not a performance degradation, I went with a run-time generated 1024 bit. Sites which wish to use 2048 run time can override the default in their configuration. Likewise, when 8.15.2 is imported, sites that prefer not to use a precomputed DH parameter can create their own by overriding the default to use a run-time or their own precomputed (but "unique") using a DH parameter file on the local file system. From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 02:43:21 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3B1CE39D; Wed, 17 Jun 2015 02:43:21 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 298C7686; Wed, 17 Jun 2015 02:43:21 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5H2hL9W072377; Wed, 17 Jun 2015 02:43:21 GMT (envelope-from acm@FreeBSD.org) Received: (from acm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5H2hLN5072376; Wed, 17 Jun 2015 02:43:21 GMT (envelope-from acm@FreeBSD.org) Message-Id: <201506170243.t5H2hLN5072376@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: acm set sender to acm@FreeBSD.org using -f From: Jose Alonso Cardenas Marquez Date: Wed, 17 Jun 2015 02:43:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284486 - head/usr.bin/calendar/calendars X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 02:43:21 -0000 Author: acm (ports committer) Date: Wed Jun 17 02:43:20 2015 New Revision: 284486 URL: https://svnweb.freebsd.org/changeset/base/284486 Log: - Add acm@ entry Modified: head/usr.bin/calendar/calendars/calendar.freebsd Modified: head/usr.bin/calendar/calendars/calendar.freebsd ============================================================================== --- head/usr.bin/calendar/calendars/calendar.freebsd Wed Jun 17 02:39:10 2015 (r284485) +++ head/usr.bin/calendar/calendars/calendar.freebsd Wed Jun 17 02:43:20 2015 (r284486) @@ -199,6 +199,7 @@ 06/06 Alan Eldridge died in Denver, Colorado, 2003 06/07 Jimmy Olgeni born in Milano, Italy, 1976 06/07 Benjamin Close born in Adelaide, Australia, 1978 +06/11 Alonso Cardenas Marquez born in Arequipa, Peru, 1979 06/14 Josh Paetzel born in Minneapolis, Minnesota, United States, 1973 06/17 Tilman Linneweh born in Weinheim, Baden-Wuerttemberg, Germany, 1978 06/18 Li-Wen Hsu born in Taipei, Taiwan, Republic of China, 1984 From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 03:12:09 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E494B81; Wed, 17 Jun 2015 03:12:09 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5CB1DE78; Wed, 17 Jun 2015 03:12:09 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5H3C9Gn088470; Wed, 17 Jun 2015 03:12:09 GMT (envelope-from marcel@FreeBSD.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5H3C9Tm088469; Wed, 17 Jun 2015 03:12:09 GMT (envelope-from marcel@FreeBSD.org) Message-Id: <201506170312.t5H3C9Tm088469@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marcel set sender to marcel@FreeBSD.org using -f From: Marcel Moolenaar Date: Wed, 17 Jun 2015 03:12:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284489 - head/bin/ls X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 03:12:09 -0000 Author: marcel Date: Wed Jun 17 03:12:08 2015 New Revision: 284489 URL: https://svnweb.freebsd.org/changeset/base/284489 Log: Unbreak ``env LANG=ru_RU.KOI8-R ls -l''. Time strings are in the current locale. Modified: head/bin/ls/print.c Modified: head/bin/ls/print.c ============================================================================== --- head/bin/ls/print.c Wed Jun 17 03:11:25 2015 (r284488) +++ head/bin/ls/print.c Wed Jun 17 03:12:08 2015 (r284489) @@ -425,7 +425,7 @@ printtime(const char *field, time_t ftim format = d_first ? "%e %b %Y" : "%b %e %Y"; strftime(longstring, sizeof(longstring), format, localtime(&ftime)); - snprintf(fmt, sizeof(fmt), "{:%s/%%s} ", field); + snprintf(fmt, sizeof(fmt), "{:%s/%%hs} ", field); xo_attr("value", "%ld", (long) ftime); xo_emit(fmt, longstring); } From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 03:20:46 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8C9E7FE3 for ; Wed, 17 Jun 2015 03:20:46 +0000 (UTC) (envelope-from mailing-machine@vniz.net) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com [209.85.217.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 191EAF4A for ; Wed, 17 Jun 2015 03:20:45 +0000 (UTC) (envelope-from mailing-machine@vniz.net) Received: by lblr1 with SMTP id r1so22826860lbl.0 for ; Tue, 16 Jun 2015 20:20:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=5wkT3ffs7tY+JwGxBq7dx6RmBov4f3BlfiVj00C1A2c=; b=AX7xc9sQZITUNg92XHifK/RRXDpuyt5sN8W6TgI8RlHRSWSgVfaNyl8nHUcEG1RUZK Nni955x0ZbgnyJOprr5BngeDSddoibPGohmImWc/vXNEvvf7cslWiUZm+x91drsgNLq7 cYltN/tGv8D3P44B5oZ3rGALq7fpqff6lAXjtVtkIb99fVMy2Mjnk79v4ov+IPe0eXo6 TwsHm9uWsaBtu3orBpqPxwMP12RFzNHm44O/1BWYk58qx5Tc43Q2h8gVnwrqmRIRyHjQ Lf2YNYHQ2qSYIFPaQEg6sjZAbua7rT6hjLJ3gbPz4UIVpCNeIAY8MkVYA9s9g8h+130e Royw== X-Gm-Message-State: ALoCoQkyG5LzBHT/zXwsrYp6lqRVILyhjK3Hyshondqw04pHB301TQo7nQbmpB61uQxSOqR0css/ X-Received: by 10.112.142.232 with SMTP id rz8mr5309935lbb.74.1434510928186; Tue, 16 Jun 2015 20:15:28 -0700 (PDT) Received: from [192.168.1.2] ([89.169.173.68]) by mx.google.com with ESMTPSA id rg6sm653944lbb.23.2015.06.16.20.15.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2015 20:15:27 -0700 (PDT) Subject: Re: svn commit: r284489 - head/bin/ls To: Marcel Moolenaar , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201506170312.t5H3C9Tm088469@svn.freebsd.org> From: Andrey Chernov Message-ID: <5580E64E.9040601@freebsd.org> Date: Wed, 17 Jun 2015 06:15:26 +0300 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.0.1 MIME-Version: 1.0 In-Reply-To: <201506170312.t5H3C9Tm088469@svn.freebsd.org> Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 03:20:46 -0000 On 17.06.2015 6:12, Marcel Moolenaar wrote: > Author: marcel > Date: Wed Jun 17 03:12:08 2015 > New Revision: 284489 > URL: https://svnweb.freebsd.org/changeset/base/284489 > > Log: > Unbreak ``env LANG=ru_RU.KOI8-R ls -l''. > Time strings are in the current locale. Thanx, but the same treatment should be for file names too: they are in the current locale. ls -l drops them otherwise. > > Modified: > head/bin/ls/print.c > > Modified: head/bin/ls/print.c > ============================================================================== > --- head/bin/ls/print.c Wed Jun 17 03:11:25 2015 (r284488) > +++ head/bin/ls/print.c Wed Jun 17 03:12:08 2015 (r284489) > @@ -425,7 +425,7 @@ printtime(const char *field, time_t ftim > format = d_first ? "%e %b %Y" : "%b %e %Y"; > strftime(longstring, sizeof(longstring), format, localtime(&ftime)); > > - snprintf(fmt, sizeof(fmt), "{:%s/%%s} ", field); > + snprintf(fmt, sizeof(fmt), "{:%s/%%hs} ", field); > xo_attr("value", "%ld", (long) ftime); > xo_emit(fmt, longstring); > } > -- http://ache.vniz.net/ From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 03:24:17 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5878B4A5; Wed, 17 Jun 2015 03:24:17 +0000 (UTC) (envelope-from marcel@xcllnt.net) Received: from mail.xcllnt.net (mail.xcllnt.net [50.0.150.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DB99152; Wed, 17 Jun 2015 03:24:15 +0000 (UTC) (envelope-from marcel@xcllnt.net) Received: from [10.1.254.15] (208.185.168.138.IPYX-104653-ZYO.zip.zayo.com [208.185.168.138] (may be forged)) (authenticated bits=0) by mail.xcllnt.net (8.14.9/8.14.9) with ESMTP id t5H3N9Ow031117 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 16 Jun 2015 20:24:09 -0700 (PDT) (envelope-from marcel@xcllnt.net) Subject: Re: svn commit: r284489 - head/bin/ls Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_FB913BB6-B7CD-4123-A8DB-D36BD3462D30"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5b6 From: Marcel Moolenaar In-Reply-To: <5580E64E.9040601@freebsd.org> Date: Tue, 16 Jun 2015 20:24:07 -0700 Cc: Marcel Moolenaar , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <64D467BD-F5DE-419E-B812-C8BFD40319A0@xcllnt.net> References: <201506170312.t5H3C9Tm088469@svn.freebsd.org> <5580E64E.9040601@freebsd.org> To: Andrey Chernov X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 03:24:17 -0000 --Apple-Mail=_FB913BB6-B7CD-4123-A8DB-D36BD3462D30 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii > On Jun 16, 2015, at 8:15 PM, Andrey Chernov wrote: > > On 17.06.2015 6:12, Marcel Moolenaar wrote: >> Author: marcel >> Date: Wed Jun 17 03:12:08 2015 >> New Revision: 284489 >> URL: https://svnweb.freebsd.org/changeset/base/284489 >> >> Log: >> Unbreak ``env LANG=ru_RU.KOI8-R ls -l''. >> Time strings are in the current locale. > > Thanx, but the same treatment should be for file names too: they are in > the current locale. ls -l drops them otherwise. filenames are already printed with the h attribute, so something else may be wrong. -- Marcel Moolenaar marcel@xcllnt.net --Apple-Mail=_FB913BB6-B7CD-4123-A8DB-D36BD3462D30 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJVgOhXAAoJEIda8t8f0tjjB8kP/jZs6KmVxHDw9I6810sL9hGj 84ZZHi/tyTVk8cwK0/9NQv+/kiWAVUWhx6sJT8NYS+EupGKiBf0WqRNELidgoGtO 2u7PbkjqhpQz1A/k2Twk4jEslVIj5iva2WjrtLhD4fE0BKX9E4VlyIwzoPw2/ufd eFijLDXKhYPXY2wvnkLn1clUcoD7fLSNiF0WeaZR4Ef1P0fj91dLSg4UNc6JbgXN cz6YvYhdxZrGNvm+Z+EPhyR1t0MZpPG4AAlIxgndueMI4yK/inLjajP6UC7d8GVP K984GXcbc7E3qwAXlKMgwjfBQ+34L0xrlES6jlPT9153fO5yz+fzLk9dt79GHv5h zGi+FGxjYI8mTr2pjAZawGKAf4JxmzJFd7lbXPYDk3WukFyb0mm63T+Y1W0tr6ea rGAgIHzLNsuQSiSPKVIT5uhJNkkMeniTzRcxFDbcZnoVPhK3VahWVuMXCAIIwYYa oVVPKkSTwkfPHZDGnUeg5cjGNiaSrUbXJRrXoMm5H/nWxAzH1PTQmHwXwqkTgeCH l6C58/qxZYFUfZOxg2KNDN2S6C4UZpLA2+3rINYMG+0ojh4PNOg6i+tCgMyHmA+l +RKyh0435/BaVgqB2h5taFphgYmX7wBVcF3y6jWPa3i9Ji6vCn/IE0FkYeMXD6Y3 xHYrB1YvQO93zuxjtXTr =lHXr -----END PGP SIGNATURE----- --Apple-Mail=_FB913BB6-B7CD-4123-A8DB-D36BD3462D30-- From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 03:40:42 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C92F4972; Wed, 17 Jun 2015 03:40:42 +0000 (UTC) (envelope-from kabaev@gmail.com) Received: from mail-qc0-x22c.google.com (mail-qc0-x22c.google.com [IPv6:2607:f8b0:400d:c01::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 86A3E6A8; Wed, 17 Jun 2015 03:40:42 +0000 (UTC) (envelope-from kabaev@gmail.com) Received: by qcwx2 with SMTP id x2so10446705qcw.1; Tue, 16 Jun 2015 20:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type; bh=9r92xZ25O1iwepDqEqCkBq4F4GV6zf3oF2wT2CH8CZI=; b=t9PgvPKxMlYOEJgPs4dXDo5ZIb17NTnu1vKgdTMC+cF6zoGFy2W+jiqvMMSzjtLbjc 1DCwrC1BGpmHP7QPhwkROZ6DmRY/W3ob+kxyzo9THXZnkf7/NdsmRcPEtPWWk1jAZvqr C4g564c+4A1NzvMsTZXPPFwB5gEBBQKue9ySi8KhxkO+IqWO9sXr2wCbdz3ewmn/v6K/ KT55ICcZG/rMvLmPTky0nNEvJTmIyK0Nd0Cpi+td9sy+2MK3K9H16T9TKz97kgPzlAn+ o2H0zHg4ww4/b0TgiCqARHyPaJuQTfbJaSYST6L8xAP81VdoQOFp7v+estpZU8RqhNUa C4ZQ== X-Received: by 10.55.25.42 with SMTP id k42mr8459376qkh.79.1434512441654; Tue, 16 Jun 2015 20:40:41 -0700 (PDT) Received: from kan ([2601:18f:0:1570:226:18ff:fe00:232e]) by mx.google.com with ESMTPSA id l81sm1546027qhl.24.2015.06.16.20.40.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2015 20:40:41 -0700 (PDT) Date: Tue, 16 Jun 2015 23:40:35 -0400 From: Alexander Kabaev To: Marcel Moolenaar Cc: Andrey Chernov , Marcel Moolenaar , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284489 - head/bin/ls Message-ID: <20150616234035.17bcf0da@kan> In-Reply-To: <64D467BD-F5DE-419E-B812-C8BFD40319A0@xcllnt.net> References: <201506170312.t5H3C9Tm088469@svn.freebsd.org> <5580E64E.9040601@freebsd.org> <64D467BD-F5DE-419E-B812-C8BFD40319A0@xcllnt.net> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.27; amd64-portbld-freebsd11.0) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/I91r79BIH8HMHm3HdhHAHvu"; protocol="application/pgp-signature" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 03:40:43 -0000 --Sig_/I91r79BIH8HMHm3HdhHAHvu Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Tue, 16 Jun 2015 20:24:07 -0700 Marcel Moolenaar wrote: >=20 > > On Jun 16, 2015, at 8:15 PM, Andrey Chernov > > wrote: > >=20 > > On 17.06.2015 6:12, Marcel Moolenaar wrote: > >> Author: marcel > >> Date: Wed Jun 17 03:12:08 2015 > >> New Revision: 284489 > >> URL: https://svnweb.freebsd.org/changeset/base/284489 > >>=20 > >> Log: > >> Unbreak ``env LANG=3Dru_RU.KOI8-R ls -l''. > >> Time strings are in the current locale. > >=20 > > Thanx, but the same treatment should be for file names too: they > > are in the current locale. ls -l drops them otherwise. >=20 > filenames are already printed with the h attribute, so > something else may be wrong. >=20 > -- > Marcel Moolenaar > marcel@xcllnt.net >=20 >=20 >=20 No, not in ls -l. You need this in printlong: - xo_emit("{ke:name}", name); + xo_emit("{ke:name/%hs}", name) - xo_emit("{dk:name}", name); + xo_emit("{dk:name/%hs}", name); --=20 Alexander Kabaev --Sig_/I91r79BIH8HMHm3HdhHAHvu Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJVgOw0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDNUY3RDk5NTk5QjY0MUUxM0M1MTU2OTEw NzEzMjI5OTkyNzkyRTdFAAoJEAcTIpmSeS5+j1kP/3gTS9QjoCBk0+jFAEuj7rFC 7X/B3tY03qvf9eaZ/1tsTW5m/a8YSE1bSxYRamv2BEAoN1QSl1jcH+YxZ8JWA6iD px+gWAWdPIYjdx0w+Xm5fLA3ykLIiyRoEszoIiu3HXLFZvE4pHACXIyv6vlUSvfg /d/Zr2modtNvvVX53b/hvps1Ystn7/qM7PkqmCKfDpd2uxuHNGl1vqbv1ajJXmNb t27Ij1tSGBsjr0g4FA3r3l5B1yZfLBD3k8HxwCxTAYkp9Josv//vfbxjJZxi4Lw3 srSGJ8hIoqJNz2LeoISGNTtBwyKl/JGYxhn2Q7Uw340SlqwwQyZtdnr9i9Ivianl wwKs6yitf4ACKbuLF9tV6CAxaWIFb76QwiHT8pNzqgKNRNzQoYWBFQM7Fdsxhio7 Rz2lufvR80vsZjfXf2ivrQwSR0TikxWfp5ZML9emWopPJPXaki3sIkqsjJOH5HXv vGQm1a2+18SRrJNiBvsLjBt98fr93/rVjPMly+P4zhpQXUAumVl2Waad7hm+91ZK aCJk47y9hTLJXtujmY6sBz2BuX/2hYNS5E96KAtnN3A6w39Bjcr7nxjxhzJ+bJ6w HY46UciF9DHFCeyCEk7dVawTfMKRf7HDC7NfB9eqeKVTf4oVMIHonlsUhZXf6+ct YLTLl43ObaRasrU4H0xm =4MBe -----END PGP SIGNATURE----- --Sig_/I91r79BIH8HMHm3HdhHAHvu-- From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 04:26:49 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6BE6C53A; Wed, 17 Jun 2015 04:26:49 +0000 (UTC) (envelope-from kan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5A2801D0; Wed, 17 Jun 2015 04:26:49 +0000 (UTC) (envelope-from kan@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5H4QnRq023707; Wed, 17 Jun 2015 04:26:49 GMT (envelope-from kan@FreeBSD.org) Received: (from kan@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5H4QngV023706; Wed, 17 Jun 2015 04:26:49 GMT (envelope-from kan@FreeBSD.org) Message-Id: <201506170426.t5H4QngV023706@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kan set sender to kan@FreeBSD.org using -f From: Alexander Kabaev Date: Wed, 17 Jun 2015 04:26:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284494 - head/bin/ls X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 04:26:49 -0000 Author: kan Date: Wed Jun 17 04:26:48 2015 New Revision: 284494 URL: https://svnweb.freebsd.org/changeset/base/284494 Log: Continue ubreaking ``env LANG=ru_RU.KOI8-R ls -l''. File names are in current locale as well. Modified: head/bin/ls/print.c Modified: head/bin/ls/print.c ============================================================================== --- head/bin/ls/print.c Wed Jun 17 04:18:30 2015 (r284493) +++ head/bin/ls/print.c Wed Jun 17 04:26:48 2015 (r284494) @@ -178,7 +178,7 @@ printlong(const DISPLAY *dp) sp = p->fts_statp; name = getname(p->fts_name); if (name) - xo_emit("{ke:name}", name); + xo_emit("{ke:name/%hs}", name); if (f_inode) xo_emit("{:inode/%*ju} ", dp->s_inode, (uintmax_t)sp->st_ino); @@ -214,7 +214,7 @@ printlong(const DISPLAY *dp) #endif if (name) { - xo_emit("{dk:name}", name); + xo_emit("{dk:name/%hs}", name); free(name); } From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 04:46:59 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9CF5920; Wed, 17 Jun 2015 04:46:59 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BC3668A6; Wed, 17 Jun 2015 04:46:59 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5H4kxE7033617; Wed, 17 Jun 2015 04:46:59 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5H4kxs7033615; Wed, 17 Jun 2015 04:46:59 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201506170446.t5H4kxs7033615@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 17 Jun 2015 04:46:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284495 - in head/sys: kern ufs/ffs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 04:47:00 -0000 Author: kib Date: Wed Jun 17 04:46:58 2015 New Revision: 284495 URL: https://svnweb.freebsd.org/changeset/base/284495 Log: vfs_msync(), called from syncer vnode fsync VOP, only iterates over the active vnode list for the given mount point, with the assumption that vnodes with dirty pages are active. This is enforced by vinactive() doing vm_object_page_clean() pass over the vnode pages. The issue is, if vinactive() cannot be called during vput() due to the vnode being only shared-locked, we might end up with the dirty pages for the vnode on the free list. Such vnode is invisible to syncer, and pages are only cleaned on the vnode reactivation. In other words, the race results in the broken guarantee that user data, written through the mmap(2), is written to the disk not later than in 30 seconds after the write. Fix this by keeping the vnode which is freed but still owing inactivation, on the active list. When syncer loops find such vnode, it is deactivated and cleaned by the final vput() call. Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Modified: head/sys/kern/vfs_subr.c head/sys/ufs/ffs/ffs_vfsops.c Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Wed Jun 17 04:26:48 2015 (r284494) +++ head/sys/kern/vfs_subr.c Wed Jun 17 04:46:58 2015 (r284495) @@ -173,6 +173,11 @@ static int reassignbufcalls; SYSCTL_INT(_vfs, OID_AUTO, reassignbufcalls, CTLFLAG_RW, &reassignbufcalls, 0, "Number of calls to reassignbuf"); +static u_long free_owe_inact; +SYSCTL_ULONG(_vfs, OID_AUTO, free_owe_inact, CTLFLAG_RD, &free_owe_inact, 0, + "Number of times free vnodes kept on active list due to VFS " + "owing inactivation"); + /* * Cache for the mount type id assigned to NFS. This is used for * special checks in nfs/nfs_nqlease.c and vm/vnode_pager.c. @@ -2368,11 +2373,8 @@ vholdl(struct vnode *vp) CTR2(KTR_VFS, "%s: vp %p", __func__, vp); #ifdef INVARIANTS /* getnewvnode() calls v_incr_usecount() without holding interlock. */ - if (vp->v_type != VNON || vp->v_data != NULL) { + if (vp->v_type != VNON || vp->v_data != NULL) ASSERT_VI_LOCKED(vp, "vholdl"); - VNASSERT(vp->v_holdcnt > 0 || (vp->v_iflag & VI_FREE) != 0, - vp, ("vholdl: free vnode is held")); - } #endif vp->v_holdcnt++; if ((vp->v_iflag & VI_FREE) == 0) @@ -2443,23 +2445,29 @@ vdropl(struct vnode *vp) VNASSERT(vp->v_holdcnt == 0, vp, ("vdropl: freeing when we shouldn't")); active = vp->v_iflag & VI_ACTIVE; - vp->v_iflag &= ~VI_ACTIVE; - mp = vp->v_mount; - mtx_lock(&vnode_free_list_mtx); - if (active) { - TAILQ_REMOVE(&mp->mnt_activevnodelist, vp, - v_actfreelist); - mp->mnt_activevnodelistsize--; - } - if (vp->v_iflag & VI_AGE) { - TAILQ_INSERT_HEAD(&vnode_free_list, vp, v_actfreelist); + if ((vp->v_iflag & VI_OWEINACT) == 0) { + vp->v_iflag &= ~VI_ACTIVE; + mp = vp->v_mount; + mtx_lock(&vnode_free_list_mtx); + if (active) { + TAILQ_REMOVE(&mp->mnt_activevnodelist, vp, + v_actfreelist); + mp->mnt_activevnodelistsize--; + } + if (vp->v_iflag & VI_AGE) { + TAILQ_INSERT_HEAD(&vnode_free_list, vp, + v_actfreelist); + } else { + TAILQ_INSERT_TAIL(&vnode_free_list, vp, + v_actfreelist); + } + freevnodes++; + vp->v_iflag &= ~VI_AGE; + vp->v_iflag |= VI_FREE; + mtx_unlock(&vnode_free_list_mtx); } else { - TAILQ_INSERT_TAIL(&vnode_free_list, vp, v_actfreelist); + atomic_add_long(&free_owe_inact, 1); } - freevnodes++; - vp->v_iflag &= ~VI_AGE; - vp->v_iflag |= VI_FREE; - mtx_unlock(&vnode_free_list_mtx); VI_UNLOCK(vp); return; } Modified: head/sys/ufs/ffs/ffs_vfsops.c ============================================================================== --- head/sys/ufs/ffs/ffs_vfsops.c Wed Jun 17 04:26:48 2015 (r284494) +++ head/sys/ufs/ffs/ffs_vfsops.c Wed Jun 17 04:46:58 2015 (r284495) @@ -1410,6 +1410,14 @@ ffs_statfs(mp, sbp) return (0); } +static bool +sync_doupdate(struct inode *ip) +{ + + return ((ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | + IN_UPDATE)) != 0); +} + /* * For a lazy sync, we only care about access times, quotas and the * superblock. Other filesystem changes are already converted to @@ -1443,15 +1451,15 @@ ffs_sync_lazy(mp) * Test also all the other timestamp flags too, to pick up * any other cases that could be missed. */ - if ((ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | - IN_UPDATE)) == 0) { + if (!sync_doupdate(ip) && (vp->v_iflag & VI_OWEINACT) == 0) { VI_UNLOCK(vp); continue; } if ((error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK, td)) != 0) continue; - error = ffs_update(vp, 0); + if (sync_doupdate(ip)) + error = ffs_update(vp, 0); if (error != 0) allerror = error; vput(vp); From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 05:25:07 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8E15FF76 for ; Wed, 17 Jun 2015 05:25:07 +0000 (UTC) (envelope-from mailing-machine@vniz.net) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com [209.85.217.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3F4C11B7 for ; Wed, 17 Jun 2015 05:25:07 +0000 (UTC) (envelope-from mailing-machine@vniz.net) Received: by lbbti3 with SMTP id ti3so23911145lbb.1 for ; Tue, 16 Jun 2015 22:24:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=yUNn1OR/qipkVkcuo6U1xLK1cJ/OEVCxlnRq4GaaP/0=; b=hy14SlKRa2J6OdJ8uj9qio11dk6JO/NSFsb9Cp4MWOJ/zW8Djshue8X4DMXVIHCsMu 2ksc9+mxkrb/POZvvhCM125mFFBSz4Cr+mxxx1rC2kk/ofzMrzue4Go4Xcqe0uuBNoLM wgsCIJNE+KeEVbyOiIn5jeGZrC65Z60LPj66KycnQ2yFopTeQJBkdfHr2SgZLys5cE3J HonsxdYbapL0IbQVrQ5y8YBCIl3H/GknshQtCcB+xukQvuZ3HE8SnXo51zvtShwKTOpl ya/2tfpXICxnqj8jRO/gaoPzKaR1mvsleedjMLrRcn3i/gbZ7aOe+L8S4d4zAUYTHkCh hhUA== X-Gm-Message-State: ALoCoQmavom6EmH0dCYo2LAtBydK7QaqEDZqVzjvKSm2KuEOFnbIfaVD5kIuxC7YgsH1zlrz6FMK X-Received: by 10.152.198.166 with SMTP id jd6mr5901751lac.26.1434518698631; Tue, 16 Jun 2015 22:24:58 -0700 (PDT) Received: from [192.168.1.2] ([89.169.173.68]) by mx.google.com with ESMTPSA id kv1sm712339lbb.48.2015.06.16.22.24.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2015 22:24:57 -0700 (PDT) Subject: Re: svn commit: r284494 - head/bin/ls To: Alexander Kabaev , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201506170426.t5H4QngV023706@svn.freebsd.org> From: Andrey Chernov Message-ID: <558104A7.20708@freebsd.org> Date: Wed, 17 Jun 2015 08:24:55 +0300 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.0.1 MIME-Version: 1.0 In-Reply-To: <201506170426.t5H4QngV023706@svn.freebsd.org> Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 05:25:07 -0000 On 17.06.2015 7:26, Alexander Kabaev wrote: > Author: kan > Date: Wed Jun 17 04:26:48 2015 > New Revision: 284494 > URL: https://svnweb.freebsd.org/changeset/base/284494 > > Log: > Continue ubreaking ``env LANG=ru_RU.KOI8-R ls -l''. > > File names are in current locale as well. Thanx, fixed now. > > Modified: > head/bin/ls/print.c > > Modified: head/bin/ls/print.c > ============================================================================== > --- head/bin/ls/print.c Wed Jun 17 04:18:30 2015 (r284493) > +++ head/bin/ls/print.c Wed Jun 17 04:26:48 2015 (r284494) > @@ -178,7 +178,7 @@ printlong(const DISPLAY *dp) > sp = p->fts_statp; > name = getname(p->fts_name); > if (name) > - xo_emit("{ke:name}", name); > + xo_emit("{ke:name/%hs}", name); > if (f_inode) > xo_emit("{:inode/%*ju} ", > dp->s_inode, (uintmax_t)sp->st_ino); > @@ -214,7 +214,7 @@ printlong(const DISPLAY *dp) > #endif > > if (name) { > - xo_emit("{dk:name}", name); > + xo_emit("{dk:name/%hs}", name); > free(name); > } > > -- http://ache.vniz.net/ From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 07:24:09 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 847818CA; Wed, 17 Jun 2015 07:24:09 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3DFE7204; Wed, 17 Jun 2015 07:24:09 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from slw by zxy.spb.ru with local (Exim 4.84 (FreeBSD)) (envelope-from ) id 1Z57hX-000GqA-JM; Wed, 17 Jun 2015 10:23:59 +0300 Date: Wed, 17 Jun 2015 10:23:59 +0300 From: Slawa Olhovchenkov To: Rui Paulo Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284476 - head/usr.sbin/syslogd Message-ID: <20150617072359.GH58397@zxy.spb.ru> References: <201506162242.t5GMgJk1049842@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201506162242.t5GMgJk1049842@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 07:24:09 -0000 On Tue, Jun 16, 2015 at 10:42:19PM +0000, Rui Paulo wrote: > Author: rpaulo > Date: Tue Jun 16 22:42:19 2015 > New Revision: 284476 > URL: https://svnweb.freebsd.org/changeset/base/284476 > > Log: > syslogd: re-read the timezone when receive a SIGHUP. > > syslogd already re-reads the configuration file and the hostname when > receiving a SIGHUP, so it makes sense to reset the timezone. > Special care was taken to ensure we don't break installations running > with a custom TZ variable. May be for cron too? From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 12:28:14 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F474600; Wed, 17 Jun 2015 12:28:14 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 642666B0; Wed, 17 Jun 2015 12:28:14 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5HCSE0o062165; Wed, 17 Jun 2015 12:28:14 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5HCSEb8062164; Wed, 17 Jun 2015 12:28:14 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201506171228.t5HCSEb8062164@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Wed, 17 Jun 2015 12:28:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284513 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 12:28:14 -0000 Author: avg Date: Wed Jun 17 12:28:13 2015 New Revision: 284513 URL: https://svnweb.freebsd.org/changeset/base/284513 Log: l2arc: pass correct size to trim requests b_size is a logical size of a buffer in memory, b_asize is its physical size that accounts for possible compression. Currently the latter is the best approximation for the allocated, on-disk size. L2ARC TRIM support was committed a few weeks before L2ARC compression was imported, so originally the code was correct, because b_size was the size. Further thoughts. Given that the cache device is being overwritten in a circular fashion it is not clear if a TRIM per each evicted L2ARC buffer has any benefits. Maybe it would be sufficient to issue a single trim request for the whole device when it is loaded, e.g. after a bootup, or when it is unloaded, e.g. before a shutdown. At least as long as L2ARC is not persistent across reboots. Discussed with: smh MFC after: 19 says Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Wed Jun 17 12:23:04 2015 (r284512) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Wed Jun 17 12:28:13 2015 (r284513) @@ -1826,7 +1826,7 @@ arc_hdr_destroy(arc_buf_hdr_t *hdr) if (l2hdr != NULL) { trim_map_free(l2hdr->b_dev->l2ad_vdev, l2hdr->b_daddr, - hdr->b_size, 0); + l2hdr->b_asize, 0); list_remove(l2hdr->b_dev->l2ad_buflist, hdr); arc_buf_l2_cdata_free(hdr); ARCSTAT_INCR(arcstat_l2_size, -hdr->b_size); @@ -3868,7 +3868,7 @@ arc_release(arc_buf_t *buf, void *tag) vdev_space_update(l2hdr->b_dev->l2ad_vdev, -l2hdr->b_asize, 0, 0); trim_map_free(l2hdr->b_dev->l2ad_vdev, l2hdr->b_daddr, - hdr->b_size, 0); + l2hdr->b_asize, 0); kmem_free(l2hdr, sizeof (l2arc_buf_hdr_t)); ARCSTAT_INCR(arcstat_l2_size, -buf_size); mutex_exit(&l2arc_buflist_mtx); @@ -4813,7 +4813,7 @@ l2arc_write_done(zio_t *zio) bytes_dropped += abl2->b_asize; hdr->b_l2hdr = NULL; trim_map_free(abl2->b_dev->l2ad_vdev, abl2->b_daddr, - hdr->b_size, 0); + abl2->b_asize, 0); kmem_free(abl2, sizeof (l2arc_buf_hdr_t)); ARCSTAT_INCR(arcstat_l2_size, -hdr->b_size); } From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 12:43:07 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 238412C6E; Wed, 17 Jun 2015 12:43:07 +0000 (UTC) (envelope-from eri@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 126CCC29; Wed, 17 Jun 2015 12:43:07 +0000 (UTC) (envelope-from eri@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5HCN5RZ061271; Wed, 17 Jun 2015 12:23:05 GMT (envelope-from eri@FreeBSD.org) Received: (from eri@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5HCN5ni061270; Wed, 17 Jun 2015 12:23:05 GMT (envelope-from eri@FreeBSD.org) Message-Id: <201506171223.t5HCN5ni061270@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: eri set sender to eri@FreeBSD.org using -f From: Ermal Luçi Date: Wed, 17 Jun 2015 12:23:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284512 - head/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 12:43:07 -0000 Author: eri Date: Wed Jun 17 12:23:04 2015 New Revision: 284512 URL: https://svnweb.freebsd.org/changeset/base/284512 Log: If there is a system with a bpf consumer running and a packet is wanted to be transmitted but the arp cache entry expired, which triggers an arp request to be sent, the bpf code might want to sleep but crash the system due to a non sleep lock held from the arp entry not released properly. Release the lock before calling the arp request code to solve the issue as is done on all the other code paths. PR: 200323 Approved by: ae, gnn(mentor) MFC after: 1 week Sponsored by: Netgate Differential Revision: https://reviews.freebsd.org/D2828 Modified: head/sys/netinet/if_ether.c Modified: head/sys/netinet/if_ether.c ============================================================================== --- head/sys/netinet/if_ether.c Wed Jun 17 12:05:04 2015 (r284511) +++ head/sys/netinet/if_ether.c Wed Jun 17 12:23:04 2015 (r284512) @@ -364,6 +364,7 @@ retry: if ((la->la_flags & LLE_VALID) && ((la->la_flags & LLE_STATIC) || la->la_expire > time_uptime)) { bcopy(&la->ll_addr, desten, ifp->if_addrlen); + renew = 0; /* * If entry has an expiry time and it is approaching, * see if we need to send an ARP request within this @@ -371,14 +372,22 @@ retry: */ if (!(la->la_flags & LLE_STATIC) && time_uptime + la->la_preempt > la->la_expire) { - arprequest(ifp, NULL, &SIN(dst)->sin_addr, NULL); + renew = 1; la->la_preempt--; } if (pflags != NULL) *pflags = la->la_flags; - error = 0; - goto done; + + if (flags & LLE_EXCLUSIVE) + LLE_WUNLOCK(la); + else + LLE_RUNLOCK(la); + + if (renew == 1) + arprequest(ifp, NULL, &SIN(dst)->sin_addr, NULL); + + return (0); } if (la->la_flags & LLE_STATIC) { /* should not happen! */ From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 12:43:10 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2BE8C2EFA; Wed, 17 Jun 2015 12:43:09 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D504EC42; Wed, 17 Jun 2015 12:43:09 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5HAKxYF097540; Wed, 17 Jun 2015 10:20:59 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5HAKxf5097539; Wed, 17 Jun 2015 10:20:59 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201506171020.t5HAKxf5097539@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Wed, 17 Jun 2015 10:20:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284508 - head/sys/ddb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 12:43:10 -0000 Author: bz Date: Wed Jun 17 10:20:59 2015 New Revision: 284508 URL: https://svnweb.freebsd.org/changeset/base/284508 Log: Correct the function name in catch-all error handling case. MFC after: 1 week Modified: head/sys/ddb/db_sym.c Modified: head/sys/ddb/db_sym.c ============================================================================== --- head/sys/ddb/db_sym.c Wed Jun 17 09:44:02 2015 (r284507) +++ head/sys/ddb/db_sym.c Wed Jun 17 10:20:59 2015 (r284508) @@ -160,7 +160,7 @@ db_var_curvnet(struct db_variable *vp, d return (0); default: - db_printf("db_var_curcpu: unknown operation\n"); + db_printf("db_var_curvnet: unknown operation\n"); return (0); } } From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 12:43:08 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C3122C71; Wed, 17 Jun 2015 12:43:08 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0A7B5C30; Wed, 17 Jun 2015 12:43:08 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5HC55Bc051742; Wed, 17 Jun 2015 12:05:05 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5HC55LI051741; Wed, 17 Jun 2015 12:05:05 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201506171205.t5HC55LI051741@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Wed, 17 Jun 2015 12:05:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284511 - head/sys/cddl/contrib/opensolaris/uts/common/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 12:43:08 -0000 Author: avg Date: Wed Jun 17 12:05:04 2015 New Revision: 284511 URL: https://svnweb.freebsd.org/changeset/base/284511 Log: illumos compat: use flsl/flsll for highbit/highbit64 This is a micro optimization. The upstream code uses the binary search. Differential Revision: https://reviews.freebsd.org/D2839 Reviewed by: delphij, mav MFC after: 15 days Modified: head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h Modified: head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h Wed Jun 17 11:48:00 2015 (r284510) +++ head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h Wed Jun 17 12:05:04 2015 (r284511) @@ -32,6 +32,13 @@ #include #include +#ifdef __FreeBSD__ +#ifdef _KERNEL +#include +#else +#include +#endif +#endif #ifdef __cplusplus extern "C" { @@ -382,6 +389,9 @@ extern unsigned char bcd_to_byte[256]; static __inline int highbit(ulong_t i) { +#ifdef __FreeBSD__ + return (flsl(i)); +#else register int h = 1; if (i == 0) @@ -407,6 +417,7 @@ highbit(ulong_t i) h += 1; } return (h); +#endif } /* @@ -416,6 +427,9 @@ highbit(ulong_t i) static __inline int highbit64(uint64_t i) { +#ifdef __FreeBSD__ + return (flsll(i)); +#else int h = 1; if (i == 0) @@ -439,6 +453,7 @@ highbit64(uint64_t i) h += 1; } return (h); +#endif } #ifdef __cplusplus From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 13:15:55 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 19C92AA6; Wed, 17 Jun 2015 13:15:55 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0853BBD8; Wed, 17 Jun 2015 13:15:55 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5HDFs01088870; Wed, 17 Jun 2015 13:15:54 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5HDFs9k088869; Wed, 17 Jun 2015 13:15:54 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201506171315.t5HDFs9k088869@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Wed, 17 Jun 2015 13:15:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284514 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 13:15:55 -0000 Author: bz Date: Wed Jun 17 13:15:54 2015 New Revision: 284514 URL: https://svnweb.freebsd.org/changeset/base/284514 Log: Initialise pr_enforce_statfs from the "default" sysctl value and not from the compile time constant. The sysctl value is seeded from the compile time constant. MFC after: 2 weeks Modified: head/sys/kern/kern_jail.c Modified: head/sys/kern/kern_jail.c ============================================================================== --- head/sys/kern/kern_jail.c Wed Jun 17 12:28:13 2015 (r284513) +++ head/sys/kern/kern_jail.c Wed Jun 17 13:15:54 2015 (r284514) @@ -1331,7 +1331,7 @@ kern_jail_set(struct thread *td, struct pr->pr_securelevel = ppr->pr_securelevel; pr->pr_allow = JAIL_DEFAULT_ALLOW & ppr->pr_allow; - pr->pr_enforce_statfs = JAIL_DEFAULT_ENFORCE_STATFS; + pr->pr_enforce_statfs = jail_default_enforce_statfs; pr->pr_devfs_rsnum = ppr->pr_devfs_rsnum; pr->pr_osreldate = osreldt ? osreldt : ppr->pr_osreldate; From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 15:20:18 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B7040F83; Wed, 17 Jun 2015 15:20:18 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A3FA1367; Wed, 17 Jun 2015 15:20:18 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5HFKIsx048998; Wed, 17 Jun 2015 15:20:18 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5HFKFXg048980; Wed, 17 Jun 2015 15:20:15 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201506171520.t5HFKFXg048980@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Wed, 17 Jun 2015 15:20:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284515 - in head/sys: netinet netinet6 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 15:20:18 -0000 Author: tuexen Date: Wed Jun 17 15:20:14 2015 New Revision: 284515 URL: https://svnweb.freebsd.org/changeset/base/284515 Log: Add FIB support for SCTP. This fixes https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=200379 MFC after: 3 days Modified: head/sys/netinet/sctp_asconf.c head/sys/netinet/sctp_input.c head/sys/netinet/sctp_input.h head/sys/netinet/sctp_os_bsd.h head/sys/netinet/sctp_output.c head/sys/netinet/sctp_output.h head/sys/netinet/sctp_pcb.c head/sys/netinet/sctp_pcb.h head/sys/netinet/sctp_usrreq.c head/sys/netinet/sctputil.c head/sys/netinet/sctputil.h head/sys/netinet6/sctp6_usrreq.c Modified: head/sys/netinet/sctp_asconf.c ============================================================================== --- head/sys/netinet/sctp_asconf.c Wed Jun 17 13:15:54 2015 (r284514) +++ head/sys/netinet/sctp_asconf.c Wed Jun 17 15:20:14 2015 (r284515) @@ -1109,7 +1109,8 @@ sctp_path_check_and_react(struct sctp_tc * not be changed. */ SCTP_RTALLOC((sctp_route_t *) & net->ro, - stcb->sctp_ep->def_vrf_id); + stcb->sctp_ep->def_vrf_id, + stcb->sctp_ep->fibnum); if (net->ro.ro_rt == NULL) continue; Modified: head/sys/netinet/sctp_input.c ============================================================================== --- head/sys/netinet/sctp_input.c Wed Jun 17 13:15:54 2015 (r284514) +++ head/sys/netinet/sctp_input.c Wed Jun 17 15:20:14 2015 (r284515) @@ -186,7 +186,7 @@ sctp_handle_init(struct mbuf *m, int iph op_err = sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code), "No listener"); sctp_send_abort(m, iphlen, src, dst, sh, 0, op_err, - mflowtype, mflowid, + mflowtype, mflowid, inp->fibnum, vrf_id, port); } goto outnow; @@ -1484,7 +1484,7 @@ sctp_process_cookie_existing(struct mbuf sctp_send_shutdown_ack(stcb, stcb->asoc.primary_destination); op_err = sctp_generate_cause(SCTP_CAUSE_COOKIE_IN_SHUTDOWN, ""); sctp_send_operr_to(src, dst, sh, cookie->peers_vtag, op_err, - mflowtype, mflowid, + mflowtype, mflowid, inp->fibnum, vrf_id, net->port); if (how_indx < sizeof(asoc->cookie_how)) asoc->cookie_how[how_indx] = 2; @@ -1694,7 +1694,7 @@ sctp_process_cookie_existing(struct mbuf */ op_err = sctp_generate_cause(SCTP_CAUSE_NAT_COLLIDING_STATE, ""); sctp_send_abort(m, iphlen, src, dst, sh, 0, op_err, - mflowtype, mflowid, + mflowtype, mflowid, inp->fibnum, vrf_id, port); return (NULL); } @@ -2572,7 +2572,7 @@ sctp_handle_cookie_echo(struct mbuf *m, tim = now.tv_usec - cookie->time_entered.tv_usec; scm->time_usec = htonl(tim); sctp_send_operr_to(src, dst, sh, cookie->peers_vtag, op_err, - mflowtype, mflowid, + mflowtype, mflowid, l_inp->fibnum, vrf_id, port); return (NULL); } @@ -2794,6 +2794,7 @@ sctp_handle_cookie_echo(struct mbuf *m, inp->partial_delivery_point = (*inp_p)->partial_delivery_point; inp->sctp_context = (*inp_p)->sctp_context; inp->local_strreset_support = (*inp_p)->local_strreset_support; + inp->fibnum = (*inp_p)->fibnum; inp->inp_starting_point_for_iterator = NULL; /* * copy in the authentication parameters from the @@ -4404,7 +4405,7 @@ __attribute__((noinline)) struct sockaddr *src, struct sockaddr *dst, struct sctphdr *sh, struct sctp_chunkhdr *ch, struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct sctp_nets **netp, int *fwd_tsn_seen, - uint8_t mflowtype, uint32_t mflowid, + uint8_t mflowtype, uint32_t mflowid, uint16_t fibnum, uint32_t vrf_id, uint16_t port) { struct sctp_association *asoc; @@ -4568,7 +4569,7 @@ __attribute__((noinline)) msg); /* no association, so it's out of the blue... */ sctp_handle_ootb(m, iphlen, *offset, src, dst, sh, inp, op_err, - mflowtype, mflowid, + mflowtype, mflowid, inp->fibnum, vrf_id, port); *offset = length; if (locked_tcb) { @@ -4612,7 +4613,7 @@ __attribute__((noinline)) msg); sctp_handle_ootb(m, iphlen, *offset, src, dst, sh, inp, op_err, - mflowtype, mflowid, + mflowtype, mflowid, fibnum, vrf_id, port); return (NULL); } @@ -5622,7 +5623,7 @@ sctp_common_input_processing(struct mbuf uint8_t compute_crc, #endif uint8_t ecn_bits, - uint8_t mflowtype, uint32_t mflowid, + uint8_t mflowtype, uint32_t mflowid, uint16_t fibnum, uint32_t vrf_id, uint16_t port) { uint32_t high_tsn; @@ -5701,7 +5702,7 @@ sctp_common_input_processing(struct mbuf } if (ch->chunk_type == SCTP_SHUTDOWN_ACK) { sctp_send_shutdown_complete2(src, dst, sh, - mflowtype, mflowid, + mflowtype, mflowid, fibnum, vrf_id, port); goto out; } @@ -5716,7 +5717,7 @@ sctp_common_input_processing(struct mbuf "Out of the blue"); sctp_send_abort(m, iphlen, src, dst, sh, 0, op_err, - mflowtype, mflowid, + mflowtype, mflowid, fibnum, vrf_id, port); } } @@ -5775,7 +5776,7 @@ sctp_common_input_processing(struct mbuf op_err = sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code), msg); sctp_handle_ootb(m, iphlen, offset, src, dst, sh, inp, op_err, - mflowtype, mflowid, + mflowtype, mflowid, inp->fibnum, vrf_id, port); goto out; } @@ -5786,7 +5787,7 @@ sctp_common_input_processing(struct mbuf stcb = sctp_process_control(m, iphlen, &offset, length, src, dst, sh, ch, inp, stcb, &net, &fwd_tsn_seen, - mflowtype, mflowid, + mflowtype, mflowid, fibnum, vrf_id, port); if (stcb) { /* @@ -5827,7 +5828,7 @@ sctp_common_input_processing(struct mbuf op_err = sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code), msg); sctp_handle_ootb(m, iphlen, offset, src, dst, sh, inp, op_err, - mflowtype, mflowid, + mflowtype, mflowid, fibnum, vrf_id, port); goto out; } @@ -5899,7 +5900,7 @@ sctp_common_input_processing(struct mbuf op_err = sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code), msg); sctp_handle_ootb(m, iphlen, offset, src, dst, sh, inp, op_err, - mflowtype, mflowid, + mflowtype, mflowid, inp->fibnum, vrf_id, port); goto out; /* sa_ignore NOTREACHED */ @@ -6023,6 +6024,7 @@ sctp_input_with_port(struct mbuf *i_pak, #endif uint32_t mflowid; uint8_t mflowtype; + uint16_t fibnum; iphlen = off; if (SCTP_GET_PKT_VRFID(i_pak, vrf_id)) { @@ -6048,6 +6050,7 @@ sctp_input_with_port(struct mbuf *i_pak, (int)m->m_pkthdr.csum_flags, CSUM_BITS); mflowid = m->m_pkthdr.flowid; mflowtype = M_HASHTYPE_GET(m); + fibnum = M_GETFIB(m); SCTP_STAT_INCR(sctps_recvpackets); SCTP_STAT_INCR_COUNTER64(sctps_inpackets); /* Get IP, SCTP, and first chunk header together in the first mbuf. */ @@ -6107,7 +6110,7 @@ sctp_input_with_port(struct mbuf *i_pak, compute_crc, #endif ecn_bits, - mflowtype, mflowid, + mflowtype, mflowid, fibnum, vrf_id, port); out: if (m) { Modified: head/sys/netinet/sctp_input.h ============================================================================== --- head/sys/netinet/sctp_input.h Wed Jun 17 13:15:54 2015 (r284514) +++ head/sys/netinet/sctp_input.h Wed Jun 17 15:20:14 2015 (r284515) @@ -45,7 +45,7 @@ sctp_common_input_processing(struct mbuf uint8_t, #endif uint8_t, - uint8_t, uint32_t, + uint8_t, uint32_t, uint16_t, uint32_t, uint16_t); struct sctp_stream_reset_request * Modified: head/sys/netinet/sctp_os_bsd.h ============================================================================== --- head/sys/netinet/sctp_os_bsd.h Wed Jun 17 13:15:54 2015 (r284514) +++ head/sys/netinet/sctp_os_bsd.h Wed Jun 17 15:20:14 2015 (r284515) @@ -413,13 +413,8 @@ typedef struct callout sctp_os_timer_t; typedef struct route sctp_route_t; typedef struct rtentry sctp_rtentry_t; -/* - * XXX multi-FIB support was backed out in r179783 and it seems clear that the - * VRF support as currently in FreeBSD is not ready to support multi-FIB. - * It might be best to implement multi-FIB support for both v4 and v6 indepedent - * of VRFs and leave those to a real MPLS stack. - */ -#define SCTP_RTALLOC(ro, vrf_id) rtalloc_ign((struct route *)ro, 0UL) +#define SCTP_RTALLOC(ro, vrf_id, fibnum) \ + rtalloc_ign_fib((struct route *)ro, 0UL, fibnum) /* Future zero copy wakeup/send function */ #define SCTP_ZERO_COPY_EVENT(inp, so) Modified: head/sys/netinet/sctp_output.c ============================================================================== --- head/sys/netinet/sctp_output.c Wed Jun 17 13:15:54 2015 (r284514) +++ head/sys/netinet/sctp_output.c Wed Jun 17 15:20:14 2015 (r284515) @@ -3389,7 +3389,7 @@ sctp_source_address_selection(struct sct /* * Need a route to cache. */ - SCTP_RTALLOC(ro, vrf_id); + SCTP_RTALLOC(ro, vrf_id, inp->fibnum); } if (ro->ro_rt == NULL) { return (NULL); @@ -4170,7 +4170,7 @@ sctp_lowlevel_chunk_output(struct sctp_i sctp_free_ifa(_lsrc); } else { ip->ip_src = over_addr->sin.sin_addr; - SCTP_RTALLOC(ro, vrf_id); + SCTP_RTALLOC(ro, vrf_id, inp->fibnum); } } if (port) { @@ -4484,7 +4484,7 @@ sctp_lowlevel_chunk_output(struct sctp_i sctp_free_ifa(_lsrc); } else { lsa6->sin6_addr = over_addr->sin6.sin6_addr; - SCTP_RTALLOC(ro, vrf_id); + SCTP_RTALLOC(ro, vrf_id, inp->fibnum); } (void)sa6_recoverscope(sin6); } @@ -5511,7 +5511,7 @@ sctp_send_initiate_ack(struct sctp_inpcb op_err = sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code), "Address added"); sctp_send_abort(init_pkt, iphlen, src, dst, sh, 0, op_err, - mflowtype, mflowid, + mflowtype, mflowid, inp->fibnum, vrf_id, port); return; } @@ -5530,7 +5530,7 @@ do_a_abort: } sctp_send_abort(init_pkt, iphlen, src, dst, sh, init_chk->init.initiate_tag, op_err, - mflowtype, mflowid, + mflowtype, mflowid, inp->fibnum, vrf_id, port); return; } @@ -10839,7 +10839,7 @@ static void sctp_send_resp_msg(struct sockaddr *src, struct sockaddr *dst, struct sctphdr *sh, uint32_t vtag, uint8_t type, struct mbuf *cause, - uint8_t mflowtype, uint32_t mflowid, + uint8_t mflowtype, uint32_t mflowid, uint16_t fibnum, uint32_t vrf_id, uint16_t port) { struct mbuf *o_pak; @@ -10919,6 +10919,7 @@ sctp_send_resp_msg(struct sockaddr *src, SCTP_BUF_RESV_UF(mout, max_linkhdr); SCTP_BUF_LEN(mout) = len; SCTP_BUF_NEXT(mout) = cause; + M_SETFIB(mout, fibnum); mout->m_pkthdr.flowid = mflowid; M_HASHTYPE_SET(mout, mflowtype); #ifdef INET @@ -11106,11 +11107,11 @@ sctp_send_resp_msg(struct sockaddr *src, void sctp_send_shutdown_complete2(struct sockaddr *src, struct sockaddr *dst, struct sctphdr *sh, - uint8_t mflowtype, uint32_t mflowid, + uint8_t mflowtype, uint32_t mflowid, uint16_t fibnum, uint32_t vrf_id, uint16_t port) { sctp_send_resp_msg(src, dst, sh, 0, SCTP_SHUTDOWN_COMPLETE, NULL, - mflowtype, mflowid, + mflowtype, mflowid, fibnum, vrf_id, port); } @@ -11929,7 +11930,7 @@ skip_stuff: void sctp_send_abort(struct mbuf *m, int iphlen, struct sockaddr *src, struct sockaddr *dst, struct sctphdr *sh, uint32_t vtag, struct mbuf *cause, - uint8_t mflowtype, uint32_t mflowid, + uint8_t mflowtype, uint32_t mflowid, uint16_t fibnum, uint32_t vrf_id, uint16_t port) { /* Don't respond to an ABORT with an ABORT. */ @@ -11939,7 +11940,7 @@ sctp_send_abort(struct mbuf *m, int iphl return; } sctp_send_resp_msg(src, dst, sh, vtag, SCTP_ABORT_ASSOCIATION, cause, - mflowtype, mflowid, + mflowtype, mflowid, fibnum, vrf_id, port); return; } @@ -11947,11 +11948,11 @@ sctp_send_abort(struct mbuf *m, int iphl void sctp_send_operr_to(struct sockaddr *src, struct sockaddr *dst, struct sctphdr *sh, uint32_t vtag, struct mbuf *cause, - uint8_t mflowtype, uint32_t mflowid, + uint8_t mflowtype, uint32_t mflowid, uint16_t fibnum, uint32_t vrf_id, uint16_t port) { sctp_send_resp_msg(src, dst, sh, vtag, SCTP_OPERATION_ERROR, cause, - mflowtype, mflowid, + mflowtype, mflowid, fibnum, vrf_id, port); return; } Modified: head/sys/netinet/sctp_output.h ============================================================================== --- head/sys/netinet/sctp_output.h Wed Jun 17 13:15:54 2015 (r284514) +++ head/sys/netinet/sctp_output.h Wed Jun 17 15:20:14 2015 (r284515) @@ -117,7 +117,7 @@ void sctp_send_shutdown_complete(struct void sctp_send_shutdown_complete2(struct sockaddr *, struct sockaddr *, struct sctphdr *, - uint8_t, uint32_t, + uint8_t, uint32_t, uint16_t, uint32_t, uint16_t); void sctp_send_asconf(struct sctp_tcb *, struct sctp_nets *, int addr_locked); @@ -187,13 +187,13 @@ sctp_send_str_reset_req(struct sctp_tcb void sctp_send_abort(struct mbuf *, int, struct sockaddr *, struct sockaddr *, struct sctphdr *, uint32_t, struct mbuf *, - uint8_t, uint32_t, + uint8_t, uint32_t, uint16_t, uint32_t, uint16_t); void sctp_send_operr_to(struct sockaddr *, struct sockaddr *, struct sctphdr *, uint32_t, struct mbuf *, - uint8_t, uint32_t, + uint8_t, uint32_t, uint16_t, uint32_t, uint16_t); #endif /* _KERNEL || __Userspace__ */ Modified: head/sys/netinet/sctp_pcb.c ============================================================================== --- head/sys/netinet/sctp_pcb.c Wed Jun 17 13:15:54 2015 (r284514) +++ head/sys/netinet/sctp_pcb.c Wed Jun 17 15:20:14 2015 (r284515) @@ -2485,6 +2485,7 @@ sctp_inpcb_alloc(struct socket *so, uint inp->reconfig_supported = (uint8_t) SCTP_BASE_SYSCTL(sctp_reconfig_enable); inp->nrsack_supported = (uint8_t) SCTP_BASE_SYSCTL(sctp_nrsack_enable); inp->pktdrop_supported = (uint8_t) SCTP_BASE_SYSCTL(sctp_pktdrop_enable); + inp->fibnum = so->so_fibnum; /* init the small hash table we use to track asocid <-> tcb */ inp->sctp_asocidhash = SCTP_HASH_INIT(SCTP_STACK_VTAG_HASH_SIZE, &inp->hashasocidmark); if (inp->sctp_asocidhash == NULL) { @@ -3949,7 +3950,9 @@ sctp_add_remote_addr(struct sctp_tcb *st sin6->sin6_scope_id = 0; } #endif - SCTP_RTALLOC((sctp_route_t *) & net->ro, stcb->asoc.vrf_id); + SCTP_RTALLOC((sctp_route_t *) & net->ro, + stcb->asoc.vrf_id, + stcb->sctp_ep->fibnum); if (SCTP_ROUTE_HAS_VALID_IFN(&net->ro)) { /* Get source address */ Modified: head/sys/netinet/sctp_pcb.h ============================================================================== --- head/sys/netinet/sctp_pcb.h Wed Jun 17 13:15:54 2015 (r284514) +++ head/sys/netinet/sctp_pcb.h Wed Jun 17 15:20:14 2015 (r284515) @@ -430,6 +430,7 @@ struct sctp_inpcb { struct mtx inp_rdata_mtx; int32_t refcount; uint32_t def_vrf_id; + uint16_t fibnum; uint32_t total_sends; uint32_t total_recvs; uint32_t last_abort_code; Modified: head/sys/netinet/sctp_usrreq.c ============================================================================== --- head/sys/netinet/sctp_usrreq.c Wed Jun 17 13:15:54 2015 (r284514) +++ head/sys/netinet/sctp_usrreq.c Wed Jun 17 15:20:14 2015 (r284515) @@ -6712,7 +6712,20 @@ sctp_ctloutput(struct socket *so, struct size_t optsize = 0; void *p; int error = 0; + struct sctp_inpcb *inp; + if ((sopt->sopt_level == SOL_SOCKET) && + (sopt->sopt_name == SO_SETFIB)) { + inp = (struct sctp_inpcb *)so->so_pcb; + if (inp == NULL) { + SCTP_LTRACE_ERR_RET(so->so_pcb, NULL, NULL, SCTP_FROM_SCTP_USRREQ, ENOBUFS); + return (EINVAL); + } + SCTP_INP_WLOCK(inp); + inp->fibnum = so->so_fibnum; + SCTP_INP_WUNLOCK(inp); + return (0); + } if (sopt->sopt_level != IPPROTO_SCTP) { /* wrong proto level... send back up to IP */ #ifdef INET6 Modified: head/sys/netinet/sctputil.c ============================================================================== --- head/sys/netinet/sctputil.c Wed Jun 17 13:15:54 2015 (r284514) +++ head/sys/netinet/sctputil.c Wed Jun 17 15:20:14 2015 (r284515) @@ -3895,7 +3895,7 @@ sctp_abort_association(struct sctp_inpcb stcb->asoc.state |= SCTP_STATE_WAS_ABORTED; } sctp_send_abort(m, iphlen, src, dst, sh, vtag, op_err, - mflowtype, mflowid, + mflowtype, mflowid, inp->fibnum, vrf_id, port); if (stcb != NULL) { /* Ok, now lets free it */ @@ -4051,7 +4051,7 @@ sctp_handle_ootb(struct mbuf *m, int iph struct sockaddr *src, struct sockaddr *dst, struct sctphdr *sh, struct sctp_inpcb *inp, struct mbuf *cause, - uint8_t mflowtype, uint32_t mflowid, + uint8_t mflowtype, uint32_t mflowid, uint16_t fibnum, uint32_t vrf_id, uint16_t port) { struct sctp_chunkhdr *ch, chunk_buf; @@ -4093,7 +4093,7 @@ sctp_handle_ootb(struct mbuf *m, int iph return; case SCTP_SHUTDOWN_ACK: sctp_send_shutdown_complete2(src, dst, sh, - mflowtype, mflowid, + mflowtype, mflowid, fibnum, vrf_id, port); return; default: @@ -4107,7 +4107,7 @@ sctp_handle_ootb(struct mbuf *m, int iph ((SCTP_BASE_SYSCTL(sctp_blackhole) == 1) && (contains_init_chunk == 0))) { sctp_send_abort(m, iphlen, src, dst, sh, 0, cause, - mflowtype, mflowid, + mflowtype, mflowid, fibnum, vrf_id, port); } } Modified: head/sys/netinet/sctputil.h ============================================================================== --- head/sys/netinet/sctputil.h Wed Jun 17 13:15:54 2015 (r284514) +++ head/sys/netinet/sctputil.h Wed Jun 17 15:20:14 2015 (r284515) @@ -208,7 +208,7 @@ sctp_handle_ootb(struct mbuf *, int, int struct sockaddr *, struct sockaddr *, struct sctphdr *, struct sctp_inpcb *, struct mbuf *, - uint8_t, uint32_t, + uint8_t, uint32_t, uint16_t, uint32_t, uint16_t); int Modified: head/sys/netinet6/sctp6_usrreq.c ============================================================================== --- head/sys/netinet6/sctp6_usrreq.c Wed Jun 17 13:15:54 2015 (r284514) +++ head/sys/netinet6/sctp6_usrreq.c Wed Jun 17 15:20:14 2015 (r284515) @@ -84,6 +84,7 @@ sctp6_input_with_port(struct mbuf **i_pa #endif uint32_t mflowid; uint8_t mflowtype; + uint16_t fibnum; iphlen = *offp; if (SCTP_GET_PKT_VRFID(*i_pak, vrf_id)) { @@ -109,6 +110,7 @@ sctp6_input_with_port(struct mbuf **i_pa (int)m->m_pkthdr.csum_flags, CSUM_BITS); mflowid = m->m_pkthdr.flowid; mflowtype = M_HASHTYPE_GET(m); + fibnum = M_GETFIB(m); SCTP_STAT_INCR(sctps_recvpackets); SCTP_STAT_INCR_COUNTER64(sctps_inpackets); /* Get IP, SCTP, and first chunk header together in the first mbuf. */ @@ -169,7 +171,7 @@ sctp6_input_with_port(struct mbuf **i_pa compute_crc, #endif ecn_bits, - mflowtype, mflowid, + mflowtype, mflowid, fibnum, vrf_id, port); out: if (m) { From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 16:21:48 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BFF1313B; Wed, 17 Jun 2015 16:21:48 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from mx1.sbone.de (bird.sbone.de [46.4.1.90]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 76EAD884; Wed, 17 Jun 2015 16:21:47 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 8CDD525D37D1; Wed, 17 Jun 2015 16:21:38 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id C6E5CC76FD3; Wed, 17 Jun 2015 16:21:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id fcScq5MdudIJ; Wed, 17 Jun 2015 16:21:36 +0000 (UTC) Received: from [IPv6:fde9:577b:c1a9:4420:cabc:c8ff:fe8b:4fe6] (orange-tun0-ula.sbone.de [IPv6:fde9:577b:c1a9:4420:cabc:c8ff:fe8b:4fe6]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id F117BC76FCE; Wed, 17 Jun 2015 16:21:35 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Subject: Re: svn commit: r284511 - head/sys/cddl/contrib/opensolaris/uts/common/sys From: "Bjoern A. Zeeb" In-Reply-To: <201506171205.t5HC55LI051741@svn.freebsd.org> Date: Wed, 17 Jun 2015 16:21:32 +0000 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: 7bit Message-Id: <69188D63-8318-42A2-85DD-766A88EAEC8D@FreeBSD.org> References: <201506171205.t5HC55LI051741@svn.freebsd.org> To: Andriy Gapon X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 16:21:48 -0000 > On 17 Jun 2015, at 12:05 , Andriy Gapon wrote: > > Author: avg > Date: Wed Jun 17 12:05:04 2015 > New Revision: 284511 > URL: https://svnweb.freebsd.org/changeset/base/284511 > > Log: > illumos compat: use flsl/flsll for highbit/highbit64 > > This is a micro optimization. > The upstream code uses the binary search. > > Differential Revision: https://reviews.freebsd.org/D2839 > Reviewed by: delphij, mav > MFC after: 15 days This broke builds. powerpc, sparc64, i386, pc98 to my best knowledge. From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 17:16:07 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7790EDFB; Wed, 17 Jun 2015 17:16:07 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 65D978D1; Wed, 17 Jun 2015 17:16:07 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5HHG7rv009175; Wed, 17 Jun 2015 17:16:07 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5HHG7ec009174; Wed, 17 Jun 2015 17:16:07 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201506171716.t5HHG7ec009174@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Wed, 17 Jun 2015 17:16:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284520 - head/sys/cddl/contrib/opensolaris/uts/common/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 17:16:07 -0000 Author: avg Date: Wed Jun 17 17:16:06 2015 New Revision: 284520 URL: https://svnweb.freebsd.org/changeset/base/284520 Log: Revert r284511 because it caused build failures on many platforms The problem is that when inline versions of flsl and flsll are not available, then libkern.h must be included for their declarations in kernel sources. The fix would be trivial, but I would like to figure out first if it even makes sense to use the libkern provided implementations. Reported by: bz Pointyhat to: avg Modified: head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h Modified: head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h Wed Jun 17 17:11:44 2015 (r284519) +++ head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h Wed Jun 17 17:16:06 2015 (r284520) @@ -32,13 +32,6 @@ #include #include -#ifdef __FreeBSD__ -#ifdef _KERNEL -#include -#else -#include -#endif -#endif #ifdef __cplusplus extern "C" { @@ -389,9 +382,6 @@ extern unsigned char bcd_to_byte[256]; static __inline int highbit(ulong_t i) { -#ifdef __FreeBSD__ - return (flsl(i)); -#else register int h = 1; if (i == 0) @@ -417,7 +407,6 @@ highbit(ulong_t i) h += 1; } return (h); -#endif } /* @@ -427,9 +416,6 @@ highbit(ulong_t i) static __inline int highbit64(uint64_t i) { -#ifdef __FreeBSD__ - return (flsll(i)); -#else int h = 1; if (i == 0) @@ -453,7 +439,6 @@ highbit64(uint64_t i) h += 1; } return (h); -#endif } #ifdef __cplusplus From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 19:26:24 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F261519; Wed, 17 Jun 2015 19:26:24 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3CDE412D; Wed, 17 Jun 2015 19:26:24 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5HJQOXN081251; Wed, 17 Jun 2015 19:26:24 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5HJQOs0081249; Wed, 17 Jun 2015 19:26:24 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201506171926.t5HJQOs0081249@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Wed, 17 Jun 2015 19:26:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284526 - head/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 19:26:24 -0000 Author: tuexen Date: Wed Jun 17 19:26:23 2015 New Revision: 284526 URL: https://svnweb.freebsd.org/changeset/base/284526 Log: Fix a bug related to flow assignment I introduce in https://svnweb.freebsd.org/base?view=revision&revision=275483 MFC after: 3 days Modified: head/sys/netinet/sctp_input.c Modified: head/sys/netinet/sctp_input.c ============================================================================== --- head/sys/netinet/sctp_input.c Wed Jun 17 19:13:13 2015 (r284525) +++ head/sys/netinet/sctp_input.c Wed Jun 17 19:26:23 2015 (r284526) @@ -2676,8 +2676,9 @@ sctp_handle_cookie_echo(struct mbuf *m, /* still no TCB... must be bad cookie-echo */ return (NULL); } - if ((*netp != NULL) && (mflowtype != M_HASHTYPE_NONE)) { + if (*netp != NULL) { (*netp)->flowtype = mflowtype; + (*netp)->flowid = mflowid; } /* * Ok, we built an association so confirm the address we sent the @@ -5662,8 +5663,9 @@ sctp_common_input_processing(struct mbuf net->port = port; } #endif - if ((net != NULL) && (mflowtype != M_HASHTYPE_NONE)) { + if (net != NULL) { net->flowtype = mflowtype; + net->flowid = mflowid; } if ((inp != NULL) && (stcb != NULL)) { sctp_send_packet_dropped(stcb, net, m, length, iphlen, 1); @@ -5692,8 +5694,9 @@ sctp_common_input_processing(struct mbuf net->port = port; } #endif - if ((net != NULL) && (mflowtype != M_HASHTYPE_NONE)) { + if (net != NULL) { net->flowtype = mflowtype; + net->flowid = mflowid; } if (inp == NULL) { SCTP_STAT_INCR(sctps_noport); From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 19:28:34 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A47C56ED; Wed, 17 Jun 2015 19:28:34 +0000 (UTC) (envelope-from hiren@strugglingcoder.info) Received: from mail.strugglingcoder.info (strugglingcoder.info [65.19.130.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 80E5015F; Wed, 17 Jun 2015 19:28:34 +0000 (UTC) (envelope-from hiren@strugglingcoder.info) Received: from localhost (unknown [10.1.1.3]) (Authenticated sender: hiren@strugglingcoder.info) by mail.strugglingcoder.info (Postfix) with ESMTPSA id AA3CF10C369; Wed, 17 Jun 2015 12:28:33 -0700 (PDT) Date: Wed, 17 Jun 2015 12:28:33 -0700 From: hiren panchasara To: Bryan Drewery Cc: Steve Kargl , Craig Rodrigues , Marcel Moolenaar , Marcel Moolenaar , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284198 - head/bin/ls Message-ID: <20150617192833.GD53336@strugglingcoder.info> References: <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> <20150614012924.GA2965@troutmask.apl.washington.edu> <557F021C.1000509@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Xm/fll+QQv+hsKip" Content-Disposition: inline In-Reply-To: <557F021C.1000509@FreeBSD.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 19:28:34 -0000 --Xm/fll+QQv+hsKip Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 06/15/15 at 12:49P, Bryan Drewery wrote: > On 6/13/15 9:29 PM, Steve Kargl wrote: > > On Sat, Jun 13, 2015 at 05:40:59PM -0700, Craig Rodrigues wrote: > >> On Sat, Jun 13, 2015 at 5:26 PM, Steve Kargl < > >> sgk@troutmask.apl.washington.edu> wrote: > >>> > >>> Given the horrid state of the manpages, which I showed > >>> in March, one can only wonder about the internals of > >>> the libxo itself. > >>> > >> > >> Are you talking about this comment you made? > >> https://lists.freebsd.org/pipermail/freebsd-current/2015-March/054899.= html > >> > >> I can't make heads or tails of what you wrote, other than you seemed v= ery > >> angry. > >> > >=20 > > I wasn't very angry. I'm simply pointing out that the libxo > > manpages, which should document what libxo is/does, are=20 > > horrible documentation. If the quality of the manpages=20 > > matches the quality of library, and the brokeness that > > we have been witnesses bears this out, should be questioned. > >=20 > > % cd src/contrib/libxo/libxo > > % grep Nd *.3 | grep formatted > > xo_attr.3:.Nd emit formatted output based on format string and arguments > > xo_create.3:.Nd emit formatted output based on format string and argume= nts > > xo_emit.3:.Nd emit formatted output based on format string and arguments > > xo_finish.3:.Nd emit formatted output based on format string and argume= nts > > xo_flush.3:.Nd emit formatted output based on format string and argumen= ts > > xo_open_list.3:.Nd emit formatted output based on format string and arg= uments > > xo_set_allocator.3:.Nd emit formatted output based on format string and= arguments > > xo_set_flags.3:.Nd emit formatted output based on format string and arg= uments > > xo_set_info.3:.Nd emit formatted output based on format string and argu= ments > > xo_set_style.3:.Nd emit formatted output based on format string and arg= uments > > xo_set_writer.3:.Nd emit formatted output based on format string and ar= guments > >=20 > > Do you really believe that the Nd entries for these manpages are > > correct? > >=20 >=20 > I also found that from simple 'man ls' (etc) there is no real mention of > what --libxo even is or how it works. Following the manpage > cross-references leads me to have to go to a webpage to see what params > --libxo even takes. The --libxo flag needs much more documentation in > these manpages. Sorry if I've missed it but has any of the libxo proponents signed up to fix the documentation part? Cheers, Hiren --Xm/fll+QQv+hsKip Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQF8BAEBCgBmBQJVgcphXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNEUyMEZBMUQ4Nzg4RjNGMTdFNjZGMDI4 QjkyNTBFMTU2M0VERkU1AAoJEIuSUOFWPt/lasgH+wUOUpXpAl3fQ+aVsCblnRKv O2fjyIhDhwbn3QF3yaOdsLYoPV+Ce6VwQVoQzyToCv0q/6eMaXK3QTx8YMwKrOYr V55kSfACBtxkAxgcvBavT/kBKwDjbdJyWdjmxFHSJB0xIPSdsG4nb8EwZ9J7uetW IkE56ntZWW8gRSF+i54lGkKv8YfCi/l5oxatrmcTMQ1RVE+eJQG3rbk7R54Y4QqY iyDaVeXYyQse0ylnoIYa0yGiMwWtEX4MD30QzSjCXYzCCFLRl+MHY/5ysncvVJBQ YLoAescQPVyAjhXYeWspNqRGxMWvcLBu0IGAZ/WNv0UytQ6lGjqQFc1VzFkUxyM= =D9Lq -----END PGP SIGNATURE----- --Xm/fll+QQv+hsKip-- From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 20:29:25 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE7CD6E8; Wed, 17 Jun 2015 20:29:25 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-yk0-x230.google.com (mail-yk0-x230.google.com [IPv6:2607:f8b0:4002:c07::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 86834243; Wed, 17 Jun 2015 20:29:25 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: by ykdr198 with SMTP id r198so50169022ykd.3; Wed, 17 Jun 2015 13:29:24 -0700 (PDT) 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=AoEceAaK/W6FiyWDG2+tZEC6TD9AUeK5UJmYzUp6XOs=; b=Wsg+COqvG1RUDYW9wskMfbE3epPyFPGZuKdGv2ynW0YOvIv45KAufzLYzKJRAZkzzY PJP2432VvJxRIm3dE4Nsb6+hLKPXnV6i+mdEnqxO+VTFT6C6dwGvqsA9BgdQAYp9W+I7 rSmruydZlODXy7LIeQcHIHQWmMKZe7XmKeET3oO+UlNhI77gx+7ZyYEjDT68w5hHar0d ZA2D2Bm1YmOh+mp7roYknnGCxKlTBCyzI7W1YN7DMQpQnsTakWFqBdAKsKCJ3sszUvOZ J9oSof+f9VsOOWkeEKWpZIj1J6pU99Ft7frew2/idmFBFxtvkQoTPLjQcLJwFXWNkuJZ uwqw== MIME-Version: 1.0 X-Received: by 10.129.136.135 with SMTP id y129mr9420717ywf.111.1434572964596; Wed, 17 Jun 2015 13:29:24 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.37.39.130 with HTTP; Wed, 17 Jun 2015 13:29:24 -0700 (PDT) In-Reply-To: <20150617192833.GD53336@strugglingcoder.info> References: <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> <20150614012924.GA2965@troutmask.apl.washington.edu> <557F021C.1000509@FreeBSD.org> <20150617192833.GD53336@strugglingcoder.info> Date: Wed, 17 Jun 2015 13:29:24 -0700 X-Google-Sender-Auth: H4f1viLuhfLwSOy9-rZ4TivFAFo Message-ID: Subject: Re: svn commit: r284198 - head/bin/ls From: Craig Rodrigues To: hiren panchasara Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 20:29:26 -0000 On Wed, Jun 17, 2015 at 12:28 PM, hiren panchasara < hiren@strugglingcoder.info> wrote: > > Sorry if I've missed it but has any of the libxo proponents signed up to > fix the documentation part? > I'm not signing up to fix the documentation for libxo, but I see bugs, I will file them upstream. I just filed this one based on Steve Kargl's e-mail: https://github.com/Juniper/libxo/issues/43 It would be helpful if folks could file bugs and submit patches to the maintainer via Github if they see problems in the library itself. -- Crai From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 21:20:43 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 207DE989; Wed, 17 Jun 2015 21:20:43 +0000 (UTC) (envelope-from marcel@xcllnt.net) Received: from mail.xcllnt.net (mail.xcllnt.net [50.0.150.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC1041E8; Wed, 17 Jun 2015 21:20:42 +0000 (UTC) (envelope-from marcel@xcllnt.net) Received: from [10.9.32.104] (208.185.168.138.IPYX-104653-ZYO.zip.zayo.com [208.185.168.138] (may be forged)) (authenticated bits=0) by mail.xcllnt.net (8.14.9/8.14.9) with ESMTP id t5HLKY4k035898 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 17 Jun 2015 14:20:35 -0700 (PDT) (envelope-from marcel@xcllnt.net) Subject: Re: svn commit: r284198 - head/bin/ls Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_497FE241-CBF6-4C70-AC5A-48B258041A07"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5b6 From: Marcel Moolenaar In-Reply-To: <20150617192833.GD53336@strugglingcoder.info> Date: Wed, 17 Jun 2015 14:20:28 -0700 Cc: Bryan Drewery , Steve Kargl , Craig Rodrigues , Marcel Moolenaar , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-Id: <0B4F6423-5B33-4463-8771-FFC4F858FF52@xcllnt.net> References: <20150613024916.GA98218@troutmask.apl.washington.edu> <1434208622.1415.57.camel@freebsd.org> <557C661F.8080104@freebsd.org> <860017ED-D754-450C-865D-2D81A30C2212@xcllnt.net> <20150614002640.GA2746@troutmask.apl.washington.edu> <20150614012924.GA2965@troutmask.apl.washington.edu> <557F021C.1000509@FreeBSD.org> <20150617192833.GD53336@strugglingcoder.info> To: hiren panchasara X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 21:20:43 -0000 --Apple-Mail=_497FE241-CBF6-4C70-AC5A-48B258041A07 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Jun 17, 2015, at 12:28 PM, hiren panchasara = wrote: >>=20 >> I also found that from simple 'man ls' (etc) there is no real mention = of >> what --libxo even is or how it works. Following the manpage >> cross-references leads me to have to go to a webpage to see what = params >> --libxo even takes. The --libxo flag needs much more documentation in >> these manpages. >=20 > Sorry if I've missed it but has any of the libxo proponents signed up = to > fix the documentation part? This already been relayed to Phil and said he=E2=80=99ll fix it. -- Marcel Moolenaar marcel@xcllnt.net --Apple-Mail=_497FE241-CBF6-4C70-AC5A-48B258041A07 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJVgeScAAoJEIda8t8f0tjj93EP/if4nVNTP57SE/Gz6hpjZOxj 1PbLQtwpx2cI+IkUhzXc+o1rKK6p2+s59YkUkkGjstTp9ZwuaFX/pBDbrzTMhELY D0AI+dNmxQabbBbMXT4PCxAnUa0+5n/ivjT/Xz8/2kWb4Jp6xwrrmFOH/ZIAZKdl rhGEM3yvJDUa0bCIWubMZnRgWDoKcQUwahLOVCQAWGxiYrfeHuCT5w6ay+h9NX9C 0JNMUgYC6X9ybNEQm+iTpnMnEHw7WfRsAzOxrkxyzhIq873BP4rx+uaZDCKYsTos 3TlhC9mMZzbGq7bqcoZYIX0wcNO5cEyrZvqfr2whmVfEdzasDchyjpoeHwjt1j3x 0mr9a8JpQDUMwuhRxwCMW1cXEd68m7cZ4O93kFkE9ed6Qy8aTm7D3CuOtxkzzcGX eJAnyEcmygMinfy4d7xTPFjXIckyqjpLQe0uBNuRhf30VWCpcBazDw9L4zkp65Wf VB9+2JCDNJ+mulWczjbyUEZQ7QEgIWclvL2BuNStrqgmWShX6C9TX8naOFrvs3Im nRXj6bcc9z1n1ecOSBQAUC0gYkCHU3kchXnyKsBKBo19wotl/MnsAkWfcwfUQtc6 QK0zY+T0MocakJJ407kaoTO6UhDxyVHn52PslbUUfRt5AEXOrAby5lT/4dYti0sB xqgGK/TpqYomuQGP+HZG =mMgs -----END PGP SIGNATURE----- --Apple-Mail=_497FE241-CBF6-4C70-AC5A-48B258041A07-- From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 21:25:37 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 754B9BAC; Wed, 17 Jun 2015 21:25:37 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 62DBE32B; Wed, 17 Jun 2015 21:25:37 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5HLPbIf040446; Wed, 17 Jun 2015 21:25:37 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5HLPbs6040445; Wed, 17 Jun 2015 21:25:37 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201506172125.t5HLPbs6040445@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 17 Jun 2015 21:25:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284527 - head/share/man/man9 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 21:25:37 -0000 Author: imp Date: Wed Jun 17 21:25:36 2015 New Revision: 284527 URL: https://svnweb.freebsd.org/changeset/base/284527 Log: Update style.9 to reflect consensus on developer's mailing list allowing redundant braces. Differential Revision: https://reviews.freebsd.org/D2842 Modified: head/share/man/man9/style.9 Modified: head/share/man/man9/style.9 ============================================================================== --- head/share/man/man9/style.9 Wed Jun 17 19:26:23 2015 (r284526) +++ head/share/man/man9/style.9 Wed Jun 17 21:25:36 2015 (r284527) @@ -503,13 +503,14 @@ Code which is unreachable for non-obviou .Pp Space after keywords .Pq Ic if , while , for , return , switch . -No braces +Two styles of braces .Ql ( \&{ and .Ql \&} ) -are -used for control statements with zero or only a single statement unless that -statement is more than a single line in which case they are permitted. +are allowed for single line statements. +Either they are used for all single statements, or +they are used only where needed for clarity. +Usage within a file should be consistent. Forever loops are done with .Ic for Ns 's , not From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 21:30:04 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 21383DB1; Wed, 17 Jun 2015 21:30:04 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [64.62.153.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "anubis.delphij.net", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 09E34380; Wed, 17 Jun 2015 21:30:03 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from zeta.ixsystems.com (unknown [12.229.62.2]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by anubis.delphij.net (Postfix) with ESMTPSA id 4B0B118B85; Wed, 17 Jun 2015 14:30:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=delphij.net; s=anubis; t=1434576603; x=1434591003; bh=grJoQlKgSdws9jprF4DY1KnOP4FXnLuCvXtZBOaJMEw=; h=Date:From:Reply-To:To:Subject:References:In-Reply-To; b=mwZ23coxwVfo3DCR+dVKUNsRzXrmHs4z1BQYaUgPtmYuArkF2hNSFzwPAJl+9I3XS PCyIt1KIrbP4sIkxHu7bVZOZInhxzPkrypHUt5NvwUM81IkqkkOYkF8ejRrU1/vfsm 33NDNteDqIka7rxF2qjthm4UECap8pOrEEkjj6bM= Message-ID: <5581E6DA.3000109@delphij.net> Date: Wed, 17 Jun 2015 14:30:02 -0700 From: Xin Li Reply-To: d@delphij.net Organization: The FreeBSD Project MIME-Version: 1.0 To: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284527 - head/share/man/man9 References: <201506172125.t5HLPbs6040445@svn.freebsd.org> In-Reply-To: <201506172125.t5HLPbs6040445@svn.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 21:30:04 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On 06/17/15 14:25, Warner Losh wrote: > Author: imp Date: Wed Jun 17 21:25:36 2015 New Revision: 284527 > URL: https://svnweb.freebsd.org/changeset/base/284527 > > Log: Update style.9 to reflect consensus on developer's mailing > list allowing redundant braces. > > Differential Revision: https://reviews.freebsd.org/D2842 Please bump .Dd date... Cheers, - -- Xin LI https://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.1.5 (FreeBSD) iQIcBAEBCgAGBQJVgebaAAoJEJW2GBstM+ns2UoQAI7B2BuhyzewAvDgpfQtDCoi 4cOoCKZcfyaDyXZjsMJgNM0fYEezzNq+YyeV+9I0/lW51GXonSPGQC77znEDxPKN gKoZF9MCVn4x0cDCzcop3PZtVeQQYGtTbs0dDoBbV/gWqQVID/29Q5TYbehiCnvN bDjHLy3ozqnxEddbBp9VnV0GEdDG6RCFfmdAYTOakFMSz6P6bH/7JBl9gMlgK+2a oZVl5HQxcvJQEiwM0JGcjC7eUvVmXH3jnjrJVlavAYOWawyfNaC3Qoh4jmo5McgO H3g31Pc8PA2yiAsaq5pcDZccpFAlRVuIXCwowtul4xdighV/lU4814fwmERYNQLB Sj3UGXOuCGfADpYWeCAPW5V+yZFZj8gfnbIQsopymmcic7xW7he5CcYx3cDrhCWN qXEcoyObDKUC3xBirorsKuOe1o8THYqSCNGsLRm226cTXsXZRL5WbYM34X5kjgS9 o2WkPwB07p83oRW03R9MSG0orkNpgxk8fnP5X2Ri/+U9XH+wSGB4imujlmuJJqvN D+Me8Y7xUVgE+EZSaFMWjmP6us78d1CWgZXnGZKkl+LRKZlUg8HxPagWnAM8baoC R2y9UMj18t2FKZ9JoZClerR4ENaybmEzPxOzTMyw4cc872MDjInwXKEIKfego4lL DuQhU8R8ISyTVcF33yA9 =97nA -----END PGP SIGNATURE----- From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 22:06:28 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B7A684C7; Wed, 17 Jun 2015 22:06:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A53F9E9F; Wed, 17 Jun 2015 22:06:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5HM6SUB060343; Wed, 17 Jun 2015 22:06:28 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5HM6Sd1060342; Wed, 17 Jun 2015 22:06:28 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201506172206.t5HM6Sd1060342@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 17 Jun 2015 22:06:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284528 - head/share/man/man9 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 22:06:28 -0000 Author: imp Date: Wed Jun 17 22:06:27 2015 New Revision: 284528 URL: https://svnweb.freebsd.org/changeset/base/284528 Log: Bump date. Submitted by: Xin Li Modified: head/share/man/man9/style.9 Modified: head/share/man/man9/style.9 ============================================================================== --- head/share/man/man9/style.9 Wed Jun 17 21:25:36 2015 (r284527) +++ head/share/man/man9/style.9 Wed Jun 17 22:06:27 2015 (r284528) @@ -26,7 +26,7 @@ .\" From: @(#)style 1.14 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd January 7, 2010 +.Dd June 17, 2015 .Dt STYLE 9 .Os .Sh NAME From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 22:44:29 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E68FDFC9; Wed, 17 Jun 2015 22:44:29 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D3036AE9; Wed, 17 Jun 2015 22:44:29 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5HMiTm5079838; Wed, 17 Jun 2015 22:44:29 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5HMiShN079772; Wed, 17 Jun 2015 22:44:28 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201506172244.t5HMiShN079772@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 17 Jun 2015 22:44:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284529 - in head/sys: cddl/contrib/opensolaris/uts/common/fs/zfs fs/nfsclient vm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 22:44:30 -0000 Author: glebius Date: Wed Jun 17 22:44:27 2015 New Revision: 284529 URL: https://svnweb.freebsd.org/changeset/base/284529 Log: o Un-inline vm_pager_get_pages(), vm_pager_get_pages_async(). o Provide an extensive set of assertions for input array of pages. o Remove now duplicate assertions from different pagers. Sponsored by: Nginx, Inc. Sponsored by: Netflix Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c head/sys/fs/nfsclient/nfs_clbio.c head/sys/vm/swap_pager.c head/sys/vm/vm_pager.c head/sys/vm/vm_pager.h Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Wed Jun 17 22:06:27 2015 (r284528) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Wed Jun 17 22:44:27 2015 (r284529) @@ -5734,8 +5734,6 @@ zfs_getpages(struct vnode *vp, vm_page_t object = mreq->object; error = 0; - KASSERT(vp->v_object == object, ("mismatching object")); - if (pcount > 1 && zp->z_blksz > PAGESIZE) { startoff = rounddown(IDX_TO_OFF(mreq->pindex), zp->z_blksz); reqstart = OFF_TO_IDX(round_page(startoff)); Modified: head/sys/fs/nfsclient/nfs_clbio.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clbio.c Wed Jun 17 22:06:27 2015 (r284528) +++ head/sys/fs/nfsclient/nfs_clbio.c Wed Jun 17 22:44:27 2015 (r284529) @@ -129,12 +129,6 @@ ncl_getpages(struct vop_getpages_args *a npages = btoc(count); /* - * Since the caller has busied the requested page, that page's valid - * field will not be changed by other threads. - */ - vm_page_assert_xbusied(pages[ap->a_reqpage]); - - /* * If the requested page is partially valid, just return it and * allow the pager to zero-out the blanks. Partially valid pages * can only occur at the file EOF. Modified: head/sys/vm/swap_pager.c ============================================================================== --- head/sys/vm/swap_pager.c Wed Jun 17 22:06:27 2015 (r284528) +++ head/sys/vm/swap_pager.c Wed Jun 17 22:44:27 2015 (r284529) @@ -1118,10 +1118,6 @@ swap_pager_getpages(vm_object_t object, mreq = m[reqpage]; - KASSERT(mreq->object == object, - ("swap_pager_getpages: object mismatch %p/%p", - object, mreq->object)); - /* * Calculate range to retrieve. The pages have already been assigned * their swapblks. We require a *contiguous* range but we know it to Modified: head/sys/vm/vm_pager.c ============================================================================== --- head/sys/vm/vm_pager.c Wed Jun 17 22:06:27 2015 (r284528) +++ head/sys/vm/vm_pager.c Wed Jun 17 22:44:27 2015 (r284529) @@ -250,8 +250,78 @@ vm_pager_deallocate(object) (*pagertab[object->type]->pgo_dealloc) (object); } +static void +vm_pager_assert_in(vm_object_t object, vm_page_t *m, int count) +{ +#ifdef INVARIANTS + + VM_OBJECT_ASSERT_WLOCKED(object); + KASSERT(count > 0, ("%s: 0 count", __func__)); + /* + * All pages must be busied, not mapped, not fully valid, + * not dirty and belong to the proper object. + */ + for (int i = 0 ; i < count; i++) { + vm_page_assert_xbusied(m[i]); + KASSERT(!pmap_page_is_mapped(m[i]), + ("%s: page %p is mapped", __func__, m[i])); + KASSERT(m[i]->valid != VM_PAGE_BITS_ALL, + ("%s: request for a valid page %p", __func__, m[i])); + KASSERT(m[i]->dirty == 0, + ("%s: page %p is dirty", __func__, m[i])); + KASSERT(m[i]->object == object, + ("%s: wrong object %p/%p", __func__, object, m[i]->object)); + } +#endif +} + +/* + * Page in the pages for the object using its associated pager. + * The requested page must be fully valid on successful return. + */ +int +vm_pager_get_pages(vm_object_t object, vm_page_t *m, int count, int reqpage) +{ + int r; + + vm_pager_assert_in(object, m, count); + + r = (*pagertab[object->type]->pgo_getpages)(object, m, count, reqpage); + if (r != VM_PAGER_OK) + return (r); + + /* + * If pager has replaced the page, assert that it had + * updated the array. Also assert that page is still + * busied. + */ + KASSERT(m[reqpage] == vm_page_lookup(object, m[reqpage]->pindex), + ("%s: mismatch page %p pindex %ju", __func__, + m[reqpage], (uintmax_t )m[reqpage]->pindex)); + vm_page_assert_xbusied(m[reqpage]); + + /* + * Pager didn't fill up entire page. Zero out + * partially filled data. + */ + if (m[reqpage]->valid != VM_PAGE_BITS_ALL) + vm_page_zero_invalid(m[reqpage], TRUE); + + return (VM_PAGER_OK); +} + +int +vm_pager_get_pages_async(vm_object_t object, vm_page_t *m, int count, + int reqpage, pgo_getpages_iodone_t iodone, void *arg) +{ + + vm_pager_assert_in(object, m, count); + + return ((*pagertab[object->type]->pgo_getpages_async)(object, m, + count, reqpage, iodone, arg)); +} + /* - * vm_pager_get_pages() - inline, see vm/vm_pager.h * vm_pager_put_pages() - inline, see vm/vm_pager.h * vm_pager_has_page() - inline, see vm/vm_pager.h */ Modified: head/sys/vm/vm_pager.h ============================================================================== --- head/sys/vm/vm_pager.h Wed Jun 17 22:06:27 2015 (r284528) +++ head/sys/vm/vm_pager.h Wed Jun 17 22:44:27 2015 (r284529) @@ -106,49 +106,15 @@ vm_object_t vm_pager_allocate(objtype_t, vm_ooffset_t, struct ucred *); void vm_pager_bufferinit(void); void vm_pager_deallocate(vm_object_t); -static __inline int vm_pager_get_pages(vm_object_t, vm_page_t *, int, int); -static inline int vm_pager_get_pages_async(vm_object_t, vm_page_t *, int, - int, pgo_getpages_iodone_t, void *); +int vm_pager_get_pages(vm_object_t, vm_page_t *, int, int); +int vm_pager_get_pages_async(vm_object_t, vm_page_t *, int, int, + pgo_getpages_iodone_t, void *); static __inline boolean_t vm_pager_has_page(vm_object_t, vm_pindex_t, int *, int *); void vm_pager_init(void); vm_object_t vm_pager_object_lookup(struct pagerlst *, void *); void vm_pager_free_nonreq(vm_object_t object, vm_page_t ma[], int reqpage, int npages, boolean_t object_locked); -/* - * vm_page_get_pages: - * - * Retrieve pages from the VM system in order to map them into an object - * ( or into VM space somewhere ). If the pagein was successful, we - * must fully validate it. - */ -static __inline int -vm_pager_get_pages( - vm_object_t object, - vm_page_t *m, - int count, - int reqpage -) { - int r; - - VM_OBJECT_ASSERT_WLOCKED(object); - r = (*pagertab[object->type]->pgo_getpages)(object, m, count, reqpage); - if (r == VM_PAGER_OK && m[reqpage]->valid != VM_PAGE_BITS_ALL) { - vm_page_zero_invalid(m[reqpage], TRUE); - } - return (r); -} - -static inline int -vm_pager_get_pages_async(vm_object_t object, vm_page_t *m, int count, - int reqpage, pgo_getpages_iodone_t iodone, void *arg) -{ - - VM_OBJECT_ASSERT_WLOCKED(object); - return ((*pagertab[object->type]->pgo_getpages_async)(object, m, - count, reqpage, iodone, arg)); -} - static __inline void vm_pager_put_pages( vm_object_t object, From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 23:24:47 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3D504E91; Wed, 17 Jun 2015 23:24:47 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2BB2B6E4; Wed, 17 Jun 2015 23:24:47 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5HNOlaC000302; Wed, 17 Jun 2015 23:24:47 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5HNOlMD000301; Wed, 17 Jun 2015 23:24:47 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201506172324.t5HNOlMD000301@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Wed, 17 Jun 2015 23:24:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284531 - head/sbin/umount X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 23:24:47 -0000 Author: rmacklem Date: Wed Jun 17 23:24:46 2015 New Revision: 284531 URL: https://svnweb.freebsd.org/changeset/base/284531 Log: Document that a forced dismount of an NFSv3 mount when the NLM (rpc.lockd) is running can crash the system. Unfortunately this is not easy to fix, but I have left PR#200585 open. PR: 200585 MFC after: 3 days Modified: head/sbin/umount/umount.8 Modified: head/sbin/umount/umount.8 ============================================================================== --- head/sbin/umount/umount.8 Wed Jun 17 22:52:12 2015 (r284530) +++ head/sbin/umount/umount.8 Wed Jun 17 23:24:46 2015 (r284531) @@ -28,7 +28,7 @@ .\" @(#)umount.8 8.2 (Berkeley) 5/8/95 .\" $FreeBSD$ .\" -.Dd November 22, 2014 +.Dd June 17, 2015 .Dt UMOUNT 8 .Os .Sh NAME @@ -81,6 +81,9 @@ The root file system cannot be forcibly For NFS, a forced dismount can take up to 1 minute or more to complete against an unresponsive server and may throw away data not yet written to the server for this case. +Also, doing a forced dismount of an NFSv3 mount when +.Xr rpc.lockd 8 +is running is unsafe and can result in a crash. .It Fl h Ar host Only file systems mounted from the specified host will be unmounted. From owner-svn-src-head@FreeBSD.ORG Wed Jun 17 23:26:02 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 831BCCC; Wed, 17 Jun 2015 23:26:02 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6FEA1759; Wed, 17 Jun 2015 23:26:02 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5HNQ20Y000576; Wed, 17 Jun 2015 23:26:02 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5HNQ1tW000562; Wed, 17 Jun 2015 23:26:01 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201506172326.t5HNQ1tW000562@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Wed, 17 Jun 2015 23:26:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284532 - in head/sys/arm/ti: . am335x omap4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 17 Jun 2015 23:26:02 -0000 Author: gonzo Date: Wed Jun 17 23:26:00 2015 New Revision: 284532 URL: https://svnweb.freebsd.org/changeset/base/284532 Log: - Add clk_set_source_freq field to struct ti_clock_dev so clock device consumers can configure clock frequency - Add ti_prcm_clk_set_source_freq wrapper for clk_set_source_freq - Add am335x_clk_set_arm_disp_freq function to control pixel clock frequency for LCD and HDMI output. Both of them are sensitive to frequency skews and we need to get pixel clock matching requested frequency as close to possible Modified: head/sys/arm/ti/am335x/am335x_prcm.c head/sys/arm/ti/omap4/omap4_prcm_clks.c head/sys/arm/ti/ti_prcm.c head/sys/arm/ti/ti_prcm.h Modified: head/sys/arm/ti/am335x/am335x_prcm.c ============================================================================== --- head/sys/arm/ti/am335x/am335x_prcm.c Wed Jun 17 23:24:46 2015 (r284531) +++ head/sys/arm/ti/am335x/am335x_prcm.c Wed Jun 17 23:26:00 2015 (r284532) @@ -151,6 +151,7 @@ static int am335x_clk_hsmmc_get_source_f static int am335x_clk_get_sysclk_freq(struct ti_clock_dev *clkdev, unsigned int *freq); static int am335x_clk_get_arm_fclk_freq(struct ti_clock_dev *clkdev, unsigned int *freq); static int am335x_clk_get_arm_disp_freq(struct ti_clock_dev *clkdev, unsigned int *freq); +static int am335x_clk_set_arm_disp_freq(struct ti_clock_dev *clkdev, unsigned int freq); static void am335x_prcm_reset(void); static int am335x_clk_cpsw_activate(struct ti_clock_dev *clkdev); static int am335x_clk_musb0_activate(struct ti_clock_dev *clkdev); @@ -163,7 +164,8 @@ static int am335x_clk_pruss_activate(str .clk_deactivate = am335x_clk_noop_deactivate, \ .clk_set_source = am335x_clk_noop_set_source, \ .clk_accessible = NULL, \ - .clk_get_source_freq = NULL \ + .clk_get_source_freq = NULL, \ + .clk_set_source_freq = NULL \ } #define AM335X_GENERIC_CLOCK_DEV(i) \ @@ -172,7 +174,8 @@ static int am335x_clk_pruss_activate(str .clk_deactivate = am335x_clk_generic_deactivate, \ .clk_set_source = am335x_clk_generic_set_source, \ .clk_accessible = NULL, \ - .clk_get_source_freq = NULL \ + .clk_get_source_freq = NULL, \ + .clk_set_source_freq = NULL \ } #define AM335X_GPIO_CLOCK_DEV(i) \ @@ -181,7 +184,8 @@ static int am335x_clk_pruss_activate(str .clk_deactivate = am335x_clk_generic_deactivate, \ .clk_set_source = am335x_clk_generic_set_source, \ .clk_accessible = NULL, \ - .clk_get_source_freq = NULL \ + .clk_get_source_freq = NULL, \ + .clk_set_source_freq = NULL \ } #define AM335X_MMCHS_CLOCK_DEV(i) \ @@ -190,7 +194,8 @@ static int am335x_clk_pruss_activate(str .clk_deactivate = am335x_clk_generic_deactivate, \ .clk_set_source = am335x_clk_generic_set_source, \ .clk_accessible = NULL, \ - .clk_get_source_freq = am335x_clk_hsmmc_get_source_freq \ + .clk_get_source_freq = am335x_clk_hsmmc_get_source_freq, \ + .clk_set_source_freq = NULL \ } struct ti_clock_dev ti_am335x_clk_devmap[] = { @@ -201,6 +206,7 @@ struct ti_clock_dev ti_am335x_clk_devmap .clk_set_source = NULL, .clk_accessible = NULL, .clk_get_source_freq = am335x_clk_get_sysclk_freq, + .clk_set_source_freq = NULL, }, /* MPU (ARM) core clocks */ { .id = MPU_CLK, @@ -209,6 +215,7 @@ struct ti_clock_dev ti_am335x_clk_devmap .clk_set_source = NULL, .clk_accessible = NULL, .clk_get_source_freq = am335x_clk_get_arm_fclk_freq, + .clk_set_source_freq = NULL, }, /* CPSW Ethernet Switch core clocks */ { .id = CPSW_CLK, @@ -217,6 +224,7 @@ struct ti_clock_dev ti_am335x_clk_devmap .clk_set_source = NULL, .clk_accessible = NULL, .clk_get_source_freq = NULL, + .clk_set_source_freq = NULL, }, /* Mentor USB HS controller core clocks */ @@ -226,6 +234,7 @@ struct ti_clock_dev ti_am335x_clk_devmap .clk_set_source = NULL, .clk_accessible = NULL, .clk_get_source_freq = NULL, + .clk_set_source_freq = NULL, }, /* LCD controller clocks */ @@ -235,6 +244,7 @@ struct ti_clock_dev ti_am335x_clk_devmap .clk_set_source = NULL, .clk_accessible = NULL, .clk_get_source_freq = am335x_clk_get_arm_disp_freq, + .clk_set_source_freq = am335x_clk_set_arm_disp_freq, }, /* UART */ @@ -296,6 +306,7 @@ struct ti_clock_dev ti_am335x_clk_devmap .clk_set_source = NULL, .clk_accessible = NULL, .clk_get_source_freq = NULL, + .clk_set_source_freq = NULL, }, /* RTC */ @@ -627,6 +638,8 @@ am335x_clk_get_sysclk_freq(struct ti_clo #define DPLL_BYP_CLKSEL(reg) ((reg>>23) & 1) #define DPLL_DIV(reg) ((reg & 0x7f)+1) #define DPLL_MULT(reg) ((reg>>8) & 0x7FF) +#define DPLL_MAX_MUL 0x800 +#define DPLL_MAX_DIV 0x80 static int am335x_clk_get_arm_fclk_freq(struct ti_clock_dev *clkdev, unsigned int *freq) @@ -662,6 +675,52 @@ am335x_clk_get_arm_disp_freq(struct ti_c return(0); } +static int +am335x_clk_set_arm_disp_freq(struct ti_clock_dev *clkdev, unsigned int freq) +{ + uint32_t sysclk; + uint32_t mul, div; + uint32_t i, j; + unsigned int delta, min_delta; + + am335x_clk_get_sysclk_freq(NULL, &sysclk); + + /* Bypass mode */ + prcm_write_4(CM_WKUP_CM_CLKMODE_DPLL_DISP, 0x4); + + /* Make sure it's in bypass mode */ + while (!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) + & (1 << 8))) + DELAY(10); + + /* Dumb and non-optimal implementation */ + min_delta = freq; + for (i = 1; i < DPLL_MAX_MUL; i++) { + for (j = 1; j < DPLL_MAX_DIV; j++) { + delta = abs(freq - i*(sysclk/j)); + if (delta < min_delta) { + mul = i; + div = j; + min_delta = delta; + } + if (min_delta == 0) + break; + } + } + + prcm_write_4(CM_WKUP_CM_CLKSEL_DPLL_DISP, (mul << 8) | (div - 1)); + + /* Locked mode */ + prcm_write_4(CM_WKUP_CM_CLKMODE_DPLL_DISP, 0x7); + + int timeout = 10000; + while ((!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) + & (1 << 0))) && timeout--) + DELAY(10); + + return(0); +} + static void am335x_prcm_reset(void) { @@ -724,27 +783,10 @@ am335x_clk_lcdc_activate(struct ti_clock if (sc == NULL) return (ENXIO); - /* Bypass mode */ - prcm_write_4(CM_WKUP_CM_CLKMODE_DPLL_DISP, 0x4); - - /* Make sure it's in bypass mode */ - while (!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) - & (1 << 8))) - DELAY(10); - /* - * For now set frequency to 99*SYSFREQ/8 which is twice as - * HDMI 1080p pixel clock (minimum LCDC freq divisor is 2) + * For now set frequency to 2*VGA_PIXEL_CLOCK */ - prcm_write_4(CM_WKUP_CM_CLKSEL_DPLL_DISP, (99 << 8) | 8); - - /* Locked mode */ - prcm_write_4(CM_WKUP_CM_CLKMODE_DPLL_DISP, 0x7); - - int timeout = 10000; - while ((!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) - & (1 << 0))) && timeout--) - DELAY(10); + am335x_clk_set_arm_disp_freq(clkdev, 25175000*2); /*set MODULEMODE to ENABLE(2) */ prcm_write_4(CM_PER_LCDC_CLKCTRL, 2); Modified: head/sys/arm/ti/omap4/omap4_prcm_clks.c ============================================================================== --- head/sys/arm/ti/omap4/omap4_prcm_clks.c Wed Jun 17 23:24:46 2015 (r284531) +++ head/sys/arm/ti/omap4/omap4_prcm_clks.c Wed Jun 17 23:26:00 2015 (r284532) @@ -217,7 +217,8 @@ static int omap4_clk_get_arm_fclk_freq(s .clk_deactivate = omap4_clk_generic_deactivate, \ .clk_set_source = omap4_clk_generic_set_source, \ .clk_accessible = omap4_clk_generic_accessible, \ - .clk_get_source_freq = omap4_clk_generic_get_source_freq \ + .clk_get_source_freq = omap4_clk_generic_get_source_freq, \ + .clk_set_source_freq = NULL \ } #define OMAP4_GPTIMER_CLOCK_DEV(i) \ @@ -226,7 +227,8 @@ static int omap4_clk_get_arm_fclk_freq(s .clk_deactivate = omap4_clk_generic_deactivate, \ .clk_set_source = omap4_clk_gptimer_set_source, \ .clk_accessible = omap4_clk_generic_accessible, \ - .clk_get_source_freq = omap4_clk_gptimer_get_source_freq \ + .clk_get_source_freq = omap4_clk_gptimer_get_source_freq, \ + .clk_set_source_freq = NULL \ } #define OMAP4_HSMMC_CLOCK_DEV(i) \ @@ -235,7 +237,8 @@ static int omap4_clk_get_arm_fclk_freq(s .clk_deactivate = omap4_clk_generic_deactivate, \ .clk_set_source = omap4_clk_hsmmc_set_source, \ .clk_accessible = omap4_clk_generic_accessible, \ - .clk_get_source_freq = omap4_clk_hsmmc_get_source_freq \ + .clk_get_source_freq = omap4_clk_hsmmc_get_source_freq, \ + .clk_set_source_freq = NULL \ } #define OMAP4_HSUSBHOST_CLOCK_DEV(i) \ @@ -244,7 +247,8 @@ static int omap4_clk_get_arm_fclk_freq(s .clk_deactivate = omap4_clk_hsusbhost_deactivate, \ .clk_set_source = omap4_clk_hsusbhost_set_source, \ .clk_accessible = omap4_clk_hsusbhost_accessible, \ - .clk_get_source_freq = NULL \ + .clk_get_source_freq = NULL, \ + .clk_set_source_freq = NULL \ } @@ -257,6 +261,7 @@ struct ti_clock_dev ti_omap4_clk_devmap[ .clk_set_source = NULL, .clk_accessible = NULL, .clk_get_source_freq = omap4_clk_get_sysclk_freq, + .clk_set_source_freq = NULL, }, /* MPU (ARM) core clocks */ { .id = MPU_CLK, @@ -265,6 +270,7 @@ struct ti_clock_dev ti_omap4_clk_devmap[ .clk_set_source = NULL, .clk_accessible = NULL, .clk_get_source_freq = omap4_clk_get_arm_fclk_freq, + .clk_set_source_freq = NULL, }, Modified: head/sys/arm/ti/ti_prcm.c ============================================================================== --- head/sys/arm/ti/ti_prcm.c Wed Jun 17 23:24:46 2015 (r284531) +++ head/sys/arm/ti/ti_prcm.c Wed Jun 17 23:26:00 2015 (r284532) @@ -285,7 +285,7 @@ ti_prcm_clk_set_source(clk_ident_t clk, * @clk: identifier for the module to enable, see ti_prcm.h for a list * of possible modules. * @freq: pointer to an integer that upon return will contain the src freq - * + * * This function returns the frequency of the source clock. * * The real work done to enable the clock is really done in the callback @@ -319,6 +319,39 @@ ti_prcm_clk_get_source_freq(clk_ident_t ret = clk_dev->clk_get_source_freq(clk_dev, freq); else ret = EINVAL; - + + return (ret); +} + +/** + * ti_prcm_clk_set_source_freq - sets the source clock frequency as close to freq as possible + * @clk: identifier for the module to enable, see ti_prcm.h for a list + * of possible modules. + * @freq: requested freq + * + * LOCKING: + * Internally locks the driver context. + * + * RETURNS: + * Returns 0 on success or positive error code on failure. + */ +int +ti_prcm_clk_set_source_freq(clk_ident_t clk, unsigned int freq) +{ + struct ti_clock_dev *clk_dev; + int ret; + + clk_dev = ti_prcm_clk_dev(clk); + + /* Sanity check we managed to find the clock */ + if (clk_dev == NULL) + return (EINVAL); + + /* Get the source frequency of the clock */ + if (clk_dev->clk_set_source_freq) + ret = clk_dev->clk_set_source_freq(clk_dev, freq); + else + ret = EINVAL; + return (ret); } Modified: head/sys/arm/ti/ti_prcm.h ============================================================================== --- head/sys/arm/ti/ti_prcm.h Wed Jun 17 23:24:46 2015 (r284531) +++ head/sys/arm/ti/ti_prcm.h Wed Jun 17 23:26:00 2015 (r284532) @@ -184,6 +184,8 @@ struct ti_clock_dev { int (*clk_set_source)(struct ti_clock_dev *clkdev, clk_src_t clksrc); int (*clk_accessible)(struct ti_clock_dev *clkdev); + int (*clk_set_source_freq)(struct ti_clock_dev *clkdev, + unsigned int freq); int (*clk_get_source_freq)(struct ti_clock_dev *clkdev, unsigned int *freq); }; @@ -194,6 +196,7 @@ int ti_prcm_clk_disable(clk_ident_t clk) int ti_prcm_clk_accessible(clk_ident_t clk); int ti_prcm_clk_disable_autoidle(clk_ident_t clk); int ti_prcm_clk_set_source(clk_ident_t clk, clk_src_t clksrc); +int ti_prcm_clk_set_source_freq(clk_ident_t clk, unsigned int freq); int ti_prcm_clk_get_source_freq(clk_ident_t clk, unsigned int *freq); void ti_prcm_reset(void); From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 00:22:15 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 89F32EDD; Thu, 18 Jun 2015 00:22:15 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 788106E8; Thu, 18 Jun 2015 00:22:15 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5I0MFLV030388; Thu, 18 Jun 2015 00:22:15 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5I0MFYx030387; Thu, 18 Jun 2015 00:22:15 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201506180022.t5I0MFYx030387@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Thu, 18 Jun 2015 00:22:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284533 - head/sys/dev/videomode X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 00:22:15 -0000 Author: gonzo Date: Thu Jun 18 00:22:14 2015 New Revision: 284533 URL: https://svnweb.freebsd.org/changeset/base/284533 Log: Add hskew field to struct videomode. It is required by some controllers that are not 100% VESA-compatible (e.g. TDA19988 HDMI framer) Modified: head/sys/dev/videomode/videomode.h Modified: head/sys/dev/videomode/videomode.h ============================================================================== --- head/sys/dev/videomode/videomode.h Wed Jun 17 23:26:00 2015 (r284532) +++ head/sys/dev/videomode/videomode.h Thu Jun 18 00:22:14 2015 (r284533) @@ -43,6 +43,7 @@ struct videomode { int vtotal; int flags; /* Video mode flags; see below. */ const char *name; + int hskew; }; /* From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 00:57:54 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8C808706; Thu, 18 Jun 2015 00:57:54 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 79957DDC; Thu, 18 Jun 2015 00:57:54 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5I0vsCU045756; Thu, 18 Jun 2015 00:57:54 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5I0vq68045741; Thu, 18 Jun 2015 00:57:52 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201506180057.t5I0vq68045741@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Thu, 18 Jun 2015 00:57:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284534 - in head/sys: arm/conf arm/ti/am335x boot/fdt/dts/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 00:57:54 -0000 Author: gonzo Date: Thu Jun 18 00:57:52 2015 New Revision: 284534 URL: https://svnweb.freebsd.org/changeset/base/284534 Log: Add HDMI support to Beaglebone Black: - Add driver for TDA19988 HDMI framer - Add simple interface to communicate with HDMI sink: read EDID and set videomode - Add event-based API to notify LCD controller when HDMI sink is available - Add HDMI framer node and add refernce to it to lcdc node. This part of DTS tree is custom and does not match Linux DTS because Linux uses combination of pseudo-node in DTS and hardcoded driver information that does not map to our model. Added: head/sys/arm/ti/am335x/hdmi.h (contents, props changed) head/sys/arm/ti/am335x/hdmi_if.m (contents, props changed) Modified: head/sys/arm/conf/BEAGLEBONE head/sys/arm/ti/am335x/am335x_lcd.c head/sys/arm/ti/am335x/am335x_lcd.h head/sys/arm/ti/am335x/files.am335x head/sys/boot/fdt/dts/arm/beaglebone-black.dts Modified: head/sys/arm/conf/BEAGLEBONE ============================================================================== --- head/sys/arm/conf/BEAGLEBONE Thu Jun 18 00:22:14 2015 (r284533) +++ head/sys/arm/conf/BEAGLEBONE Thu Jun 18 00:57:52 2015 (r284534) @@ -138,3 +138,11 @@ device fdt_pinctrl # Flattened Device Tree options FDT # Configure using FDT/DTB data + +# Comment following lines for boot console on serial port +device vt +device videomode +device hdmi +device ums +device ukbd +device kbdmux Modified: head/sys/arm/ti/am335x/am335x_lcd.c ============================================================================== --- head/sys/arm/ti/am335x/am335x_lcd.c Thu Jun 18 00:22:14 2015 (r284533) +++ head/sys/arm/ti/am335x/am335x_lcd.c Thu Jun 18 00:57:52 2015 (r284534) @@ -52,6 +52,10 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include +#include + #include #ifdef DEV_SC #include @@ -66,6 +70,7 @@ __FBSDID("$FreeBSD$"); #include "am335x_pwm.h" #include "fb_if.h" +#include "hdmi_if.h" #define LCD_PID 0x00 #define LCD_CTRL 0x04 @@ -176,11 +181,20 @@ __FBSDID("$FreeBSD$"); #define LCD_WRITE4(_sc, reg, value) \ bus_write_4((_sc)->sc_mem_res, reg, value); - /* Backlight is controlled by eCAS interface on PWM unit 0 */ #define PWM_UNIT 0 #define PWM_PERIOD 100 +#define MODE_HBP(mode) ((mode)->htotal - (mode)->hsync_end) +#define MODE_HFP(mode) ((mode)->hsync_start - (mode)->hdisplay) +#define MODE_HSW(mode) ((mode)->hsync_end - (mode)->hsync_start) +#define MODE_VBP(mode) ((mode)->vtotal - (mode)->vsync_end) +#define MODE_VFP(mode) ((mode)->vsync_start - (mode)->vdisplay) +#define MODE_VSW(mode) ((mode)->vsync_end - (mode)->vsync_start) + +#define MAX_PIXEL_CLOCK 126000 +#define MAX_BANDWIDTH (1280*1024*60) + struct am335x_lcd_softc { device_t sc_dev; struct fb_info sc_fb_info; @@ -191,12 +205,18 @@ struct am335x_lcd_softc { int sc_backlight; struct sysctl_oid *sc_oid; + struct panel_info sc_panel; + /* Framebuffer */ bus_dma_tag_t sc_dma_tag; bus_dmamap_t sc_dma_map; size_t sc_fb_size; bus_addr_t sc_fb_phys; uint8_t *sc_fb_base; + + /* HDMI framer */ + phandle_t sc_hdmi_framer; + eventhandler_tag sc_hdmi_evh; }; static void @@ -214,13 +234,22 @@ am335x_fb_dmamap_cb(void *arg, bus_dma_s static uint32_t am335x_lcd_calc_divisor(uint32_t reference, uint32_t freq) { - uint32_t div; + uint32_t div, i; + uint32_t delta, min_delta; + + min_delta = freq; + div = 255; + /* Raster mode case: divisors are in range from 2 to 255 */ - for (div = 2; div < 255; div++) - if (reference/div <= freq) - return (div); + for (i = 2; i < 255; i++) { + delta = abs(reference/i - freq); + if (delta < min_delta) { + div = i; + min_delta = delta; + } + } - return (255); + return (div); } static int @@ -229,7 +258,7 @@ am335x_lcd_sysctl_backlight(SYSCTL_HANDL struct am335x_lcd_softc *sc = (struct am335x_lcd_softc*)arg1; int error; int backlight; - + backlight = sc->sc_backlight; error = sysctl_handle_int(oidp, &backlight, 0, req); @@ -251,6 +280,81 @@ am335x_lcd_sysctl_backlight(SYSCTL_HANDL return (error); } +static uint32_t +am335x_mode_vrefresh(const struct videomode *mode) +{ + uint32_t refresh; + + /* Calculate vertical refresh rate */ + refresh = (mode->dot_clock * 1000 / mode->htotal); + refresh = (refresh + mode->vtotal / 2) / mode->vtotal; + + if (mode->flags & VID_INTERLACE) + refresh *= 2; + if (mode->flags & VID_DBLSCAN) + refresh /= 2; + + return refresh; +} + +static int +am335x_mode_is_valid(const struct videomode *mode) +{ + uint32_t hbp, hfp, hsw; + uint32_t vbp, vfp, vsw; + + if (mode->dot_clock > MAX_PIXEL_CLOCK) + return (0); + + if (mode->hdisplay & 0xf) + return (0); + + if (mode->vdisplay > 2048) + return (0); + + /* Check ranges for timing parameters */ + hbp = MODE_HBP(mode) - 1; + hfp = MODE_HFP(mode) - 1; + hsw = MODE_HSW(mode) - 1; + vbp = MODE_VBP(mode); + vfp = MODE_VFP(mode); + vsw = MODE_VSW(mode) - 1; + + if (hbp > 0x3ff) + return (0); + if (hfp > 0x3ff) + return (0); + if (hsw > 0x3ff) + return (0); + + if (vbp > 0xff) + return (0); + if (vfp > 0xff) + return (0); + if (vsw > 0x3f) + return (0); + if (mode->vdisplay*mode->hdisplay*am335x_mode_vrefresh(mode) + > MAX_BANDWIDTH) + return (0); + + return (1); +} + +static void +am335x_read_hdmi_property(device_t dev) +{ + phandle_t node; + phandle_t hdmi_xref; + struct am335x_lcd_softc *sc; + + sc = device_get_softc(dev); + node = ofw_bus_get_node(dev); + if (OF_getencprop(node, "hdmi", &hdmi_xref, sizeof(hdmi_xref)) == -1) + sc->sc_hdmi_framer = 0; + else + sc->sc_hdmi_framer = hdmi_xref; +} + static int am335x_read_property(device_t dev, phandle_t node, const char *name, uint32_t *val) { @@ -343,44 +447,34 @@ out: static int am335x_read_panel_info(device_t dev, phandle_t node, struct panel_info *panel) { - int error; phandle_t panel_info_node; panel_info_node = ofw_bus_find_child(node, "panel-info"); if (panel_info_node == 0) return (-1); - error = 0; + am335x_read_property(dev, panel_info_node, + "ac-bias", &panel->ac_bias); - if ((error = am335x_read_property(dev, panel_info_node, - "ac-bias", &panel->ac_bias))) - goto out; + am335x_read_property(dev, panel_info_node, + "ac-bias-intrpt", &panel->ac_bias_intrpt); - if ((error = am335x_read_property(dev, panel_info_node, - "ac-bias-intrpt", &panel->ac_bias_intrpt))) - goto out; + am335x_read_property(dev, panel_info_node, + "dma-burst-sz", &panel->dma_burst_sz); - if ((error = am335x_read_property(dev, panel_info_node, - "dma-burst-sz", &panel->dma_burst_sz))) - goto out; + am335x_read_property(dev, panel_info_node, + "bpp", &panel->bpp); - if ((error = am335x_read_property(dev, panel_info_node, - "bpp", &panel->bpp))) - goto out; + am335x_read_property(dev, panel_info_node, + "fdd", &panel->fdd); - if ((error = am335x_read_property(dev, panel_info_node, - "fdd", &panel->fdd))) - goto out; + am335x_read_property(dev, panel_info_node, + "sync-edge", &panel->sync_edge); - if ((error = am335x_read_property(dev, panel_info_node, - "sync-edge", &panel->sync_edge))) - goto out; - - error = am335x_read_property(dev, panel_info_node, + am335x_read_property(dev, panel_info_node, "sync-ctrl", &panel->sync_ctrl); -out: - return (error); + return (0); } static void @@ -442,119 +536,75 @@ done: reg = LCD_READ4(sc, LCD_END_OF_INT_IND); } -static int -am335x_lcd_probe(device_t dev) +static const struct videomode * +am335x_lcd_pick_mode(struct edid_info *ei) { -#ifdef DEV_SC - int err; -#endif + const struct videomode *videomode; + const struct videomode *m; + int n; - if (!ofw_bus_status_okay(dev)) - return (ENXIO); + /* Get standard VGA as default */ + videomode = NULL; - if (!ofw_bus_is_compatible(dev, "ti,am33xx-tilcdc")) - return (ENXIO); + /* + * Pick a mode. + */ + if (ei->edid_preferred_mode != NULL) { + if (am335x_mode_is_valid(ei->edid_preferred_mode)) + videomode = ei->edid_preferred_mode; + } - device_set_desc(dev, "AM335x LCD controller"); + if (videomode == NULL) { + m = ei->edid_modes; -#ifdef DEV_SC - err = sc_probe_unit(device_get_unit(dev), - device_get_flags(dev) | SC_AUTODETECT_KBD); - if (err != 0) - return (err); -#endif + sort_modes(ei->edid_modes, + &ei->edid_preferred_mode, + ei->edid_nmodes); + for (n = 0; n < ei->edid_nmodes; n++) + if (am335x_mode_is_valid(&m[n])) { + videomode = &m[n]; + break; + } + } - return (BUS_PROBE_DEFAULT); + return videomode; } static int -am335x_lcd_attach(device_t dev) +am335x_lcd_configure(struct am335x_lcd_softc *sc) { - struct am335x_lcd_softc *sc; - int rid; int div; - struct panel_info panel; uint32_t reg, timing0, timing1, timing2; - struct sysctl_ctx_list *ctx; - struct sysctl_oid *tree; uint32_t burst_log; - int err; size_t dma_size; uint32_t hbp, hfp, hsw; uint32_t vbp, vfp, vsw; uint32_t width, height; - phandle_t root, panel_node; - - sc = device_get_softc(dev); - sc->sc_dev = dev; - - root = OF_finddevice("/"); - if (root == 0) { - device_printf(dev, "failed to get FDT root node\n"); - return (ENXIO); - } - - panel_node = fdt_find_compatible(root, "ti,tilcdc,panel", 1); - if (panel_node == 0) { - device_printf(dev, "failed to find compatible panel in FDT blob\n"); - return (ENXIO); - } - - if (am335x_read_panel_info(dev, panel_node, &panel)) { - device_printf(dev, "failed to read panel info\n"); - return (ENXIO); - } + unsigned int ref_freq; + int err; - if (am335x_read_timing(dev, panel_node, &panel)) { - device_printf(dev, "failed to read timings\n"); + /* + * try to adjust clock to get double of requested frequency + * HDMI/DVI displays are very sensitive to error in frequncy value + */ + if (ti_prcm_clk_set_source_freq(LCDC_CLK, sc->sc_panel.panel_pxl_clk*2)) { + device_printf(sc->sc_dev, "can't set source frequency\n"); return (ENXIO); } - int ref_freq = 0; - ti_prcm_clk_enable(LCDC_CLK); if (ti_prcm_clk_get_source_freq(LCDC_CLK, &ref_freq)) { - device_printf(dev, "Can't get reference frequency\n"); - return (ENXIO); - } - - rid = 0; - sc->sc_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE); - if (!sc->sc_mem_res) { - device_printf(dev, "cannot allocate memory window\n"); - return (ENXIO); - } - - rid = 0; - sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_ACTIVE); - if (!sc->sc_irq_res) { - bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res); - device_printf(dev, "cannot allocate interrupt\n"); - return (ENXIO); - } - - if (bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - NULL, am335x_lcd_intr, sc, - &sc->sc_intr_hl) != 0) { - bus_release_resource(dev, SYS_RES_IRQ, rid, - sc->sc_irq_res); - bus_release_resource(dev, SYS_RES_MEMORY, rid, - sc->sc_mem_res); - device_printf(dev, "Unable to setup the irq handler.\n"); + device_printf(sc->sc_dev, "can't get reference frequency\n"); return (ENXIO); } - LCD_LOCK_INIT(sc); - /* Panle initialization */ - dma_size = round_page(panel.panel_width*panel.panel_height*panel.bpp/8); + dma_size = round_page(sc->sc_panel.panel_width*sc->sc_panel.panel_height*sc->sc_panel.bpp/8); /* * Now allocate framebuffer memory */ err = bus_dma_tag_create( - bus_get_dma_tag(dev), + bus_get_dma_tag(sc->sc_dev), 4, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -564,49 +614,49 @@ am335x_lcd_attach(device_t dev) NULL, NULL, /* lockfunc, lockarg */ &sc->sc_dma_tag); if (err) - goto fail; + goto done; err = bus_dmamem_alloc(sc->sc_dma_tag, (void **)&sc->sc_fb_base, BUS_DMA_COHERENT, &sc->sc_dma_map); if (err) { - device_printf(dev, "cannot allocate framebuffer\n"); - goto fail; + device_printf(sc->sc_dev, "cannot allocate framebuffer\n"); + goto done; } err = bus_dmamap_load(sc->sc_dma_tag, sc->sc_dma_map, sc->sc_fb_base, dma_size, am335x_fb_dmamap_cb, &sc->sc_fb_phys, BUS_DMA_NOWAIT); if (err) { - device_printf(dev, "cannot load DMA map\n"); - goto fail; + device_printf(sc->sc_dev, "cannot load DMA map\n"); + goto done; } /* Make sure it's blank */ - memset(sc->sc_fb_base, 0x00, dma_size); + memset(sc->sc_fb_base, 0x0, dma_size); /* Calculate actual FB Size */ - sc->sc_fb_size = panel.panel_width*panel.panel_height*panel.bpp/8; + sc->sc_fb_size = sc->sc_panel.panel_width*sc->sc_panel.panel_height*sc->sc_panel.bpp/8; /* Only raster mode is supported */ reg = CTRL_RASTER_MODE; - div = am335x_lcd_calc_divisor(ref_freq, panel.panel_pxl_clk); + div = am335x_lcd_calc_divisor(ref_freq, sc->sc_panel.panel_pxl_clk); reg |= (div << CTRL_DIV_SHIFT); LCD_WRITE4(sc, LCD_CTRL, reg); /* Set timing */ timing0 = timing1 = timing2 = 0; - hbp = panel.panel_hbp - 1; - hfp = panel.panel_hfp - 1; - hsw = panel.panel_hsw - 1; - - vbp = panel.panel_vbp; - vfp = panel.panel_vfp; - vsw = panel.panel_vsw - 1; + hbp = sc->sc_panel.panel_hbp - 1; + hfp = sc->sc_panel.panel_hfp - 1; + hsw = sc->sc_panel.panel_hsw - 1; + + vbp = sc->sc_panel.panel_vbp; + vfp = sc->sc_panel.panel_vfp; + vsw = sc->sc_panel.panel_vsw - 1; - height = panel.panel_height - 1; - width = panel.panel_width - 1; + height = sc->sc_panel.panel_height - 1; + width = sc->sc_panel.panel_width - 1; /* Horizontal back porch */ timing0 |= (hbp & 0xff) << RASTER_TIMING_0_HBP_SHIFT; @@ -636,22 +686,22 @@ am335x_lcd_attach(device_t dev) << RASTER_TIMING_2_LPP_B10_SHIFT; /* clock signal settings */ - if (panel.sync_ctrl) + if (sc->sc_panel.sync_ctrl) timing2 |= RASTER_TIMING_2_PHSVS; - if (panel.sync_edge) + if (sc->sc_panel.sync_edge) timing2 |= RASTER_TIMING_2_PHSVS_RISE; else timing2 |= RASTER_TIMING_2_PHSVS_FALL; - if (panel.hsync_active == 0) + if (sc->sc_panel.hsync_active == 0) timing2 |= RASTER_TIMING_2_IHS; - if (panel.vsync_active == 0) + if (sc->sc_panel.vsync_active == 0) timing2 |= RASTER_TIMING_2_IVS; - if (panel.pixelclk_active == 0) + if (sc->sc_panel.pixelclk_active == 0) timing2 |= RASTER_TIMING_2_IPC; /* AC bias */ - timing2 |= (panel.ac_bias << RASTER_TIMING_2_ACB_SHIFT); - timing2 |= (panel.ac_bias_intrpt << RASTER_TIMING_2_ACBI_SHIFT); + timing2 |= (sc->sc_panel.ac_bias << RASTER_TIMING_2_ACB_SHIFT); + timing2 |= (sc->sc_panel.ac_bias_intrpt << RASTER_TIMING_2_ACBI_SHIFT); LCD_WRITE4(sc, LCD_RASTER_TIMING_0, timing0); LCD_WRITE4(sc, LCD_RASTER_TIMING_1, timing1); @@ -660,7 +710,7 @@ am335x_lcd_attach(device_t dev) /* DMA settings */ reg = LCDDMA_CTRL_FB0_FB1; /* Find power of 2 for current burst size */ - switch (panel.dma_burst_sz) { + switch (sc->sc_panel.dma_burst_sz) { case 1: burst_log = 0; break; @@ -690,11 +740,11 @@ am335x_lcd_attach(device_t dev) /* Enable LCD */ reg = RASTER_CTRL_LCDTFT; - reg |= (panel.fdd << RASTER_CTRL_REQDLY_SHIFT); + reg |= (sc->sc_panel.fdd << RASTER_CTRL_REQDLY_SHIFT); reg |= (PALETTE_DATA_ONLY << RASTER_CTRL_PALMODE_SHIFT); - if (panel.bpp >= 24) + if (sc->sc_panel.bpp >= 24) reg |= RASTER_CTRL_TFT24; - if (panel.bpp == 32) + if (sc->sc_panel.bpp == 32) reg |= RASTER_CTRL_TFT24_UNPACKED; LCD_WRITE4(sc, LCD_RASTER_CTRL, reg); @@ -717,54 +767,241 @@ am335x_lcd_attach(device_t dev) LCD_WRITE4(sc, LCD_SYSCONFIG, SYSCONFIG_STANDBY_SMART | SYSCONFIG_IDLE_SMART); - /* Init backlight interface */ - ctx = device_get_sysctl_ctx(sc->sc_dev); - tree = device_get_sysctl_tree(sc->sc_dev); - sc->sc_oid = SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, - "backlight", CTLTYPE_INT | CTLFLAG_RW, sc, 0, - am335x_lcd_sysctl_backlight, "I", "LCD backlight"); - sc->sc_backlight = 0; - /* Check if eCAS interface is available at this point */ - if (am335x_pwm_config_ecap(PWM_UNIT, - PWM_PERIOD, PWM_PERIOD) == 0) - sc->sc_backlight = 100; - sc->sc_fb_info.fb_name = device_get_nameunit(sc->sc_dev); sc->sc_fb_info.fb_vbase = (intptr_t)sc->sc_fb_base; sc->sc_fb_info.fb_pbase = sc->sc_fb_phys; sc->sc_fb_info.fb_size = sc->sc_fb_size; - sc->sc_fb_info.fb_bpp = sc->sc_fb_info.fb_depth = panel.bpp; - sc->sc_fb_info.fb_stride = panel.panel_width*panel.bpp / 8; - sc->sc_fb_info.fb_width = panel.panel_width; - sc->sc_fb_info.fb_height = panel.panel_height; + sc->sc_fb_info.fb_bpp = sc->sc_fb_info.fb_depth = sc->sc_panel.bpp; + sc->sc_fb_info.fb_stride = sc->sc_panel.panel_width*sc->sc_panel.bpp / 8; + sc->sc_fb_info.fb_width = sc->sc_panel.panel_width; + sc->sc_fb_info.fb_height = sc->sc_panel.panel_height; #ifdef DEV_SC - err = (sc_attach_unit(device_get_unit(dev), - device_get_flags(dev) | SC_AUTODETECT_KBD)); + err = (sc_attach_unit(device_get_unit(sc->sc_dev), + device_get_flags(sc->sc_dev) | SC_AUTODETECT_KBD)); if (err) { - device_printf(dev, "failed to attach syscons\n"); + device_printf(sc->sc_dev, "failed to attach syscons\n"); goto fail; } am335x_lcd_syscons_setup((vm_offset_t)sc->sc_fb_base, sc->sc_fb_phys, &panel); #else /* VT */ - device_t fbd = device_add_child(dev, "fbd", - device_get_unit(dev)); - if (fbd == NULL) { - device_printf(dev, "Failed to add fbd child\n"); - goto fail; + device_t fbd = device_add_child(sc->sc_dev, "fbd", + device_get_unit(sc->sc_dev)); + if (fbd != NULL) { + if (device_probe_and_attach(fbd) != 0) + device_printf(sc->sc_dev, "failed to attach fbd device\n"); + } else + device_printf(sc->sc_dev, "failed to add fbd child\n"); +#endif + +done: + return (err); +} + +static void +am335x_lcd_hdmi_event(void *arg) +{ + struct am335x_lcd_softc *sc; + const struct videomode *videomode; + struct videomode hdmi_mode; + device_t hdmi_dev; + uint8_t *edid; + uint32_t edid_len; + struct edid_info ei; + + sc = arg; + + /* Nothing to work with */ + if (!sc->sc_hdmi_framer) { + device_printf(sc->sc_dev, "HDMI event without HDMI framer set\n"); + return; } - if (device_probe_and_attach(fbd) != 0) { - device_printf(dev, "Failed to attach fbd device\n"); - goto fail; + + hdmi_dev = OF_device_from_xref(sc->sc_hdmi_framer); + if (!hdmi_dev) { + device_printf(sc->sc_dev, "no actual device for \"hdmi\" property\n"); + return; } + + edid = NULL; + edid_len = 0; + if (HDMI_GET_EDID(hdmi_dev, &edid, &edid_len) != 0) { + device_printf(sc->sc_dev, "failed to get EDID info from HDMI framer\n"); + return; + } + + videomode = NULL; + + if (edid_parse(edid, &ei) == 0) { + edid_print(&ei); + videomode = am335x_lcd_pick_mode(&ei); + } else + device_printf(sc->sc_dev, "failed to parse EDID\n"); + + /* Use standard VGA as fallback */ + if (videomode == NULL) + videomode = pick_mode_by_ref(640, 480, 60); + + if (videomode == NULL) { + device_printf(sc->sc_dev, "failed to find usable videomode"); + return; + } + + device_printf(sc->sc_dev, "detected videomode: %dx%d @ %dKHz\n", videomode->hdisplay, + videomode->vdisplay, am335x_mode_vrefresh(videomode)); + + sc->sc_panel.panel_width = videomode->hdisplay; + sc->sc_panel.panel_height = videomode->vdisplay; + sc->sc_panel.panel_hfp = videomode->hsync_start - videomode->hdisplay; + sc->sc_panel.panel_hbp = videomode->htotal - videomode->hsync_end; + sc->sc_panel.panel_hsw = videomode->hsync_end - videomode->hsync_start; + sc->sc_panel.panel_vfp = videomode->vsync_start - videomode->vdisplay; + sc->sc_panel.panel_vbp = videomode->vtotal - videomode->vsync_end; + sc->sc_panel.panel_vsw = videomode->vsync_end - videomode->vsync_start; + sc->sc_panel.pixelclk_active = 1; + + /* logic for HSYNC should be reversed */ + if (videomode->flags & VID_NHSYNC) + sc->sc_panel.hsync_active = 1; + else + sc->sc_panel.hsync_active = 0; + + if (videomode->flags & VID_NVSYNC) + sc->sc_panel.vsync_active = 0; + else + sc->sc_panel.vsync_active = 1; + + sc->sc_panel.panel_pxl_clk = videomode->dot_clock * 1000; + + am335x_lcd_configure(sc); + + memcpy(&hdmi_mode, videomode, sizeof(hdmi_mode)); + hdmi_mode.hskew = videomode->hsync_end - videomode->hsync_start; + hdmi_mode.flags |= VID_HSKEW; + + HDMI_SET_VIDEOMODE(hdmi_dev, &hdmi_mode); +} + +static int +am335x_lcd_probe(device_t dev) +{ +#ifdef DEV_SC + int err; #endif - return (0); + if (!ofw_bus_status_okay(dev)) + return (ENXIO); -fail: - return (err); + if (!ofw_bus_is_compatible(dev, "ti,am33xx-tilcdc")) + return (ENXIO); + + device_set_desc(dev, "AM335x LCD controller"); + +#ifdef DEV_SC + err = sc_probe_unit(device_get_unit(dev), + device_get_flags(dev) | SC_AUTODETECT_KBD); + if (err != 0) + return (err); +#endif + + return (BUS_PROBE_DEFAULT); +} + +static int +am335x_lcd_attach(device_t dev) +{ + struct am335x_lcd_softc *sc; + + int err; + int rid; + struct sysctl_ctx_list *ctx; + struct sysctl_oid *tree; + phandle_t root, panel_node; + + err = 0; + sc = device_get_softc(dev); + sc->sc_dev = dev; + + am335x_read_hdmi_property(dev); + + root = OF_finddevice("/"); + if (root == 0) { + device_printf(dev, "failed to get FDT root node\n"); + return (ENXIO); + } + + sc->sc_panel.ac_bias = 255; + sc->sc_panel.ac_bias_intrpt = 0; + sc->sc_panel.dma_burst_sz = 16; + sc->sc_panel.bpp = 16; + sc->sc_panel.fdd = 128; + sc->sc_panel.sync_edge = 0; + sc->sc_panel.sync_ctrl = 1; + + panel_node = fdt_find_compatible(root, "ti,tilcdc,panel", 1); + if (panel_node != 0) { + device_printf(dev, "using static panel info\n"); + if (am335x_read_panel_info(dev, panel_node, &sc->sc_panel)) { + device_printf(dev, "failed to read panel info\n"); + return (ENXIO); + } + + if (am335x_read_timing(dev, panel_node, &sc->sc_panel)) { + device_printf(dev, "failed to read timings\n"); + return (ENXIO); + } + } + + ti_prcm_clk_enable(LCDC_CLK); + + rid = 0; + sc->sc_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (!sc->sc_mem_res) { + device_printf(dev, "cannot allocate memory window\n"); + return (ENXIO); + } + + rid = 0; + sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_ACTIVE); + if (!sc->sc_irq_res) { + bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res); + device_printf(dev, "cannot allocate interrupt\n"); + return (ENXIO); + } + + if (bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE, + NULL, am335x_lcd_intr, sc, + &sc->sc_intr_hl) != 0) { + bus_release_resource(dev, SYS_RES_IRQ, rid, + sc->sc_irq_res); + bus_release_resource(dev, SYS_RES_MEMORY, rid, + sc->sc_mem_res); + device_printf(dev, "Unable to setup the irq handler.\n"); + return (ENXIO); + } + + LCD_LOCK_INIT(sc); + + /* Init backlight interface */ + ctx = device_get_sysctl_ctx(sc->sc_dev); + tree = device_get_sysctl_tree(sc->sc_dev); + sc->sc_oid = SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "backlight", CTLTYPE_INT | CTLFLAG_RW, sc, 0, + am335x_lcd_sysctl_backlight, "I", "LCD backlight"); + sc->sc_backlight = 0; + /* Check if eCAS interface is available at this point */ + if (am335x_pwm_config_ecap(PWM_UNIT, + PWM_PERIOD, PWM_PERIOD) == 0) + sc->sc_backlight = 100; + + sc->sc_hdmi_evh = EVENTHANDLER_REGISTER(hdmi_event, + am335x_lcd_hdmi_event, sc, 0); + + return (0); } static int Modified: head/sys/arm/ti/am335x/am335x_lcd.h ============================================================================== --- head/sys/arm/ti/am335x/am335x_lcd.h Thu Jun 18 00:22:14 2015 (r284533) +++ head/sys/arm/ti/am335x/am335x_lcd.h Thu Jun 18 00:57:52 2015 (r284534) @@ -29,6 +29,7 @@ #define __AM335X_LCD_H__ struct panel_info { + /* Timing part */ uint32_t panel_width; uint32_t panel_height; uint32_t panel_hfp; @@ -37,16 +38,17 @@ struct panel_info { uint32_t panel_vfp; uint32_t panel_vbp; uint32_t panel_vsw; + uint32_t hsync_active; + uint32_t vsync_active; + uint32_t panel_pxl_clk; + uint32_t ac_bias; uint32_t ac_bias_intrpt; uint32_t dma_burst_sz; uint32_t bpp; uint32_t fdd; - uint32_t hsync_active; - uint32_t vsync_active; uint32_t sync_edge; uint32_t sync_ctrl; - uint32_t panel_pxl_clk; uint32_t pixelclk_active; }; Modified: head/sys/arm/ti/am335x/files.am335x ============================================================================== --- head/sys/arm/ti/am335x/files.am335x Thu Jun 18 00:22:14 2015 (r284533) +++ head/sys/arm/ti/am335x/files.am335x Thu Jun 18 00:57:52 2015 (r284534) @@ -16,5 +16,8 @@ arm/ti/am335x/am335x_scm_padconf.c stand arm/ti/am335x/am335x_usbss.c optional musb fdt arm/ti/am335x/am335x_musb.c optional musb fdt +arm/ti/am335x/hdmi_if.m optional hdmi +arm/ti/am335x/tda19988.c optional hdmi + arm/ti/ti_edma3.c standard arm/ti/cpsw/if_cpsw.c optional cpsw Added: head/sys/arm/ti/am335x/hdmi.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/ti/am335x/hdmi.h Thu Jun 18 00:57:52 2015 (r284534) @@ -0,0 +1,38 @@ +/*- + * Copyright (c) 2015 Oleksandr Tymoshenko + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _HDMI_H_ +#define _HDMI_H_ + +#include + +typedef void (*hdmi_event_hook)(void *, int); +EVENTHANDLER_DECLARE(hdmi_event, hdmi_event_hook); + +#endif /* !_HDMI_H_ */ + Added: head/sys/arm/ti/am335x/hdmi_if.m ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/ti/am335x/hdmi_if.m Thu Jun 18 00:57:52 2015 (r284534) @@ -0,0 +1,50 @@ +#- +# Copyright (c) 2015 Oleksandr Tymoshenko +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +#include +#include +#include + +INTERFACE hdmi; + +# +# Get EDID info +# +METHOD int get_edid { + device_t dev; + uint8_t **edid; + uint32_t *edid_length; +}; + +# +# Set videomode +# +METHOD int set_videomode { + device_t dev; + const struct videomode *videomode; +}; Modified: head/sys/boot/fdt/dts/arm/beaglebone-black.dts ============================================================================== --- head/sys/boot/fdt/dts/arm/beaglebone-black.dts Thu Jun 18 00:22:14 2015 (r284533) +++ head/sys/boot/fdt/dts/arm/beaglebone-black.dts Thu Jun 18 00:57:52 2015 (r284534) @@ -29,3 +29,25 @@ #include "am335x-boneblack.dts" #include "beaglebone-common.dtsi" + +&i2c0 { + tda998x: hdmi-encoder { + compatible = "nxp,tda998x"; + reg = <0x70>; + + pinctrl-names = "default", "off"; + pinctrl-0 = <&nxp_hdmi_bonelt_pins>; + pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; + status = "okay"; + }; +}; + +&lcdc { + hdmi = <&tda998x>; +}; + +/ { + hdmi { + status = "disabled"; + }; +}; From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 02:04:21 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7724FEB1; Thu, 18 Jun 2015 02:04:21 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 58519F4E; Thu, 18 Jun 2015 02:04:21 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5I24L3E079538; Thu, 18 Jun 2015 02:04:21 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5I24LJm079537; Thu, 18 Jun 2015 02:04:21 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201506180204.t5I24LJm079537@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Thu, 18 Jun 2015 02:04:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284535 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 02:04:21 -0000 Author: sbruno Date: Thu Jun 18 02:04:20 2015 New Revision: 284535 URL: https://svnweb.freebsd.org/changeset/base/284535 Log: This change replaces the mutex with a sx lock for the interpreter list to avoid the problem of holding a non-sleep lock during a page fault as reported by witness. It also uses atomics where possible to avoid having to acquire the exclusive lock. In addition, it consistently uses memset()/memcpy() instead of bzero()/bcopy(). Differential Revision: https://reviews.freebsd.org/D1971 Submitted by: sson Reviewed by: jhb Modified: head/sys/kern/imgact_binmisc.c Modified: head/sys/kern/imgact_binmisc.c ============================================================================== --- head/sys/kern/imgact_binmisc.c Thu Jun 18 00:57:52 2015 (r284534) +++ head/sys/kern/imgact_binmisc.c Thu Jun 18 02:04:20 2015 (r284535) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2013, Stacey D. Son + * Copyright (c) 2013-15, Stacey D. Son * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -41,6 +41,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include + +#include /** * Miscellaneous binary interpreter image activator. @@ -96,7 +99,7 @@ static SLIST_HEAD(, imgact_binmisc_entry static int interp_list_entry_count = 0; -static struct mtx interp_list_mtx; +static struct sx interp_list_sx; int imgact_binmisc_exec(struct image_params *imgp); @@ -111,7 +114,7 @@ imgact_binmisc_populate_interp(char *str char t[IBE_INTERP_LEN_MAX]; char *sp, *tp; - bzero(t, sizeof(t)); + memset(t, 0, sizeof(t)); /* * Normalize interpreter string. Replace white space between args with @@ -152,8 +155,6 @@ imgact_binmisc_new_entry(ximgact_binmisc imgact_binmisc_entry_t *ibe = NULL; size_t namesz = min(strlen(xbe->xbe_name) + 1, IBE_NAME_MAX); - mtx_assert(&interp_list_mtx, MA_NOTOWNED); - ibe = malloc(sizeof(*ibe), M_BINMISC, M_WAITOK|M_ZERO); ibe->ibe_name = malloc(namesz, M_BINMISC, M_WAITOK|M_ZERO); @@ -203,7 +204,7 @@ imgact_binmisc_find_entry(char *name) { imgact_binmisc_entry_t *ibe; - mtx_assert(&interp_list_mtx, MA_OWNED); + sx_assert(&interp_list_sx, SA_LOCKED); SLIST_FOREACH(ibe, &interpreter_list, link) { if (strncmp(name, ibe->ibe_name, IBE_NAME_MAX) == 0) @@ -260,21 +261,20 @@ imgact_binmisc_add_entry(ximgact_binmisc } } - mtx_lock(&interp_list_mtx); + sx_xlock(&interp_list_sx); if (imgact_binmisc_find_entry(xbe->xbe_name) != NULL) { - mtx_unlock(&interp_list_mtx); + sx_xunlock(&interp_list_sx); return (EEXIST); } - mtx_unlock(&interp_list_mtx); + /* Preallocate a new entry. */ ibe = imgact_binmisc_new_entry(xbe); if (!ibe) return (ENOMEM); - mtx_lock(&interp_list_mtx); SLIST_INSERT_HEAD(&interpreter_list, ibe, link); interp_list_entry_count++; - mtx_unlock(&interp_list_mtx); + sx_xunlock(&interp_list_sx); return (0); } @@ -288,14 +288,14 @@ imgact_binmisc_remove_entry(char *name) { imgact_binmisc_entry_t *ibe; - mtx_lock(&interp_list_mtx); + sx_xlock(&interp_list_sx); if ((ibe = imgact_binmisc_find_entry(name)) == NULL) { - mtx_unlock(&interp_list_mtx); + sx_xunlock(&interp_list_sx); return (ENOENT); } SLIST_REMOVE(&interpreter_list, ibe, imgact_binmisc_entry, link); interp_list_entry_count--; - mtx_unlock(&interp_list_mtx); + sx_xunlock(&interp_list_sx); imgact_binmisc_destroy_entry(ibe); @@ -311,14 +311,14 @@ imgact_binmisc_disable_entry(char *name) { imgact_binmisc_entry_t *ibe; - mtx_lock(&interp_list_mtx); + sx_slock(&interp_list_sx); if ((ibe = imgact_binmisc_find_entry(name)) == NULL) { - mtx_unlock(&interp_list_mtx); + sx_sunlock(&interp_list_sx); return (ENOENT); } ibe->ibe_flags &= ~IBF_ENABLED; - mtx_unlock(&interp_list_mtx); + sx_sunlock(&interp_list_sx); return (0); } @@ -332,14 +332,14 @@ imgact_binmisc_enable_entry(char *name) { imgact_binmisc_entry_t *ibe; - mtx_lock(&interp_list_mtx); + sx_slock(&interp_list_sx); if ((ibe = imgact_binmisc_find_entry(name)) == NULL) { - mtx_unlock(&interp_list_mtx); + sx_sunlock(&interp_list_sx); return (ENOENT); } - ibe->ibe_flags |= IBF_ENABLED; - mtx_unlock(&interp_list_mtx); + atomic_set_32(&ibe->ibe_flags, IBF_ENABLED); + sx_sunlock(&interp_list_sx); return (0); } @@ -350,9 +350,9 @@ imgact_binmisc_populate_xbe(ximgact_binm { uint32_t i; - mtx_assert(&interp_list_mtx, MA_OWNED); + sx_assert(&interp_list_sx, SA_LOCKED); - bzero(xbe, sizeof(*xbe)); + memset(xbe, 0, sizeof(*xbe)); strlcpy(xbe->xbe_name, ibe->ibe_name, IBE_NAME_MAX); /* Copy interpreter string. Replace NULL breaks with space. */ @@ -382,14 +382,14 @@ imgact_binmisc_lookup_entry(char *name, imgact_binmisc_entry_t *ibe; int error = 0; - mtx_lock(&interp_list_mtx); + sx_slock(&interp_list_sx); if ((ibe = imgact_binmisc_find_entry(name)) == NULL) { - mtx_unlock(&interp_list_mtx); + sx_sunlock(&interp_list_sx); return (ENOENT); } error = imgact_binmisc_populate_xbe(xbe, ibe); - mtx_unlock(&interp_list_mtx); + sx_sunlock(&interp_list_sx); return (error); } @@ -404,12 +404,12 @@ imgact_binmisc_get_all_entries(struct sy imgact_binmisc_entry_t *ibe; int error = 0, count; - mtx_lock(&interp_list_mtx); + sx_slock(&interp_list_sx); count = interp_list_entry_count; /* Don't block in malloc() while holding lock. */ xbe = malloc(sizeof(*xbe) * count, M_BINMISC, M_NOWAIT|M_ZERO); if (!xbe) { - mtx_unlock(&interp_list_mtx); + sx_sunlock(&interp_list_sx); return (ENOMEM); } @@ -419,7 +419,7 @@ imgact_binmisc_get_all_entries(struct sy if (error) break; } - mtx_unlock(&interp_list_mtx); + sx_sunlock(&interp_list_sx); if (!error) error = SYSCTL_OUT(req, xbe, sizeof(*xbe) * count); @@ -556,7 +556,7 @@ imgact_binmisc_find_interpreter(const ch int i; size_t sz; - mtx_assert(&interp_list_mtx, MA_OWNED); + sx_assert(&interp_list_sx, SA_LOCKED); SLIST_FOREACH(ibe, &interpreter_list, link) { if (!(IBF_ENABLED & ibe->ibe_flags)) @@ -593,15 +593,15 @@ imgact_binmisc_exec(struct image_params char *s, *d; /* Do we have an interpreter for the given image header? */ - mtx_lock(&interp_list_mtx); + sx_slock(&interp_list_sx); if ((ibe = imgact_binmisc_find_interpreter(image_header)) == NULL) { - mtx_unlock(&interp_list_mtx); + sx_sunlock(&interp_list_sx); return (-1); } /* No interpreter nesting allowed. */ if (imgp->interpreted & IMGACT_BINMISC) { - mtx_unlock(&interp_list_mtx); + sx_sunlock(&interp_list_sx); return (ENOEXEC); } @@ -649,7 +649,7 @@ imgact_binmisc_exec(struct image_params default: /* Hmm... This shouldn't happen. */ - mtx_unlock(&interp_list_mtx); + sx_sunlock(&interp_list_sx); printf("%s: Unknown macro #%c sequence in " "interpreter string\n", KMOD_NAME, *(s + 1)); error = EINVAL; @@ -660,7 +660,7 @@ imgact_binmisc_exec(struct image_params /* Check to make sure we won't overrun the stringspace. */ if (offset > imgp->args->stringspace) { - mtx_unlock(&interp_list_mtx); + sx_sunlock(&interp_list_sx); error = E2BIG; goto done; } @@ -720,7 +720,7 @@ imgact_binmisc_exec(struct image_params s++; } *d = '\0'; - mtx_unlock(&interp_list_mtx); + sx_sunlock(&interp_list_sx); if (!error) imgp->interpreter_name = imgp->args->begin_argv; @@ -736,7 +736,7 @@ static void imgact_binmisc_init(void *arg) { - mtx_init(&interp_list_mtx, KMOD_NAME, NULL, MTX_DEF); + sx_init(&interp_list_sx, KMOD_NAME); } static void @@ -745,15 +745,15 @@ imgact_binmisc_fini(void *arg) imgact_binmisc_entry_t *ibe, *ibe_tmp; /* Free all the interpreters. */ - mtx_lock(&interp_list_mtx); + sx_xlock(&interp_list_sx); SLIST_FOREACH_SAFE(ibe, &interpreter_list, link, ibe_tmp) { SLIST_REMOVE(&interpreter_list, ibe, imgact_binmisc_entry, link); imgact_binmisc_destroy_entry(ibe); } - mtx_unlock(&interp_list_mtx); + sx_xunlock(&interp_list_sx); - mtx_destroy(&interp_list_mtx); + sx_destroy(&interp_list_sx); } SYSINIT(imgact_binmisc, SI_SUB_EXEC, SI_ORDER_MIDDLE, imgact_binmisc_init, 0); From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 03:07:21 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 49191C0E; Thu, 18 Jun 2015 03:07:21 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B209CF94; Thu, 18 Jun 2015 03:07:20 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id t5I37FKO003852 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Thu, 18 Jun 2015 06:07:15 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua t5I37FKO003852 Received: (from kostik@localhost) by tom.home (8.14.9/8.14.9/Submit) id t5I37FKW003851; Thu, 18 Jun 2015 06:07:15 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 18 Jun 2015 06:07:15 +0300 From: Konstantin Belousov To: Sean Bruno Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284535 - head/sys/kern Message-ID: <20150618030715.GD2080@kib.kiev.ua> References: <201506180204.t5I24LJm079537@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201506180204.t5I24LJm079537@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 03:07:21 -0000 On Thu, Jun 18, 2015 at 02:04:21AM +0000, Sean Bruno wrote: > Author: sbruno > Date: Thu Jun 18 02:04:20 2015 > New Revision: 284535 > URL: https://svnweb.freebsd.org/changeset/base/284535 > > Log: > This change replaces the mutex with a sx lock for the interpreter list to > avoid the problem of holding a non-sleep lock during a page fault as > reported by witness. It also uses atomics where possible to avoid having > to acquire the exclusive lock. In addition, it consistently uses > memset()/memcpy() instead of bzero()/bcopy(). > > Differential Revision: https://reviews.freebsd.org/D1971 > Submitted by: sson > Reviewed by: jhb What are the page faults during image activator run ? Or, if the page faults are not during image activation, then where ? > > @@ -404,12 +404,12 @@ imgact_binmisc_get_all_entries(struct sy > imgact_binmisc_entry_t *ibe; > int error = 0, count; > > - mtx_lock(&interp_list_mtx); > + sx_slock(&interp_list_sx); > count = interp_list_entry_count; > /* Don't block in malloc() while holding lock. */ > xbe = malloc(sizeof(*xbe) * count, M_BINMISC, M_NOWAIT|M_ZERO); This is definitely no longer true statement. Even the original use of M_NOWAIT there is not warranted. > if (!xbe) { > - mtx_unlock(&interp_list_mtx); > + sx_sunlock(&interp_list_sx); > return (ENOMEM); > } > From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 05:54:04 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E87BD88B; Thu, 18 Jun 2015 05:54:04 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6F19C6B; Thu, 18 Jun 2015 05:54:04 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5I5s4Cc092531; Thu, 18 Jun 2015 05:54:04 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5I5s4ag092530; Thu, 18 Jun 2015 05:54:04 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506180554.t5I5s4ag092530@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 18 Jun 2015 05:54:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284537 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 05:54:05 -0000 Author: bapt Date: Thu Jun 18 05:54:04 2015 New Revision: 284537 URL: https://svnweb.freebsd.org/changeset/base/284537 Log: Do not remove mailwrapper(8) in case WITHOUT_SENDMAIL is used It is required for other tools in base and/or ports like dma(8) or any MTA available in ports. It is also build and installed anyway even if world is built WITHOUT_SENDMAIL Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Thu Jun 18 05:36:45 2015 (r284536) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Thu Jun 18 05:54:04 2015 (r284537) @@ -5102,9 +5102,7 @@ OLD_FILES+=usr/share/misc/mail.tildehelp .if ${MK_MAILWRAPPER} == no OLD_FILES+=etc/mail/mailer.conf -.if ${MK_SENDMAIL} == no OLD_FILES+=usr/sbin/mailwrapper -.endif OLD_FILES+=usr/share/man/man8/mailwrapper.8.gz .endif From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 05:58:16 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A5AA2A60; Thu, 18 Jun 2015 05:58:16 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 94032CCD; Thu, 18 Jun 2015 05:58:16 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5I5wGwl093117; Thu, 18 Jun 2015 05:58:16 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5I5wGIr093116; Thu, 18 Jun 2015 05:58:16 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506180558.t5I5wGIr093116@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 18 Jun 2015 05:58:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284538 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 05:58:16 -0000 Author: bapt Date: Thu Jun 18 05:58:15 2015 New Revision: 284538 URL: https://svnweb.freebsd.org/changeset/base/284538 Log: The build and installation of rmail(8) is only related to the SENDMAIL option Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Thu Jun 18 05:54:04 2015 (r284537) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Thu Jun 18 05:58:15 2015 (r284538) @@ -6333,9 +6333,7 @@ OLD_FILES+=etc/periodic/daily/150.clean- OLD_FILES+=etc/periodic/daily/440.status-mailq OLD_FILES+=etc/periodic/daily/460.status-mail-rejects OLD_FILES+=etc/periodic/daily/500.queuerun -.if ${MK_MAILWRAPPER} == no OLD_FILES+=bin/rmail -.endif OLD_FILES+=usr/bin/vacation OLD_FILES+=usr/include/libmilter/mfapi.h OLD_FILES+=usr/include/libmilter/mfdef.h From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 06:00:20 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 912CCCC0; Thu, 18 Jun 2015 06:00:20 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C245D24; Thu, 18 Jun 2015 06:00:20 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5I60KTi094244; Thu, 18 Jun 2015 06:00:20 GMT (envelope-from neel@FreeBSD.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5I60Hh5094232; Thu, 18 Jun 2015 06:00:17 GMT (envelope-from neel@FreeBSD.org) Message-Id: <201506180600.t5I60Hh5094232@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org using -f From: Neel Natu Date: Thu, 18 Jun 2015 06:00:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284539 - in head: lib/libvmmapi share/examples/bhyve sys/amd64/include sys/amd64/vmm sys/amd64/vmm/amd sys/amd64/vmm/intel sys/amd64/vmm/io usr.sbin/bhyve usr.sbin/bhyvectl usr.sbin/bh... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 06:00:20 -0000 Author: neel Date: Thu Jun 18 06:00:17 2015 New Revision: 284539 URL: https://svnweb.freebsd.org/changeset/base/284539 Log: Restructure memory allocation in bhyve to support "devmem". devmem is used to represent MMIO devices like the boot ROM or a VESA framebuffer where doing a trap-and-emulate for every access is impractical. devmem is a hybrid of system memory (sysmem) and emulated device models. devmem is mapped in the guest address space via nested page tables similar to sysmem. However the address range where devmem is mapped may be changed by the guest at runtime (e.g. by reprogramming a PCI BAR). Also devmem is usually mapped RO or RW as compared to RWX mappings for sysmem. Each devmem segment is named (e.g. "bootrom") and this name is used to create a device node for the devmem segment (e.g. /dev/vmm/testvm.bootrom). The device node supports mmap(2) and this decouples the host mapping of devmem from its mapping in the guest address space (which can change). Reviewed by: tychon Discussed with: grehan Differential Revision: https://reviews.freebsd.org/D2762 MFC after: 4 weeks Added: head/usr.sbin/bhyve/bootrom.c (contents, props changed) head/usr.sbin/bhyve/bootrom.h (contents, props changed) Modified: head/lib/libvmmapi/vmmapi.c head/lib/libvmmapi/vmmapi.h head/share/examples/bhyve/vmrun.sh head/sys/amd64/include/vmm.h head/sys/amd64/include/vmm_dev.h head/sys/amd64/vmm/amd/svm.c head/sys/amd64/vmm/intel/vmx.c head/sys/amd64/vmm/io/ppt.c head/sys/amd64/vmm/vmm.c head/sys/amd64/vmm/vmm_dev.c head/sys/amd64/vmm/vmm_instruction_emul.c head/sys/amd64/vmm/vmm_mem.c head/sys/amd64/vmm/vmm_mem.h head/usr.sbin/bhyve/Makefile head/usr.sbin/bhyve/bhyve.8 head/usr.sbin/bhyve/bhyverun.c head/usr.sbin/bhyve/pci_lpc.c head/usr.sbin/bhyve/pci_lpc.h head/usr.sbin/bhyve/pci_passthru.c head/usr.sbin/bhyvectl/Makefile head/usr.sbin/bhyvectl/bhyvectl.c head/usr.sbin/bhyveload/bhyveload.8 head/usr.sbin/bhyveload/bhyveload.c Modified: head/lib/libvmmapi/vmmapi.c ============================================================================== --- head/lib/libvmmapi/vmmapi.c Thu Jun 18 05:58:15 2015 (r284538) +++ head/lib/libvmmapi/vmmapi.c Thu Jun 18 06:00:17 2015 (r284539) @@ -58,15 +58,23 @@ __FBSDID("$FreeBSD$"); #define MB (1024 * 1024UL) #define GB (1024 * 1024 * 1024UL) +/* + * Size of the guard region before and after the virtual address space + * mapping the guest physical memory. This must be a multiple of the + * superpage size for performance reasons. + */ +#define VM_MMAP_GUARD_SIZE (4 * MB) + +#define PROT_RW (PROT_READ | PROT_WRITE) +#define PROT_ALL (PROT_READ | PROT_WRITE | PROT_EXEC) + struct vmctx { int fd; uint32_t lowmem_limit; - enum vm_mmap_style vms; int memflags; size_t lowmem; - char *lowmem_addr; size_t highmem; - char *highmem_addr; + char *baseaddr; char *name; }; @@ -157,22 +165,6 @@ vm_parse_memsize(const char *optarg, siz return (error); } -int -vm_get_memory_seg(struct vmctx *ctx, vm_paddr_t gpa, size_t *ret_len, - int *wired) -{ - int error; - struct vm_memory_segment seg; - - bzero(&seg, sizeof(seg)); - seg.gpa = gpa; - error = ioctl(ctx->fd, VM_GET_MEMORY_SEG, &seg); - *ret_len = seg.len; - if (wired != NULL) - *wired = seg.wired; - return (error); -} - uint32_t vm_get_lowmem_limit(struct vmctx *ctx) { @@ -194,39 +186,184 @@ vm_set_memflags(struct vmctx *ctx, int f ctx->memflags = flags; } +int +vm_get_memflags(struct vmctx *ctx) +{ + + return (ctx->memflags); +} + +/* + * Map segment 'segid' starting at 'off' into guest address range [gpa,gpa+len). + */ +int +vm_mmap_memseg(struct vmctx *ctx, vm_paddr_t gpa, int segid, vm_ooffset_t off, + size_t len, int prot) +{ + struct vm_memmap memmap; + int error, flags; + + memmap.gpa = gpa; + memmap.segid = segid; + memmap.segoff = off; + memmap.len = len; + memmap.prot = prot; + memmap.flags = 0; + + if (ctx->memflags & VM_MEM_F_WIRED) + memmap.flags |= VM_MEMMAP_F_WIRED; + + /* + * If this mapping already exists then don't create it again. This + * is the common case for SYSMEM mappings created by bhyveload(8). + */ + error = vm_mmap_getnext(ctx, &gpa, &segid, &off, &len, &prot, &flags); + if (error == 0 && gpa == memmap.gpa) { + if (segid != memmap.segid || off != memmap.segoff || + prot != memmap.prot || flags != memmap.flags) { + errno = EEXIST; + return (-1); + } else { + return (0); + } + } + + error = ioctl(ctx->fd, VM_MMAP_MEMSEG, &memmap); + return (error); +} + +int +vm_mmap_getnext(struct vmctx *ctx, vm_paddr_t *gpa, int *segid, + vm_ooffset_t *segoff, size_t *len, int *prot, int *flags) +{ + struct vm_memmap memmap; + int error; + + bzero(&memmap, sizeof(struct vm_memmap)); + memmap.gpa = *gpa; + error = ioctl(ctx->fd, VM_MMAP_GETNEXT, &memmap); + if (error == 0) { + *gpa = memmap.gpa; + *segid = memmap.segid; + *segoff = memmap.segoff; + *len = memmap.len; + *prot = memmap.prot; + *flags = memmap.flags; + } + return (error); +} + +/* + * Return 0 if the segments are identical and non-zero otherwise. + * + * This is slightly complicated by the fact that only device memory segments + * are named. + */ static int -setup_memory_segment(struct vmctx *ctx, vm_paddr_t gpa, size_t len, char **addr) +cmpseg(size_t len, const char *str, size_t len2, const char *str2) { - int error, mmap_flags; - struct vm_memory_segment seg; + + if (len == len2) { + if ((!str && !str2) || (str && str2 && !strcmp(str, str2))) + return (0); + } + return (-1); +} + +static int +vm_alloc_memseg(struct vmctx *ctx, int segid, size_t len, const char *name) +{ + struct vm_memseg memseg; + size_t n; + int error; /* - * Create and optionally map 'len' bytes of memory at guest - * physical address 'gpa' + * If the memory segment has already been created then just return. + * This is the usual case for the SYSMEM segment created by userspace + * loaders like bhyveload(8). */ - bzero(&seg, sizeof(seg)); - seg.gpa = gpa; - seg.len = len; - error = ioctl(ctx->fd, VM_MAP_MEMORY, &seg); - if (error == 0 && addr != NULL) { - mmap_flags = MAP_SHARED; - if ((ctx->memflags & VM_MEM_F_INCORE) == 0) - mmap_flags |= MAP_NOCORE; - *addr = mmap(NULL, len, PROT_READ | PROT_WRITE, mmap_flags, - ctx->fd, gpa); + error = vm_get_memseg(ctx, segid, &memseg.len, memseg.name, + sizeof(memseg.name)); + if (error) + return (error); + + if (memseg.len != 0) { + if (cmpseg(len, name, memseg.len, VM_MEMSEG_NAME(&memseg))) { + errno = EINVAL; + return (-1); + } else { + return (0); + } + } + + bzero(&memseg, sizeof(struct vm_memseg)); + memseg.segid = segid; + memseg.len = len; + if (name != NULL) { + n = strlcpy(memseg.name, name, sizeof(memseg.name)); + if (n >= sizeof(memseg.name)) { + errno = ENAMETOOLONG; + return (-1); + } + } + + error = ioctl(ctx->fd, VM_ALLOC_MEMSEG, &memseg); + return (error); +} + +int +vm_get_memseg(struct vmctx *ctx, int segid, size_t *lenp, char *namebuf, + size_t bufsize) +{ + struct vm_memseg memseg; + size_t n; + int error; + + memseg.segid = segid; + error = ioctl(ctx->fd, VM_GET_MEMSEG, &memseg); + if (error == 0) { + *lenp = memseg.len; + n = strlcpy(namebuf, memseg.name, bufsize); + if (n >= bufsize) { + errno = ENAMETOOLONG; + error = -1; + } } return (error); } +static int +setup_memory_segment(struct vmctx *ctx, vm_paddr_t gpa, size_t len, char *base) +{ + char *ptr; + int error, flags; + + /* Map 'len' bytes starting at 'gpa' in the guest address space */ + error = vm_mmap_memseg(ctx, gpa, VM_SYSMEM, gpa, len, PROT_ALL); + if (error) + return (error); + + flags = MAP_SHARED | MAP_FIXED; + if ((ctx->memflags & VM_MEM_F_INCORE) == 0) + flags |= MAP_NOCORE; + + /* mmap into the process address space on the host */ + ptr = mmap(base + gpa, len, PROT_RW, flags, ctx->fd, gpa); + if (ptr == MAP_FAILED) + return (-1); + + return (0); +} + int vm_setup_memory(struct vmctx *ctx, size_t memsize, enum vm_mmap_style vms) { - char **addr; - int error; + size_t objsize, len; + vm_paddr_t gpa; + char *baseaddr, *ptr; + int error, flags; - /* XXX VM_MMAP_SPARSE not implemented yet */ - assert(vms == VM_MMAP_NONE || vms == VM_MMAP_ALL); - ctx->vms = vms; + assert(vms == VM_MMAP_ALL); /* * If 'memsize' cannot fit entirely in the 'lowmem' segment then @@ -234,46 +371,63 @@ vm_setup_memory(struct vmctx *ctx, size_ */ if (memsize > ctx->lowmem_limit) { ctx->lowmem = ctx->lowmem_limit; - ctx->highmem = memsize - ctx->lowmem; + ctx->highmem = memsize - ctx->lowmem_limit; + objsize = 4*GB + ctx->highmem; } else { ctx->lowmem = memsize; ctx->highmem = 0; + objsize = ctx->lowmem; } - if (ctx->lowmem > 0) { - addr = (vms == VM_MMAP_ALL) ? &ctx->lowmem_addr : NULL; - error = setup_memory_segment(ctx, 0, ctx->lowmem, addr); + error = vm_alloc_memseg(ctx, VM_SYSMEM, objsize, NULL); + if (error) + return (error); + + /* + * Stake out a contiguous region covering the guest physical memory + * and the adjoining guard regions. + */ + len = VM_MMAP_GUARD_SIZE + objsize + VM_MMAP_GUARD_SIZE; + flags = MAP_PRIVATE | MAP_ANON | MAP_NOCORE | MAP_ALIGNED_SUPER; + ptr = mmap(NULL, len, PROT_NONE, flags, -1, 0); + if (ptr == MAP_FAILED) + return (-1); + + baseaddr = ptr + VM_MMAP_GUARD_SIZE; + if (ctx->highmem > 0) { + gpa = 4*GB; + len = ctx->highmem; + error = setup_memory_segment(ctx, gpa, len, baseaddr); if (error) return (error); } - if (ctx->highmem > 0) { - addr = (vms == VM_MMAP_ALL) ? &ctx->highmem_addr : NULL; - error = setup_memory_segment(ctx, 4*GB, ctx->highmem, addr); + if (ctx->lowmem > 0) { + gpa = 0; + len = ctx->lowmem; + error = setup_memory_segment(ctx, gpa, len, baseaddr); if (error) return (error); } + ctx->baseaddr = baseaddr; + return (0); } void * vm_map_gpa(struct vmctx *ctx, vm_paddr_t gaddr, size_t len) { + vm_paddr_t start, end, mapend; - /* XXX VM_MMAP_SPARSE not implemented yet */ - assert(ctx->vms == VM_MMAP_ALL); + start = gaddr; + end = gaddr + len; + mapend = ctx->highmem ? 4*GB + ctx->highmem : ctx->lowmem; - if (gaddr < ctx->lowmem && gaddr + len <= ctx->lowmem) - return ((void *)(ctx->lowmem_addr + gaddr)); - - if (gaddr >= 4*GB) { - gaddr -= 4*GB; - if (gaddr < ctx->highmem && gaddr + len <= ctx->highmem) - return ((void *)(ctx->highmem_addr + gaddr)); - } - - return (NULL); + if (start <= end && end <= mapend) + return (ctx->baseaddr + start); + else + return (NULL); } size_t @@ -290,6 +444,56 @@ vm_get_highmem_size(struct vmctx *ctx) return (ctx->highmem); } +void * +vm_create_devmem(struct vmctx *ctx, int segid, const char *name, size_t len) +{ + char pathname[MAXPATHLEN]; + size_t len2; + char *base, *ptr; + int fd, error, flags; + + fd = -1; + ptr = MAP_FAILED; + if (name == NULL || strlen(name) == 0) { + errno = EINVAL; + goto done; + } + + error = vm_alloc_memseg(ctx, segid, len, name); + if (error) + goto done; + + strlcpy(pathname, "/dev/vmm/", sizeof(pathname)); + strlcat(pathname, ctx->name, sizeof(pathname)); + strlcat(pathname, ".", sizeof(pathname)); + strlcat(pathname, name, sizeof(pathname)); + + fd = open(pathname, O_RDWR); + if (fd < 0) + goto done; + + /* + * Stake out a contiguous region covering the device memory and the + * adjoining guard regions. + */ + len2 = VM_MMAP_GUARD_SIZE + len + VM_MMAP_GUARD_SIZE; + flags = MAP_PRIVATE | MAP_ANON | MAP_NOCORE | MAP_ALIGNED_SUPER; + base = mmap(NULL, len2, PROT_NONE, flags, -1, 0); + if (base == MAP_FAILED) + goto done; + + flags = MAP_SHARED | MAP_FIXED; + if ((ctx->memflags & VM_MEM_F_INCORE) == 0) + flags |= MAP_NOCORE; + + /* mmap the devmem region in the host address space */ + ptr = mmap(base + VM_MMAP_GUARD_SIZE, len, PROT_RW, flags, fd, 0); +done: + if (fd >= 0) + close(fd); + return (ptr); +} + int vm_set_desc(struct vmctx *ctx, int vcpu, int reg, uint64_t base, uint32_t limit, uint32_t access) Modified: head/lib/libvmmapi/vmmapi.h ============================================================================== --- head/lib/libvmmapi/vmmapi.h Thu Jun 18 05:58:15 2015 (r284538) +++ head/lib/libvmmapi/vmmapi.h Thu Jun 18 06:00:17 2015 (r284539) @@ -36,7 +36,7 @@ * API version for out-of-tree consumers like grub-bhyve for making compile * time decisions. */ -#define VMMAPI_VERSION 0101 /* 2 digit major followed by 2 digit minor */ +#define VMMAPI_VERSION 0102 /* 2 digit major followed by 2 digit minor */ struct iovec; struct vmctx; @@ -52,14 +52,59 @@ enum vm_mmap_style { VM_MMAP_SPARSE, /* mappings created on-demand */ }; +/* + * 'flags' value passed to 'vm_set_memflags()'. + */ #define VM_MEM_F_INCORE 0x01 /* include guest memory in core file */ +#define VM_MEM_F_WIRED 0x02 /* guest memory is wired */ + +/* + * Identifiers for memory segments: + * - vm_setup_memory() uses VM_SYSMEM for the system memory segment. + * - the remaining identifiers can be used to create devmem segments. + */ +enum { + VM_SYSMEM, + VM_BOOTROM, + VM_FRAMEBUFFER, +}; + +/* + * Get the length and name of the memory segment identified by 'segid'. + * Note that system memory segments are identified with a nul name. + * + * Returns 0 on success and non-zero otherwise. + */ +int vm_get_memseg(struct vmctx *ctx, int ident, size_t *lenp, char *name, + size_t namesiz); + +/* + * Iterate over the guest address space. This function finds an address range + * that starts at an address >= *gpa. + * + * Returns 0 if the next address range was found and non-zero otherwise. + */ +int vm_mmap_getnext(struct vmctx *ctx, vm_paddr_t *gpa, int *segid, + vm_ooffset_t *segoff, size_t *len, int *prot, int *flags); +/* + * Create a device memory segment identified by 'segid'. + * + * Returns a pointer to the memory segment on success and MAP_FAILED otherwise. + */ +void *vm_create_devmem(struct vmctx *ctx, int segid, const char *name, + size_t len); + +/* + * Map the memory segment identified by 'segid' into the guest address space + * at [gpa,gpa+len) with protection 'prot'. + */ +int vm_mmap_memseg(struct vmctx *ctx, vm_paddr_t gpa, int segid, + vm_ooffset_t segoff, size_t len, int prot); int vm_create(const char *name); struct vmctx *vm_open(const char *name); void vm_destroy(struct vmctx *ctx); int vm_parse_memsize(const char *optarg, size_t *memsize); -int vm_get_memory_seg(struct vmctx *ctx, vm_paddr_t gpa, size_t *ret_len, - int *wired); int vm_setup_memory(struct vmctx *ctx, size_t len, enum vm_mmap_style s); void *vm_map_gpa(struct vmctx *ctx, vm_paddr_t gaddr, size_t len); int vm_get_gpa_pmap(struct vmctx *, uint64_t gpa, uint64_t *pte, int *num); @@ -68,6 +113,7 @@ int vm_gla2gpa(struct vmctx *, int vcpui uint32_t vm_get_lowmem_limit(struct vmctx *ctx); void vm_set_lowmem_limit(struct vmctx *ctx, uint32_t limit); void vm_set_memflags(struct vmctx *ctx, int flags); +int vm_get_memflags(struct vmctx *ctx); size_t vm_get_lowmem_size(struct vmctx *ctx); size_t vm_get_highmem_size(struct vmctx *ctx); int vm_set_desc(struct vmctx *ctx, int vcpu, int reg, Modified: head/share/examples/bhyve/vmrun.sh ============================================================================== --- head/share/examples/bhyve/vmrun.sh Thu Jun 18 05:58:15 2015 (r284538) +++ head/share/examples/bhyve/vmrun.sh Thu Jun 18 06:00:17 2015 (r284539) @@ -87,15 +87,15 @@ console=${DEFAULT_CONSOLE} cpus=${DEFAULT_CPUS} tap_total=0 disk_total=0 -apic_opt="" gdbport=0 loader_opt="" +bhyverun_opt="-H -A -P" pass_total=0 while getopts ac:C:d:e:g:hH:iI:m:p:t: c ; do case $c in a) - apic_opt="-a" + bhyverun_opt="${bhyverun_opt} -a" ;; c) cpus=${OPTARG} @@ -163,6 +163,12 @@ if [ -n "${host_base}" ]; then loader_opt="${loader_opt} -h ${host_base}" fi +# If PCI passthru devices are configured then guest memory must be wired +if [ ${pass_total} -gt 0 ]; then + loader_opt="${loader_opt} -S" + bhyverun_opt="${bhyverun_opt} -S" +fi + make_and_check_diskdev() { local virtio_diskdev="$1" @@ -263,7 +269,7 @@ while [ 1 ]; do i=$(($i + 1)) done - ${FBSDRUN} -c ${cpus} -m ${memsize} ${apic_opt} -A -H -P \ + ${FBSDRUN} -c ${cpus} -m ${memsize} ${bhyverun_opt} \ -g ${gdbport} \ -s 0:0,hostbridge \ -s 1:0,lpc \ Modified: head/sys/amd64/include/vmm.h ============================================================================== --- head/sys/amd64/include/vmm.h Thu Jun 18 05:58:15 2015 (r284538) +++ head/sys/amd64/include/vmm.h Thu Jun 18 06:00:17 2015 (r284539) @@ -108,7 +108,6 @@ enum x2apic_state { struct vm; struct vm_exception; -struct vm_memory_segment; struct seg_desc; struct vm_exit; struct vm_run; @@ -175,17 +174,33 @@ int vm_create(const char *name, struct v void vm_destroy(struct vm *vm); int vm_reinit(struct vm *vm); const char *vm_name(struct vm *vm); -int vm_malloc(struct vm *vm, vm_paddr_t gpa, size_t len); + +/* + * APIs that modify the guest memory map require all vcpus to be frozen. + */ +int vm_mmap_memseg(struct vm *vm, vm_paddr_t gpa, int segid, vm_ooffset_t off, + size_t len, int prot, int flags); +int vm_alloc_memseg(struct vm *vm, int ident, size_t len, bool sysmem); +void vm_free_memseg(struct vm *vm, int ident); int vm_map_mmio(struct vm *vm, vm_paddr_t gpa, size_t len, vm_paddr_t hpa); int vm_unmap_mmio(struct vm *vm, vm_paddr_t gpa, size_t len); -void *vm_gpa_hold(struct vm *, vm_paddr_t gpa, size_t len, int prot, - void **cookie); +int vm_assign_pptdev(struct vm *vm, int bus, int slot, int func); +int vm_unassign_pptdev(struct vm *vm, int bus, int slot, int func); + +/* + * APIs that inspect the guest memory map require only a *single* vcpu to + * be frozen. This acts like a read lock on the guest memory map since any + * modification requires *all* vcpus to be frozen. + */ +int vm_mmap_getnext(struct vm *vm, vm_paddr_t *gpa, int *segid, + vm_ooffset_t *segoff, size_t *len, int *prot, int *flags); +int vm_get_memseg(struct vm *vm, int ident, size_t *len, bool *sysmem, + struct vm_object **objptr); +void *vm_gpa_hold(struct vm *, int vcpuid, vm_paddr_t gpa, size_t len, + int prot, void **cookie); void vm_gpa_release(void *cookie); -int vm_gpabase2memseg(struct vm *vm, vm_paddr_t gpabase, - struct vm_memory_segment *seg); -int vm_get_memobj(struct vm *vm, vm_paddr_t gpa, size_t len, - vm_offset_t *offset, struct vm_object **object); -boolean_t vm_mem_allocated(struct vm *vm, vm_paddr_t gpa); +bool vm_mem_allocated(struct vm *vm, int vcpuid, vm_paddr_t gpa); + int vm_get_register(struct vm *vm, int vcpu, int reg, uint64_t *retval); int vm_set_register(struct vm *vm, int vcpu, int reg, uint64_t val); int vm_get_seg_desc(struct vm *vm, int vcpu, int reg, @@ -302,8 +317,6 @@ vcpu_should_yield(struct vm *vm, int vcp void *vcpu_stats(struct vm *vm, int vcpu); void vcpu_notify_event(struct vm *vm, int vcpuid, bool lapic_intr); struct vmspace *vm_get_vmspace(struct vm *vm); -int vm_assign_pptdev(struct vm *vm, int bus, int slot, int func); -int vm_unassign_pptdev(struct vm *vm, int bus, int slot, int func); struct vatpic *vm_atpic(struct vm *vm); struct vatpit *vm_atpit(struct vm *vm); struct vpmtmr *vm_pmtmr(struct vm *vm); Modified: head/sys/amd64/include/vmm_dev.h ============================================================================== --- head/sys/amd64/include/vmm_dev.h Thu Jun 18 05:58:15 2015 (r284538) +++ head/sys/amd64/include/vmm_dev.h Thu Jun 18 06:00:17 2015 (r284539) @@ -34,10 +34,22 @@ void vmmdev_init(void); int vmmdev_cleanup(void); #endif -struct vm_memory_segment { - vm_paddr_t gpa; /* in */ +struct vm_memmap { + vm_paddr_t gpa; + int segid; /* memory segment */ + vm_ooffset_t segoff; /* offset into memory segment */ + size_t len; /* mmap length */ + int prot; /* RWX */ + int flags; +}; +#define VM_MEMMAP_F_WIRED 0x01 +#define VM_MEMMAP_F_IOMMU 0x02 + +#define VM_MEMSEG_NAME(m) ((m)->name[0] != '\0' ? (m)->name : NULL) +struct vm_memseg { + int segid; size_t len; - int wired; + char name[SPECNAMELEN + 1]; }; struct vm_register { @@ -214,10 +226,14 @@ enum { IOCNUM_REINIT = 5, /* memory apis */ - IOCNUM_MAP_MEMORY = 10, - IOCNUM_GET_MEMORY_SEG = 11, + IOCNUM_MAP_MEMORY = 10, /* deprecated */ + IOCNUM_GET_MEMORY_SEG = 11, /* deprecated */ IOCNUM_GET_GPA_PMAP = 12, IOCNUM_GLA2GPA = 13, + IOCNUM_ALLOC_MEMSEG = 14, + IOCNUM_GET_MEMSEG = 15, + IOCNUM_MMAP_MEMSEG = 16, + IOCNUM_MMAP_GETNEXT = 17, /* register/state accessors */ IOCNUM_SET_REGISTER = 20, @@ -278,10 +294,14 @@ enum { _IOW('v', IOCNUM_SUSPEND, struct vm_suspend) #define VM_REINIT \ _IO('v', IOCNUM_REINIT) -#define VM_MAP_MEMORY \ - _IOWR('v', IOCNUM_MAP_MEMORY, struct vm_memory_segment) -#define VM_GET_MEMORY_SEG \ - _IOWR('v', IOCNUM_GET_MEMORY_SEG, struct vm_memory_segment) +#define VM_ALLOC_MEMSEG \ + _IOW('v', IOCNUM_ALLOC_MEMSEG, struct vm_memseg) +#define VM_GET_MEMSEG \ + _IOWR('v', IOCNUM_GET_MEMSEG, struct vm_memseg) +#define VM_MMAP_MEMSEG \ + _IOW('v', IOCNUM_MMAP_MEMSEG, struct vm_memmap) +#define VM_MMAP_GETNEXT \ + _IOWR('v', IOCNUM_MMAP_GETNEXT, struct vm_memmap) #define VM_SET_REGISTER \ _IOW('v', IOCNUM_SET_REGISTER, struct vm_register) #define VM_GET_REGISTER \ Modified: head/sys/amd64/vmm/amd/svm.c ============================================================================== --- head/sys/amd64/vmm/amd/svm.c Thu Jun 18 05:58:15 2015 (r284538) +++ head/sys/amd64/vmm/amd/svm.c Thu Jun 18 06:00:17 2015 (r284539) @@ -1477,7 +1477,7 @@ svm_vmexit(struct svm_softc *svm_sc, int VCPU_CTR2(svm_sc->vm, vcpu, "nested page fault with " "reserved bits set: info1(%#lx) info2(%#lx)", info1, info2); - } else if (vm_mem_allocated(svm_sc->vm, info2)) { + } else if (vm_mem_allocated(svm_sc->vm, vcpu, info2)) { vmexit->exitcode = VM_EXITCODE_PAGING; vmexit->u.paging.gpa = info2; vmexit->u.paging.fault_type = npf_fault_type(info1); Modified: head/sys/amd64/vmm/intel/vmx.c ============================================================================== --- head/sys/amd64/vmm/intel/vmx.c Thu Jun 18 05:58:15 2015 (r284538) +++ head/sys/amd64/vmm/intel/vmx.c Thu Jun 18 06:00:17 2015 (r284539) @@ -2425,7 +2425,7 @@ vmx_exit_process(struct vmx *vmx, int vc * this must be an instruction that accesses MMIO space. */ gpa = vmcs_gpa(); - if (vm_mem_allocated(vmx->vm, gpa) || + if (vm_mem_allocated(vmx->vm, vcpu, gpa) || apic_access_fault(vmx, vcpu, gpa)) { vmexit->exitcode = VM_EXITCODE_PAGING; vmexit->inst_length = 0; Modified: head/sys/amd64/vmm/io/ppt.c ============================================================================== --- head/sys/amd64/vmm/io/ppt.c Thu Jun 18 05:58:15 2015 (r284538) +++ head/sys/amd64/vmm/io/ppt.c Thu Jun 18 06:00:17 2015 (r284539) @@ -76,11 +76,17 @@ struct pptintr_arg { /* pptintr(pptin uint64_t msg_data; }; +struct pptseg { + vm_paddr_t gpa; + size_t len; + int wired; +}; + struct pptdev { device_t dev; struct vm *vm; /* owner of this device */ TAILQ_ENTRY(pptdev) next; - struct vm_memory_segment mmio[MAX_MMIOSEGS]; + struct pptseg mmio[MAX_MMIOSEGS]; struct { int num_msgs; /* guest state */ @@ -207,14 +213,14 @@ static void ppt_unmap_mmio(struct vm *vm, struct pptdev *ppt) { int i; - struct vm_memory_segment *seg; + struct pptseg *seg; for (i = 0; i < MAX_MMIOSEGS; i++) { seg = &ppt->mmio[i]; if (seg->len == 0) continue; (void)vm_unmap_mmio(vm, seg->gpa, seg->len); - bzero(seg, sizeof(struct vm_memory_segment)); + bzero(seg, sizeof(struct pptseg)); } } @@ -324,7 +330,7 @@ ppt_is_mmio(struct vm *vm, vm_paddr_t gp { int i; struct pptdev *ppt; - struct vm_memory_segment *seg; + struct pptseg *seg; TAILQ_FOREACH(ppt, &pptdev_list, next) { if (ppt->vm != vm) @@ -410,7 +416,7 @@ ppt_map_mmio(struct vm *vm, int bus, int vm_paddr_t gpa, size_t len, vm_paddr_t hpa) { int i, error; - struct vm_memory_segment *seg; + struct pptseg *seg; struct pptdev *ppt; ppt = ppt_find(bus, slot, func); Modified: head/sys/amd64/vmm/vmm.c ============================================================================== --- head/sys/amd64/vmm/vmm.c Thu Jun 18 05:58:15 2015 (r284538) +++ head/sys/amd64/vmm/vmm.c Thu Jun 18 06:00:17 2015 (r284539) @@ -119,12 +119,21 @@ struct vcpu { #define vcpu_assert_locked(v) mtx_assert(&((v)->mtx), MA_OWNED) struct mem_seg { + size_t len; + bool sysmem; + struct vm_object *object; +}; +#define VM_MAX_MEMSEGS 2 + +struct mem_map { vm_paddr_t gpa; size_t len; - boolean_t wired; - vm_object_t object; + vm_ooffset_t segoff; + int segid; + int prot; + int flags; }; -#define VM_MAX_MEMORY_SEGMENTS 2 +#define VM_MAX_MEMMAPS 4 /* * Initialization: @@ -150,8 +159,8 @@ struct vm { void *rendezvous_arg; /* (x) rendezvous func/arg */ vm_rendezvous_func_t rendezvous_func; struct mtx rendezvous_mtx; /* (o) rendezvous lock */ - int num_mem_segs; /* (o) guest memory segments */ - struct mem_seg mem_segs[VM_MAX_MEMORY_SEGMENTS]; + struct mem_map mem_maps[VM_MAX_MEMMAPS]; /* (i) guest address space */ + struct mem_seg mem_segs[VM_MAX_MEMSEGS]; /* (o) guest memory regions */ struct vmspace *vmspace; /* (o) guest's address space */ char name[VM_MAX_NAMELEN]; /* (o) virtual machine name */ struct vcpu vcpu[VM_MAXCPU]; /* (i) guest vcpus */ @@ -222,6 +231,8 @@ TUNABLE_INT("hw.vmm.force_iommu", &vmm_f SYSCTL_INT(_hw_vmm, OID_AUTO, force_iommu, CTLFLAG_RDTUN, &vmm_force_iommu, 0, "Force use of I/O MMU even if no passthrough devices were found."); +static void vm_free_memmap(struct vm *vm, int ident); +static bool sysmem_mapping(struct vm *vm, struct mem_map *mm); static void vcpu_notify_event_locked(struct vcpu *vcpu, bool lapic_intr); #ifdef KTR @@ -442,7 +453,6 @@ vm_create(const char *name, struct vm ** vm = malloc(sizeof(struct vm), M_VM, M_WAITOK | M_ZERO); strcpy(vm->name, name); - vm->num_mem_segs = 0; vm->vmspace = vmspace; mtx_init(&vm->rendezvous_mtx, "vm rendezvous lock", 0, MTX_DEF); @@ -453,18 +463,9 @@ vm_create(const char *name, struct vm ** } static void -vm_free_mem_seg(struct vm *vm, struct mem_seg *seg) -{ - - if (seg->object != NULL) - vmm_mem_free(vm->vmspace, seg->gpa, seg->len); - - bzero(seg, sizeof(*seg)); -} - -static void vm_cleanup(struct vm *vm, bool destroy) { + struct mem_map *mm; int i; ppt_unassign_all(vm); @@ -487,11 +488,23 @@ vm_cleanup(struct vm *vm, bool destroy) VMCLEANUP(vm->cookie); - if (destroy) { - for (i = 0; i < vm->num_mem_segs; i++) - vm_free_mem_seg(vm, &vm->mem_segs[i]); + /* + * System memory is removed from the guest address space only when + * the VM is destroyed. This is because the mapping remains the same + * across VM reset. + * + * Device memory can be relocated by the guest (e.g. using PCI BARs) + * so those mappings are removed on a VM reset. + */ + for (i = 0; i < VM_MAX_MEMMAPS; i++) { + mm = &vm->mem_maps[i]; + if (destroy || !sysmem_mapping(vm, mm)) + vm_free_memmap(vm, i); + } - vm->num_mem_segs = 0; + if (destroy) { + for (i = 0; i < VM_MAX_MEMSEGS; i++) + vm_free_memseg(vm, i); VMSPACE_FREE(vm->vmspace); vm->vmspace = NULL; @@ -549,146 +562,243 @@ vm_unmap_mmio(struct vm *vm, vm_paddr_t return (0); } -boolean_t -vm_mem_allocated(struct vm *vm, vm_paddr_t gpa) +/* + * Return 'true' if 'gpa' is allocated in the guest address space. + * + * This function is called in the context of a running vcpu which acts as + * an implicit lock on 'vm->mem_maps[]'. + */ +bool +vm_mem_allocated(struct vm *vm, int vcpuid, vm_paddr_t gpa) { + struct mem_map *mm; int i; - vm_paddr_t gpabase, gpalimit; - for (i = 0; i < vm->num_mem_segs; i++) { - gpabase = vm->mem_segs[i].gpa; - gpalimit = gpabase + vm->mem_segs[i].len; - if (gpa >= gpabase && gpa < gpalimit) - return (TRUE); /* 'gpa' is regular memory */ +#ifdef INVARIANTS + int hostcpu, state; + state = vcpu_get_state(vm, vcpuid, &hostcpu); + KASSERT(state == VCPU_RUNNING && hostcpu == curcpu, + ("%s: invalid vcpu state %d/%d", __func__, state, hostcpu)); +#endif + + for (i = 0; i < VM_MAX_MEMMAPS; i++) { + mm = &vm->mem_maps[i]; + if (mm->len != 0 && gpa >= mm->gpa && gpa < mm->gpa + mm->len) + return (true); /* 'gpa' is sysmem or devmem */ } if (ppt_is_mmio(vm, gpa)) - return (TRUE); /* 'gpa' is pci passthru mmio */ + return (true); /* 'gpa' is pci passthru mmio */ - return (FALSE); + return (false); } int -vm_malloc(struct vm *vm, vm_paddr_t gpa, size_t len) +vm_alloc_memseg(struct vm *vm, int ident, size_t len, bool sysmem) { - int available, allocated; struct mem_seg *seg; - vm_object_t object; - vm_paddr_t g; + vm_object_t obj; - if ((gpa & PAGE_MASK) || (len & PAGE_MASK) || len == 0) + if (ident < 0 || ident >= VM_MAX_MEMSEGS) return (EINVAL); - - available = allocated = 0; - g = gpa; - while (g < gpa + len) { - if (vm_mem_allocated(vm, g)) - allocated++; - else - available++; - g += PAGE_SIZE; - } - - /* - * If there are some allocated and some available pages in the address - * range then it is an error. - */ - if (allocated && available) + if (len == 0 || (len & PAGE_MASK)) return (EINVAL); - /* - * If the entire address range being requested has already been - * allocated then there isn't anything more to do. - */ - if (allocated && available == 0) - return (0); - - if (vm->num_mem_segs >= VM_MAX_MEMORY_SEGMENTS) - return (E2BIG); - - seg = &vm->mem_segs[vm->num_mem_segs]; + seg = &vm->mem_segs[ident]; + if (seg->object != NULL) { + if (seg->len == len && seg->sysmem == sysmem) + return (EEXIST); + else + return (EINVAL); + } - if ((object = vmm_mem_alloc(vm->vmspace, gpa, len)) == NULL) + obj = vm_object_allocate(OBJT_DEFAULT, len >> PAGE_SHIFT); + if (obj == NULL) return (ENOMEM); - seg->gpa = gpa; seg->len = len; - seg->object = object; - seg->wired = FALSE; + seg->object = obj; + seg->sysmem = sysmem; + return (0); +} - vm->num_mem_segs++; +int +vm_get_memseg(struct vm *vm, int ident, size_t *len, bool *sysmem, + vm_object_t *objptr) +{ + struct mem_seg *seg; + + if (ident < 0 || ident >= VM_MAX_MEMSEGS) + return (EINVAL); + seg = &vm->mem_segs[ident]; + if (len) + *len = seg->len; + if (sysmem) + *sysmem = seg->sysmem; + if (objptr) + *objptr = seg->object; return (0); } -static vm_paddr_t -vm_maxmem(struct vm *vm) +void +vm_free_memseg(struct vm *vm, int ident) { - int i; - vm_paddr_t gpa, maxmem; + struct mem_seg *seg; - maxmem = 0; - for (i = 0; i < vm->num_mem_segs; i++) { - gpa = vm->mem_segs[i].gpa + vm->mem_segs[i].len; - if (gpa > maxmem) - maxmem = gpa; + KASSERT(ident >= 0 && ident < VM_MAX_MEMSEGS, + ("%s: invalid memseg ident %d", __func__, ident)); + + seg = &vm->mem_segs[ident]; + if (seg->object != NULL) { + vm_object_deallocate(seg->object); + bzero(seg, sizeof(struct mem_seg)); } - return (maxmem); } -static void -vm_gpa_unwire(struct vm *vm) +int +vm_mmap_memseg(struct vm *vm, vm_paddr_t gpa, int segid, vm_ooffset_t first, + size_t len, int prot, int flags) { - int i, rv; struct mem_seg *seg; + struct mem_map *m, *map; + vm_ooffset_t last; + int i, error; - for (i = 0; i < vm->num_mem_segs; i++) { - seg = &vm->mem_segs[i]; - if (!seg->wired) - continue; + if (prot == 0 || (prot & ~(VM_PROT_ALL)) != 0) + return (EINVAL); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 07:50:28 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 727D2761; Thu, 18 Jun 2015 07:50:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 606F2C7E; Thu, 18 Jun 2015 07:50:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5I7oS05048452; Thu, 18 Jun 2015 07:50:28 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5I7oSK1048451; Thu, 18 Jun 2015 07:50:28 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201506180750.t5I7oSK1048451@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Thu, 18 Jun 2015 07:50:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284540 - head/sys/dev/isp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 07:50:28 -0000 Author: mav Date: Thu Jun 18 07:50:27 2015 New Revision: 284540 URL: https://svnweb.freebsd.org/changeset/base/284540 Log: In case of target mode disable at least ISP2532 return invalid zero ct_rxid value on CTIO completion. Try to workaround that using tag_id from the CCB, pointed by still valid ct_syshandle. I don't know whether this is valid fix or dirty hack, but considering that alternative is indefinitely stuck command -- it worth trying. MFC after: 1 week Modified: head/sys/dev/isp/isp_freebsd.c Modified: head/sys/dev/isp/isp_freebsd.c ============================================================================== --- head/sys/dev/isp/isp_freebsd.c Thu Jun 18 06:00:17 2015 (r284539) +++ head/sys/dev/isp/isp_freebsd.c Thu Jun 18 07:50:27 2015 (r284540) @@ -2931,6 +2931,14 @@ isp_handle_platform_ctio(ispsoftc_t *isp atp = isp_find_atpd(isp, tptr, ((ct_entry_t *)arg)->ct_fwhandle); } if (atp == NULL) { + /* + * In case of target mode disable at least ISP2532 return + * invalid zero ct_rxid value. Try to workaround that using + * tag_id from the CCB, pointed by valid ct_syshandle. + */ + atp = isp_find_atpd(isp, tptr, ccb->csio.tag_id); + } + if (atp == NULL) { rls_lun_statep(isp, tptr); isp_prt(isp, ISP_LOGERR, "%s: cannot find adjunct for %x after I/O", __func__, ccb->csio.tag_id); return; From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 09:39:52 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5E8A9360; Thu, 18 Jun 2015 09:39:52 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D236955; Thu, 18 Jun 2015 09:39:52 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5I9dqfU099341; Thu, 18 Jun 2015 09:39:52 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5I9dqru099340; Thu, 18 Jun 2015 09:39:52 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201506180939.t5I9dqru099340@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Thu, 18 Jun 2015 09:39:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284541 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 09:39:52 -0000 Author: mav Date: Thu Jun 18 09:39:51 2015 New Revision: 284541 URL: https://svnweb.freebsd.org/changeset/base/284541 Log: Change ATIO/INOT counting to prevent periph destruction while requests are still running inside CTL. MFC after: 1 week Modified: head/sys/cam/ctl/scsi_ctl.c Modified: head/sys/cam/ctl/scsi_ctl.c ============================================================================== --- head/sys/cam/ctl/scsi_ctl.c Thu Jun 18 07:50:27 2015 (r284540) +++ head/sys/cam/ctl/scsi_ctl.c Thu Jun 18 09:39:51 2015 (r284541) @@ -104,10 +104,10 @@ struct ctlfe_lun_softc { uint64_t ccbs_freed; uint64_t ctios_sent; uint64_t ctios_returned; - uint64_t atios_sent; - uint64_t atios_returned; - uint64_t inots_sent; - uint64_t inots_returned; + uint64_t atios_alloced; + uint64_t atios_freed; + uint64_t inots_alloced; + uint64_t inots_freed; /* bus_dma_tag_t dma_tag; */ TAILQ_HEAD(, ccb_hdr) work_queue; STAILQ_ENTRY(ctlfe_lun_softc) links; @@ -546,6 +546,7 @@ ctlferegister(struct cam_periph *periph, status = CAM_RESRC_UNAVAIL; break; } + softc->atios_alloced++; new_ccb->ccb_h.io_ptr = new_io; xpt_setup_ccb(&new_ccb->ccb_h, periph->path, /*priority*/ 1); @@ -553,7 +554,6 @@ ctlferegister(struct cam_periph *periph, new_ccb->ccb_h.cbfcnp = ctlfedone; new_ccb->ccb_h.flags |= CAM_UNLOCKED; xpt_action(new_ccb); - softc->atios_sent++; status = new_ccb->ccb_h.status; if ((status & CAM_STATUS_MASK) != CAM_REQ_INPROG) { ctl_free_io(new_io); @@ -591,6 +591,7 @@ ctlferegister(struct cam_periph *periph, status = CAM_RESRC_UNAVAIL; break; } + softc->inots_alloced++; new_ccb->ccb_h.io_ptr = new_io; xpt_setup_ccb(&new_ccb->ccb_h, periph->path, /*priority*/ 1); @@ -598,7 +599,6 @@ ctlferegister(struct cam_periph *periph, new_ccb->ccb_h.cbfcnp = ctlfedone; new_ccb->ccb_h.flags |= CAM_UNLOCKED; xpt_action(new_ccb); - softc->inots_sent++; status = new_ccb->ccb_h.status; if ((status & CAM_STATUS_MASK) != CAM_REQ_INPROG) { /* @@ -650,10 +650,6 @@ ctlfeoninvalidate(struct cam_periph *per * XXX KDM what do we do now? */ } - xpt_print(periph->path, "LUN removed, %ju ATIOs outstanding, %ju " - "INOTs outstanding, %d refs\n", softc->atios_sent - - softc->atios_returned, softc->inots_sent - - softc->inots_returned, periph->refcount); bus_softc = softc->parent_softc; mtx_lock(&bus_softc->lun_softc_mtx); @@ -666,13 +662,20 @@ ctlfecleanup(struct cam_periph *periph) { struct ctlfe_lun_softc *softc; - xpt_print(periph->path, "%s: Called\n", __func__); - softc = (struct ctlfe_lun_softc *)periph->softc; - /* - * XXX KDM is there anything else that needs to be done here? - */ + KASSERT(softc->ccbs_freed == softc->ccbs_alloced, ("%s: " + "ccbs_freed %ju != ccbs_alloced %ju", __func__, + softc->ccbs_freed, softc->ccbs_alloced)); + KASSERT(softc->ctios_returned == softc->ctios_sent, ("%s: " + "ctios_returned %ju != ctios_sent %ju", __func__, + softc->ctios_returned, softc->ctios_sent)); + KASSERT(softc->atios_freed == softc->atios_alloced, ("%s: " + "atios_freed %ju != atios_alloced %ju", __func__, + softc->atios_freed, softc->atios_alloced)); + KASSERT(softc->inots_freed == softc->inots_alloced, ("%s: " + "inots_freed %ju != inots_alloced %ju", __func__, + softc->inots_freed, softc->inots_alloced)); free(softc, M_CTLFE); } @@ -871,7 +874,6 @@ ctlfestart(struct cam_periph *periph, un * Send the ATIO back down to the SIM. */ xpt_action((union ccb *)atio); - softc->atios_sent++; /* * If we still have work to do, ask for @@ -989,11 +991,11 @@ ctlfe_free_ccb(struct cam_periph *periph switch (ccb->ccb_h.func_code) { case XPT_ACCEPT_TARGET_IO: - softc->atios_returned++; + softc->atios_freed++; break; case XPT_IMMEDIATE_NOTIFY: case XPT_NOTIFY_ACKNOWLEDGE: - softc->inots_returned++; + softc->inots_freed++; break; default: break; @@ -1002,20 +1004,20 @@ ctlfe_free_ccb(struct cam_periph *periph ctl_free_io(ccb->ccb_h.io_ptr); free(ccb, M_CTLFE); - KASSERT(softc->atios_returned <= softc->atios_sent, ("%s: " - "atios_returned %ju > atios_sent %ju", __func__, - softc->atios_returned, softc->atios_sent)); - KASSERT(softc->inots_returned <= softc->inots_sent, ("%s: " - "inots_returned %ju > inots_sent %ju", __func__, - softc->inots_returned, softc->inots_sent)); + KASSERT(softc->atios_freed <= softc->atios_alloced, ("%s: " + "atios_freed %ju > atios_alloced %ju", __func__, + softc->atios_freed, softc->atios_alloced)); + KASSERT(softc->inots_freed <= softc->inots_alloced, ("%s: " + "inots_freed %ju > inots_alloced %ju", __func__, + softc->inots_freed, softc->inots_alloced)); /* * If we have received all of our CCBs, we can release our * reference on the peripheral driver. It will probably go away * now. */ - if ((softc->atios_returned == softc->atios_sent) - && (softc->inots_returned == softc->inots_sent)) { + if ((softc->atios_freed == softc->atios_alloced) + && (softc->inots_freed == softc->inots_alloced)) { cam_periph_release_locked(periph); } } @@ -1135,8 +1137,6 @@ ctlfedone(struct cam_periph *periph, uni atio = &done_ccb->atio; - softc->atios_returned++; - resubmit: /* * Allocate a ctl_io, pass it to CTL, and wait for the @@ -1291,7 +1291,6 @@ ctlfedone(struct cam_periph *periph, uni if (periph->flags & CAM_PERIPH_INVALID) { ctlfe_free_ccb(periph, (union ccb *)atio); } else { - softc->atios_sent++; mtx_unlock(mtx); xpt_action((union ccb *)atio); return; @@ -1422,8 +1421,6 @@ ctlfedone(struct cam_periph *periph, uni inot = &done_ccb->cin1; - softc->inots_returned++; - frozen = (done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0; printf("%s: got XPT_IMMEDIATE_NOTIFY status %#x tag %#x " @@ -1543,7 +1540,6 @@ ctlfedone(struct cam_periph *periph, uni */ done_ccb->ccb_h.func_code = XPT_IMMEDIATE_NOTIFY; xpt_action(done_ccb); - softc->inots_sent++; break; case XPT_SET_SIM_KNOB: case XPT_GET_SIM_KNOB: @@ -2043,7 +2039,6 @@ ctlfe_done(union ctl_io *io) if (periph->flags & CAM_PERIPH_INVALID) { ctlfe_free_ccb(periph, ccb); } else { - softc->atios_sent++; cam_periph_unlock(periph); xpt_action(ccb); return; From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 10:17:48 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2C6C7B5A; Thu, 18 Jun 2015 10:17:48 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1A20D173; Thu, 18 Jun 2015 10:17:48 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5IAHl6r017937; Thu, 18 Jun 2015 10:17:47 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5IAHlqV017936; Thu, 18 Jun 2015 10:17:47 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201506181017.t5IAHlqV017936@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 18 Jun 2015 10:17:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284542 - head/usr.sbin/ctld X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 10:17:48 -0000 Author: trasz Date: Thu Jun 18 10:17:47 2015 New Revision: 284542 URL: https://svnweb.freebsd.org/changeset/base/284542 Log: Allow '@' in unquoted strings, such as with the "path" statement. Note that one can use any character they like by using double quotes. PR: 200895 MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/ctld/token.l Modified: head/usr.sbin/ctld/token.l ============================================================================== --- head/usr.sbin/ctld/token.l Thu Jun 18 09:39:51 2015 (r284541) +++ head/usr.sbin/ctld/token.l Thu Jun 18 10:17:47 2015 (r284542) @@ -80,7 +80,7 @@ target { return TARGET; } timeout { return TIMEOUT; } \"[^"]+\" { yylval.str = strndup(yytext + 1, strlen(yytext) - 2); return STR; } -[a-zA-Z0-9\.\-_/\:\[\]]+ { yylval.str = strdup(yytext); return STR; } +[a-zA-Z0-9\.\-@_/\:\[\]]+ { yylval.str = strdup(yytext); return STR; } \{ { return OPENING_BRACKET; } \} { return CLOSING_BRACKET; } #.*$ /* ignore comments */; From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 10:26:30 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7F5561C6; Thu, 18 Jun 2015 10:26:30 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 69D74390; Thu, 18 Jun 2015 10:26:30 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5IAQU9V022596; Thu, 18 Jun 2015 10:26:30 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5IAQSSU022586; Thu, 18 Jun 2015 10:26:28 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506181026.t5IAQSSU022586@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 18 Jun 2015 10:26:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284543 - head/release/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 10:26:30 -0000 Author: gjb Date: Thu Jun 18 10:26:27 2015 New Revision: 284543 URL: https://svnweb.freebsd.org/changeset/base/284543 Log: Increase the FreeBSD/arm image sizes back to 1G for 11-CURRENT. While 480M is sufficient for 10-STABLE, 11-CURRENT images at this size fail due to insufficient space. This commit is solely for the sake of getting updated snapshot builds out, after which I'll analyze the resulting images to figure out what a more sane value is, even if the image size for 11-CURRENT needs to differ from 10-STABLE. Sponsored by: The FreeBSD Foundation Modified: head/release/arm/BEAGLEBONE.conf head/release/arm/CUBOX-HUMMINGBOARD.conf head/release/arm/GUMSTIX.conf head/release/arm/PANDABOARD.conf head/release/arm/RPI-B.conf head/release/arm/RPI2.conf head/release/arm/WANDBOARD.conf Modified: head/release/arm/BEAGLEBONE.conf ============================================================================== --- head/release/arm/BEAGLEBONE.conf Thu Jun 18 10:17:47 2015 (r284542) +++ head/release/arm/BEAGLEBONE.conf Thu Jun 18 10:26:27 2015 (r284543) @@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv6" EMBEDDEDPORTS="sysutils/u-boot-beaglebone" KERNEL="BEAGLEBONE" WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" -IMAGE_SIZE="480M" +IMAGE_SIZE="1G" PART_SCHEME="MBR" FAT_SIZE="2m" FAT_TYPE="12" Modified: head/release/arm/CUBOX-HUMMINGBOARD.conf ============================================================================== --- head/release/arm/CUBOX-HUMMINGBOARD.conf Thu Jun 18 10:17:47 2015 (r284542) +++ head/release/arm/CUBOX-HUMMINGBOARD.conf Thu Jun 18 10:26:27 2015 (r284543) @@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv6" EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard" KERNEL="IMX6" WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" -IMAGE_SIZE="480M" +IMAGE_SIZE="1G" PART_SCHEME="MBR" FAT_SIZE="50m -b 16384" FAT_TYPE="16" Modified: head/release/arm/GUMSTIX.conf ============================================================================== --- head/release/arm/GUMSTIX.conf Thu Jun 18 10:17:47 2015 (r284542) +++ head/release/arm/GUMSTIX.conf Thu Jun 18 10:26:27 2015 (r284543) @@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv6" EMBEDDEDPORTS="sysutils/u-boot-duovero" KERNEL="GUMSTIX" WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" -IMAGE_SIZE="480M" +IMAGE_SIZE="1G" PART_SCHEME="MBR" FAT_SIZE="2m" FAT_TYPE="12" Modified: head/release/arm/PANDABOARD.conf ============================================================================== --- head/release/arm/PANDABOARD.conf Thu Jun 18 10:17:47 2015 (r284542) +++ head/release/arm/PANDABOARD.conf Thu Jun 18 10:26:27 2015 (r284543) @@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv6" EMBEDDEDPORTS="sysutils/u-boot-pandaboard" KERNEL="PANDABOARD" WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" -IMAGE_SIZE="480M" +IMAGE_SIZE="1G" PART_SCHEME="MBR" FAT_SIZE="2m" FAT_TYPE="12" Modified: head/release/arm/RPI-B.conf ============================================================================== --- head/release/arm/RPI-B.conf Thu Jun 18 10:17:47 2015 (r284542) +++ head/release/arm/RPI-B.conf Thu Jun 18 10:26:27 2015 (r284543) @@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv6" EMBEDDEDPORTS="sysutils/u-boot-rpi" KERNEL="RPI-B" WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" -IMAGE_SIZE="480M" +IMAGE_SIZE="1G" PART_SCHEME="MBR" FAT_SIZE="17m" FAT_TYPE="16" Modified: head/release/arm/RPI2.conf ============================================================================== --- head/release/arm/RPI2.conf Thu Jun 18 10:17:47 2015 (r284542) +++ head/release/arm/RPI2.conf Thu Jun 18 10:26:27 2015 (r284543) @@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv6" EMBEDDEDPORTS="sysutils/u-boot-rpi2" KERNEL="RPI2" WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" -IMAGE_SIZE="480M" +IMAGE_SIZE="1G" PART_SCHEME="MBR" FAT_SIZE="50m" FAT_TYPE="16" Modified: head/release/arm/WANDBOARD.conf ============================================================================== --- head/release/arm/WANDBOARD.conf Thu Jun 18 10:17:47 2015 (r284542) +++ head/release/arm/WANDBOARD.conf Thu Jun 18 10:26:27 2015 (r284543) @@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv6" EMBEDDEDPORTS="sysutils/u-boot-wandboard" KERNEL="IMX6" WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" -IMAGE_SIZE="480M" +IMAGE_SIZE="1G" PART_SCHEME="MBR" FAT_SIZE="50m -b 16384" FAT_TYPE="16" From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 10:33:04 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E7F1E3AA; Thu, 18 Jun 2015 10:33:04 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D65CC6EE; Thu, 18 Jun 2015 10:33:04 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5IAX4bM026905; Thu, 18 Jun 2015 10:33:04 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5IAX4u5026903; Thu, 18 Jun 2015 10:33:04 GMT (envelope-from br@FreeBSD.org) Message-Id: <201506181033.t5IAX4u5026903@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Thu, 18 Jun 2015 10:33:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284544 - head/sys/dev/virtio/mmio X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 10:33:05 -0000 Author: br Date: Thu Jun 18 10:33:04 2015 New Revision: 284544 URL: https://svnweb.freebsd.org/changeset/base/284544 Log: Remove duplicate defines. Sponsored by: HEIF5 Modified: head/sys/dev/virtio/mmio/virtio_mmio.h Modified: head/sys/dev/virtio/mmio/virtio_mmio.h ============================================================================== --- head/sys/dev/virtio/mmio/virtio_mmio.h Thu Jun 18 10:26:27 2015 (r284543) +++ head/sys/dev/virtio/mmio/virtio_mmio.h Thu Jun 18 10:33:04 2015 (r284544) @@ -36,10 +36,6 @@ #define VIRTIO_MMIO_MAGIC_VALUE 0x000 #define VIRTIO_MMIO_VERSION 0x004 #define VIRTIO_MMIO_DEVICE_ID 0x008 - -#define VIRTIO_MMIO_MAGIC_VALUE 0x000 -#define VIRTIO_MMIO_VERSION 0x004 -#define VIRTIO_MMIO_DEVICE_ID 0x008 #define VIRTIO_MMIO_VENDOR_ID 0x00c #define VIRTIO_MMIO_HOST_FEATURES 0x010 #define VIRTIO_MMIO_HOST_FEATURES_SEL 0x014 From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 11:09:49 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70192F7; Thu, 18 Jun 2015 11:09:49 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 8D6FB157; Thu, 18 Jun 2015 11:09:47 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id OAA14673; Thu, 18 Jun 2015 14:09:44 +0300 (EEST) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1Z5XhY-000DGd-6B; Thu, 18 Jun 2015 14:09:44 +0300 Message-ID: <5582A6A6.4040604@FreeBSD.org> Date: Thu, 18 Jun 2015 14:08:22 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Warner Losh , Matthew Ahrens CC: Baptiste Daroussin , "src-committers@freebsd.org" , svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Subject: Re: svn commit: r284409 - in head/cddl/lib: libzfs libzfs_core References: <201506151048.t5FAmnF0039077@svn.freebsd.org> <557EBCAB.3010505@FreeBSD.org> In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 11:09:49 -0000 On 15/06/2015 21:06, Warner Losh wrote: > >> On Jun 15, 2015, at 8:37 AM, Matthew Ahrens wrote: >> >> >> >> On Mon, Jun 15, 2015 at 7:53 AM, Andriy Gapon wrote: >> >> P.S. My personal preference would be to drop that compat code and to >> convince ZFS/FreeBSD users to always use boot environments, so that their >> kernel and userland never fall out of sync :) >> >> Me too :-) > > Sadly, there are a number of upgrade scenarios where this simply isn’t > possible. Curious what are those... The only scenario I can think of is one where there is not enough space to hold the previous OS bits and the new ones. But in such a constrained system there is probably not much use for ZFS anyway. > But looking at the file, it appears to be full of stuff to do the 8.x -> > 9.x upgrade of ZFS to format 28. Perhaps that can now be removed? I would expect that every user of ZFS/FreeBSD has moved past that line by now, but who knows... > These libraries appear to be versioned, rather than symbol versioned > otherwise Baptiste’s commit would have been bad… but I wonder if maybe a > version bump is in order… I think we should be okay without a version bump, because the symbol is moved from a library to its dependency. So, libzfs_core interface is extended and that should not be a problem for its users. And libzfs users should not notice that the symbol migrated from libzfs to libfzs_core because the users have to link to both libraries (or load both of them). -- Andriy Gapon From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 13:29:47 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F214A4D6 for ; Thu, 18 Jun 2015 13:29:47 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from pmta2.delivery4.ore.mailhop.org (pmta2.delivery4.ore.mailhop.org [54.200.247.200]) by mx1.freebsd.org (Postfix) with SMTP id B5FA3CC4 for ; Thu, 18 Jun 2015 13:29:47 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from ilsoft.org (unknown [73.34.117.227]) by outbound1.ore.mailhop.org (Halon Mail Gateway) with ESMTPSA; Thu, 18 Jun 2015 13:29:34 +0000 (UTC) Received: from revolution.hippie.lan (revolution.hippie.lan [172.22.42.240]) by ilsoft.org (8.14.9/8.14.9) with ESMTP id t5IDTfpH013957; Thu, 18 Jun 2015 07:29:41 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1434634181.1415.88.camel@freebsd.org> Subject: Re: svn: head/sys/boot: common uboot/common uboot/lib From: Ian Lepore To: Maxim Sobolev Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Thu, 18 Jun 2015 07:29:41 -0600 In-Reply-To: References: Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.12.10 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 13:29:48 -0000 On Sat, 2015-06-13 at 14:53 -0700, Maxim Sobolev wrote: > Just in case, my debug code and proposed fix can be found here: > > https://github.com/sobomax/FreeBSD.arm/commit/48509790f82352cb455d0f5029291b917afb985b > > Unless I hear from you I am going to push it into the repository in the > next few days (modulo printf() debug stuff). > > Thanks! > > On Thu, Jun 11, 2015 at 6:21 AM, Maxim Sobolev wrote: > > > Hi Ian, there is some issues with that commit that I've run into when > > trying to get FreeBSD booting on my Xilinx Zinq 7010-based board. > > Basically, the instructions we have on Wiki suggests that the ubldr loading > > address to be 0x100000. That makes ubldr panic with "not enough DRAM" > > error. I've added some debug code into the for loop, you can find the > > output below. As you can see the code is not handling the case when ubldr > > is below 2MB and as such sblock == eubldr. On top of that, this_block and > > this_size may be left uninitialized causing loading at some random address > > and panicing then, instead of DRAM is too small panic. > > > > kernel_addr=0x100000 > > ubldr_addr=0x100000 > > dtb_addr=0x1000 > > dtb_name=system.dtb > > uenvcmd=echo Booting FreeBSD from SD...; mmcinfo && fatload mmc 0 > > ${ubldr_addr} ubldr && fatload mmc 0 ${dtb_addr} ${dtb_name} && fdt addr > > ${dtb_addr} && bootelf ${ubldr_addr} > > I'm sorry for the long delay in responding to this, I'm enmeshed in a crazy-deadline project at $work. To tell you the truth, I had a feeling when I was working on that code that it was "too simple". When I've solved the "do these blocks overlap" problem before the code always ended up looking a lot more like what you propose. I think you should commit your changes, they look more correct than my code. -- Ian From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 13:40:09 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 560F7744; Thu, 18 Jun 2015 13:40:09 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 44EB4F3B; Thu, 18 Jun 2015 13:40:09 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5IDe9Z3017925; Thu, 18 Jun 2015 13:40:09 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5IDe9Rk017924; Thu, 18 Jun 2015 13:40:09 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201506181340.t5IDe9Rk017924@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Thu, 18 Jun 2015 13:40:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284546 - head/contrib/gcc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 13:40:09 -0000 Author: adrian Date: Thu Jun 18 13:40:08 2015 New Revision: 284546 URL: https://svnweb.freebsd.org/changeset/base/284546 Log: Fix compilation of this macro under gcc-4.9 for MIPS32. Some point after gcc-4.2 the MIPS inline assembly restrictions changed - =h (hi register) disappeared from the list of restrictions and can no longer be used. So, until someone requires an assembly version of this function, just use a non-assembly version and let the compiler sort it out. Suggested by: kan Modified: head/contrib/gcc/longlong.h Modified: head/contrib/gcc/longlong.h ============================================================================== --- head/contrib/gcc/longlong.h Thu Jun 18 13:23:52 2015 (r284545) +++ head/contrib/gcc/longlong.h Thu Jun 18 13:40:08 2015 (r284546) @@ -584,11 +584,11 @@ UDItype __umulsidi3 (USItype, USItype); #if defined (__mips__) && W_TYPE_SIZE == 32 #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("multu %2,%3" \ - : "=l" ((USItype) (w0)), \ - "=h" ((USItype) (w1)) \ - : "d" ((USItype) (u)), \ - "d" ((USItype) (v))) + do { \ + UDItype __x = (UDItype) (USItype) (u) * (USItype) (v); \ + w1 = __x >> 32; \ + w0 = __x; \ + } while (0) #define UMUL_TIME 10 #define UDIV_TIME 100 #endif /* __mips__ */ From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 13:45:08 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9157AACC; Thu, 18 Jun 2015 13:45:08 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7FA241C8; Thu, 18 Jun 2015 13:45:08 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5IDj8Rr021466; Thu, 18 Jun 2015 13:45:08 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5IDj8Hf021465; Thu, 18 Jun 2015 13:45:08 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201506181345.t5IDj8Hf021465@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Thu, 18 Jun 2015 13:45:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284547 - head/usr.bin/sockstat X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 13:45:08 -0000 Author: tuexen Date: Thu Jun 18 13:45:07 2015 New Revision: 284547 URL: https://svnweb.freebsd.org/changeset/base/284547 Log: Fix a bug reported by coverity. Since AF_UNIX sockets don't have multiple addresses, the problem didn't show up during testing. Reported by: Coverity CID: 1306787 Modified: head/usr.bin/sockstat/sockstat.c Modified: head/usr.bin/sockstat/sockstat.c ============================================================================== --- head/usr.bin/sockstat/sockstat.c Thu Jun 18 13:40:08 2015 (r284546) +++ head/usr.bin/sockstat/sockstat.c Thu Jun 18 13:45:07 2015 (r284547) @@ -865,6 +865,7 @@ displaysock(struct sock *s, int pos) void *p; int hash; struct addr *laddr, *faddr; + struct sock *s_tmp; while (pos < 29) pos += xprintf(" "); @@ -908,18 +909,20 @@ displaysock(struct sock *s, int pos) } pos += xprintf("-> "); for (hash = 0; hash < HASHSIZE; ++hash) { - for (s = sockhash[hash]; s != NULL; s = s->next) - if (s->pcb == p) + for (s_tmp = sockhash[hash]; + s_tmp != NULL; + s_tmp = s_tmp->next) + if (s_tmp->pcb == p) break; - if (s != NULL) + if (s_tmp != NULL) break; } - if (s == NULL || - s->laddr == NULL || - s->laddr->address.ss_len == 0) + if (s_tmp == NULL || + s_tmp->laddr == NULL || + s_tmp->laddr->address.ss_len == 0) pos += xprintf("??"); else - pos += printaddr(&s->laddr->address); + pos += printaddr(&s_tmp->laddr->address); break; default: abort(); From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 13:48:21 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 979DAD97 for ; Thu, 18 Jun 2015 13:48:21 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from pmta2.delivery6.ore.mailhop.org (pmta2.delivery6.ore.mailhop.org [54.200.129.228]) by mx1.freebsd.org (Postfix) with SMTP id 6C543208 for ; Thu, 18 Jun 2015 13:48:21 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from ilsoft.org (unknown [73.34.117.227]) by outbound2.ore.mailhop.org (Halon Mail Gateway) with ESMTPSA; Thu, 18 Jun 2015 13:48:28 +0000 (UTC) Received: from revolution.hippie.lan (revolution.hippie.lan [172.22.42.240]) by ilsoft.org (8.14.9/8.14.9) with ESMTP id t5IDmCxn013997; Thu, 18 Jun 2015 07:48:12 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1434635292.1415.93.camel@freebsd.org> Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... From: Ian Lepore To: "Simon J. Gerraty" Cc: Garrett Cooper , Craig Rodrigues , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Baptiste Daroussin Date: Thu, 18 Jun 2015 07:48:12 -0600 In-Reply-To: <4710.1434319205@chaos> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <950C4B23-B625-4173-A7C4-A4F1B2C5771D@gmail.com> <306889B5-3417-467C-965F-B011866E6F15@gmail.com> <450D8D9A-CBF2-445A-8221-4CD353591549@gmail.com> <16996.1434316874@chaos> <094A5FA6-7DB8-485E-84A8-C15D2A0BC9F6@gmail.com> <4710.1434319205@chaos> Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.12.10 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 13:48:21 -0000 On Sun, 2015-06-14 at 15:00 -0700, Simon J. Gerraty wrote: > Garrett Cooper wrote: > > > Breaking source upgrades to later versions is painful. We want to make > > sure fmake at least works with upgrade_checks so people can upgrade > > from earlier versions of 8/9/10 to 11 without having to deal with a > > lot of pain. > > I agree but 8 -> 11 is a very big jump. > Not really. We're in the midst of such a change at $work, but it will be literally years before we're no longer doing anything with 8 and are fully converted to 11. We'll have completely skipped 9 and 10 in the process. That's the reality of being a company smaller than Yahoo or Juniper -- we just don't have the resources to track -current. We're lucky if we can get enough resources to make a jump every 4 or 5 years. In the meantime I've got to support building products on everything from 6.x through -current using basically the same source base and build machinery. The fmake->bmake change has been fairly painful; it's only working at all for us because I've hacked fmake on 6.x and 8.x to support a few crucial bmake features. -- Ian From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 14:12:09 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 24F1B587; Thu, 18 Jun 2015 14:12:09 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 124D6B19; Thu, 18 Jun 2015 14:12:09 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5IEC9oQ035724; Thu, 18 Jun 2015 14:12:09 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5IEC9Kd035723; Thu, 18 Jun 2015 14:12:09 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201506181412.t5IEC9Kd035723@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 18 Jun 2015 14:12:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284551 - head/contrib/libcxxrt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 14:12:09 -0000 Author: emaste Date: Thu Jun 18 14:12:08 2015 New Revision: 284551 URL: https://svnweb.freebsd.org/changeset/base/284551 Log: Import libcxxrt master e64e93fe5bba67a6d52cbe5a97f8770c054bfa65. This includes a number of demangler fixes obtained from upstream ELF Tool Chain. PR: 200913 Sponsored by: The FreeBSD Foundation Modified: head/contrib/libcxxrt/libelftc_dem_gnu3.c Directory Properties: head/contrib/libcxxrt/ (props changed) Modified: head/contrib/libcxxrt/libelftc_dem_gnu3.c ============================================================================== --- head/contrib/libcxxrt/libelftc_dem_gnu3.c Thu Jun 18 14:02:19 2015 (r284550) +++ head/contrib/libcxxrt/libelftc_dem_gnu3.c Thu Jun 18 14:12:08 2015 (r284551) @@ -59,7 +59,7 @@ struct vector_str { enum type_qualifier { TYPE_PTR, TYPE_REF, TYPE_CMX, TYPE_IMG, TYPE_EXT, TYPE_RST, TYPE_VAT, - TYPE_CST + TYPE_CST, TYPE_VEC }; struct vector_type_qualifier { @@ -397,6 +397,8 @@ static int cpp_demangle_read_array(struc static int cpp_demangle_read_encoding(struct cpp_demangle_data *); static int cpp_demangle_read_expr_primary(struct cpp_demangle_data *); static int cpp_demangle_read_expression(struct cpp_demangle_data *); +static int cpp_demangle_read_expression_flat(struct cpp_demangle_data *, + char **); static int cpp_demangle_read_expression_binary(struct cpp_demangle_data *, const char *, size_t); static int cpp_demangle_read_expression_unary(struct cpp_demangle_data *, @@ -408,8 +410,12 @@ static int cpp_demangle_read_function(st static int cpp_demangle_local_source_name(struct cpp_demangle_data *ddata); static int cpp_demangle_read_local_name(struct cpp_demangle_data *); static int cpp_demangle_read_name(struct cpp_demangle_data *); +static int cpp_demangle_read_name_flat(struct cpp_demangle_data *, + char**); static int cpp_demangle_read_nested_name(struct cpp_demangle_data *); static int cpp_demangle_read_number(struct cpp_demangle_data *, long *); +static int cpp_demangle_read_number_as_string(struct cpp_demangle_data *, + char **); static int cpp_demangle_read_nv_offset(struct cpp_demangle_data *); static int cpp_demangle_read_offset(struct cpp_demangle_data *); static int cpp_demangle_read_offset_number(struct cpp_demangle_data *); @@ -423,6 +429,8 @@ static int cpp_demangle_read_tmpl_arg(st static int cpp_demangle_read_tmpl_args(struct cpp_demangle_data *); static int cpp_demangle_read_tmpl_param(struct cpp_demangle_data *); static int cpp_demangle_read_type(struct cpp_demangle_data *, int); +static int cpp_demangle_read_type_flat(struct cpp_demangle_data *, + char **); static int cpp_demangle_read_uqname(struct cpp_demangle_data *); static int cpp_demangle_read_v_offset(struct cpp_demangle_data *); static char *decode_fp_to_double(const char *, size_t); @@ -601,17 +609,18 @@ cpp_demangle_push_fp(struct cpp_demangle fp = ddata->cur; while (*ddata->cur != 'E') ++ddata->cur; - ++ddata->cur; if ((f = decoder(fp, ddata->cur - fp)) == NULL) return (0); rtn = 0; if ((len = strlen(f)) > 0) - rtn = cpp_demangle_push_str(ddata, f, len); + rtn = cpp_demangle_push_str(ddata, f, len); free(f); + ++ddata->cur; + return (rtn); } @@ -695,7 +704,8 @@ cpp_demangle_push_type_qualifier(struct if (type_str != NULL) { if (!vector_str_push(&subst_v, "*", 1)) goto clean; - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) goto clean; } break; @@ -706,7 +716,8 @@ cpp_demangle_push_type_qualifier(struct if (type_str != NULL) { if (!vector_str_push(&subst_v, "&", 1)) goto clean; - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) goto clean; } break; @@ -717,7 +728,8 @@ cpp_demangle_push_type_qualifier(struct if (type_str != NULL) { if (!vector_str_push(&subst_v, " complex", 8)) goto clean; - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) goto clean; } break; @@ -726,23 +738,26 @@ cpp_demangle_push_type_qualifier(struct if (!cpp_demangle_push_str(ddata, " imaginary", 10)) goto clean; if (type_str != NULL) { - if (!vector_str_push(&subst_v, " imaginary", 10)) + if (!vector_str_push(&subst_v, " imaginary", + 10)) goto clean; - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) goto clean; } break; case TYPE_EXT: - if (e_idx > v->ext_name.size - 1) + if (v->ext_name.size == 0 || + e_idx > v->ext_name.size - 1) goto clean; - if ((e_len = strlen(v->ext_name.container[e_idx])) == 0) + if ((e_len = strlen(v->ext_name.container[e_idx])) == + 0) goto clean; - if ((buf = malloc(sizeof(char) * (e_len + 1))) == NULL) + if ((buf = malloc(e_len + 2)) == NULL) goto clean; - - memcpy(buf, " ", 1); - memcpy(buf + 1, v->ext_name.container[e_idx], e_len); + snprintf(buf, e_len + 2, " %s", + v->ext_name.container[e_idx]); if (!cpp_demangle_push_str(ddata, buf, e_len + 1)) { free(buf); @@ -755,7 +770,8 @@ cpp_demangle_push_type_qualifier(struct free(buf); goto clean; } - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) { + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) { free(buf); goto clean; } @@ -770,7 +786,8 @@ cpp_demangle_push_type_qualifier(struct if (type_str != NULL) { if (!vector_str_push(&subst_v, " restrict", 9)) goto clean; - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) goto clean; } break; @@ -781,7 +798,8 @@ cpp_demangle_push_type_qualifier(struct if (type_str != NULL) { if (!vector_str_push(&subst_v, " volatile", 9)) goto clean; - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) goto clean; } break; @@ -792,11 +810,42 @@ cpp_demangle_push_type_qualifier(struct if (type_str != NULL) { if (!vector_str_push(&subst_v, " const", 6)) goto clean; - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) goto clean; } break; + case TYPE_VEC: + if (v->ext_name.size == 0 || + e_idx > v->ext_name.size - 1) + goto clean; + if ((e_len = strlen(v->ext_name.container[e_idx])) == + 0) + goto clean; + if ((buf = malloc(e_len + 12)) == NULL) + goto clean; + snprintf(buf, e_len + 12, " __vector(%s)", + v->ext_name.container[e_idx]); + if (!cpp_demangle_push_str(ddata, buf, e_len + 11)) { + free(buf); + goto clean; + } + if (type_str != NULL) { + if (!vector_str_push(&subst_v, buf, + e_len + 11)) { + free(buf); + goto clean; + } + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) { + free(buf); + goto clean; + } + } + free(buf); + ++e_idx; + break; }; --idx; } @@ -947,10 +996,14 @@ cpp_demangle_read_expr_primary(struct cp switch (*ddata->cur) { case 'b': + if (*(ddata->cur + 2) != 'E') + return (0); switch (*(++ddata->cur)) { case '0': + ddata->cur += 2; return (cpp_demangle_push_str(ddata, "false", 5)); case '1': + ddata->cur += 2; return (cpp_demangle_push_str(ddata, "true", 4)); default: return (0); @@ -999,7 +1052,8 @@ cpp_demangle_read_expr_primary(struct cp ++ddata->cur; } ++ddata->cur; - return (cpp_demangle_push_str(ddata, num, ddata->cur - num)); + return (cpp_demangle_push_str(ddata, num, + ddata->cur - num - 1)); default: return (0); @@ -1291,6 +1345,38 @@ cpp_demangle_read_expression(struct cpp_ } static int +cpp_demangle_read_expression_flat(struct cpp_demangle_data *ddata, char **str) +{ + struct vector_str *output; + size_t i, p_idx, idx, exp_len; + char *exp; + + output = ddata->push_head > 0 ? &ddata->output_tmp : + &ddata->output; + + p_idx = output->size; + + if (!cpp_demangle_read_expression(ddata)) + return (0); + + if ((exp = vector_str_substr(output, p_idx, output->size - 1, + &exp_len)) == NULL) + return (0); + + idx = output->size; + for (i = p_idx; i < idx; ++i) { + if (!vector_str_pop(output)) { + free(exp); + return (0); + } + } + + *str = exp; + + return (1); +} + +static int cpp_demangle_read_expression_binary(struct cpp_demangle_data *ddata, const char *name, size_t len) { @@ -1419,12 +1505,65 @@ cpp_demangle_read_function(struct cpp_de static int cpp_demangle_read_encoding(struct cpp_demangle_data *ddata) { + char *name, *type, *num_str; + long offset; + int rtn; if (ddata == NULL || *ddata->cur == '\0') return (0); /* special name */ switch (SIMPLE_HASH(*ddata->cur, *(ddata->cur + 1))) { + case SIMPLE_HASH('G', 'A'): + if (!cpp_demangle_push_str(ddata, "hidden alias for ", 17)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + return (cpp_demangle_read_encoding(ddata)); + + case SIMPLE_HASH('G', 'R'): + if (!cpp_demangle_push_str(ddata, "reference temporary #", 21)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + if (!cpp_demangle_read_name_flat(ddata, &name)) + return (0); + rtn = 0; + if (!cpp_demangle_read_number_as_string(ddata, &num_str)) + goto clean1; + if (!cpp_demangle_push_str(ddata, num_str, strlen(num_str))) + goto clean2; + if (!cpp_demangle_push_str(ddata, " for ", 5)) + goto clean2; + if (!cpp_demangle_push_str(ddata, name, strlen(name))) + goto clean2; + rtn = 1; + clean2: + free(num_str); + clean1: + free(name); + return (rtn); + + case SIMPLE_HASH('G', 'T'): + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + switch (*ddata->cur) { + case 'n': + if (!cpp_demangle_push_str(ddata, + "non-transaction clone for ", 26)) + return (0); + case 't': + default: + if (!cpp_demangle_push_str(ddata, + "transaction clone for ", 22)) + return (0); + } + ++ddata->cur; + return (cpp_demangle_read_encoding(ddata)); + case SIMPLE_HASH('G', 'V'): /* sentry object for 1 time init */ if (!cpp_demangle_push_str(ddata, "guard variable for ", 20)) @@ -1446,14 +1585,49 @@ cpp_demangle_read_encoding(struct cpp_de return (0); return (cpp_demangle_read_encoding(ddata)); + case SIMPLE_HASH('T', 'C'): + /* construction vtable */ + if (!cpp_demangle_push_str(ddata, "construction vtable for ", + 24)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + if (!cpp_demangle_read_type_flat(ddata, &type)) + return (0); + rtn = 0; + if (!cpp_demangle_read_number(ddata, &offset)) + goto clean3; + if (*ddata->cur++ != '_') + goto clean3; + if (!cpp_demangle_read_type(ddata, 0)) + goto clean3; + if (!cpp_demangle_push_str(ddata, "-in-", 4)) + goto clean3; + if (!cpp_demangle_push_str(ddata, type, strlen(type))) + goto clean3; + rtn = 1; + clean3: + free(type); + return (rtn); + case SIMPLE_HASH('T', 'D'): /* typeinfo common proxy */ break; + case SIMPLE_HASH('T', 'F'): + /* typeinfo fn */ + if (!cpp_demangle_push_str(ddata, "typeinfo fn for ", 16)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + return (cpp_demangle_read_type(ddata, 0)); + case SIMPLE_HASH('T', 'h'): /* virtual function non-virtual override thunk */ - if (cpp_demangle_push_str(ddata, - "virtual function non-virtual override ", 38) == 0) + if (!cpp_demangle_push_str(ddata, + "virtual function non-virtual override ", 38)) return (0); ddata->cur += 2; if (*ddata->cur == '\0') @@ -1462,24 +1636,51 @@ cpp_demangle_read_encoding(struct cpp_de return (0); return (cpp_demangle_read_encoding(ddata)); + case SIMPLE_HASH('T', 'H'): + /* TLS init function */ + if (!cpp_demangle_push_str(ddata, "TLS init function for ", + 22)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + break; + case SIMPLE_HASH('T', 'I'): /* typeinfo structure */ - /* FALLTHROUGH */ + if (!cpp_demangle_push_str(ddata, "typeinfo for ", 13)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + return (cpp_demangle_read_type(ddata, 0)); + + case SIMPLE_HASH('T', 'J'): + /* java class */ + if (!cpp_demangle_push_str(ddata, "java Class for ", 15)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + return (cpp_demangle_read_type(ddata, 0)); + case SIMPLE_HASH('T', 'S'): /* RTTI name (NTBS) */ - if (!cpp_demangle_push_str(ddata, "typeinfo for ", 14)) + if (!cpp_demangle_push_str(ddata, "typeinfo name for ", 18)) return (0); ddata->cur += 2; if (*ddata->cur == '\0') return (0); - return (cpp_demangle_read_type(ddata, 1)); + return (cpp_demangle_read_type(ddata, 0)); case SIMPLE_HASH('T', 'T'): /* VTT table */ if (!cpp_demangle_push_str(ddata, "VTT for ", 8)) return (0); ddata->cur += 2; - return (cpp_demangle_read_type(ddata, 1)); + if (*ddata->cur == '\0') + return (0); + return (cpp_demangle_read_type(ddata, 0)); case SIMPLE_HASH('T', 'v'): /* virtual function virtual override thunk */ @@ -1500,7 +1701,17 @@ cpp_demangle_read_encoding(struct cpp_de ddata->cur += 2; if (*ddata->cur == '\0') return (0); - return (cpp_demangle_read_type(ddata, 1)); + return (cpp_demangle_read_type(ddata, 0)); + + case SIMPLE_HASH('T', 'W'): + /* TLS wrapper function */ + if (!cpp_demangle_push_str(ddata, "TLS wrapper function for ", + 25)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + break; }; return (cpp_demangle_read_name(ddata)); @@ -1618,6 +1829,38 @@ clean: } static int +cpp_demangle_read_name_flat(struct cpp_demangle_data *ddata, char **str) +{ + struct vector_str *output; + size_t i, p_idx, idx, name_len; + char *name; + + output = ddata->push_head > 0 ? &ddata->output_tmp : + &ddata->output; + + p_idx = output->size; + + if (!cpp_demangle_read_name(ddata)) + return (0); + + if ((name = vector_str_substr(output, p_idx, output->size - 1, + &name_len)) == NULL) + return (0); + + idx = output->size; + for (i = p_idx; i < idx; ++i) { + if (!vector_str_pop(output)) { + free(name); + return (0); + } + } + + *str = name; + + return (1); +} + +static int cpp_demangle_read_nested_name(struct cpp_demangle_data *ddata) { struct vector_str *output, v; @@ -1743,6 +1986,24 @@ cpp_demangle_read_number(struct cpp_dema } static int +cpp_demangle_read_number_as_string(struct cpp_demangle_data *ddata, char **str) +{ + long n; + + if (!cpp_demangle_read_number(ddata, &n)) { + *str = NULL; + return (0); + } + + if (asprintf(str, "%ld", n) < 0) { + *str = NULL; + return (0); + } + + return (1); +} + +static int cpp_demangle_read_nv_offset(struct cpp_demangle_data *ddata) { @@ -1877,11 +2138,11 @@ cpp_demangle_read_sname(struct cpp_deman len <= 0) return (0); - if (len == 12 && (memcmp("_GLOBAL__N_1", ddata->cur, 12) == 0)) + if (len == 12 && (memcmp("_GLOBAL__N_1", ddata->cur, 12) == 0)) err = cpp_demangle_push_str(ddata, "(anonymous namespace)", 21); else err = cpp_demangle_push_str(ddata, ddata->cur, len); - + if (err == 0) return (0); @@ -2232,7 +2493,7 @@ cpp_demangle_read_type(struct cpp_demang size_t p_idx, type_str_len; int extern_c, is_builtin; long len; - char *type_str; + char *type_str, *exp_str, *num_str; if (ddata == NULL) return (0); @@ -2274,7 +2535,7 @@ cpp_demangle_read_type(struct cpp_demang extern_c = 0; is_builtin = 1; p_idx = output->size; - type_str = NULL; + type_str = exp_str = num_str = NULL; again: /* builtin type */ switch (*ddata->cur) { @@ -2320,6 +2581,82 @@ again: ++ddata->cur; goto rtn; + case 'D': + ++ddata->cur; + switch (*ddata->cur) { + case 'd': + /* IEEE 754r decimal floating point (64 bits) */ + if (!cpp_demangle_push_str(ddata, "decimal64", 9)) + goto clean; + ++ddata->cur; + break; + case 'e': + /* IEEE 754r decimal floating point (128 bits) */ + if (!cpp_demangle_push_str(ddata, "decimal128", 10)) + goto clean; + ++ddata->cur; + break; + case 'f': + /* IEEE 754r decimal floating point (32 bits) */ + if (!cpp_demangle_push_str(ddata, "decimal32", 9)) + goto clean; + ++ddata->cur; + break; + case 'h': + /* IEEE 754r half-precision floating point (16 bits) */ + if (!cpp_demangle_push_str(ddata, "half", 4)) + goto clean; + ++ddata->cur; + break; + case 'i': + /* char32_t */ + if (!cpp_demangle_push_str(ddata, "char32_t", 8)) + goto clean; + ++ddata->cur; + break; + case 'n': + /* std::nullptr_t (i.e., decltype(nullptr)) */ + if (!cpp_demangle_push_str(ddata, "decltype(nullptr)", + 17)) + goto clean; + ++ddata->cur; + break; + case 's': + /* char16_t */ + if (!cpp_demangle_push_str(ddata, "char16_t", 8)) + goto clean; + ++ddata->cur; + break; + case 'v': + /* gcc vector_size extension. */ + ++ddata->cur; + if (*ddata->cur == '_') { + ++ddata->cur; + if (!cpp_demangle_read_expression_flat(ddata, + &exp_str)) + goto clean; + if (!vector_str_push(&v.ext_name, exp_str, + strlen(exp_str))) + goto clean; + } else { + if (!cpp_demangle_read_number_as_string(ddata, + &num_str)) + goto clean; + if (!vector_str_push(&v.ext_name, num_str, + strlen(num_str))) + goto clean; + } + if (*ddata->cur != '_') + goto clean; + ++ddata->cur; + if (!vector_type_qualifier_push(&v, TYPE_VEC)) + goto clean; + goto again; + default: + goto clean; + } + goto rtn; + case 'e': /* long double */ if (!cpp_demangle_push_str(ddata, "long double", 11)) @@ -2414,7 +2751,7 @@ again: case 'o': /* unsigned __int128 */ - if (!cpp_demangle_push_str(ddata, "unsigned _;int128", 17)) + if (!cpp_demangle_push_str(ddata, "unsigned __int128", 17)) goto clean; ++ddata->cur; goto rtn; @@ -2485,6 +2822,8 @@ again: if (!vector_str_push(&v.ext_name, ddata->cur, len)) return (0); ddata->cur += len; + if (!vector_type_qualifier_push(&v, TYPE_EXT)) + goto clean; goto again; case 'v': @@ -2549,6 +2888,8 @@ rtn: goto clean; free(type_str); + free(exp_str); + free(num_str); vector_type_qualifier_dest(&v); if (ddata->push_head > 0) { @@ -2580,11 +2921,45 @@ rtn: return (1); clean: free(type_str); + free(exp_str); + free(num_str); vector_type_qualifier_dest(&v); return (0); } +static int +cpp_demangle_read_type_flat(struct cpp_demangle_data *ddata, char **str) +{ + struct vector_str *output; + size_t i, p_idx, idx, type_len; + char *type; + + output = ddata->push_head > 0 ? &ddata->output_tmp : + &ddata->output; + + p_idx = output->size; + + if (!cpp_demangle_read_type(ddata, 0)) + return (0); + + if ((type = vector_str_substr(output, p_idx, output->size - 1, + &type_len)) == NULL) + return (0); + + idx = output->size; + for (i = p_idx; i < idx; ++i) { + if (!vector_str_pop(output)) { + free(type); + return (0); + } + } + + *str = type; + + return (1); +} + /* * read unqualified-name, unqualified name are operator-name, ctor-dtor-name, * source-name @@ -3008,39 +3383,38 @@ cpp_demangle_read_uqname(struct cpp_dema if (ELFTC_ISDIGIT(*ddata->cur) != 0) return (cpp_demangle_read_sname(ddata)); - - /* local source name */ - if (*ddata->cur == 'L') - return (cpp_demangle_local_source_name(ddata)); - - return (1); -} - -/* - * Read local source name. - * - * References: - * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31775 - * http://gcc.gnu.org/viewcvs?view=rev&revision=124467 - */ -static int -cpp_demangle_local_source_name(struct cpp_demangle_data *ddata) -{ - /* L */ - if (ddata == NULL || *ddata->cur != 'L') - return (0); - ++ddata->cur; - - /* source name */ - if (!cpp_demangle_read_sname(ddata)) - return (0); - - /* discriminator */ - if (*ddata->cur == '_') { - ++ddata->cur; - while (ELFTC_ISDIGIT(*ddata->cur) != 0) - ++ddata->cur; - } + /* local source name */ + if (*ddata->cur == 'L') + return (cpp_demangle_local_source_name(ddata)); + + return (1); +} + +/* + * Read local source name. + * + * References: + * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31775 + * http://gcc.gnu.org/viewcvs?view=rev&revision=124467 + */ +static int +cpp_demangle_local_source_name(struct cpp_demangle_data *ddata) +{ + /* L */ + if (ddata == NULL || *ddata->cur != 'L') + return (0); + ++ddata->cur; + + /* source name */ + if (!cpp_demangle_read_sname(ddata)) + return (0); + + /* discriminator */ + if (*ddata->cur == '_') { + ++ddata->cur; + while (ELFTC_ISDIGIT(*ddata->cur) != 0) + ++ddata->cur; + } return (1); } From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 14:13:17 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 25951732; Thu, 18 Jun 2015 14:13:17 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 13D59B2F; Thu, 18 Jun 2015 14:13:17 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5IEDGcB035918; Thu, 18 Jun 2015 14:13:16 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5IEDG9P035917; Thu, 18 Jun 2015 14:13:16 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201506181413.t5IEDG9P035917@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 18 Jun 2015 14:13:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284552 - head/sys/dev/mii X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 14:13:17 -0000 Author: marius Date: Thu Jun 18 14:13:16 2015 New Revision: 284552 URL: https://svnweb.freebsd.org/changeset/base/284552 Log: Fix yet another comment typo in NetBSD rev. 1.16, missed when merging it in r284447. Submitted by: yongari Sponsored by: genua mbh Modified: head/sys/dev/mii/mii.h Modified: head/sys/dev/mii/mii.h ============================================================================== --- head/sys/dev/mii/mii.h Thu Jun 18 14:12:08 2015 (r284551) +++ head/sys/dev/mii/mii.h Thu Jun 18 14:13:16 2015 (r284552) @@ -204,7 +204,7 @@ #define MII_PSESR 0x0c /* PSE status register */ #define PSESR_PWRDENIED 0x1000 /* Power Denied */ #define PSESR_VALSIG 0x0800 /* Valid PD signature detected */ -#define PSESR_INVALSIG 0x0400 /* Inalid PD signature detected */ +#define PSESR_INVALSIG 0x0400 /* Invalid PD signature detected */ #define PSESR_SHORTCIRC 0x0200 /* Short circuit condition detected */ #define PSESR_OVERLOAD 0x0100 /* Overload condition detected */ #define PSESR_MPSABSENT 0x0080 /* MPS absent condition detected */ From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 14:29:47 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B32A7CFE; Thu, 18 Jun 2015 14:29:47 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A12EADB8; Thu, 18 Jun 2015 14:29:47 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5IETlIo041471; Thu, 18 Jun 2015 14:29:47 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5IETlBq041470; Thu, 18 Jun 2015 14:29:47 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201506181429.t5IETlBq041470@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 18 Jun 2015 14:29:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284553 - head/contrib/libcxxrt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 14:29:47 -0000 Author: emaste Date: Thu Jun 18 14:29:46 2015 New Revision: 284553 URL: https://svnweb.freebsd.org/changeset/base/284553 Log: Update libcxxrt upgrade instructions The typeinfo file no longer exists upstream. Modified: head/contrib/libcxxrt/FREEBSD-upgrade Modified: head/contrib/libcxxrt/FREEBSD-upgrade ============================================================================== --- head/contrib/libcxxrt/FREEBSD-upgrade Thu Jun 18 14:13:16 2015 (r284552) +++ head/contrib/libcxxrt/FREEBSD-upgrade Thu Jun 18 14:29:46 2015 (r284553) @@ -3,4 +3,4 @@ $FreeBSD$ This is the FreeBSD copy of libcxxrt. It contains the src directory from the upstream repository. -When updating, copy *.{c,cc,h} and typeinfo from the upstream src/. +When updating, copy *.{c,cc,h} from the upstream src/. From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 14:59:46 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2D122608; Thu, 18 Jun 2015 14:59:46 +0000 (UTC) (envelope-from sbruno@ignoranthack.me) Received: from mail.ignoranthack.me (ignoranthack.me [199.102.79.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA21D7D6; Thu, 18 Jun 2015 14:59:45 +0000 (UTC) (envelope-from sbruno@ignoranthack.me) Received: from [192.168.200.214] (unknown [50.136.155.142]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sbruno@ignoranthack.me) by mail.ignoranthack.me (Postfix) with ESMTPSA id 79F42193DA3; Thu, 18 Jun 2015 14:59:44 +0000 (UTC) Message-ID: <5582DCDF.9080708@ignoranthack.me> Date: Thu, 18 Jun 2015 07:59:43 -0700 From: Sean Bruno Reply-To: sbruno@freebsd.org User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Konstantin Belousov CC: svn-src-head@freebsd.org Subject: Re: svn commit: r284535 - head/sys/kern References: <201506180204.t5I24LJm079537@svn.freebsd.org> <20150618030715.GD2080@kib.kiev.ua> In-Reply-To: <20150618030715.GD2080@kib.kiev.ua> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 14:59:46 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On 06/17/15 20:07, Konstantin Belousov wrote: > On Thu, Jun 18, 2015 at 02:04:21AM +0000, Sean Bruno wrote: >> Author: sbruno Date: Thu Jun 18 02:04:20 2015 New Revision: >> 284535 URL: https://svnweb.freebsd.org/changeset/base/284535 >> >> Log: This change replaces the mutex with a sx lock for the >> interpreter list to avoid the problem of holding a non-sleep lock >> during a page fault as reported by witness. It also uses atomics >> where possible to avoid having to acquire the exclusive lock. In >> addition, it consistently uses memset()/memcpy() instead of >> bzero()/bcopy(). >> >> Differential Revision: https://reviews.freebsd.org/D1971 >> Submitted by: sson Reviewed by: jhb > What are the page faults during image activator run ? Or, if the > page faults are not during image activation, then where ? > The original witness panic was one we discussed a while ago on current. https://lists.freebsd.org/pipermail/freebsd-current/2015-February/054698 .html I wanted to resolve that witness issue before I tried to reproduce any other failure cases. Kernel page fault with the following non-sleepable locks held: exclusive sleep mutex imgact_binmisc (imgact_binmisc) r = 0 (0xffffffff82012418) locked @ /usr/src/sys/modules/imgact_binmisc/../../kern/imgact_binmisc.c:596 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe046a236280 witness_warn() at witness_warn+0x4ae/frame 0xfffffe046a236350 trap_pfault() at trap_pfault+0x59/frame 0xfffffe046a2363f0 trap() at trap+0x45e/frame 0xfffffe046a236600 calltrap() at calltrap+0x8/frame 0xfffffe046a236600 - - --- trap 0xc, rip = 0xffffffff80d21279, rsp = 0xfffffe046a2366c0, rbp = 0xfffffe046a2366d0 --- bcopy() at bcopy+0x39/frame 0xfffffe046a2366d0 imgact_binmisc_exec() at imgact_binmisc_exec+0x23d/frame 0xfffffe046a236720 kern_execve() at kern_execve+0x4c6/frame 0xfffffe046a236a80 sys_execve() at sys_execve+0x37/frame 0xfffffe046a236ae0 amd64_syscall() at amd64_syscall+0x27f/frame 0xfffffe046a236bf0 Xfast_syscall() at Xfast_syscall+0xfb/frame 0xfffffe046a236bf0 - - --- syscall (59, FreeBSD ELF64, sys_execve), rip = 0x4297ba, rsp = 0x7fffffffdaf8, rbp = 0x7fffffffdb00 --- >> >> @@ -404,12 +404,12 @@ imgact_binmisc_get_all_entries(struct sy >> imgact_binmisc_entry_t *ibe; int error = 0, count; >> >> - mtx_lock(&interp_list_mtx); + sx_slock(&interp_list_sx); count >> = interp_list_entry_count; /* Don't block in malloc() while >> holding lock. */ xbe = malloc(sizeof(*xbe) * count, M_BINMISC, >> M_NOWAIT|M_ZERO); > This is definitely no longer true statement. Even the original use > of M_NOWAIT there is not warranted. > Dead comment? I should remove it then as it is invalid/inaccurate/never was true? I should remove M_NOWAIT as well? Sean -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQF8BAEBCgBmBQJVgtzfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCQUFENDYzMkU3MTIxREU4RDIwOTk3REQx MjAxRUZDQTFFNzI3RTY0AAoJEBIB78oecn5kInoIAJ87XMcWE0p4ebkofYGlcdNP wkDSUkICqBTTB/yV5O9aCcMd8umIVXrimIP8Xm4q/A9tt+CgB23DbmgHZsDOU2eE OypHL2myI/SuEki6k4JtFItJg0JD6IuNi6gVG6Ps0ZKWm0SQHJ6vLSzEdBdY67EF 4cquOnnKiIMrn6qK9jCYzEm+6Nj3lf0roaE9DQLtZ58OfMSfHx2vDEBrlCzwRfEk ih2oxAFnsM5LLoEXpfTaihyQRsTeLIVHAUIZ3Kw3G6021LbQhExUZPBp5uZOzzi7 Bl0wrBIJC/6O4uhY3TpnffpJuAnXf6IGzJ8u2jrz5wZ6tLScVVVdPaM6eAI33dQ= =aN1P -----END PGP SIGNATURE----- From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 15:33:25 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BFF0F1D9; Thu, 18 Jun 2015 15:33:25 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4895D1B4; Thu, 18 Jun 2015 15:33:25 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id t5IFXIDY026573 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Thu, 18 Jun 2015 18:33:19 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua t5IFXIDY026573 Received: (from kostik@localhost) by tom.home (8.14.9/8.14.9/Submit) id t5IFXIC5026572; Thu, 18 Jun 2015 18:33:18 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 18 Jun 2015 18:33:18 +0300 From: Konstantin Belousov To: sbruno@freebsd.org Cc: svn-src-head@freebsd.org Subject: Re: svn commit: r284535 - head/sys/kern Message-ID: <20150618153318.GH2080@kib.kiev.ua> References: <201506180204.t5I24LJm079537@svn.freebsd.org> <20150618030715.GD2080@kib.kiev.ua> <5582DCDF.9080708@ignoranthack.me> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5582DCDF.9080708@ignoranthack.me> User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 15:33:25 -0000 On Thu, Jun 18, 2015 at 07:59:43AM -0700, Sean Bruno wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA512 > > On 06/17/15 20:07, Konstantin Belousov wrote: > > On Thu, Jun 18, 2015 at 02:04:21AM +0000, Sean Bruno wrote: > >> Author: sbruno Date: Thu Jun 18 02:04:20 2015 New Revision: > >> 284535 URL: https://svnweb.freebsd.org/changeset/base/284535 > >> > >> Log: This change replaces the mutex with a sx lock for the > >> interpreter list to avoid the problem of holding a non-sleep lock > >> during a page fault as reported by witness. It also uses atomics > >> where possible to avoid having to acquire the exclusive lock. In > >> addition, it consistently uses memset()/memcpy() instead of > >> bzero()/bcopy(). > >> > >> Differential Revision: https://reviews.freebsd.org/D1971 > >> Submitted by: sson Reviewed by: jhb > > What are the page faults during image activator run ? Or, if the > > page faults are not during image activation, then where ? > > > > The original witness panic was one we discussed a while ago on current. > https://lists.freebsd.org/pipermail/freebsd-current/2015-February/054698 > .html > > I wanted to resolve that witness issue before I tried to reproduce any > other failure cases. > > Kernel page fault with the following non-sleepable locks held: > exclusive sleep mutex imgact_binmisc (imgact_binmisc) r = 0 > (0xffffffff82012418) locked @ > /usr/src/sys/modules/imgact_binmisc/../../kern/imgact_binmisc.c:596 > KDB: stack backtrace: > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame > 0xfffffe046a236280 > witness_warn() at witness_warn+0x4ae/frame 0xfffffe046a236350 > trap_pfault() at trap_pfault+0x59/frame 0xfffffe046a2363f0 > trap() at trap+0x45e/frame 0xfffffe046a236600 > calltrap() at calltrap+0x8/frame 0xfffffe046a236600 > - - --- trap 0xc, rip = 0xffffffff80d21279, rsp = 0xfffffe046a2366c0, rbp > = 0xfffffe046a2366d0 --- > bcopy() at bcopy+0x39/frame 0xfffffe046a2366d0 > imgact_binmisc_exec() at imgact_binmisc_exec+0x23d/frame > 0xfffffe046a236720 > kern_execve() at kern_execve+0x4c6/frame 0xfffffe046a236a80 > sys_execve() at sys_execve+0x37/frame 0xfffffe046a236ae0 > amd64_syscall() at amd64_syscall+0x27f/frame 0xfffffe046a236bf0 > Xfast_syscall() at Xfast_syscall+0xfb/frame 0xfffffe046a236bf0 > - - --- syscall (59, FreeBSD ELF64, sys_execve), rip = 0x4297ba, rsp = > 0x7fffffffdaf8, rbp = 0x7fffffffdb00 --- > What is the source line for imgact_binmisc_exec+0x23d ? I see only one direct bcopy() call in the imgact_binmisc_exec(), which is accessing the exec_map swappable memory, indeed. There might be compiler-generated bcopy() calls, and in this case the faulting access probably indicates other bug. BTW, why imgact_binmisc_exec() is not static ? > > >> > >> @@ -404,12 +404,12 @@ imgact_binmisc_get_all_entries(struct sy > >> imgact_binmisc_entry_t *ibe; int error = 0, count; > >> > >> - mtx_lock(&interp_list_mtx); + sx_slock(&interp_list_sx); count > >> = interp_list_entry_count; /* Don't block in malloc() while > >> holding lock. */ xbe = malloc(sizeof(*xbe) * count, M_BINMISC, > >> M_NOWAIT|M_ZERO); > > This is definitely no longer true statement. Even the original use > > of M_NOWAIT there is not warranted. > > > > Dead comment? I should remove it then as it is > invalid/inaccurate/never was true? > > I should remove M_NOWAIT as well? Yes and yes. Also, M_NOWAIT does not return NULL. From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 16:29:12 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87AE84F2; Thu, 18 Jun 2015 16:29:12 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 68E82D6; Thu, 18 Jun 2015 16:29:12 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5IGTCER099567; Thu, 18 Jun 2015 16:29:12 GMT (envelope-from brueffer@FreeBSD.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5IGTBRF099564; Thu, 18 Jun 2015 16:29:11 GMT (envelope-from brueffer@FreeBSD.org) Message-Id: <201506181629.t5IGTBRF099564@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brueffer set sender to brueffer@FreeBSD.org using -f From: Christian Brueffer Date: Thu, 18 Jun 2015 16:29:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284557 - head/share/man/man9 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 16:29:12 -0000 Author: brueffer Date: Thu Jun 18 16:29:11 2015 New Revision: 284557 URL: https://svnweb.freebsd.org/changeset/base/284557 Log: Remove EOL whitespace. Modified: head/share/man/man9/pci_iov_schema.9 head/share/man/man9/sbuf.9 head/share/man/man9/taskqueue.9 Modified: head/share/man/man9/pci_iov_schema.9 ============================================================================== --- head/share/man/man9/pci_iov_schema.9 Thu Jun 18 15:50:42 2015 (r284556) +++ head/share/man/man9/pci_iov_schema.9 Thu Jun 18 16:29:11 2015 (r284557) @@ -67,7 +67,7 @@ .Fn pci_iov_schema_add_unicast_mac "nvlist_t *schema" "const char *name" \ "uint32_t flags" "const uint8_t *defaultVal" .Sh DESCRIPTION -The PCI Single-Root I/O Virtualization +The PCI Single-Root I/O Virtualization .Pq SR-IOV configuration schema is a data structure that describes the device-specific configuration parameters that a PF @@ -147,9 +147,9 @@ the VF was allowed to change its MAC add set this parameter as optional. The PF driver must either allow the MAC to change or not, so it would be more appropriate for the PF driver to document the default behaviour by specifying -a default value in the schema +a default value in the schema .Po or potentially force the user to make the choice by setting the parameter -to be required +to be required .Pc . .Pp Configuration parameters that have security implications must default to the @@ -226,7 +226,7 @@ and having a type. Values of type .Vt uint32_t -are unsigned integers in the range 0 to +are unsigned integers in the range 0 to .Po 2**32 - 1 Pc , inclusive. .Pp @@ -240,7 +240,7 @@ and having a type. Values of type .Vt uint64_t -are unsigned integers in the range 0 to +are unsigned integers in the range 0 to .Po 2**64 - 1 Pc , inclusive. .Pp Modified: head/share/man/man9/sbuf.9 ============================================================================== --- head/share/man/man9/sbuf.9 Thu Jun 18 15:50:42 2015 (r284556) +++ head/share/man/man9/sbuf.9 Thu Jun 18 16:29:11 2015 (r284557) @@ -117,7 +117,7 @@ .Ft ssize_t .Fn sbuf_end_section "struct sbuf *s" "ssize_t old_len" "size_t pad" "int c" .Ft void -.Fo sbuf_hexdump +.Fo sbuf_hexdump .Fa "struct sbuf *sb" .Fa "void *ptr" .Fa "int length" Modified: head/share/man/man9/taskqueue.9 ============================================================================== --- head/share/man/man9/taskqueue.9 Thu Jun 18 15:50:42 2015 (r284556) +++ head/share/man/man9/taskqueue.9 Thu Jun 18 16:29:11 2015 (r284557) @@ -288,11 +288,11 @@ are enqueued on the taskqueue to finish. Tasks posted to the taskqueue after .Fn taskqueue_drain_all begins processing, -including pending enqueues scheduled by a previous call to +including pending enqueues scheduled by a previous call to .Fn taskqueue_enqueue_timeout , do not extend the wait time of .Fn taskqueue_drain_all -and may complete after +and may complete after .Fn taskqueue_drain_all returns. .Pp From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 16:31:33 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 71EF2682; Thu, 18 Jun 2015 16:31:33 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5FE112A9; Thu, 18 Jun 2015 16:31:33 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5IGVXCW001789; Thu, 18 Jun 2015 16:31:33 GMT (envelope-from brueffer@FreeBSD.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5IGVXVh001788; Thu, 18 Jun 2015 16:31:33 GMT (envelope-from brueffer@FreeBSD.org) Message-Id: <201506181631.t5IGVXVh001788@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brueffer set sender to brueffer@FreeBSD.org using -f From: Christian Brueffer Date: Thu, 18 Jun 2015 16:31:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284558 - head/share/man/man9 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 16:31:33 -0000 Author: brueffer Date: Thu Jun 18 16:31:32 2015 New Revision: 284558 URL: https://svnweb.freebsd.org/changeset/base/284558 Log: Document title should be in CAPS. Modified: head/share/man/man9/pci_iov_schema.9 Modified: head/share/man/man9/pci_iov_schema.9 ============================================================================== --- head/share/man/man9/pci_iov_schema.9 Thu Jun 18 16:29:11 2015 (r284557) +++ head/share/man/man9/pci_iov_schema.9 Thu Jun 18 16:31:32 2015 (r284558) @@ -25,8 +25,8 @@ .\" .\" $FreeBSD$ .\" -.Dd May 28, 2015 -.Dt pci_iov_schema 9 +.Dd June 18, 2015 +.Dt PCI_IOV_SCHEMA 9 .Os .Sh NAME .Nm pci_iov_schema , From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 16:51:50 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E54735C; Thu, 18 Jun 2015 16:51:50 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B37EB5F; Thu, 18 Jun 2015 16:51:50 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5IGpog4011783; Thu, 18 Jun 2015 16:51:50 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5IGpogn011782; Thu, 18 Jun 2015 16:51:50 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201506181651.t5IGpogn011782@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Thu, 18 Jun 2015 16:51:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284562 - head/sys/arm/ti/am335x X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 16:51:50 -0000 Author: gonzo Date: Thu Jun 18 16:51:49 2015 New Revision: 284562 URL: https://svnweb.freebsd.org/changeset/base/284562 Log: Add missing driver for TDA19988 HDMI framer Added: head/sys/arm/ti/am335x/tda19988.c (contents, props changed) Added: head/sys/arm/ti/am335x/tda19988.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/ti/am335x/tda19988.c Thu Jun 18 16:51:49 2015 (r284562) @@ -0,0 +1,810 @@ +/*- + * Copyright (c) 2015 Oleksandr Tymoshenko + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); +/* +* NXP TDA19988 HDMI encoder +*/ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include + +#include "iicbus_if.h" +#include "hdmi_if.h" + +#define MKREG(page, addr) (((page) << 8) | (addr)) + +#define REGPAGE(reg) (((reg) >> 8) & 0xff) +#define REGADDR(reg) ((reg) & 0xff) + +#define TDA_VERSION MKREG(0x00, 0x00) +#define TDA_MAIN_CNTRL0 MKREG(0x00, 0x01) +#define MAIN_CNTRL0_SR (1 << 0) +#define TDA_VERSION_MSB MKREG(0x00, 0x02) +#define TDA_SOFTRESET MKREG(0x00, 0x0a) +#define SOFTRESET_I2C (1 << 1) +#define SOFTRESET_AUDIO (1 << 0) +#define TDA_DDC_CTRL MKREG(0x00, 0x0b) +#define DDC_ENABLE 0 +#define TDA_CCLK MKREG(0x00, 0x0c) +#define CCLK_ENABLE 1 +#define TDA_INT_FLAGS_2 MKREG(0x00, 0x11) +#define INT_FLAGS_2_EDID_BLK_RD (1 << 1) + +#define TDA_VIP_CNTRL_0 MKREG(0x00, 0x20) +#define TDA_VIP_CNTRL_1 MKREG(0x00, 0x21) +#define TDA_VIP_CNTRL_2 MKREG(0x00, 0x22) +#define TDA_VIP_CNTRL_3 MKREG(0x00, 0x23) +#define VIP_CNTRL_3_SYNC_HS (2 << 4) +#define VIP_CNTRL_3_V_TGL (1 << 2) +#define VIP_CNTRL_3_H_TGL (1 << 1) + +#define TDA_VIP_CNTRL_4 MKREG(0x00, 0x24) +#define VIP_CNTRL_4_BLANKIT_NDE (0 << 2) +#define VIP_CNTRL_4_BLANKIT_HS_VS (1 << 2) +#define VIP_CNTRL_4_BLANKIT_NHS_VS (2 << 2) +#define VIP_CNTRL_4_BLANKIT_HE_VE (3 << 2) +#define VIP_CNTRL_4_BLC_NONE (0 << 0) +#define VIP_CNTRL_4_BLC_RGB444 (1 << 0) +#define VIP_CNTRL_4_BLC_YUV444 (2 << 0) +#define VIP_CNTRL_4_BLC_YUV422 (3 << 0) +#define TDA_VIP_CNTRL_5 MKREG(0x00, 0x25) +#define VIP_CNTRL_5_SP_CNT(n) (((n) & 3) << 1) +#define TDA_MUX_VP_VIP_OUT MKREG(0x00, 0x27) +#define TDA_MAT_CONTRL MKREG(0x00, 0x80) +#define MAT_CONTRL_MAT_BP (1 << 2) +#define TDA_VIDFORMAT MKREG(0x00, 0xa0) +#define TDA_REFPIX_MSB MKREG(0x00, 0xa1) +#define TDA_REFPIX_LSB MKREG(0x00, 0xa2) +#define TDA_REFLINE_MSB MKREG(0x00, 0xa3) +#define TDA_REFLINE_LSB MKREG(0x00, 0xa4) +#define TDA_NPIX_MSB MKREG(0x00, 0xa5) +#define TDA_NPIX_LSB MKREG(0x00, 0xa6) +#define TDA_NLINE_MSB MKREG(0x00, 0xa7) +#define TDA_NLINE_LSB MKREG(0x00, 0xa8) +#define TDA_VS_LINE_STRT_1_MSB MKREG(0x00, 0xa9) +#define TDA_VS_LINE_STRT_1_LSB MKREG(0x00, 0xaa) +#define TDA_VS_PIX_STRT_1_MSB MKREG(0x00, 0xab) +#define TDA_VS_PIX_STRT_1_LSB MKREG(0x00, 0xac) +#define TDA_VS_LINE_END_1_MSB MKREG(0x00, 0xad) +#define TDA_VS_LINE_END_1_LSB MKREG(0x00, 0xae) +#define TDA_VS_PIX_END_1_MSB MKREG(0x00, 0xaf) +#define TDA_VS_PIX_END_1_LSB MKREG(0x00, 0xb0) +#define TDA_VS_LINE_STRT_2_MSB MKREG(0x00, 0xb1) +#define TDA_VS_LINE_STRT_2_LSB MKREG(0x00, 0xb2) +#define TDA_VS_PIX_STRT_2_MSB MKREG(0x00, 0xb3) +#define TDA_VS_PIX_STRT_2_LSB MKREG(0x00, 0xb4) +#define TDA_VS_LINE_END_2_MSB MKREG(0x00, 0xb5) +#define TDA_VS_LINE_END_2_LSB MKREG(0x00, 0xb6) +#define TDA_VS_PIX_END_2_MSB MKREG(0x00, 0xb7) +#define TDA_VS_PIX_END_2_LSB MKREG(0x00, 0xb8) +#define TDA_HS_PIX_START_MSB MKREG(0x00, 0xb9) +#define TDA_HS_PIX_START_LSB MKREG(0x00, 0xba) +#define TDA_HS_PIX_STOP_MSB MKREG(0x00, 0xbb) +#define TDA_HS_PIX_STOP_LSB MKREG(0x00, 0xbc) +#define TDA_VWIN_START_1_MSB MKREG(0x00, 0xbd) +#define TDA_VWIN_START_1_LSB MKREG(0x00, 0xbe) +#define TDA_VWIN_END_1_MSB MKREG(0x00, 0xbf) +#define TDA_VWIN_END_1_LSB MKREG(0x00, 0xc0) +#define TDA_VWIN_START_2_MSB MKREG(0x00, 0xc1) +#define TDA_VWIN_START_2_LSB MKREG(0x00, 0xc2) +#define TDA_VWIN_END_2_MSB MKREG(0x00, 0xc3) +#define TDA_VWIN_END_2_LSB MKREG(0x00, 0xc4) +#define TDA_DE_START_MSB MKREG(0x00, 0xc5) +#define TDA_DE_START_LSB MKREG(0x00, 0xc6) +#define TDA_DE_STOP_MSB MKREG(0x00, 0xc7) +#define TDA_DE_STOP_LSB MKREG(0x00, 0xc8) + +#define TDA_TBG_CNTRL_0 MKREG(0x00, 0xca) +#define TBG_CNTRL_0_SYNC_ONCE (1 << 7) +#define TBG_CNTRL_0_SYNC_MTHD (1 << 6) + +#define TDA_TBG_CNTRL_1 MKREG(0x00, 0xcb) +#define TBG_CNTRL_1_DWIN_DIS (1 << 6) +#define TBG_CNTRL_1_TGL_EN (1 << 2) +#define TBG_CNTRL_1_V_TGL (1 << 1) +#define TBG_CNTRL_1_H_TGL (1 << 0) + +#define TDA_HVF_CNTRL_0 MKREG(0x00, 0xe4) +#define HVF_CNTRL_0_PREFIL_NONE (0 << 2) +#define HVF_CNTRL_0_INTPOL_BYPASS (0 << 0) +#define TDA_HVF_CNTRL_1 MKREG(0x00, 0xe5) +#define HVF_CNTRL_1_VQR(x) (((x) & 3) << 2) +#define HVF_CNTRL_1_VQR_FULL HVF_CNTRL_1_VQR(0) +#define TDA_ENABLE_SPACE MKREG(0x00, 0xd6) +#define TDA_RPT_CNTRL MKREG(0x00, 0xf0) + +#define TDA_PLL_SERIAL_1 MKREG(0x02, 0x00) +#define PLL_SERIAL_1_SRL_MAN_IP (1 << 6) +#define TDA_PLL_SERIAL_2 MKREG(0x02, 0x01) +#define PLL_SERIAL_2_SRL_PR(x) (((x) & 0xf) << 4) +#define PLL_SERIAL_2_SRL_NOSC(x) (((x) & 0x3) << 0) +#define TDA_PLL_SERIAL_3 MKREG(0x02, 0x02) +#define PLL_SERIAL_3_SRL_PXIN_SEL (1 << 4) +#define PLL_SERIAL_3_SRL_DE (1 << 2) +#define PLL_SERIAL_3_SRL_CCIR (1 << 0) +#define TDA_SERIALIZER MKREG(0x02, 0x03) +#define TDA_BUFFER_OUT MKREG(0x02, 0x04) +#define TDA_PLL_SCG1 MKREG(0x02, 0x05) +#define TDA_PLL_SCG2 MKREG(0x02, 0x06) +#define TDA_PLL_SCGN1 MKREG(0x02, 0x07) +#define TDA_PLL_SCGN2 MKREG(0x02, 0x08) +#define TDA_PLL_SCGR1 MKREG(0x02, 0x09) +#define TDA_PLL_SCGR2 MKREG(0x02, 0x0a) + +#define TDA_SEL_CLK MKREG(0x02, 0x11) +#define SEL_CLK_ENA_SC_CLK (1 << 3) +#define SEL_CLK_SEL_VRF_CLK(x) (((x) & 3) << 1) +#define SEL_CLK_SEL_CLK1 (1 << 0) +#define TDA_ANA_GENERAL MKREG(0x02, 0x12) + +#define TDA_EDID_DATA0 MKREG(0x09, 0x00) +#define TDA_EDID_CTRL MKREG(0x09, 0xfa) +#define TDA_DDC_ADDR MKREG(0x09, 0xfb) +#define TDA_DDC_OFFS MKREG(0x09, 0xfc) +#define TDA_DDC_SEGM_ADDR MKREG(0x09, 0xfd) +#define TDA_DDC_SEGM MKREG(0x09, 0xfe) + +#define TDA_IF_VSP MKREG(0x10, 0x20) +#define TDA_IF_AVI MKREG(0x10, 0x40) +#define TDA_IF_SPD MKREG(0x10, 0x60) +#define TDA_IF_AUD MKREG(0x10, 0x80) +#define TDA_IF_MPS MKREG(0x10, 0xa0) + +#define TDA_ENC_CNTRL MKREG(0x11, 0x0d) +#define ENC_CNTRL_DVI_MODE (0 << 2) +#define ENC_CNTRL_HDMI_MODE (1 << 2) +#define TDA_DIP_IF_FLAGS MKREG(0x11, 0x0f) +#define DIP_IF_FLAGS_IF5 (1 << 5) +#define DIP_IF_FLAGS_IF4 (1 << 4) +#define DIP_IF_FLAGS_IF3 (1 << 3) +#define DIP_IF_FLAGS_IF2 (1 << 2) /* AVI IF on page 10h */ +#define DIP_IF_FLAGS_IF1 (1 << 1) + +#define TDA_TX3 MKREG(0x12, 0x9a) +#define TDA_TX4 MKREG(0x12, 0x9b) +#define TX4_PD_RAM (1 << 1) +#define TDA_HDCP_TX33 MKREG(0x12, 0xb8) +#define HDCP_TX33_HDMI (1 << 1) + +#define TDA_CURPAGE_ADDR 0xff + +#define TDA_CEC_ENAMODS 0xff +#define ENAMODS_RXSENS (1 << 2) +#define ENAMODS_HDMI (1 << 1) +#define TDA_CEC_FRO_IM_CLK_CTRL 0xfb +#define CEC_FRO_IM_CLK_CTRL_GHOST_DIS (1 << 7) +#define CEC_FRO_IM_CLK_CTRL_IMCLK_SEL (1 << 1) + +/* EDID reading */ +#define EDID_LENGTH 0x80 +#define MAX_READ_ATTEMPTS 100 + +/* EDID fields */ +#define EDID_MODES0 35 +#define EDID_MODES1 36 +#define EDID_TIMING_START 38 +#define EDID_TIMING_END 54 +#define EDID_TIMING_X(v) (((v) + 31) * 8) +#define EDID_FREQ(v) (((v) & 0x3f) + 60) +#define EDID_RATIO(v) (((v) >> 6) & 0x3) +#define EDID_RATIO_10x16 0 +#define EDID_RATIO_3x4 1 +#define EDID_RATIO_4x5 2 +#define EDID_RATIO_9x16 3 + +#define TDA19988 0x0301 + +struct tda19988_softc { + device_t sc_dev; + uint32_t sc_addr; + uint32_t sc_cec_addr; + uint16_t sc_version; + struct intr_config_hook enum_hook; + int sc_current_page; + uint8_t *sc_edid; + uint32_t sc_edid_len; +}; + +static int +tda19988_set_page(struct tda19988_softc *sc, uint8_t page) +{ + uint8_t addr = TDA_CURPAGE_ADDR; + uint8_t cmd[2]; + int result; + struct iic_msg msg[] = { + { sc->sc_addr, IIC_M_WR, 2, cmd }, + }; + + cmd[0] = addr; + cmd[1] = page; + + result = (iicbus_transfer(sc->sc_dev, msg, 1)); + if (result) + printf("tda19988_set_page failed: %d\n", result); + else + sc->sc_current_page = page; + + return (result); +} + +static int +tda19988_cec_read(struct tda19988_softc *sc, uint8_t addr, uint8_t *data) +{ + int result; + struct iic_msg msg[] = { + { sc->sc_cec_addr, IIC_M_WR, 1, &addr }, + { sc->sc_cec_addr, IIC_M_RD, 1, data }, + }; + + result = iicbus_transfer(sc->sc_dev, msg, 2); + if (result) + printf("tda19988_cec_read failed: %d\n", result); + return (result); +} + +static int +tda19988_cec_write(struct tda19988_softc *sc, uint8_t address, uint8_t data) +{ + uint8_t cmd[2]; + int result; + struct iic_msg msg[] = { + { sc->sc_cec_addr, IIC_M_WR, 2, cmd }, + }; + + cmd[0] = address; + cmd[1] = data; + + result = iicbus_transfer(sc->sc_dev, msg, 1); + if (result) + printf("tda19988_cec_write failed: %d\n", result); + return (result); +} + +static int +tda19988_block_read(struct tda19988_softc *sc, uint16_t addr, uint8_t *data, int len) +{ + uint8_t reg; + int result; + struct iic_msg msg[] = { + { sc->sc_addr, IIC_M_WR, 1, ® }, + { sc->sc_addr, IIC_M_RD, len, data }, + }; + + reg = REGADDR(addr); + + if (sc->sc_current_page != REGPAGE(addr)) + tda19988_set_page(sc, REGPAGE(addr)); + + result = (iicbus_transfer(sc->sc_dev, msg, 2)); + if (result) + device_printf(sc->sc_dev, "tda19988_block_read failed: %d\n", result); + return (result); +} + +static int +tda19988_reg_read(struct tda19988_softc *sc, uint16_t addr, uint8_t *data) +{ + uint8_t reg; + int result; + struct iic_msg msg[] = { + { sc->sc_addr, IIC_M_WR, 1, ® }, + { sc->sc_addr, IIC_M_RD, 1, data }, + }; + + reg = REGADDR(addr); + + if (sc->sc_current_page != REGPAGE(addr)) + tda19988_set_page(sc, REGPAGE(addr)); + + result = (iicbus_transfer(sc->sc_dev, msg, 2)); + if (result) + device_printf(sc->sc_dev, "tda19988_reg_read failed: %d\n", result); + return (result); +} + +static int +tda19988_reg_write(struct tda19988_softc *sc, uint16_t address, uint8_t data) +{ + uint8_t cmd[2]; + int result; + struct iic_msg msg[] = { + { sc->sc_addr, IIC_M_WR, 2, cmd }, + }; + + cmd[0] = REGADDR(address); + cmd[1] = data; + + if (sc->sc_current_page != REGPAGE(address)) + tda19988_set_page(sc, REGPAGE(address)); + + result = iicbus_transfer(sc->sc_dev, msg, 1); + if (result) + device_printf(sc->sc_dev, "tda19988_reg_write failed: %d\n", result); + + return (result); +} + +static int +tda19988_reg_write2(struct tda19988_softc *sc, uint16_t address, uint16_t data) +{ + uint8_t cmd[3]; + int result; + struct iic_msg msg[] = { + { sc->sc_addr, IIC_M_WR, 3, cmd }, + }; + + cmd[0] = REGADDR(address); + cmd[1] = (data >> 8); + cmd[2] = (data & 0xff); + + if (sc->sc_current_page != REGPAGE(address)) + tda19988_set_page(sc, REGPAGE(address)); + + result = iicbus_transfer(sc->sc_dev, msg, 1); + if (result) + device_printf(sc->sc_dev, "tda19988_reg_write2 failed: %d\n", result); + + return (result); +} + +static void +tda19988_reg_set(struct tda19988_softc *sc, uint16_t addr, uint8_t flags) +{ + uint8_t data; + + tda19988_reg_read(sc, addr, &data); + data |= flags; + tda19988_reg_write(sc, addr, data); +} + +static void +tda19988_reg_clear(struct tda19988_softc *sc, uint16_t addr, uint8_t flags) +{ + uint8_t data; + + tda19988_reg_read(sc, addr, &data); + data &= ~flags; + tda19988_reg_write(sc, addr, data); +} + +static int +tda19988_probe(device_t dev) +{ + + if (!ofw_bus_is_compatible(dev, "nxp,tda998x")) + return (ENXIO); + + return (BUS_PROBE_DEFAULT); +} + +static void +tda19988_init_encoder(struct tda19988_softc *sc, const struct videomode *mode) +{ + uint16_t ref_pix, ref_line, n_pix, n_line; + uint16_t hs_pix_start, hs_pix_stop; + uint16_t vs1_pix_start, vs1_pix_stop; + uint16_t vs1_line_start, vs1_line_end; + uint16_t vs2_pix_start, vs2_pix_stop; + uint16_t vs2_line_start, vs2_line_end; + uint16_t vwin1_line_start, vwin1_line_end; + uint16_t vwin2_line_start, vwin2_line_end; + uint16_t de_start, de_stop; + uint8_t reg, div; + + n_pix = mode->htotal; + n_line = mode->vtotal; + + hs_pix_stop = mode->hsync_end - mode->hdisplay; + hs_pix_start = mode->hsync_start - mode->hdisplay; + + de_stop = mode->htotal; + de_start = mode->htotal - mode->hdisplay; + ref_pix = hs_pix_start + 3; + + if (mode->flags & VID_HSKEW) + ref_pix += mode->hskew; + + if ((mode->flags & VID_INTERLACE) == 0) { + ref_line = 1 + mode->vsync_start - mode->vdisplay; + vwin1_line_start = mode->vtotal - mode->vdisplay - 1; + vwin1_line_end = vwin1_line_start + mode->vdisplay; + + vs1_pix_start = vs1_pix_stop = hs_pix_start; + vs1_line_start = mode->vsync_start - mode->vdisplay; + vs1_line_end = vs1_line_start + mode->vsync_end - mode->vsync_start; + + vwin2_line_start = vwin2_line_end = 0; + vs2_pix_start = vs2_pix_stop = 0; + vs2_line_start = vs2_line_end = 0; + } else { + ref_line = 1 + (mode->vsync_start - mode->vdisplay)/2; + vwin1_line_start = (mode->vtotal - mode->vdisplay)/2; + vwin1_line_end = vwin1_line_start + mode->vdisplay/2; + + vs1_pix_start = vs1_pix_stop = hs_pix_start; + vs1_line_start = (mode->vsync_start - mode->vdisplay)/2; + vs1_line_end = vs1_line_start + (mode->vsync_end - mode->vsync_start)/2; + + vwin2_line_start = vwin1_line_start + mode->vtotal/2; + vwin2_line_end = vwin2_line_start + mode->vdisplay/2; + + vs2_pix_start = vs2_pix_stop = hs_pix_start + mode->htotal/2; + vs2_line_start = vs1_line_start + mode->vtotal/2 ; + vs2_line_end = vs2_line_start + (mode->vsync_end - mode->vsync_start)/2; + } + + div = 148500 / mode->dot_clock; + if (div != 0) { + div--; + if (div > 3) + div = 3; + } + + /* set HDMI HDCP mode off */ + tda19988_reg_set(sc, TDA_TBG_CNTRL_1, TBG_CNTRL_1_DWIN_DIS); + tda19988_reg_clear(sc, TDA_HDCP_TX33, HDCP_TX33_HDMI); + tda19988_reg_write(sc, TDA_ENC_CNTRL, ENC_CNTRL_DVI_MODE); + + /* no pre-filter or interpolator */ + tda19988_reg_write(sc, TDA_HVF_CNTRL_0, + HVF_CNTRL_0_INTPOL_BYPASS | HVF_CNTRL_0_PREFIL_NONE); + tda19988_reg_write(sc, TDA_VIP_CNTRL_5, VIP_CNTRL_5_SP_CNT(0)); + tda19988_reg_write(sc, TDA_VIP_CNTRL_4, + VIP_CNTRL_4_BLANKIT_NDE | VIP_CNTRL_4_BLC_NONE); + + tda19988_reg_clear(sc, TDA_PLL_SERIAL_3, PLL_SERIAL_3_SRL_CCIR); + tda19988_reg_clear(sc, TDA_PLL_SERIAL_1, PLL_SERIAL_1_SRL_MAN_IP); + tda19988_reg_clear(sc, TDA_PLL_SERIAL_3, PLL_SERIAL_3_SRL_DE); + tda19988_reg_write(sc, TDA_SERIALIZER, 0); + tda19988_reg_write(sc, TDA_HVF_CNTRL_1, HVF_CNTRL_1_VQR_FULL); + + tda19988_reg_write(sc, TDA_RPT_CNTRL, 0); + tda19988_reg_write(sc, TDA_SEL_CLK, SEL_CLK_SEL_VRF_CLK(0) | + SEL_CLK_SEL_CLK1 | SEL_CLK_ENA_SC_CLK); + + tda19988_reg_write(sc, TDA_PLL_SERIAL_2, PLL_SERIAL_2_SRL_NOSC(div) | + PLL_SERIAL_2_SRL_PR(0)); + + tda19988_reg_set(sc, TDA_MAT_CONTRL, MAT_CONTRL_MAT_BP); + + tda19988_reg_write(sc, TDA_ANA_GENERAL, 0x09); + + tda19988_reg_clear(sc, TDA_TBG_CNTRL_0, TBG_CNTRL_0_SYNC_MTHD); + + /* + * Sync on rising HSYNC/VSYNC + */ + reg = VIP_CNTRL_3_SYNC_HS; + if (mode->flags & VID_NHSYNC) + reg |= VIP_CNTRL_3_H_TGL; + if (mode->flags & VID_NVSYNC) + reg |= VIP_CNTRL_3_V_TGL; + tda19988_reg_write(sc, TDA_VIP_CNTRL_3, reg); + + reg = TBG_CNTRL_1_TGL_EN; + if (mode->flags & VID_NHSYNC) + reg |= TBG_CNTRL_1_H_TGL; + if (mode->flags & VID_NVSYNC) + reg |= TBG_CNTRL_1_V_TGL; + tda19988_reg_write(sc, TDA_TBG_CNTRL_1, reg); + + /* Program timing */ + tda19988_reg_write(sc, TDA_VIDFORMAT, 0x00); + + tda19988_reg_write2(sc, TDA_REFPIX_MSB, ref_pix); + tda19988_reg_write2(sc, TDA_REFLINE_MSB, ref_line); + tda19988_reg_write2(sc, TDA_NPIX_MSB, n_pix); + tda19988_reg_write2(sc, TDA_NLINE_MSB, n_line); + + tda19988_reg_write2(sc, TDA_VS_LINE_STRT_1_MSB, vs1_line_start); + tda19988_reg_write2(sc, TDA_VS_PIX_STRT_1_MSB, vs1_pix_start); + tda19988_reg_write2(sc, TDA_VS_LINE_END_1_MSB, vs1_line_end); + tda19988_reg_write2(sc, TDA_VS_PIX_END_1_MSB, vs1_pix_stop); + tda19988_reg_write2(sc, TDA_VS_LINE_STRT_2_MSB, vs2_line_start); + tda19988_reg_write2(sc, TDA_VS_PIX_STRT_2_MSB, vs2_pix_start); + tda19988_reg_write2(sc, TDA_VS_LINE_END_2_MSB, vs2_line_end); + tda19988_reg_write2(sc, TDA_VS_PIX_END_2_MSB, vs2_pix_stop); + tda19988_reg_write2(sc, TDA_HS_PIX_START_MSB, hs_pix_start); + tda19988_reg_write2(sc, TDA_HS_PIX_STOP_MSB, hs_pix_stop); + tda19988_reg_write2(sc, TDA_VWIN_START_1_MSB, vwin1_line_start); + tda19988_reg_write2(sc, TDA_VWIN_END_1_MSB, vwin1_line_end); + tda19988_reg_write2(sc, TDA_VWIN_START_2_MSB, vwin2_line_start); + tda19988_reg_write2(sc, TDA_VWIN_END_2_MSB, vwin2_line_end); + tda19988_reg_write2(sc, TDA_DE_START_MSB, de_start); + tda19988_reg_write2(sc, TDA_DE_STOP_MSB, de_stop); + + if (sc->sc_version == TDA19988) + tda19988_reg_write(sc, TDA_ENABLE_SPACE, 0x00); + + /* must be last register set */ + tda19988_reg_clear(sc, TDA_TBG_CNTRL_0, TBG_CNTRL_0_SYNC_ONCE); +} + +static int +tda19988_read_edid_block(struct tda19988_softc *sc, uint8_t *buf, int block) +{ + int attempt, err; + uint8_t data; + + err = 0; + + tda19988_reg_set(sc, TDA_INT_FLAGS_2, INT_FLAGS_2_EDID_BLK_RD); + + /* Block 0 */ + tda19988_reg_write(sc, TDA_DDC_ADDR, 0xa0); + tda19988_reg_write(sc, TDA_DDC_OFFS, (block % 2) ? 128 : 0); + tda19988_reg_write(sc, TDA_DDC_SEGM_ADDR, 0x60); + tda19988_reg_write(sc, TDA_DDC_SEGM, block / 2); + + tda19988_reg_write(sc, TDA_EDID_CTRL, 1); + tda19988_reg_write(sc, TDA_EDID_CTRL, 0); + + data = 0; + for (attempt = 0; attempt < MAX_READ_ATTEMPTS; attempt++) { + tda19988_reg_read(sc, TDA_INT_FLAGS_2, &data); + if (data & INT_FLAGS_2_EDID_BLK_RD) + break; + pause("EDID", 1); + } + + if (attempt == MAX_READ_ATTEMPTS) { + err = -1; + goto done; + } + + if (tda19988_block_read(sc, TDA_EDID_DATA0, buf, EDID_LENGTH) != 0) { + err = -1; + goto done; + } + +done: + tda19988_reg_clear(sc, TDA_INT_FLAGS_2, INT_FLAGS_2_EDID_BLK_RD); + + return (err); +} + +static int +tda19988_read_edid(struct tda19988_softc *sc) +{ + int err; + int blocks, i; + uint8_t *buf; + + err = 0; + if (sc->sc_version == TDA19988) + tda19988_reg_clear(sc, TDA_TX4, TX4_PD_RAM); + + err = tda19988_read_edid_block(sc, sc->sc_edid, 0); + if (err) + goto done; + + blocks = sc->sc_edid[0x7e]; + if (blocks > 0) { + sc->sc_edid = realloc(sc->sc_edid, + EDID_LENGTH*(blocks+1), M_DEVBUF, M_WAITOK); + sc->sc_edid_len = EDID_LENGTH*(blocks+1); + for (i = 0; i < blocks; i++) { + /* TODO: check validity */ + buf = sc->sc_edid + EDID_LENGTH*(i+1); + err = tda19988_read_edid_block(sc, buf, i); + if (err) + goto done; + } + } + + EVENTHANDLER_INVOKE(hdmi_event, 0); +done: + if (sc->sc_version == TDA19988) + tda19988_reg_set(sc, TDA_TX4, TX4_PD_RAM); + + return (err); +} + +static void +tda19988_start(void *xdev) +{ + struct tda19988_softc *sc; + device_t dev = (device_t)xdev; + uint8_t data; + uint16_t version; + + sc = device_get_softc(dev); + + tda19988_cec_write(sc, TDA_CEC_ENAMODS, ENAMODS_RXSENS | ENAMODS_HDMI); + DELAY(1000); + tda19988_cec_read(sc, 0xfe, &data); + + /* Reset core */ + tda19988_reg_set(sc, TDA_SOFTRESET, 3); + DELAY(100); + tda19988_reg_clear(sc, TDA_SOFTRESET, 3); + DELAY(100); + + /* reset transmitter: */ + tda19988_reg_set(sc, TDA_MAIN_CNTRL0, MAIN_CNTRL0_SR); + tda19988_reg_clear(sc, TDA_MAIN_CNTRL0, MAIN_CNTRL0_SR); + + /* PLL registers common configuration */ + tda19988_reg_write(sc, TDA_PLL_SERIAL_1, 0x00); + tda19988_reg_write(sc, TDA_PLL_SERIAL_2, PLL_SERIAL_2_SRL_NOSC(1)); + tda19988_reg_write(sc, TDA_PLL_SERIAL_3, 0x00); + tda19988_reg_write(sc, TDA_SERIALIZER, 0x00); + tda19988_reg_write(sc, TDA_BUFFER_OUT, 0x00); + tda19988_reg_write(sc, TDA_PLL_SCG1, 0x00); + tda19988_reg_write(sc, TDA_SEL_CLK, SEL_CLK_SEL_CLK1 | SEL_CLK_ENA_SC_CLK); + tda19988_reg_write(sc, TDA_PLL_SCGN1, 0xfa); + tda19988_reg_write(sc, TDA_PLL_SCGN2, 0x00); + tda19988_reg_write(sc, TDA_PLL_SCGR1, 0x5b); + tda19988_reg_write(sc, TDA_PLL_SCGR2, 0x00); + tda19988_reg_write(sc, TDA_PLL_SCG2, 0x10); + + /* Write the default value MUX register */ + tda19988_reg_write(sc, TDA_MUX_VP_VIP_OUT, 0x24); + + version = 0; + tda19988_reg_read(sc, TDA_VERSION, &data); + version |= data; + tda19988_reg_read(sc, TDA_VERSION_MSB, &data); + version |= (data << 8); + + /* Clear feature bits */ + sc->sc_version = version & ~0x30; + switch (sc->sc_version) { + case TDA19988: + device_printf(dev, "TDA19988\n"); + break; + default: + device_printf(dev, "Unknown device: %04x\n", sc->sc_version); + goto done; + } + + tda19988_reg_write(sc, TDA_DDC_CTRL, DDC_ENABLE); + tda19988_reg_write(sc, TDA_TX3, 39); + + tda19988_cec_write(sc, TDA_CEC_FRO_IM_CLK_CTRL, + CEC_FRO_IM_CLK_CTRL_GHOST_DIS | CEC_FRO_IM_CLK_CTRL_IMCLK_SEL); + + if (tda19988_read_edid(sc) < 0) { + device_printf(dev, "failed to read EDID\n"); + goto done; + } + + /* Default values for RGB 4:4:4 mapping */ + tda19988_reg_write(sc, TDA_VIP_CNTRL_0, 0x23); + tda19988_reg_write(sc, TDA_VIP_CNTRL_1, 0x45); + tda19988_reg_write(sc, TDA_VIP_CNTRL_2, 0x01); + +done: + config_intrhook_disestablish(&sc->enum_hook); +} + +static int +tda19988_attach(device_t dev) +{ + struct tda19988_softc *sc; + phandle_t node; + + sc = device_get_softc(dev); + + sc->sc_dev = dev; + sc->sc_addr = iicbus_get_addr(dev) << 1; + sc->sc_cec_addr = (0x34 << 1); /* hardcoded */ + sc->sc_edid = malloc(EDID_LENGTH, M_DEVBUF, M_WAITOK | M_ZERO); + sc->sc_edid_len = EDID_LENGTH; + + device_set_desc(dev, "NXP TDA19988 HDMI transmitter"); + + sc->enum_hook.ich_func = tda19988_start; + sc->enum_hook.ich_arg = dev; + + if (config_intrhook_establish(&sc->enum_hook) != 0) + return (ENOMEM); + + node = ofw_bus_get_node(dev); + OF_device_register_xref(OF_xref_from_node(node), dev); + + return (0); +} + +static int +tda19988_detach(device_t dev) +{ + + /* XXX: Do not let unload drive */ + return (EBUSY); +} + +static int +tda19988_get_edid(device_t dev, uint8_t **edid, uint32_t *edid_len) +{ + struct tda19988_softc *sc; + + sc = device_get_softc(dev); + + if (sc->sc_edid) { + *edid = sc->sc_edid; + *edid_len = sc->sc_edid_len; + } else + return (ENXIO); + + return (0); +} + +static int +tda19988_set_videomode(device_t dev, const struct videomode *mode) +{ + struct tda19988_softc *sc; + + sc = device_get_softc(dev); + + tda19988_init_encoder(sc, mode); + + return (0); +} + +static device_method_t tda_methods[] = { + DEVMETHOD(device_probe, tda19988_probe), + DEVMETHOD(device_attach, tda19988_attach), + DEVMETHOD(device_detach, tda19988_detach), + + /* HDMI methods */ + DEVMETHOD(hdmi_get_edid, tda19988_get_edid), + DEVMETHOD(hdmi_set_videomode, tda19988_set_videomode), + {0, 0}, +}; + +static driver_t tda_driver = { + "tda", + tda_methods, + sizeof(struct tda19988_softc), +}; + +static devclass_t tda_devclass; + +DRIVER_MODULE(tda, iicbus, tda_driver, tda_devclass, 0, 0); +MODULE_VERSION(tda, 1); +MODULE_DEPEND(tda, iicbus, 1, 1, 1); From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 18:28:39 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 086F29FC; Thu, 18 Jun 2015 18:28:39 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EAA28612; Thu, 18 Jun 2015 18:28:38 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5IISc05060635; Thu, 18 Jun 2015 18:28:38 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5IIScG0060634; Thu, 18 Jun 2015 18:28:38 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201506181828.t5IIScG0060634@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Thu, 18 Jun 2015 18:28:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284566 - head/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 18:28:39 -0000 Author: ae Date: Thu Jun 18 18:28:38 2015 New Revision: 284566 URL: https://svnweb.freebsd.org/changeset/base/284566 Log: Fix possible use after free in encap[46]_input(). There is small window, when encap_detach() can free matched entry directly after we release encapmtx. Instead of use pointer to the matched entry, save pointers to needed variables from this entry and use them after release mutex. Pass argument stored in the encaptab entry to encap_fillarg(), instead of pointer to matched entry. Also do not allocate new mbuf tag, when argument that we plan to save in this tag is NULL. Also make encaptab variable static. Obtained from: Yandex LLC Sponsored by: Yandex LLC Modified: head/sys/netinet/ip_encap.c Modified: head/sys/netinet/ip_encap.c ============================================================================== --- head/sys/netinet/ip_encap.c Thu Jun 18 17:42:24 2015 (r284565) +++ head/sys/netinet/ip_encap.c Thu Jun 18 18:28:38 2015 (r284566) @@ -95,14 +95,14 @@ static MALLOC_DEFINE(M_NETADDR, "encap_e static void encap_add(struct encaptab *); static int mask_match(const struct encaptab *, const struct sockaddr *, const struct sockaddr *); -static void encap_fillarg(struct mbuf *, const struct encaptab *); +static void encap_fillarg(struct mbuf *, void *); /* * All global variables in ip_encap.c are locked using encapmtx. */ static struct mtx encapmtx; MTX_SYSINIT(encapmtx, &encapmtx, "encapmtx", MTX_DEF); -LIST_HEAD(, encaptab) encaptab = LIST_HEAD_INITIALIZER(encaptab); +static LIST_HEAD(, encaptab) encaptab = LIST_HEAD_INITIALIZER(encaptab); /* * We currently keey encap_init() for source code compatibility reasons -- @@ -122,12 +122,12 @@ encap4_input(struct mbuf **mp, int *offp struct sockaddr_in s, d; const struct protosw *psw; struct encaptab *ep, *match; + void *arg; int matchprio, off, prio; m = *mp; off = *offp; ip = mtod(m, struct ip *); - *mp = NULL; bzero(&s, sizeof(s)); s.sin_family = AF_INET; @@ -138,6 +138,8 @@ encap4_input(struct mbuf **mp, int *offp d.sin_len = sizeof(struct sockaddr_in); d.sin_addr = ip->ip_dst; + arg = NULL; + psw = NULL; match = NULL; matchprio = 0; mtx_lock(&encapmtx); @@ -182,14 +184,16 @@ encap4_input(struct mbuf **mp, int *offp match = ep; } } + if (match != NULL) { + psw = match->psw; + arg = match->arg; + } mtx_unlock(&encapmtx); - if (match) { + if (match != NULL) { /* found a match, "match" has the best one */ - psw = match->psw; - if (psw && psw->pr_input) { - encap_fillarg(m, match); - *mp = m; + if (psw != NULL && psw->pr_input != NULL) { + encap_fillarg(m, arg); (*psw->pr_input)(mp, offp, proto); } else m_freem(m); @@ -197,7 +201,6 @@ encap4_input(struct mbuf **mp, int *offp } /* last resort: inject to raw socket */ - *mp = m; return (rip_input(mp, offp, proto)); } #endif @@ -211,6 +214,7 @@ encap6_input(struct mbuf **mp, int *offp struct sockaddr_in6 s, d; const struct protosw *psw; struct encaptab *ep, *match; + void *arg; int prio, matchprio; ip6 = mtod(m, struct ip6_hdr *); @@ -224,6 +228,8 @@ encap6_input(struct mbuf **mp, int *offp d.sin6_len = sizeof(struct sockaddr_in6); d.sin6_addr = ip6->ip6_dst; + arg = NULL; + psw = NULL; match = NULL; matchprio = 0; mtx_lock(&encapmtx); @@ -251,17 +257,20 @@ encap6_input(struct mbuf **mp, int *offp match = ep; } } + if (match != NULL) { + psw = match->psw; + arg = match->arg; + } mtx_unlock(&encapmtx); - if (match) { + if (match != NULL) { /* found a match */ - psw = match->psw; - if (psw && psw->pr_input) { - encap_fillarg(m, match); + if (psw != NULL && psw->pr_input != NULL) { + encap_fillarg(m, arg); return (*psw->pr_input)(mp, offp, proto); } else { m_freem(m); - return IPPROTO_DONE; + return (IPPROTO_DONE); } } @@ -440,14 +449,16 @@ mask_match(const struct encaptab *ep, co } static void -encap_fillarg(struct mbuf *m, const struct encaptab *ep) +encap_fillarg(struct mbuf *m, void *arg) { struct m_tag *tag; - tag = m_tag_get(PACKET_TAG_ENCAP, sizeof (void*), M_NOWAIT); - if (tag) { - *(void**)(tag+1) = ep->arg; - m_tag_prepend(m, tag); + if (arg != NULL) { + tag = m_tag_get(PACKET_TAG_ENCAP, sizeof(void *), M_NOWAIT); + if (tag != NULL) { + *(void**)(tag+1) = arg; + m_tag_prepend(m, tag); + } } } From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 18:49:24 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A3DA8F41; Thu, 18 Jun 2015 18:49:24 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0138.outbound.protection.outlook.com [207.46.100.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C80B5AFD; Thu, 18 Jun 2015 18:49:23 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from BY2PR05MB711.namprd05.prod.outlook.com (10.141.222.149) by BY2PR05MB662.namprd05.prod.outlook.com (10.141.221.14) with Microsoft SMTP Server (TLS) id 15.1.190.14; Thu, 18 Jun 2015 18:49:17 +0000 Received: from CO2PR05CA036.namprd05.prod.outlook.com (10.141.241.164) by BY2PR05MB711.namprd05.prod.outlook.com (10.141.222.149) with Microsoft SMTP Server (TLS) id 15.1.195.15; Thu, 18 Jun 2015 18:49:16 +0000 Received: from BN1BFFO11FD026.protection.gbl (2a01:111:f400:7c10::1:192) by CO2PR05CA036.outlook.office365.com (2a01:111:e400:1429::36) with Microsoft SMTP Server (TLS) id 15.1.195.15 via Frontend Transport; Thu, 18 Jun 2015 18:49:16 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BN1BFFO11FD026.mail.protection.outlook.com (10.58.144.89) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Thu, 18 Jun 2015 18:49:14 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Thu, 18 Jun 2015 11:49:13 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5IInCD42192; Thu, 18 Jun 2015 11:49:12 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id 29865580AA; Thu, 18 Jun 2015 11:49:12 -0700 (PDT) To: Ian Lepore CC: Garrett Cooper , Craig Rodrigues , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Baptiste Daroussin Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... In-Reply-To: <1434635292.1415.93.camel@freebsd.org> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <950C4B23-B625-4173-A7C4-A4F1B2C5771D@gmail.com> <306889B5-3417-467C-965F-B011866E6F15@gmail.com> <450D8D9A-CBF2-445A-8221-4CD353591549@gmail.com> <16996.1434316874@chaos> <094A5FA6-7DB8-485E-84A8-C15D2A0BC9F6@gmail.com> <4710.1434319205@chaos> <1434635292.1415.93.camel@freebsd.org> Comments: In-reply-to: Ian Lepore message dated "Thu, 18 Jun 2015 07:48:12 -0600." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Thu, 18 Jun 2015 11:49:12 -0700 Message-ID: <4731.1434653352@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD026; 1:GpuOJq+IZFm6IrUm2mbokppiYkN5p8DaFuvYddxc9uxfT/XroAkV1XRoCJCLiUn6VW6crgfUtIYRLd6bXHEdTH3969aUMVWEbG+nzRCPKa+SkN0/vdIrq0MXQcgkwDYvmBE1UfN+COKPl12JVIDg8qS7zMd+QqtM+JI50OpQmIwR9RSQEZnGIBbnzyJLRtBt6VnlOUwSbHGbkua0cjS95z2pJkCpwhEPIKj86lYwo1qsFQ+CM6aGQEKUa4JQofBijywTun4Ncg7PPHQanNR0YrcnH/lre0/XG7ybL1qxdY8= X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(199003)(189002)(24454002)(51704005)(117636001)(93886004)(77156002)(86362001)(50466002)(87936001)(46102003)(50986999)(50226001)(62966003)(47776003)(106466001)(76176999)(105596002)(76506005)(6806004)(19580405001)(19580395003)(77096005)(57986006)(2950100001)(110136002)(5001960100002)(48376002)(92566002)(189998001)(33716001)(62816006)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR05MB711; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:ovrnspm; A:3; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2PR05MB711; 2:L9eeO6p0K79KVGecScpmty/z3Ck7Zoc2ogVOV3jQqx7KG5oqvYX633zifNxgvZVM; 3:4s8456CULAPqIOyhJW6Ck4Y/HvPJ78sbwvrYPVEx094nNWS/Q+SRWy1tSXCXVUBe96pT3SAJX2cXarVs+N9+FgFSRLX3wO2Pc25WiGW4W1wEgiICNExZzR+yCU1omgXevrTfPrnsJSnEvTu++dI9buEGZyNSQTnv1huKiTnK9q406jnNmGnHGb2Dmqy/R4DhC47kWyOOJuMxDUxp8PLhvO3gzoxsEeDpXeigwGJBLts=; 20:05q7AUwJ29394k+dT385ZCy8z29ZqBypfKhnJXRbxfNbX72qW1cMLzZyXBDZ90YGD3Dzll+uCkTpbf0D5v3nu9fZbL2V+Mz5bmlP9oecdTQ9CyArVi0DDDw6fWbFRZjjG5PHGAz6Y1irO7wQZ/TxTl5bQC39e58QBiZ7tRgAcnAVb9//WAnVwvHkcVc7nPcqH9dF9PPqBFdQ/pTXdh8Xzpob/+bfz4HwNoF6GdtlQd+UnLbsvepnX/KYSRFUJdXGwEB5fqb+twT4GNJyihS6CHYGs/B86zH1vENl/LGRBNqIZ4c3CmL7/O/andMHorOGu/s9boBhKYvpSrDMSKiclmP0hB/+EdYDzSL7lZom50CiwWyGjTRzertbrvs0cTKWKe/nTo0Jc8m0IZbpRNgrNz9rJli2pEfIwWSyxTotgMmlZR5OJSyMZZNmm8P+nJeJ6lukLSIbxcS/ehWT5dxPBWx42fpCpMIf758v/4Dv1sUo2vB1CEn6x0B6H3klVOkq X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY2PR05MB711; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY2PR05MB662; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(10322497157591); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BY2PR05MB711; BCL:0; PCL:0; RULEID:; SRVR:BY2PR05MB711; X-Microsoft-Exchange-Diagnostics: 1; BY2PR05MB711; 4:AxGL35o02j3ZGDIIcEESBGSoRdBS8/S6fN/TNqXjM4Ce9/UymUNnJdtoTZsEifPIRoabYwyBL1h8RKiZFe+53E78ZTxbk5uj+cnAYKnc72eqjQ5lfrnWitwCHe1jsTrFdm5PkRBYb35bfyMOMUgUnJK/MUTIc7T2LSSXyBRfCCmn7/d0wIfAKnEICKUsXVjP24CQ8qMkHGtwvpZjFhVtgQ3VC/iyGvfZvrfMghwPkljhUGZ0rQ1kh9/Hwey9L9MllIBzrAJPh5Nb9SsmI8pYn0DDBTWnFgKIPA4mwUJXbjs= X-Forefront-PRVS: 0611A21987 X-Microsoft-Exchange-Diagnostics: 1; BY2PR05MB711; 23:v9CfDf4jVj/qzBCzoiP2oNTAhOQS9c2zLmhlIPIbWmfxHH0gjG7a2rv90vEpRk0bErpr7dlzVL87NutlJWG9dmEiJ1kl9+ox4d4V7zVkV5oL0t9Vzz6HQb3N3vogr8NS34XcQF96tMvB7xvAUQKiyrD+Ar/1R1Wx1cUhRUal0d4JRQiOFMWoXtA9TpMJaItiNKPNiXlKiRy8ny5Fp5qrgJZJEMzLWuw4VdQvREklKgOHe1ClRRzcmFUDW7CO8DgHKaV678Cr6WSdS0HcMiCF9/FAzh9ZBV8W9RKicktJNf3HgWnfOuhAQ2f1VflhPt9clnlgHz8TQSubyDBZDUhgeMkCqklZOh9Co4YWlTFBoqYh1b8/nXDm2oMzDbPqH5PV/3I4qVn7S+xCTkEqFqMmG2P8qX1ops/moU10YZBRQqCjjg8eIsvV5LIpR0g75kMvUM+5s+75URDZPZQKqIJZ5I9At/TCdse1gvAGFLiAE0R2i0D64vm0hhvL+cX8LuhdTG81pBdSXvnINS5L0v2Vxs7TVcTKQKaY35vsGq5DL2kOCXTpUPsxyQ5JGLaUuHU+vQ78Oz3uRdSAoz9W8mcAkI/jZXo0Sp2pgmYrd2i58mNkyMxBF0BzkIUyUmN9DRNazPhaKmahWG9pCDdj+KE0azwiisOWwXSYv+sb//BcMTIEBoydi6VMoNuH+GPqRBQ1lGgFzn9P1at1/VwU3St1p7NjWtLHODEbAqsr3SnsxW9MKEhrkoXY3lmYjp3XiQ9YB2zpv3XG3w8ruCm7Mi/w+n53pVk2y7Jp5g712sivoPg9lKKYNZZMeP6ciT3z1yp805dHNcDOS2Rq+Vz8yh3WK4QjAwLFBXsMVQ3VLiPgFvpUprHxumRo1IDrq0aok6SXcko9afNEmzwYoEclTm6aXuQviuGLA2Q1ehBqOlWVlWw= X-Microsoft-Exchange-Diagnostics: 1; BY2PR05MB711; 5:3G5mKd2ebTUlnse9AgH1Jc/LpyCgte+By/Whlx6tWwVMRyWWTimb/YAlXSGZQEXjqogeVEI1pTYuohc/3UjIEA/ciOTnoaI8Mt5/QlhjIdUkJiLq6o6MH2YF9fETRLoNryLgGd5jyNOTWgh93DVs9A==; 24:xzseOpXU7rx0b/oiDpXaR5mUzGpYvdK3YR03pSaqMUYRD2Cgd4kR8Re/wpDpE8zkhdwnoOER6zqlDp5PyJ3VSb4REzQMRdtzVeAYPTTdn9M=; 20:45cMMwUnLtnHeUqs2nWDvvMjA3HY4f8Wm54PeW8r8ioa2wznljXGzO798Adw2K2SXJst0ASSx5KdOiFXKEG9XA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2015 18:49:14.6213 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR05MB711 X-Microsoft-Exchange-Diagnostics: 1; BY2PR05MB662; 2:MqOFT9Ts158LgXn52aYLVrD2DLmFoRQxHDWUSjHiRzYAQ9i4dblc5jtR+6IfWRXS; 2:Sq9iFzhaIxXxpPFBEW2u/FL2XbLkT+eWcuvD6/oJ5WS/Ten0WPAXPvt+GQbJn3kYjNAJABn8wsJrbqA/jniXrBLR9YCxJ5WwILAJV/Dn+moCmzC37yVUE8ZzvvzvPFVijfyI+gB3QCXqsrnxA5q9hB2tFlPnMjk7RmzgY0NOldgWwBIeDdB0143nMEEWNOcW0eSo2eJ89oXo9oEIaq0uNZM8t/7pP9kD9Pnamfueg/Q=; 9:3n6/d7d89OXjDJZxvBQLm/FQ1Lj8bWYMRDSBaxaSgRF0k47UT5cYqfHe2rH2+hvVg9o4A5Dzgo83lIplaHJkZv0KFK5+wJRDO4pek5Ak3FJPt8l4VMwMqr8THKwqxjsiVqQdsc+gaoTA51KwsAIeCA== X-OriginatorOrg: juniper.net X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 18:49:24 -0000 Ian Lepore wrote: > > I agree but 8 -> 11 is a very big jump. > > Not really. We're in the midst of such a change at $work, but it will Yes we still use 7.x on most machines - these can build head just fine, but it is a reasonably controlled environment, with minimal dependence on the host env. I was speaking more in terms of the project's boundaries on what they are willing to support. > machinery. The fmake->bmake change has been fairly painful; it's only > working at all for us because I've hacked fmake on 6.x and 8.x to > support a few crucial bmake features. Yes, a common theme at most vendor summits is the ever increasing maintenance "cost" of falling behind. From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 19:20:01 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4A41ACFF; Thu, 18 Jun 2015 19:20:01 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1FCD3237; Thu, 18 Jun 2015 19:20:01 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5IJK0UM086196; Thu, 18 Jun 2015 19:20:00 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5IJK0fO086193; Thu, 18 Jun 2015 19:20:00 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506181920.t5IJK0fO086193@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 18 Jun 2015 19:20:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284567 - head/release X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 19:20:01 -0000 Author: gjb Date: Thu Jun 18 19:20:00 2015 New Revision: 284567 URL: https://svnweb.freebsd.org/changeset/base/284567 Log: Add Makefile.azure, used to upload VHD images to the Microsoft Azure environment, similar to the EC2 AMIs. MFC after: 3 days Tested with: stable/10@r284517 (patched) Sponsored by: The FreeBSD Foundation Added: head/release/Makefile.azure (contents, props changed) Modified: head/release/Makefile.vm Added: head/release/Makefile.azure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/release/Makefile.azure Thu Jun 18 19:20:00 2015 (r284567) @@ -0,0 +1,53 @@ +# +# $FreeBSD$ +# +# +# Makefile for uploading Microsoft Azure disk images. +# + +AZURE_IMG?= ${.OBJDIR}/azure.vhdf +AZURE_UPLOAD_TGTS= azure-check-depends \ + azure-do-upload +CLEANFILES+= ${AZURE_UPLOAD_TGTS} + +.if defined(AZURE_UPLOAD_CONF) && !empty(AZURE_UPLOAD_CONF) +. for VAR in _STORAGE _ACCOUNT _KEY +AZURE${VAR}!= grep -E ^AZURE${VAR} ${AZURE_UPLOAD_CONF} | awk -F' ' '{print $$2}' +. endfor +.endif + +.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" +SNAPSHOT_DATE!= date +-%Y-%m-%d +.endif + +AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.vhd + +azure-upload: ${AZURE_UPLOAD_TGTS} + +azure-check-depends: +.for VAR in _STORAGE _ACCOUNT _KEY +. if !defined(AZURE${VAR}) || empty(AZURE${VAR}) + @echo "Variable AZURE${VAR} cannot be empty." + @false +. endif +.endfor +.if !exists(/usr/local/bin/azure) +. if !exists(/usr/local/bin/npm) +. if !exists(${PORTSDIR}/www/npm/Makefile) +. if !exists(/usr/local/sbin/pkg-static) + env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf +. endif + env ASSUME_ALWAYS_YES=yes pkg install -y www/npm +. else + make -C ${PORTSDIR}/www/npm BATCH=1 all install clean +. endif +. endif + npm install -g azure-cli +.endif + +azure-do-upload: + /usr/local/bin/azure storage blob upload \ + ${AZURE_IMG} ${AZURE_STORAGE} ${AZURE_TARGET} \ + -t page -a ${AZURE_ACCOUNT} -k "${AZURE_KEY}" + touch ${.OBJDIR}/${.TARGET} + Modified: head/release/Makefile.vm ============================================================================== --- head/release/Makefile.vm Thu Jun 18 18:28:38 2015 (r284566) +++ head/release/Makefile.vm Thu Jun 18 19:20:00 2015 (r284567) @@ -154,3 +154,4 @@ cloudware-install: .endif .include "${.CURDIR}/Makefile.ec2" +.include "${.CURDIR}/Makefile.azure" From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 21:18:44 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A38F7BA2; Thu, 18 Jun 2015 21:18:44 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9149A3E3; Thu, 18 Jun 2015 21:18:44 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5ILIiG2047758; Thu, 18 Jun 2015 21:18:44 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5ILIigX047757; Thu, 18 Jun 2015 21:18:44 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201506182118.t5ILIigX047757@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 18 Jun 2015 21:18:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284578 - head/kerberos5/lib/libhx509 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 21:18:44 -0000 Author: jkim Date: Thu Jun 18 21:18:43 2015 New Revision: 284578 URL: https://svnweb.freebsd.org/changeset/base/284578 Log: Fix a typo introduced in r262209. MFC after: 3 days Modified: head/kerberos5/lib/libhx509/Makefile Modified: head/kerberos5/lib/libhx509/Makefile ============================================================================== --- head/kerberos5/lib/libhx509/Makefile Thu Jun 18 20:59:48 2015 (r284577) +++ head/kerberos5/lib/libhx509/Makefile Thu Jun 18 21:18:43 2015 (r284578) @@ -268,7 +268,7 @@ CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx INCS+= ocsp_asn1.h pkcs10_asn1.h crmf_asn1.h -.ORDER: ${GEN_OSCP} +.ORDER: ${GEN_OCSP} ${GEN_OCSP}: ocsp.asn1 ocsp.opt ${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \ ${.ALLSRC:M*.asn1} ocsp_asn1 From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 21:55:58 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F04E17D8; Thu, 18 Jun 2015 21:55:57 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD8B1F14; Thu, 18 Jun 2015 21:55:57 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5ILtvbd068884; Thu, 18 Jun 2015 21:55:57 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5ILttwm068873; Thu, 18 Jun 2015 21:55:55 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201506182155.t5ILttwm068873@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 18 Jun 2015 21:55:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284582 - in head: sys/geom/label usr.sbin/fstyp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 21:55:58 -0000 Author: trasz Date: Thu Jun 18 21:55:55 2015 New Revision: 284582 URL: https://svnweb.freebsd.org/changeset/base/284582 Log: Fix off-by-one error in fstyp(8) and geom_label(4) that made them use a single space (" ") as a CD9660 label name when no label was present. Similar problem was also present in msdosfs label recognition. PR: 200828 Differential Revision: https://reviews.freebsd.org/D2830 Reviewed by: asomers@, emaste@ MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Modified: head/sys/geom/label/g_label.c head/sys/geom/label/g_label.h head/sys/geom/label/g_label_iso9660.c head/sys/geom/label/g_label_msdosfs.c head/usr.sbin/fstyp/cd9660.c head/usr.sbin/fstyp/fstyp.c head/usr.sbin/fstyp/fstyp.h head/usr.sbin/fstyp/msdosfs.c Modified: head/sys/geom/label/g_label.c ============================================================================== --- head/sys/geom/label/g_label.c Thu Jun 18 21:25:07 2015 (r284581) +++ head/sys/geom/label/g_label.c Thu Jun 18 21:55:55 2015 (r284582) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -96,6 +97,20 @@ const struct g_label_desc *g_labels[] = NULL }; +void +g_label_rtrim(char *label, size_t size) +{ + ptrdiff_t i; + + for (i = size - 1; i >= 0; i--) { + if (label[i] == '\0') + continue; + else if (label[i] == ' ') + label[i] = '\0'; + else + break; + } +} static int g_label_destroy_geom(struct gctl_req *req __unused, struct g_class *mp, Modified: head/sys/geom/label/g_label.h ============================================================================== --- head/sys/geom/label/g_label.h Thu Jun 18 21:25:07 2015 (r284581) +++ head/sys/geom/label/g_label.h Thu Jun 18 21:55:55 2015 (r284582) @@ -86,6 +86,8 @@ extern struct g_label_desc g_label_ntfs; extern struct g_label_desc g_label_gpt; extern struct g_label_desc g_label_gpt_uuid; extern struct g_label_desc g_label_disk_ident; + +extern void g_label_rtrim(char *label, size_t size); #endif /* _KERNEL */ struct g_label_metadata { Modified: head/sys/geom/label/g_label_iso9660.c ============================================================================== --- head/sys/geom/label/g_label_iso9660.c Thu Jun 18 21:25:07 2015 (r284581) +++ head/sys/geom/label/g_label_iso9660.c Thu Jun 18 21:55:55 2015 (r284582) @@ -47,7 +47,6 @@ g_label_iso9660_taste(struct g_consumer { struct g_provider *pp; char *sector, *volume; - int i; g_topology_assert_not(); pp = cp->provider; @@ -68,14 +67,7 @@ g_label_iso9660_taste(struct g_consumer bzero(label, size); strlcpy(label, volume, MIN(size, VOLUME_LEN)); g_free(sector); - for (i = size - 1; i > 0; i--) { - if (label[i] == '\0') - continue; - else if (label[i] == ' ') - label[i] = '\0'; - else - break; - } + g_label_rtrim(label, size); } struct g_label_desc g_label_iso9660 = { Modified: head/sys/geom/label/g_label_msdosfs.c ============================================================================== --- head/sys/geom/label/g_label_msdosfs.c Thu Jun 18 21:25:07 2015 (r284581) +++ head/sys/geom/label/g_label_msdosfs.c Thu Jun 18 21:55:55 2015 (r284582) @@ -48,7 +48,6 @@ g_label_msdosfs_taste(struct g_consumer FAT32_BSBPB *pfat32_bsbpb; FAT_DES *pfat_entry; uint8_t *sector0, *sector; - uint32_t i; g_topology_assert_not(); pp = cp->provider; @@ -200,14 +199,7 @@ g_label_msdosfs_taste(struct g_consumer } endofchecks: - for (i = size - 1; i > 0; i--) { - if (label[i] == '\0') - continue; - else if (label[i] == ' ') - label[i] = '\0'; - else - break; - } + g_label_rtrim(label, size); error: if (sector0 != NULL) Modified: head/usr.sbin/fstyp/cd9660.c ============================================================================== --- head/usr.sbin/fstyp/cd9660.c Thu Jun 18 21:25:07 2015 (r284581) +++ head/usr.sbin/fstyp/cd9660.c Thu Jun 18 21:55:55 2015 (r284582) @@ -45,7 +45,6 @@ int fstyp_cd9660(FILE *fp, char *label, size_t size) { char *sector, *volume; - int i; sector = read_buf(fp, ISO9660_OFFSET, 512); if (sector == NULL) @@ -58,13 +57,6 @@ fstyp_cd9660(FILE *fp, char *label, size bzero(label, size); strlcpy(label, volume, MIN(size, VOLUME_LEN)); free(sector); - for (i = size - 1; i > 0; i--) { - if (label[i] == '\0') - continue; - else if (label[i] == ' ') - label[i] = '\0'; - else - break; - } + rtrim(label, size); return (0); } Modified: head/usr.sbin/fstyp/fstyp.c ============================================================================== --- head/usr.sbin/fstyp/fstyp.c Thu Jun 18 21:25:07 2015 (r284581) +++ head/usr.sbin/fstyp/fstyp.c Thu Jun 18 21:55:55 2015 (r284582) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -104,6 +105,21 @@ checked_strdup(const char *s) return (c); } +void +rtrim(char *label, size_t size) +{ + ptrdiff_t i; + + for (i = size - 1; i >= 0; i--) { + if (label[i] == '\0') + continue; + else if (label[i] == ' ') + label[i] = '\0'; + else + break; + } +} + static void usage(void) { Modified: head/usr.sbin/fstyp/fstyp.h ============================================================================== --- head/usr.sbin/fstyp/fstyp.h Thu Jun 18 21:25:07 2015 (r284581) +++ head/usr.sbin/fstyp/fstyp.h Thu Jun 18 21:55:55 2015 (r284582) @@ -36,6 +36,7 @@ void *read_buf(FILE *fp, off_t off, size_t len); char *checked_strdup(const char *s); +void rtrim(char *label, size_t size); int fstyp_cd9660(FILE *fp, char *label, size_t size); int fstyp_ext2fs(FILE *fp, char *label, size_t size); Modified: head/usr.sbin/fstyp/msdosfs.c ============================================================================== --- head/usr.sbin/fstyp/msdosfs.c Thu Jun 18 21:25:07 2015 (r284581) +++ head/usr.sbin/fstyp/msdosfs.c Thu Jun 18 21:55:55 2015 (r284582) @@ -48,7 +48,6 @@ fstyp_msdosfs(FILE *fp, char *label, siz FAT32_BSBPB *pfat32_bsbpb; FAT_DES *pfat_entry; uint8_t *sector0, *sector; - uint32_t i; sector0 = NULL; sector = NULL; @@ -161,14 +160,7 @@ fstyp_msdosfs(FILE *fp, char *label, siz } endofchecks: - for (i = size - 1; i > 0; i--) { - if (label[i] == '\0') - continue; - else if (label[i] == ' ') - label[i] = '\0'; - else - break; - } + rtrim(label, size); free(sector0); free(sector); From owner-svn-src-head@FreeBSD.ORG Thu Jun 18 23:14:54 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2C48D97A; Thu, 18 Jun 2015 23:14:54 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 16310628; Thu, 18 Jun 2015 23:14:54 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5INErFc008288; Thu, 18 Jun 2015 23:14:53 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5INEka5008230; Thu, 18 Jun 2015 23:14:46 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201506182314.t5INEka5008230@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 18 Jun 2015 23:14:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284583 - in head/sys: contrib/dev/acpica contrib/dev/acpica/common contrib/dev/acpica/compiler contrib/dev/acpica/components/debugger contrib/dev/acpica/components/disassembler contrib... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 18 Jun 2015 23:14:54 -0000 Author: jkim Date: Thu Jun 18 23:14:45 2015 New Revision: 284583 URL: https://svnweb.freebsd.org/changeset/base/284583 Log: Merge ACPICA 20150619. Added: head/sys/contrib/dev/acpica/include/acclib.h - copied unchanged from r284563, vendor-sys/acpica/dist/source/include/acclib.h Modified: head/sys/contrib/dev/acpica/acpica_prep.sh head/sys/contrib/dev/acpica/changes.txt head/sys/contrib/dev/acpica/common/adisasm.c head/sys/contrib/dev/acpica/common/ahids.c head/sys/contrib/dev/acpica/common/ahpredef.c head/sys/contrib/dev/acpica/common/ahuuids.c head/sys/contrib/dev/acpica/common/dmextern.c head/sys/contrib/dev/acpica/common/dmrestag.c head/sys/contrib/dev/acpica/common/dmtable.c head/sys/contrib/dev/acpica/common/dmtbdump.c head/sys/contrib/dev/acpica/common/dmtbinfo.c head/sys/contrib/dev/acpica/common/getopt.c head/sys/contrib/dev/acpica/compiler/aslanalyze.c head/sys/contrib/dev/acpica/compiler/aslascii.c head/sys/contrib/dev/acpica/compiler/aslcodegen.c head/sys/contrib/dev/acpica/compiler/aslcompile.c head/sys/contrib/dev/acpica/compiler/aslcompiler.h head/sys/contrib/dev/acpica/compiler/aslcompiler.l head/sys/contrib/dev/acpica/compiler/asldefine.h head/sys/contrib/dev/acpica/compiler/aslerror.c head/sys/contrib/dev/acpica/compiler/aslfileio.c head/sys/contrib/dev/acpica/compiler/aslfiles.c head/sys/contrib/dev/acpica/compiler/aslfold.c head/sys/contrib/dev/acpica/compiler/aslglobal.h head/sys/contrib/dev/acpica/compiler/aslmain.c head/sys/contrib/dev/acpica/compiler/aslmapenter.c head/sys/contrib/dev/acpica/compiler/aslmapoutput.c head/sys/contrib/dev/acpica/compiler/aslmethod.c head/sys/contrib/dev/acpica/compiler/aslopcodes.c head/sys/contrib/dev/acpica/compiler/asloperands.c head/sys/contrib/dev/acpica/compiler/aslopt.c head/sys/contrib/dev/acpica/compiler/asloptions.c head/sys/contrib/dev/acpica/compiler/aslprintf.c head/sys/contrib/dev/acpica/compiler/aslstartup.c head/sys/contrib/dev/acpica/compiler/aslsupport.l head/sys/contrib/dev/acpica/compiler/asltypes.h head/sys/contrib/dev/acpica/compiler/aslutils.c head/sys/contrib/dev/acpica/compiler/asluuid.c head/sys/contrib/dev/acpica/compiler/dtcompile.c head/sys/contrib/dev/acpica/compiler/dtcompiler.h head/sys/contrib/dev/acpica/compiler/dtexpress.c head/sys/contrib/dev/acpica/compiler/dtfield.c head/sys/contrib/dev/acpica/compiler/dtio.c head/sys/contrib/dev/acpica/compiler/dtparser.y head/sys/contrib/dev/acpica/compiler/dtsubtable.c head/sys/contrib/dev/acpica/compiler/dttable.c head/sys/contrib/dev/acpica/compiler/dttemplate.c head/sys/contrib/dev/acpica/compiler/dttemplate.h head/sys/contrib/dev/acpica/compiler/dtutils.c head/sys/contrib/dev/acpica/compiler/prparser.y head/sys/contrib/dev/acpica/compiler/prscan.c head/sys/contrib/dev/acpica/compiler/prutils.c head/sys/contrib/dev/acpica/components/debugger/dbcmds.c head/sys/contrib/dev/acpica/components/debugger/dbconvert.c head/sys/contrib/dev/acpica/components/debugger/dbdisply.c head/sys/contrib/dev/acpica/components/debugger/dbexec.c head/sys/contrib/dev/acpica/components/debugger/dbfileio.c head/sys/contrib/dev/acpica/components/debugger/dbhistry.c head/sys/contrib/dev/acpica/components/debugger/dbinput.c head/sys/contrib/dev/acpica/components/debugger/dbmethod.c head/sys/contrib/dev/acpica/components/debugger/dbnames.c head/sys/contrib/dev/acpica/components/debugger/dbtest.c head/sys/contrib/dev/acpica/components/debugger/dbutils.c head/sys/contrib/dev/acpica/components/debugger/dbxface.c head/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c head/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c head/sys/contrib/dev/acpica/components/disassembler/dmopcode.c head/sys/contrib/dev/acpica/components/dispatcher/dsfield.c head/sys/contrib/dev/acpica/components/dispatcher/dsinit.c head/sys/contrib/dev/acpica/components/dispatcher/dsobject.c head/sys/contrib/dev/acpica/components/dispatcher/dsutils.c head/sys/contrib/dev/acpica/components/dispatcher/dswload.c head/sys/contrib/dev/acpica/components/events/evgpe.c head/sys/contrib/dev/acpica/components/events/evgpeinit.c head/sys/contrib/dev/acpica/components/executer/exconfig.c head/sys/contrib/dev/acpica/components/executer/exconvrt.c head/sys/contrib/dev/acpica/components/executer/exdebug.c head/sys/contrib/dev/acpica/components/executer/exdump.c head/sys/contrib/dev/acpica/components/executer/exfield.c head/sys/contrib/dev/acpica/components/executer/exfldio.c head/sys/contrib/dev/acpica/components/executer/exmisc.c head/sys/contrib/dev/acpica/components/executer/exnames.c head/sys/contrib/dev/acpica/components/executer/exoparg2.c head/sys/contrib/dev/acpica/components/executer/exoparg3.c head/sys/contrib/dev/acpica/components/executer/exregion.c head/sys/contrib/dev/acpica/components/executer/exstorob.c head/sys/contrib/dev/acpica/components/executer/exutils.c head/sys/contrib/dev/acpica/components/hardware/hwgpe.c head/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c head/sys/contrib/dev/acpica/components/namespace/nsaccess.c head/sys/contrib/dev/acpica/components/namespace/nsconvert.c head/sys/contrib/dev/acpica/components/namespace/nsdump.c head/sys/contrib/dev/acpica/components/namespace/nseval.c head/sys/contrib/dev/acpica/components/namespace/nsinit.c head/sys/contrib/dev/acpica/components/namespace/nsparse.c head/sys/contrib/dev/acpica/components/namespace/nsrepair2.c head/sys/contrib/dev/acpica/components/namespace/nssearch.c head/sys/contrib/dev/acpica/components/namespace/nsutils.c head/sys/contrib/dev/acpica/components/namespace/nsxfeval.c head/sys/contrib/dev/acpica/components/namespace/nsxfname.c head/sys/contrib/dev/acpica/components/parser/psutils.c head/sys/contrib/dev/acpica/components/resources/rscreate.c head/sys/contrib/dev/acpica/components/resources/rsmisc.c head/sys/contrib/dev/acpica/components/resources/rsutils.c head/sys/contrib/dev/acpica/components/resources/rsxface.c head/sys/contrib/dev/acpica/components/tables/tbdata.c head/sys/contrib/dev/acpica/components/tables/tbfadt.c head/sys/contrib/dev/acpica/components/tables/tbfind.c head/sys/contrib/dev/acpica/components/tables/tbinstal.c head/sys/contrib/dev/acpica/components/tables/tbprint.c head/sys/contrib/dev/acpica/components/tables/tbutils.c head/sys/contrib/dev/acpica/components/tables/tbxface.c head/sys/contrib/dev/acpica/components/tables/tbxfload.c head/sys/contrib/dev/acpica/components/utilities/utalloc.c head/sys/contrib/dev/acpica/components/utilities/utbuffer.c head/sys/contrib/dev/acpica/components/utilities/utcache.c head/sys/contrib/dev/acpica/components/utilities/utcopy.c head/sys/contrib/dev/acpica/components/utilities/utids.c head/sys/contrib/dev/acpica/components/utilities/utmisc.c head/sys/contrib/dev/acpica/components/utilities/utosi.c head/sys/contrib/dev/acpica/components/utilities/utpredef.c head/sys/contrib/dev/acpica/components/utilities/utprint.c head/sys/contrib/dev/acpica/components/utilities/utstring.c head/sys/contrib/dev/acpica/components/utilities/uttrack.c head/sys/contrib/dev/acpica/components/utilities/utxface.c head/sys/contrib/dev/acpica/components/utilities/utxfinit.c head/sys/contrib/dev/acpica/include/accommon.h head/sys/contrib/dev/acpica/include/acglobal.h head/sys/contrib/dev/acpica/include/acinterp.h head/sys/contrib/dev/acpica/include/aclocal.h head/sys/contrib/dev/acpica/include/acnames.h head/sys/contrib/dev/acpica/include/acnamesp.h head/sys/contrib/dev/acpica/include/acobject.h head/sys/contrib/dev/acpica/include/acoutput.h head/sys/contrib/dev/acpica/include/acpixf.h head/sys/contrib/dev/acpica/include/acstruct.h head/sys/contrib/dev/acpica/include/actbl.h head/sys/contrib/dev/acpica/include/actbl1.h head/sys/contrib/dev/acpica/include/actbl2.h head/sys/contrib/dev/acpica/include/actbl3.h head/sys/contrib/dev/acpica/include/actypes.h head/sys/contrib/dev/acpica/include/acutils.h head/sys/contrib/dev/acpica/include/platform/acenv.h head/sys/contrib/dev/acpica/include/platform/acenvex.h head/sys/contrib/dev/acpica/include/platform/acgcc.h head/sys/x86/acpica/acpi_wakeup.c Directory Properties: head/sys/contrib/dev/acpica/ (props changed) Modified: head/sys/contrib/dev/acpica/acpica_prep.sh ============================================================================== --- head/sys/contrib/dev/acpica/acpica_prep.sh Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/acpica_prep.sh Thu Jun 18 23:14:45 2015 (r284583) @@ -19,20 +19,20 @@ fulldirs="common compiler components inc # files to remove stripdirs="generate libraries tests tools" stripfiles="Makefile README accygwin.h acdragonfly.h acdragonflyex.h \ - acefi.h achaiku.h acintel.h aclinux.h aclinuxex.h acmacosx.h \ - acmsvc.h acnetbsd.h acos2.h acwin.h acwin64.h new_table.txt \ - osbsdtbl.c osefitbl.c osefixf.c osfreebsdtbl.c oslinuxtbl.c \ - osunixdir.c osunixmap.c oswindir.c oswintbl.c oswinxf.c \ - readme.txt utclib.c" + acefi.h acefiex.h achaiku.h acintel.h aclinux.h aclinuxex.h \ + acmacosx.h acmsvc.h acnetbsd.h acos2.h acwin.h acwin64.h \ + new_table.txt osbsdtbl.c osefitbl.c osefixf.c osfreebsdtbl.c \ + oslinuxtbl.c osunixdir.c osunixmap.c oswindir.c oswintbl.c \ + oswinxf.c readme.txt utclib.c" # include files to canonify -src_headers="acapps.h acbuffer.h accommon.h acconfig.h acdebug.h \ - acdisasm.h acdispat.h acevents.h acexcep.h acglobal.h achware.h \ - acinterp.h aclocal.h acmacros.h acnames.h acnamesp.h acobject.h \ - acopcode.h acoutput.h acparser.h acpi.h acpiosxf.h acpixf.h \ - acpredef.h acresrc.h acrestyp.h acstruct.h actables.h actbl.h \ - actbl1.h actbl2.h actbl3.h actypes.h acutils.h amlcode.h \ - amlresrc.h platform/acenv.h platform/acenvex.h \ +src_headers="acapps.h acbuffer.h acclib.h accommon.h acconfig.h \ + acdebug.h acdisasm.h acdispat.h acevents.h acexcep.h acglobal.h \ + achware.h acinterp.h aclocal.h acmacros.h acnames.h acnamesp.h \ + acobject.h acopcode.h acoutput.h acparser.h acpi.h acpiosxf.h \ + acpixf.h acpredef.h acresrc.h acrestyp.h acstruct.h actables.h \ + actbl.h actbl1.h actbl2.h actbl3.h actypes.h acutils.h acuuid.h \ + amlcode.h amlresrc.h platform/acenv.h platform/acenvex.h \ platform/acfreebsd.h platform/acgcc.h" comp_headers="aslcompiler.h asldefine.h aslglobal.h aslmessages.h \ aslsupport.l asltypes.h dtcompiler.h dttemplate.h preprocess.h" Modified: head/sys/contrib/dev/acpica/changes.txt ============================================================================== --- head/sys/contrib/dev/acpica/changes.txt Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/changes.txt Thu Jun 18 23:14:45 2015 (r284583) @@ -1,5 +1,130 @@ ---------------------------------------- -08 April 2015. Summary of changes for version 20150515: +19 June 2015. Summary of changes for version 20150619: + +Two regressions in version 20150616 have been addressed: + +Fixes some problems/issues with the C library macro removal (ACPI_STRLEN, +etc.) This update changes ACPICA to only use the standard headers for +functions, or the prototypes for the local versions of the C library +functions. Across the source code, this required some additional casts +for some Clib invocations for portability. Moved all local prototypes to +a new file, acclib.h + +Fixes several problems with recent changes to the handling of the FACS +table that could cause some systems not to boot. + + +---------------------------------------- +16 June 2015. Summary of changes for version 20150616: + + +1) ACPICA kernel-resident subsystem: + +Across the entire ACPICA source code base, the various macros for the C +library functions (such as ACPI_STRLEN, etc.) have been removed and +replaced by the standard C library names (strlen, etc.) The original +purpose for these macros is no longer applicable. This simplification +reduces the number of macros used in the ACPICA source code +significantly, improving readability and maintainability. + +Implemented support for a new ACPI table, the OSDT. This table, the +"override" SDT, can be loaded directly by the host OS at boot time. It +enables the replacement of existing namespace objects that were installed +via the DSDT and/or SSDTs. The primary purpose for this is to replace +buggy or incorrect ASL/AML code obtained via the BIOS. The OSDT is slated +for inclusion in a future version of the ACPI Specification. Lv Zheng/Bob +Moore. + +Added support for systems with (improperly) two FACS tables -- a "32-bit" +table (via FADT 32-bit legacy field) and a "64-bit" table (via the 64-bit +X field). This change will support both automatically. There continues to +be systems found with this issue. This support requires a change to the +AcpiSetFirmwareWakingVector interface. Also, a public global variable has +been added to allow the host to select which FACS is desired +(AcpiGbl_Use32BitFacsAddresses). See the ACPICA reference for more +details Lv Zheng. + +Added a new feature to allow for systems that do not contain an FACS. +Although this is already supported on hardware-reduced platforms, the +feature has been extended for all platforms. The reasoning is that we do +not want to abort the entire ACPICA initialization just because the +system is seriously buggy and has no FACS. + +Fixed a problem where the GUID strings for NFIT tables (in acuuid.h) were +not correctly transcribed from the ACPI specification in ACPICA version +20150515. + +Implemented support for the _CLS object in the AcpiGetObjectInfo external +interface. + +Updated the definitions of the TCPA and TPM2 ACPI tables to the more +recent TCG ACPI Specification, December 14, 2014. Table disassembler and +compiler also updated. Note: The TCPA "server" table is not supported by +the disassembler/table-compiler at this time. + +ACPI 6.0: Added definitions for the new GIC version field in the MADT. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. + + Current Release: + Non-Debug Version: 100.6K Code, 27.6K Data, 128.2K Total + Debug Version: 196.2K Code, 81.0K Data, 277.2K Total + Previous Release: + Non-Debug Version: 99.9K Code, 27.5K Data, 127.4K Total + Debug Version: 195.2K Code, 80.8K Data, 276.0K Total + + +2) iASL Compiler/Disassembler and Tools: + +Disassembler: Fixed a problem with the new symbolic operator disassembler +where incorrect ASL code could be emitted in some cases for the "non- +commutative" operators -- Subtract, Divide, Modulo, ShiftLeft, and +ShiftRight. The actual problem cases seem to be rather unusual in common +ASL code, however. David Box. + +Modified the linux version of acpidump to obtain ACPI tables from not +just /dev/mem (which may not exist) and /sys/firmware/acpi/tables. Lv +Zheng. + +iASL: Fixed a problem where the user preprocessor output file (.i) +contained extra data that was not expected. The compiler was using this +file as a temporary file and passed through #line directives in order to +keep compiler error messages in sync with the input file and line number +across multiple include files. The (.i) is no longer a temporary file as +the compiler uses a new, different file for the original purpose. + +iASL: Fixed a problem where comments within the original ASL source code +file were not passed through to the preprocessor output file, nor any +listing files. + +iASL: Fixed some issues for the handling of the "#include" preprocessor +directive and the similar (but not the same) "Include" ASL operator. + +iASL: Add support for the new OSDT in both the disassembler and compiler. + +iASL: Fixed a problem with the constant folding support where a Buffer +object could be incorrectly generated (incorrectly formed) during a +conversion to a Store() operator. + +AcpiHelp: Updated for new NFIT GUIDs, "External" AML opcode, and new +description text for the _REV predefined name. _REV now permanently +returns 2, as per the ACPI 6.0 specification. + +Debugger: Enhanced the output of the Debug ASL object for references +produced by the Index operator. For Buffers and strings, only output the +actual byte pointed to by the index. For packages, only print the single +package element decoded by the index. Previously, the entire +buffer/string/package was emitted. + +iASL/Table-compiler: Fixed a regression where the "generic" data types +were no longer recognized, causing errors. + + +---------------------------------------- +15 May 2015. Summary of changes for version 20150515: This release implements most of ACPI 6.0 as described below. @@ -34,7 +159,7 @@ iASL disassembler and table compiler: Ad tables: FADT, MADT. iASL preprocessor: Added a new directive to enable inclusion of binary -blobs into ASL code. The new directive is #includebinary. It takes a +blobs into ASL code. The new directive is #includebuffer. It takes a binary file as input and emits a named ascii buffer object into the ASL code. Modified: head/sys/contrib/dev/acpica/common/adisasm.c ============================================================================== --- head/sys/contrib/dev/acpica/common/adisasm.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/common/adisasm.c Thu Jun 18 23:14:45 2015 (r284583) @@ -243,7 +243,7 @@ AdAmlDisassemble ( while (ExternalFileList) { ExternalFilename = ExternalFileList->Path; - if (!ACPI_STRCMP (ExternalFilename, Filename)) + if (!strcmp (ExternalFilename, Filename)) { /* Next external file */ Modified: head/sys/contrib/dev/acpica/common/ahids.c ============================================================================== --- head/sys/contrib/dev/acpica/common/ahids.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/common/ahids.c Thu Jun 18 23:14:45 2015 (r284583) @@ -230,7 +230,7 @@ AcpiAhMatchHardwareId ( for (Info = AslDeviceIds; Info->Name; Info++) { - if (!ACPI_STRCMP (HardwareId, Info->Name)) + if (!strcmp (HardwareId, Info->Name)) { return (Info); } Modified: head/sys/contrib/dev/acpica/common/ahpredef.c ============================================================================== --- head/sys/contrib/dev/acpica/common/ahpredef.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/common/ahpredef.c Thu Jun 18 23:14:45 2015 (r284583) @@ -249,7 +249,7 @@ const AH_PREDEFINED_NAME AslPredefine AH_PREDEF ("_RBW", "Register Bit Width", "Resource Descriptor field"), AH_PREDEF ("_RDI", "Resource Dependencies for Idle", "Returns a list of dependencies for idle states"), AH_PREDEF ("_REG", "Region Availability", "Inform AML code of an operation region availability change"), - AH_PREDEF ("_REV", "Supported ACPI Revision", "Returns the revision of the ACPI specification that is implemented"), + AH_PREDEF ("_REV", "Supported Integer Width", "Returns the supported integer width (<= 1: 32 bits only, >=2: both 32 and 64 bits"), AH_PREDEF ("_RMV", "Removal Status", "Returns a device's removal ability status (docking)"), AH_PREDEF ("_RNG", "Range", "Memory range type, Resource Descriptor field"), AH_PREDEF ("_RST", "Device Reset", "Executes a reset on a device"), Modified: head/sys/contrib/dev/acpica/common/ahuuids.c ============================================================================== --- head/sys/contrib/dev/acpica/common/ahuuids.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/common/ahuuids.c Thu Jun 18 23:14:45 2015 (r284583) @@ -122,7 +122,7 @@ AcpiAhMatchUuid ( AcpiUtConvertStringToUuid (Info->String, UuidBuffer); - if (!ACPI_MEMCMP (Data, UuidBuffer, UUID_BUFFER_LENGTH)) + if (!memcmp (Data, UuidBuffer, UUID_BUFFER_LENGTH)) { return (Info->Description); } Modified: head/sys/contrib/dev/acpica/common/dmextern.c ============================================================================== --- head/sys/contrib/dev/acpica/common/dmextern.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/common/dmextern.c Thu Jun 18 23:14:45 2015 (r284583) @@ -224,7 +224,7 @@ AcpiDmNormalizeParentPrefix ( return (NULL); } - Length = (ACPI_STRLEN (ParentPath) + ACPI_STRLEN (Path) + 1); + Length = (strlen (ParentPath) + strlen (Path) + 1); if (ParentPath[1]) { /* @@ -253,7 +253,7 @@ AcpiDmNormalizeParentPrefix ( * * Copy the parent path */ - ACPI_STRCPY (Fullpath, &ParentPath[Index]); + strcpy (Fullpath, &ParentPath[Index]); /* * Add dot separator @@ -261,12 +261,12 @@ AcpiDmNormalizeParentPrefix ( */ if (ParentPath[1]) { - ACPI_STRCAT (Fullpath, "."); + strcat (Fullpath, "."); } /* Copy child path (carat parent prefix(es) were skipped above) */ - ACPI_STRCAT (Fullpath, Path); + strcat (Fullpath, Path); Cleanup: ACPI_FREE (ParentPath); @@ -648,13 +648,13 @@ AcpiDmAddNodeToExternalList ( if ((*ExternalPath == AML_ROOT_PREFIX) && (ExternalPath[1])) { - Temp = ACPI_ALLOCATE_ZEROED (ACPI_STRLEN (ExternalPath) + 1); + Temp = ACPI_ALLOCATE_ZEROED (strlen (ExternalPath) + 1); if (!Temp) { return_VOID; } - ACPI_STRCPY (Temp, &ExternalPath[1]); + strcpy (Temp, &ExternalPath[1]); ACPI_FREE (ExternalPath); ExternalPath = Temp; } @@ -806,7 +806,7 @@ AcpiDmCreateNewExternal ( NextExternal = AcpiGbl_ExternalList; while (NextExternal) { - if (!ACPI_STRCMP (ExternalPath, NextExternal->Path)) + if (!strcmp (ExternalPath, NextExternal->Path)) { /* Duplicate method, check that the Value (ArgCount) is the same */ @@ -849,7 +849,7 @@ AcpiDmCreateNewExternal ( NewExternal->Value = Value; NewExternal->Path = ExternalPath; NewExternal->Type = Type; - NewExternal->Length = (UINT16) ACPI_STRLEN (ExternalPath); + NewExternal->Length = (UINT16) strlen (ExternalPath); NewExternal->InternalPath = InternalPath; /* Link the new descriptor into the global list, alphabetically ordered */ Modified: head/sys/contrib/dev/acpica/common/dmrestag.c ============================================================================== --- head/sys/contrib/dev/acpica/common/dmrestag.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/common/dmrestag.c Thu Jun 18 23:14:45 2015 (r284583) @@ -679,10 +679,10 @@ AcpiGetTagPathname ( * end up in the final compiled AML, it's just an appearance issue for the * disassembled code. */ - Pathname[ACPI_STRLEN (Pathname) - ACPI_NAME_SIZE] = 0; - ACPI_STRNCAT (Pathname, ResourceNode->Name.Ascii, ACPI_NAME_SIZE); - ACPI_STRCAT (Pathname, "."); - ACPI_STRNCAT (Pathname, Tag, ACPI_NAME_SIZE); + Pathname[strlen (Pathname) - ACPI_NAME_SIZE] = 0; + strncat (Pathname, ResourceNode->Name.Ascii, ACPI_NAME_SIZE); + strcat (Pathname, "."); + strncat (Pathname, Tag, ACPI_NAME_SIZE); /* Internalize the namepath to AML format */ Modified: head/sys/contrib/dev/acpica/common/dmtable.c ============================================================================== --- head/sys/contrib/dev/acpica/common/dmtable.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/common/dmtable.c Thu Jun 18 23:14:45 2015 (r284583) @@ -528,7 +528,7 @@ AcpiDmDumpDataTable ( TableData = AcpiDmGetTableData (Table->Signature); if (!TableData) { - if (!ACPI_STRNCMP (Table->Signature, "OEM", 3)) + if (!strncmp (Table->Signature, "OEM", 3)) { AcpiOsPrintf ("\n**** OEM-defined ACPI table [%4.4s], unknown contents\n\n", Table->Signature); @@ -856,7 +856,7 @@ AcpiDmDumpTable ( case ACPI_DMT_STRING: - ByteLength = ACPI_STRLEN (ACPI_CAST_PTR (char, Target)) + 1; + ByteLength = strlen (ACPI_CAST_PTR (char, Target)) + 1; break; case ACPI_DMT_GAS: Modified: head/sys/contrib/dev/acpica/common/dmtbdump.c ============================================================================== --- head/sys/contrib/dev/acpica/common/dmtbdump.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/common/dmtbdump.c Thu Jun 18 23:14:45 2015 (r284583) @@ -155,7 +155,7 @@ AcpiDmDumpUnicode ( for (i = 0; i < Length; i += 2) { - if (!ACPI_IS_PRINT (Buffer[i])) + if (!isprint (Buffer[i])) { goto DumpRawBuffer; } @@ -1701,7 +1701,7 @@ AcpiDmDumpIort ( InfoTable = AcpiDmTableInfoIort1; Length = ACPI_OFFSET (ACPI_IORT_NAMED_COMPONENT, DeviceName); String = ACPI_ADD_PTR (char, IortNode, NodeOffset + Length); - Length += ACPI_STRLEN (String) + 1; + Length += strlen (String) + 1; break; case ACPI_IORT_NODE_PCI_ROOT_COMPLEX: @@ -3344,7 +3344,7 @@ AcpiDmDumpStao ( while (Offset < Table->Length) { Namepath = ACPI_ADD_PTR (char, Table, Offset); - StringLength = ACPI_STRLEN (Namepath) + 1; + StringLength = strlen (Namepath) + 1; AcpiDmLineHeader (Offset, StringLength, "Namestring"); AcpiOsPrintf ("\"%s\"\n", Namepath); Modified: head/sys/contrib/dev/acpica/common/dmtbinfo.c ============================================================================== --- head/sys/contrib/dev/acpica/common/dmtbinfo.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/common/dmtbinfo.c Thu Jun 18 23:14:45 2015 (r284583) @@ -113,7 +113,7 @@ #define ACPI_SPMI_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_SPMI,f) #define ACPI_SRAT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_SRAT,f) #define ACPI_STAO_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_STAO,f) -#define ACPI_TCPA_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_TCPA,f) +#define ACPI_TCPA_CLIENT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_TCPA_CLIENT,f) #define ACPI_TPM2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_TPM2,f) #define ACPI_UEFI_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_UEFI,f) #define ACPI_WAET_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_WAET,f) @@ -2611,15 +2611,15 @@ ACPI_DMTABLE_INFO AcpiDmTableI /******************************************************************************* * - * TCPA - Trusted Computing Platform Alliance table + * TCPA - Trusted Computing Platform Alliance table (Client) * ******************************************************************************/ ACPI_DMTABLE_INFO AcpiDmTableInfoTcpa[] = { - {ACPI_DMT_UINT16, ACPI_TCPA_OFFSET (Reserved), "Reserved", 0}, - {ACPI_DMT_UINT32, ACPI_TCPA_OFFSET (MaxLogLength), "Max Event Log Length", 0}, - {ACPI_DMT_UINT64, ACPI_TCPA_OFFSET (LogAddress), "Event Log Address", 0}, + {ACPI_DMT_UINT16, ACPI_TCPA_CLIENT_OFFSET (PlatformClass), "Platform Class", 0}, + {ACPI_DMT_UINT32, ACPI_TCPA_CLIENT_OFFSET (MinimumLogLength), "Min Event Log Length", 0}, + {ACPI_DMT_UINT64, ACPI_TCPA_CLIENT_OFFSET (LogAddress), "Event Log Address", 0}, ACPI_DMT_TERMINATOR }; @@ -2632,7 +2632,8 @@ ACPI_DMTABLE_INFO AcpiDmTableI ACPI_DMTABLE_INFO AcpiDmTableInfoTpm2[] = { - {ACPI_DMT_UINT32, ACPI_TPM2_OFFSET (Flags), "Flags", 0}, + {ACPI_DMT_UINT16, ACPI_TPM2_OFFSET (PlatformClass), "Platform Class", 0}, + {ACPI_DMT_UINT16, ACPI_TPM2_OFFSET (Reserved), "Reserved", 0}, {ACPI_DMT_UINT64, ACPI_TPM2_OFFSET (ControlAddress), "Control Address", 0}, {ACPI_DMT_UINT32, ACPI_TPM2_OFFSET (StartMethod), "Start Method", 0}, ACPI_DMT_TERMINATOR Modified: head/sys/contrib/dev/acpica/common/getopt.c ============================================================================== --- head/sys/contrib/dev/acpica/common/getopt.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/common/getopt.c Thu Jun 18 23:14:45 2015 (r284583) @@ -145,7 +145,7 @@ AcpiGetopt( { return (ACPI_OPT_END); } - else if (ACPI_STRCMP (argv[AcpiGbl_Optind], "--") == 0) + else if (strcmp (argv[AcpiGbl_Optind], "--") == 0) { AcpiGbl_Optind++; return (ACPI_OPT_END); @@ -159,7 +159,7 @@ AcpiGetopt( /* Make sure that the option is legal */ if (CurrentChar == ':' || - (OptsPtr = ACPI_STRCHR (opts, CurrentChar)) == NULL) + (OptsPtr = strchr (opts, CurrentChar)) == NULL) { ACPI_OPTION_ERROR ("Illegal option: -", CurrentChar); Modified: head/sys/contrib/dev/acpica/compiler/aslanalyze.c ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslanalyze.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/compiler/aslanalyze.c Thu Jun 18 23:14:45 2015 (r284583) @@ -67,8 +67,8 @@ AnIsInternalMethod ( ACPI_PARSE_OBJECT *Op) { - if ((!ACPI_STRCMP (Op->Asl.ExternalName, "\\_OSI")) || - (!ACPI_STRCMP (Op->Asl.ExternalName, "_OSI"))) + if ((!strcmp (Op->Asl.ExternalName, "\\_OSI")) || + (!strcmp (Op->Asl.ExternalName, "_OSI"))) { return (TRUE); } @@ -94,8 +94,8 @@ AnGetInternalMethodReturnType ( ACPI_PARSE_OBJECT *Op) { - if ((!ACPI_STRCMP (Op->Asl.ExternalName, "\\_OSI")) || - (!ACPI_STRCMP (Op->Asl.ExternalName, "_OSI"))) + if ((!strcmp (Op->Asl.ExternalName, "\\_OSI")) || + (!strcmp (Op->Asl.ExternalName, "_OSI"))) { return (ACPI_BTYPE_STRING); } @@ -462,7 +462,7 @@ ApCheckForGpeNameConflict ( /* Verify 3rd/4th chars are a valid hex value */ - GpeNumber = ACPI_STRTOUL (&Name[2], NULL, 16); + GpeNumber = strtoul (&Name[2], NULL, 16); if (GpeNumber == ACPI_UINT32_MAX) { return; Modified: head/sys/contrib/dev/acpica/compiler/aslascii.c ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslascii.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/compiler/aslascii.c Thu Jun 18 23:14:45 2015 (r284583) @@ -226,7 +226,7 @@ FlCheckForAscii ( /* Ensure character is either printable or a "space" char */ - else if (!ACPI_IS_PRINT (Byte) && !ACPI_IS_SPACE (Byte)) + else if (!isprint (Byte) && !isspace (Byte)) { if ((BadBytes < 10) && (DisplayErrors)) { Modified: head/sys/contrib/dev/acpica/compiler/aslcodegen.c ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslcodegen.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/compiler/aslcodegen.c Thu Jun 18 23:14:45 2015 (r284583) @@ -110,7 +110,7 @@ CgGenerateAmlOutput ( DbgPrint (ASL_TREE_OUTPUT, "%*s Value P_Op A_Op OpLen PByts Len SubLen PSubLen OpPtr" - " Parent Child Next Flags AcTyp Final Col L\n", + " Parent Child Next Flags AcTyp Final Col L# EL# LL# ELL#\n", 76, " "); CgCloseTable (); @@ -145,7 +145,7 @@ CgAmlWriteWalk ( "Final parse tree used for AML output:\n"); DbgPrint (ASL_TREE_OUTPUT, "%*s Value P_Op A_Op OpLen PByts Len SubLen PSubLen OpPtr" - " Parent Child Next Flags AcTyp Final Col L\n", + " Parent Child Next Flags AcTyp Final Col L# EL# LL# ELL#\n", 76, " "); } @@ -169,7 +169,7 @@ CgAmlWriteWalk ( DbgPrint (ASL_TREE_OUTPUT, "%08X %04X %04X %01X %04X %04X %04X %04X " - "%08X %08X %08X %08X %08X %08X %04X %02d %02d\n", + "%08X %08X %08X %08X %08X %08X %04X %02d %02d %02d %02d %02d\n", /* 1 */ (UINT32) Op->Asl.Value.Integer, /* 2 */ Op->Asl.ParseOpcode, /* 3 */ Op->Asl.AmlOpcode, @@ -186,7 +186,10 @@ CgAmlWriteWalk ( /* 14 */ Op->Asl.AcpiBtype, /* 15 */ Op->Asl.FinalAmlLength, /* 16 */ Op->Asl.Column, - /* 17 */ Op->Asl.LineNumber); + /* 17 */ Op->Asl.LineNumber, + /* 18 */ Op->Asl.EndLine, + /* 19 */ Op->Asl.LogicalLineNumber, + /* 20 */ Op->Asl.EndLogicalLine); /* Generate the AML for this node */ Modified: head/sys/contrib/dev/acpica/compiler/aslcompile.c ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslcompile.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/compiler/aslcompile.c Thu Jun 18 23:14:45 2015 (r284583) @@ -103,6 +103,9 @@ CmDoCompile ( /* Preprocessor */ PrDoPreprocess (); + Gbl_CurrentLineNumber = 1; + Gbl_LogicalLineNumber = 1; + if (Gbl_PreprocessOnly) { UtEndEvent (Event); @@ -112,6 +115,7 @@ CmDoCompile ( } UtEndEvent (Event); + /* Build the parse tree */ Event = UtBeginEvent ("Parse source code and build parse tree"); @@ -708,7 +712,7 @@ CmCleanupAndExit ( /* Close all open files */ /* - * Take care with the preprocessor file (.i), it might be the same + * Take care with the preprocessor file (.pre), it might be the same * as the "input" file, depending on where the compiler has terminated * or aborted. Prevent attempt to close the same file twice in * loop below. @@ -733,10 +737,9 @@ CmCleanupAndExit ( FlDeleteFile (ASL_FILE_AML_OUTPUT); } - /* Delete the preprocessor output file (.i) unless -li flag is set */ + /* Delete the preprocessor temp file unless full debug was specified */ - if (!Gbl_PreprocessorOutputFlag && - Gbl_PreprocessFlag) + if (Gbl_PreprocessFlag && !Gbl_KeepPreprocessorTempFile) { FlDeleteFile (ASL_FILE_PREPROCESSOR); } @@ -752,8 +755,6 @@ CmCleanupAndExit ( * Note: Handles are cleared by FlCloseFile above, so we look at the * filename instead, to determine if the .SRC file was actually * created. - * - * TBD: SourceOutput should be .TMP, then rename if we want to keep it? */ if (!Gbl_SourceOutputFlag) { Modified: head/sys/contrib/dev/acpica/compiler/aslcompiler.h ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslcompiler.h Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/compiler/aslcompiler.h Thu Jun 18 23:14:45 2015 (r284583) @@ -1003,7 +1003,7 @@ UtDoConstant ( char *String); ACPI_STATUS -UtStrtoul64 ( +stroul64 ( char *String, UINT32 Base, UINT64 *RetInteger); Modified: head/sys/contrib/dev/acpica/compiler/aslcompiler.l ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslcompiler.l Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/compiler/aslcompiler.l Thu Jun 18 23:14:45 2015 (r284583) @@ -709,7 +709,7 @@ NamePathTail [.]{NameSeg} return (PARSEOP_NAMESTRING); } . { count (1); - if (ACPI_IS_PRINT (*AslCompilertext)) + if (isprint ((int) *AslCompilertext)) { sprintf (MsgBuffer, "Invalid character (%c), expecting ASL keyword or name", Modified: head/sys/contrib/dev/acpica/compiler/asldefine.h ============================================================================== --- head/sys/contrib/dev/acpica/compiler/asldefine.h Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/compiler/asldefine.h Thu Jun 18 23:14:45 2015 (r284583) @@ -105,7 +105,8 @@ /* filename suffixes for output files */ -#define FILE_SUFFIX_PREPROCESSOR "i" +#define FILE_SUFFIX_PREPROC_USER "i " +#define FILE_SUFFIX_PREPROCESSOR "pre" #define FILE_SUFFIX_AML_CODE "aml" #define FILE_SUFFIX_MAP "map" #define FILE_SUFFIX_LISTING "lst" @@ -136,6 +137,8 @@ #define ASL_ABORT TRUE #define ASL_NO_ABORT FALSE #define ASL_EOF ACPI_UINT32_MAX +#define ASL_WITHIN_COMMENT (ACPI_UINT32_MAX -1) +#define ASL_BLANK_LINE (ACPI_UINT32_MAX -1) /* Listings */ Modified: head/sys/contrib/dev/acpica/compiler/aslerror.c ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslerror.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/compiler/aslerror.c Thu Jun 18 23:14:45 2015 (r284583) @@ -561,11 +561,11 @@ AslCommonError2 ( /* Keep a copy of the extra message */ - ACPI_STRCPY (MessageBuffer, ExtraMessage); + strcpy (MessageBuffer, ExtraMessage); } LineBuffer = UtLocalCalloc (strlen (SourceLine) + 1); - ACPI_STRCPY (LineBuffer, SourceLine); + strcpy (LineBuffer, SourceLine); /* Initialize the error node */ @@ -647,7 +647,7 @@ AslCommonError ( /* Keep a copy of the extra message */ - ACPI_STRCPY (MessageBuffer, ExtraMessage); + strcpy (MessageBuffer, ExtraMessage); } /* Initialize the error node */ Modified: head/sys/contrib/dev/acpica/compiler/aslfileio.c ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslfileio.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/compiler/aslfileio.c Thu Jun 18 23:14:45 2015 (r284583) @@ -218,6 +218,19 @@ FlWriteFile ( FlFileError (FileId, ASL_MSG_WRITE); AslAbort (); } + + if ((FileId == ASL_FILE_PREPROCESSOR) && Gbl_PreprocessorOutputFlag) + { + /* Duplicate the output to the user preprocessor (.i) file */ + + Actual = fwrite ((char *) Buffer, 1, Length, + Gbl_Files[ASL_FILE_PREPROCESSOR_USER].Handle); + if (Actual != Length) + { + FlFileError (FileId, ASL_MSG_WRITE); + AslAbort (); + } + } } @@ -247,7 +260,6 @@ FlPrintFile ( va_start (Args, Format); - Actual = vfprintf (Gbl_Files[FileId].Handle, Format, Args); va_end (Args); @@ -256,6 +268,30 @@ FlPrintFile ( FlFileError (FileId, ASL_MSG_WRITE); AslAbort (); } + + if ((FileId == ASL_FILE_PREPROCESSOR) && Gbl_PreprocessorOutputFlag) + { + /* + * Duplicate the output to the user preprocessor (.i) file, + * except: no #line directives. + */ + if (!strncmp (Format, "#line", 5)) + { + return; + } + + va_start (Args, Format); + Actual = vfprintf (Gbl_Files[ASL_FILE_PREPROCESSOR_USER].Handle, + Format, Args); + va_end (Args); + + if (Actual == -1) + { + FlFileError (FileId, ASL_MSG_WRITE); + AslAbort (); + } + } + } Modified: head/sys/contrib/dev/acpica/compiler/aslfiles.c ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslfiles.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/compiler/aslfiles.c Thu Jun 18 23:14:45 2015 (r284583) @@ -43,6 +43,7 @@ #include #include +#include #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslfiles") @@ -84,7 +85,6 @@ FlSetLineNumber ( LineNumber, Gbl_LogicalLineNumber); Gbl_CurrentLineNumber = LineNumber; - Gbl_LogicalLineNumber = LineNumber; } @@ -303,6 +303,7 @@ FlOpenIncludeWithPrefix ( { FILE *IncludeFile; char *Pathname; + UINT32 OriginalLineNumber; /* Build the full pathname to the file */ @@ -322,13 +323,20 @@ FlOpenIncludeWithPrefix ( return (NULL); } -#ifdef _MUST_HANDLE_COMMENTS /* - * Check entire include file for any # preprocessor directives. + * Check the entire include file for any # preprocessor directives. * This is because there may be some confusion between the #include - * preprocessor directive and the ASL Include statement. + * preprocessor directive and the ASL Include statement. A file included + * by the ASL include cannot contain preprocessor directives because + * the preprocessor has already run by the time the ASL include is + * recognized (by the compiler, not the preprocessor.) + * + * Note: DtGetNextLine strips/ignores comments. + * Save current line number since DtGetNextLine modifies it. */ - while (fgets (Gbl_CurrentLineBuffer, Gbl_LineBufferSize, IncludeFile)) + Gbl_CurrentLineNumber--; + OriginalLineNumber = Gbl_CurrentLineNumber; + while (DtGetNextLine (IncludeFile, DT_ALLOW_MULTILINE_QUOTES) != ASL_EOF) { if (Gbl_CurrentLineBuffer[0] == '#') { @@ -336,7 +344,7 @@ FlOpenIncludeWithPrefix ( Op, "use #include instead"); } } -#endif + Gbl_CurrentLineNumber = OriginalLineNumber; /* Must seek back to the start of the file */ @@ -579,8 +587,6 @@ FlOpenMiscOutputFiles ( /* Open the debug file as STDERR, text mode */ - /* TBD: hide this behind a FlReopenFile function */ - Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Filename = Filename; Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Handle = freopen (Filename, "w+t", stderr); @@ -588,13 +594,15 @@ FlOpenMiscOutputFiles ( if (!Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Handle) { /* - * A problem with freopen is that on error, - * we no longer have stderr. + * A problem with freopen is that on error, we no longer + * have stderr and cannot emit normal error messages. + * Emit error to stdout, close files, and exit. */ - Gbl_DebugFlag = FALSE; - memcpy (stderr, stdout, sizeof (FILE)); - FlFileError (ASL_FILE_DEBUG_OUTPUT, ASL_MSG_DEBUG_FILENAME); - AslAbort (); + fprintf (stdout, + "\nCould not open debug output file: %s\n\n", Filename); + + CmCleanupAndExit (); + exit (1); } AslCompilerSignon (ASL_FILE_DEBUG_OUTPUT); @@ -621,7 +629,7 @@ FlOpenMiscOutputFiles ( AslCompilerFileHeader (ASL_FILE_LISTING_OUTPUT); } - /* Create the preprocessor output file if preprocessor enabled */ + /* Create the preprocessor output temp file if preprocessor enabled */ if (Gbl_PreprocessFlag) { @@ -636,6 +644,23 @@ FlOpenMiscOutputFiles ( FlOpenFile (ASL_FILE_PREPROCESSOR, Filename, "w+t"); } + /* + * Create the "user" preprocessor output file if -li flag set. + * Note, this file contains no embedded #line directives. + */ + if (Gbl_PreprocessorOutputFlag) + { + Filename = FlGenerateFilename (FilenamePrefix, FILE_SUFFIX_PREPROC_USER); + if (!Filename) + { + AslCommonError (ASL_ERROR, ASL_MSG_PREPROCESSOR_FILENAME, + 0, 0, 0, 0, NULL, NULL); + return (AE_ERROR); + } + + FlOpenFile (ASL_FILE_PREPROCESSOR_USER, Filename, "w+t"); + } + /* All done for data table compiler */ if (Gbl_FileType == ASL_INPUT_TYPE_ASCII_DATA) Modified: head/sys/contrib/dev/acpica/compiler/aslfold.c ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslfold.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/compiler/aslfold.c Thu Jun 18 23:14:45 2015 (r284583) @@ -236,6 +236,8 @@ OpcAmlCheckForConstant ( */ if (WalkState->Opcode == AML_BUFFER_OP) { + DbgPrint (ASL_PARSE_OUTPUT, + "\nBuffer+Buffer->Buffer constant reduction is not supported yet"); Status = AE_TYPE; goto CleanupAndExit; } @@ -380,10 +382,12 @@ TrSimpleConstantReduction ( return (Status); } + /* Disconnect any existing children, install new constant */ + + Op->Asl.Child = NULL; TrInstallReducedConstant (Op, ObjDesc); UtSetParseOpName (Op); - Op->Asl.Child = NULL; return (AE_OK); } @@ -494,6 +498,10 @@ TrTransformToStoreOp ( goto EvalError; } + /* Truncate any subtree expressions, they have been evaluated */ + + Child1->Asl.Child = NULL; + /* Folded constant is in ObjDesc, store into Child1 */ TrInstallReducedConstant (Child1, ObjDesc); @@ -505,11 +513,6 @@ TrTransformToStoreOp ( UtSetParseOpName (Op); Op->Common.Parent = OriginalParent; - /* Truncate any subtree expressions, they have been evaluated */ - - Child1->Asl.Child = NULL; - Child2->Asl.Child = NULL; - /* First child is the folded constant */ /* Second child will be the target */ @@ -547,7 +550,8 @@ TrInstallReducedConstant ( ACPI_PARSE_OBJECT *Op, ACPI_OPERAND_OBJECT *ObjDesc) { - ACPI_PARSE_OBJECT *RootOp; + ACPI_PARSE_OBJECT *LengthOp; + ACPI_PARSE_OBJECT *DataOp; TotalFolds++; @@ -574,17 +578,22 @@ TrInstallReducedConstant ( Op->Asl.ParseOpcode = PARSEOP_STRING_LITERAL; Op->Common.AmlOpcode = AML_STRING_OP; - Op->Asl.AmlLength = ACPI_STRLEN (ObjDesc->String.Pointer) + 1; + Op->Asl.AmlLength = strlen (ObjDesc->String.Pointer) + 1; Op->Common.Value.String = ObjDesc->String.Pointer; DbgPrint (ASL_PARSE_OUTPUT, "Constant expression reduced to (STRING) %s\n\n", Op->Common.Value.String); - break; case ACPI_TYPE_BUFFER: - + /* + * Create a new parse subtree of the form: + * + * BUFFER (Buffer AML opcode) + * INTEGER (Buffer length in bytes) + * RAW_DATA (Buffer byte data) + */ Op->Asl.ParseOpcode = PARSEOP_BUFFER; Op->Common.AmlOpcode = AML_BUFFER_OP; Op->Asl.CompileFlags = NODE_AML_PACKAGE; @@ -592,28 +601,24 @@ TrInstallReducedConstant ( /* Child node is the buffer length */ - RootOp = TrAllocateNode (PARSEOP_INTEGER); + LengthOp = TrAllocateNode (PARSEOP_INTEGER); - RootOp->Asl.AmlOpcode = AML_DWORD_OP; - RootOp->Asl.Value.Integer = ObjDesc->Buffer.Length; - RootOp->Asl.Parent = Op; + LengthOp->Asl.AmlOpcode = AML_DWORD_OP; + LengthOp->Asl.Value.Integer = ObjDesc->Buffer.Length; + LengthOp->Asl.Parent = Op; + (void) OpcSetOptimalIntegerSize (LengthOp); - (void) OpcSetOptimalIntegerSize (RootOp); - - Op->Asl.Child = RootOp; - Op = RootOp; - UtSetParseOpName (Op); + Op->Asl.Child = LengthOp; - /* Peer to the child is the raw buffer data */ + /* Next child is the raw buffer data */ - RootOp = TrAllocateNode (PARSEOP_RAW_DATA); - RootOp->Asl.AmlOpcode = AML_RAW_DATA_BUFFER; - RootOp->Asl.AmlLength = ObjDesc->Buffer.Length; - RootOp->Asl.Value.String = (char *) ObjDesc->Buffer.Pointer; - RootOp->Asl.Parent = Op->Asl.Parent; + DataOp = TrAllocateNode (PARSEOP_RAW_DATA); + DataOp->Asl.AmlOpcode = AML_RAW_DATA_BUFFER; + DataOp->Asl.AmlLength = ObjDesc->Buffer.Length; + DataOp->Asl.Value.String = (char *) ObjDesc->Buffer.Pointer; + DataOp->Asl.Parent = Op; - Op->Asl.Next = RootOp; - Op = RootOp; + LengthOp->Asl.Next = DataOp; DbgPrint (ASL_PARSE_OUTPUT, "Constant expression reduced to (BUFFER) length %X\n\n", Modified: head/sys/contrib/dev/acpica/compiler/aslglobal.h ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslglobal.h Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/compiler/aslglobal.h Thu Jun 18 23:14:45 2015 (r284583) @@ -73,6 +73,7 @@ ASL_FILE_INFO Gbl_ {NULL, NULL, "Binary Output:", "AML Output"}, {NULL, NULL, "Source Output:", "Source Output"}, {NULL, NULL, "Preprocessor: ", "Preprocessor Output"}, + {NULL, NULL, "Preprocessor: ", "Preprocessor Temp File"}, {NULL, NULL, "Listing File: ", "Listing Output"}, {NULL, NULL, "Hex Dump: ", "Hex Table Output"}, {NULL, NULL, "Namespace: ", "Namespace Output"}, @@ -123,10 +124,10 @@ ASL_EXTERN char ASL_ ASL_EXTERN char ASL_INIT_GLOBAL (*Gbl_LineBufPtr, NULL); ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_LineBufferSize, ASL_DEFAULT_LINE_BUFFER_SIZE); ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_CurrentColumn, 0); -ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_PreviousLineNumber, 0); ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_CurrentLineNumber, 1); ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_LogicalLineNumber, 1); ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_CurrentLineOffset, 0); +ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_OriginalInputFileSize, 0); ASL_EXTERN UINT8 ASL_INIT_GLOBAL (Gbl_SyntaxError, 0); /* Exception reporting */ @@ -146,6 +147,7 @@ ASL_EXTERN BOOLEAN ASL_ ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_MapfileFlag, FALSE); ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_NsOutputFlag, FALSE); ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_PreprocessorOutputFlag, FALSE); +ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_KeepPreprocessorTempFile, FALSE); ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_DebugFlag, FALSE); ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_AsmOutputFlag, FALSE); ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_C_OutputFlag, FALSE); Modified: head/sys/contrib/dev/acpica/compiler/aslmain.c ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslmain.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/compiler/aslmain.c Thu Jun 18 23:14:45 2015 (r284583) @@ -261,7 +261,7 @@ AslSignalHandler ( /* Close all open files */ - Gbl_Files[ASL_FILE_PREPROCESSOR].Handle = NULL; /* the .i file is same as source file */ + Gbl_Files[ASL_FILE_PREPROCESSOR].Handle = NULL; /* the .pre file is same as source file */ for (i = ASL_FILE_INPUT; i < ASL_MAX_FILE_TYPE; i++) { Modified: head/sys/contrib/dev/acpica/compiler/aslmapenter.c ============================================================================== --- head/sys/contrib/dev/acpica/compiler/aslmapenter.c Thu Jun 18 21:55:55 2015 (r284582) +++ head/sys/contrib/dev/acpica/compiler/aslmapenter.c Thu Jun 18 23:14:45 2015 (r284583) @@ -239,7 +239,7 @@ MpCreateGpioInfo ( /* Sort on source DeviceName first */ while (NextGpio && - (ACPI_STRCMP (DeviceName, NextGpio->DeviceName) > 0)) + (strcmp (DeviceName, NextGpio->DeviceName) > 0)) { PrevGpio = NextGpio; NextGpio = NextGpio->Next; @@ -249,7 +249,7 @@ MpCreateGpioInfo ( while (NextGpio && (NextGpio->PinNumber < PinNumber) && - !ACPI_STRCMP (DeviceName, NextGpio->DeviceName)) + !strcmp (DeviceName, NextGpio->DeviceName)) { PrevGpio = NextGpio; NextGpio = NextGpio->Next; @@ -316,7 +316,7 @@ MpCreateSerialInfo ( /* Sort on source DeviceName */ while (NextSerial && - (ACPI_STRCMP (DeviceName, NextSerial->DeviceName) > 0)) + (strcmp (DeviceName, NextSerial->DeviceName) > 0)) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 00:10:31 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5EBDA5FA; Fri, 19 Jun 2015 00:10:31 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31B6A24C; Fri, 19 Jun 2015 00:10:31 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5J0AVpk034790; Fri, 19 Jun 2015 00:10:31 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5J0AVDR034789; Fri, 19 Jun 2015 00:10:31 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201506190010.t5J0AVDR034789@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Fri, 19 Jun 2015 00:10:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284585 - head/sys/dev/atkbdc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 00:10:31 -0000 Author: rpaulo Date: Fri Jun 19 00:10:30 2015 New Revision: 284585 URL: https://svnweb.freebsd.org/changeset/base/284585 Log: Synaptics: fix a problem with trackpoint passthrough. There was a inconsistency which led to enable passthrough commands being interpreted as actual touchpad commands. Submitted by: Jan Kokemüller MFC after: 1 week Modified: head/sys/dev/atkbdc/psm.c Modified: head/sys/dev/atkbdc/psm.c ============================================================================== --- head/sys/dev/atkbdc/psm.c Fri Jun 19 00:00:32 2015 (r284584) +++ head/sys/dev/atkbdc/psm.c Fri Jun 19 00:10:30 2015 (r284585) @@ -4839,9 +4839,7 @@ enable_synaptics(struct psm_softc *sc, e synaptics_set_mode(sc, synaptics_preferred_mode(sc)); if (trackpoint_support && synhw.capPassthrough) { - synaptics_passthrough_on(sc); enable_trackpoint(sc, arg); - synaptics_passthrough_off(sc); } VLOG(3, (LOG_DEBUG, "synaptics: END init (%d buttons)\n", buttons)); @@ -5096,16 +5094,29 @@ enable_trackpoint(struct psm_softc *sc, KBDC kbdc = sc->kbdc; int id; + /* + * If called from enable_synaptics(), make sure that passthrough + * mode is enabled so we can reach the trackpoint. + * However, passthrough mode must be disabled before setting the + * trackpoint parameters, as rackpoint_command() enables and disables + * passthrough mode on its own. + */ + if (sc->synhw.capPassthrough) + synaptics_passthrough_on(sc); + if (send_aux_command(kbdc, 0xe1) != PSM_ACK || read_aux_data(kbdc) != 0x01) - return (FALSE); + goto no_trackpoint; id = read_aux_data(kbdc); if (id < 0x01) - return (FALSE); + goto no_trackpoint; if (arg == PROBE) sc->tphw = id; if (!trackpoint_support) - return (FALSE); + goto no_trackpoint; + + if (sc->synhw.capPassthrough) + synaptics_passthrough_off(sc); if (arg == PROBE) { trackpoint_sysctl_create_tree(sc); @@ -5122,6 +5133,12 @@ enable_trackpoint(struct psm_softc *sc, set_trackpoint_parameters(sc); return (TRUE); + +no_trackpoint: + if (sc->synhw.capPassthrough) + synaptics_passthrough_off(sc); + + return (FALSE); } /* Interlink electronics VersaPad */ From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 01:21:11 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 402488F6; Fri, 19 Jun 2015 01:21:11 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2EFF575A; Fri, 19 Jun 2015 01:21:11 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5J1LB4n072222; Fri, 19 Jun 2015 01:21:11 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5J1LBsr072221; Fri, 19 Jun 2015 01:21:11 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201506190121.t5J1LBsr072221@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 19 Jun 2015 01:21:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284587 - head/sys/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 01:21:11 -0000 Author: adrian Date: Fri Jun 19 01:21:10 2015 New Revision: 284587 URL: https://svnweb.freebsd.org/changeset/base/284587 Log: Add in library routines not supplied by gcc-4.9 but required by the kernel. Reviewed by: imp Modified: head/sys/conf/files.mips Modified: head/sys/conf/files.mips ============================================================================== --- head/sys/conf/files.mips Fri Jun 19 00:53:15 2015 (r284586) +++ head/sys/conf/files.mips Fri Jun 19 01:21:10 2015 (r284587) @@ -61,6 +61,8 @@ libkern/flsll.c standard libkern/memmove.c standard libkern/cmpdi2.c optional mips | mipsel libkern/ucmpdi2.c optional mips | mipsel +libkern/ashldi3.c standard +libkern/ashrdi3.c standard # cfe support dev/cfe/cfe_api.c optional cfe From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 01:44:19 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DC64ACDF; Fri, 19 Jun 2015 01:44:18 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C9E08CBC; Fri, 19 Jun 2015 01:44:18 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5J1iIY9083930; Fri, 19 Jun 2015 01:44:18 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5J1iIbH083926; Fri, 19 Jun 2015 01:44:18 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201506190144.t5J1iIbH083926@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 19 Jun 2015 01:44:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284588 - head/sys/dev/iwn X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 01:44:19 -0000 Author: adrian Date: Fri Jun 19 01:44:17 2015 New Revision: 284588 URL: https://svnweb.freebsd.org/changeset/base/284588 Log: First cut at attempting to buffer frames until we see a beacon. The iwn(4) firmware forgets most of its channel state after an RXON command. This means that any beacons its seen on passive 5GHz channels are forgotten upon an association/authorisation request. This unfortuantely means that 5GHz association almost always fails - the assoc and/or auth frames are dropped with a status of "passive channel, haven't seen a beacon yet." (0x90.) So: * add an xmit queue, global, to buffer frames * modify the xmit path to use the mbuf tag from net80211 to specify raw frame details * buffer xmit frames from both raw and non-raw paths * if a beacon is seen in the RX path, schedule a taskqueue to send said frames and un-buffer things. * flush frames during state change back to INIT, or NIC down/up/detach. This isn't the final shape I'd like this to be in but it certainly is better than 5GHz "not working at all". Tested: * Intel 5100, STA mode (before spilling coffee) * Intel 5300, STA mode (after spilling coffee) Story: * This has been bugging me at work for months, which I just worked around by throwing an ath(4) into my Lenovo T400 cardbus slot. * Our ops director discovered indeed FreeBSD runs well on the Lenovo T420p, except for that pesky 5GHz thing. So now developers also can have a T420p running FreeBSD to do work with. Their #1 feedback to me - "boy it'd be nice if 5GHz wifi worked." * .. then, I was at NANOG but stuck with 5GHz only wifi and no ath(4) NIC to put in a laptop - and I snapped. Thus, the reason this is actually work related. MFC after: 2 weeks Sponsored by: Norse Corp, Inc. Modified: head/sys/dev/iwn/if_iwn.c head/sys/dev/iwn/if_iwnvar.h Modified: head/sys/dev/iwn/if_iwn.c ============================================================================== --- head/sys/dev/iwn/if_iwn.c Fri Jun 19 01:21:10 2015 (r284587) +++ head/sys/dev/iwn/if_iwn.c Fri Jun 19 01:44:17 2015 (r284588) @@ -232,6 +232,7 @@ static int iwn_tx_data(struct iwn_softc static int iwn_tx_data_raw(struct iwn_softc *, struct mbuf *, struct ieee80211_node *, const struct ieee80211_bpf_params *params); +static void iwn_xmit_task(void *arg0, int pending); static int iwn_raw_xmit(struct ieee80211_node *, struct mbuf *, const struct ieee80211_bpf_params *); static void iwn_start(struct ifnet *); @@ -682,6 +683,9 @@ iwn_attach(device_t dev) TASK_INIT(&sc->sc_radioon_task, 0, iwn_radio_on, sc); TASK_INIT(&sc->sc_radiooff_task, 0, iwn_radio_off, sc); TASK_INIT(&sc->sc_panic_task, 0, iwn_panicked, sc); + TASK_INIT(&sc->sc_xmit_task, 0, iwn_xmit_task, sc); + + mbufq_init(&sc->sc_xmit_queue, 1024); sc->sc_tq = taskqueue_create("iwn_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->sc_tq); @@ -1360,6 +1364,28 @@ iwn_vap_delete(struct ieee80211vap *vap) free(ivp, M_80211_VAP); } +static void +iwn_xmit_queue_drain(struct iwn_softc *sc) +{ + struct mbuf *m; + struct ieee80211_node *ni; + + IWN_LOCK_ASSERT(sc); + while ((m = mbufq_dequeue(&sc->sc_xmit_queue)) != NULL) { + ni = (struct ieee80211_node *)m->m_pkthdr.rcvif; + ieee80211_free_node(ni); + m_freem(m); + } +} + +static int +iwn_xmit_queue_enqueue(struct iwn_softc *sc, struct mbuf *m) +{ + + IWN_LOCK_ASSERT(sc); + return (mbufq_enqueue(&sc->sc_xmit_queue, m)); +} + static int iwn_detach(device_t dev) { @@ -1373,6 +1399,11 @@ iwn_detach(device_t dev) if (ifp != NULL) { ic = ifp->if_l2com; + /* Free the mbuf queue and node references */ + IWN_LOCK(sc); + iwn_xmit_queue_drain(sc); + IWN_UNLOCK(sc); + ieee80211_draintask(ic, &sc->sc_reinit_task); ieee80211_draintask(ic, &sc->sc_radioon_task); ieee80211_draintask(ic, &sc->sc_radiooff_task); @@ -2831,6 +2862,9 @@ iwn_newstate(struct ieee80211vap *vap, e sc->rxon->filter &= ~htole32(IWN_FILTER_BSS); sc->calib.state = IWN_CALIB_STATE_INIT; + /* Wait until we hear a beacon before we transmit */ + sc->sc_beacon_wait = 1; + if ((error = iwn_auth(sc, vap)) != 0) { device_printf(sc->sc_dev, "%s: could not move to auth state\n", __func__); @@ -2846,6 +2880,9 @@ iwn_newstate(struct ieee80211vap *vap, e break; } + /* Wait until we hear a beacon before we transmit */ + sc->sc_beacon_wait = 1; + /* * !RUN -> RUN requires setting the association id * which is done with a firmware cmd. We also defer @@ -2859,6 +2896,12 @@ iwn_newstate(struct ieee80211vap *vap, e case IEEE80211_S_INIT: sc->calib.state = IWN_CALIB_STATE_INIT; + /* + * Purge the xmit queue so we don't have old frames + * during a new association attempt. + */ + sc->sc_beacon_wait = 0; + iwn_xmit_queue_drain(sc); break; default: @@ -3066,6 +3109,32 @@ iwn_rx_done(struct iwn_softc *sc, struct } } + /* + * If it's a beacon and we're waiting, then do the + * wakeup. This should unblock raw_xmit/start. + */ + if (sc->sc_beacon_wait) { + uint8_t type, subtype; + /* NB: Re-assign wh */ + wh = mtod(m, struct ieee80211_frame *); + type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; + subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK; + /* + * This assumes at this point we've received our own + * beacon. + */ + DPRINTF(sc, IWN_DEBUG_TRACE, + "%s: beacon_wait, type=%d, subtype=%d\n", + __func__, type, subtype); + if (type == IEEE80211_FC0_TYPE_MGT && + subtype == IEEE80211_FC0_SUBTYPE_BEACON) { + DPRINTF(sc, IWN_DEBUG_TRACE | IWN_DEBUG_XMIT, + "%s: waking things up\n", __func__); + /* queue taskqueue to transmit! */ + taskqueue_enqueue(sc->sc_tq, &sc->sc_xmit_task); + } + } + IWN_UNLOCK(sc); /* Send the frame to the 802.11 layer. */ @@ -4802,6 +4871,51 @@ iwn_tx_data_raw(struct iwn_softc *sc, st return 0; } +static void +iwn_xmit_task(void *arg0, int pending) +{ + struct iwn_softc *sc = arg0; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211_node *ni; + struct mbuf *m; + int error; + struct ieee80211_bpf_params p; + int have_p; + + DPRINTF(sc, IWN_DEBUG_XMIT, "%s: called\n", __func__); + + IWN_LOCK(sc); + /* + * Dequeue frames, attempt to transmit, + * then disable beaconwait when we're done. + */ + while ((m = mbufq_dequeue(&sc->sc_xmit_queue)) != NULL) { + have_p = 0; + ni = (struct ieee80211_node *)m->m_pkthdr.rcvif; + + /* Get xmit params if appropriate */ + if (ieee80211_get_xmit_params(m, &p) == 0) + have_p = 1; + + DPRINTF(sc, IWN_DEBUG_XMIT, "%s: m=%p, have_p=%d\n", + __func__, m, have_p); + + /* If we have xmit params, use them */ + if (have_p) + error = iwn_tx_data_raw(sc, m, ni, &p); + else + error = iwn_tx_data(sc, m, ni); + + if (error != 0) { + ieee80211_free_node(ni); + if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); + } + } + + sc->sc_beacon_wait = 0; + IWN_UNLOCK(sc); +} + static int iwn_raw_xmit(struct ieee80211_node *ni, struct mbuf *m, const struct ieee80211_bpf_params *params) @@ -4819,7 +4933,25 @@ iwn_raw_xmit(struct ieee80211_node *ni, return ENETDOWN; } + /* XXX? net80211 doesn't set this on xmit'ed raw frames? */ + m->m_pkthdr.rcvif = (void *) ni; + IWN_LOCK(sc); + + /* queue frame if we have to */ + if (sc->sc_beacon_wait) { + if (iwn_xmit_queue_enqueue(sc, m) != 0) { + m_freem(m); + ieee80211_free_node(ni); + if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); + IWN_UNLOCK(sc); + return (ENOBUFS); + } + /* Queued, so just return OK */ + IWN_UNLOCK(sc); + return (0); + } + if (params == NULL) { /* * Legacy path; interpret frame contents to decide @@ -4866,6 +4998,14 @@ iwn_start_locked(struct ifnet *ifp) IWN_LOCK_ASSERT(sc); + /* + * If we're waiting for a beacon, we can just exit out here + * and wait for the taskqueue to be kicked. + */ + if (sc->sc_beacon_wait) { + return; + } + DPRINTF(sc, IWN_DEBUG_XMIT, "%s: called\n", __func__); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || Modified: head/sys/dev/iwn/if_iwnvar.h ============================================================================== --- head/sys/dev/iwn/if_iwnvar.h Fri Jun 19 01:21:10 2015 (r284587) +++ head/sys/dev/iwn/if_iwnvar.h Fri Jun 19 01:44:17 2015 (r284588) @@ -309,6 +309,7 @@ struct iwn_softc { struct task sc_radioon_task; struct task sc_radiooff_task; struct task sc_panic_task; + struct task sc_xmit_task; /* Taskqueue */ struct taskqueue *sc_tq; @@ -385,6 +386,9 @@ struct iwn_softc { /* Are we doing a scan? */ int sc_is_scanning; + /* Are we waiting for a beacon before xmit? */ + int sc_beacon_wait; + struct ieee80211_tx_ampdu *qid2tap[IWN5000_NTXQUEUES]; int (*sc_ampdu_rx_start)(struct ieee80211_node *, @@ -417,6 +421,13 @@ struct iwn_softc { #define IWN_UCODE_API(ver) (((ver) & 0x0000FF00) >> 8) uint32_t ucode_rev; + + /* + * Global queue for queuing xmit frames + * when we can't yet transmit (eg raw + * frames whilst waiting for beacons.) + */ + struct mbufq sc_xmit_queue; }; #define IWN_LOCK_INIT(_sc) \ From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 05:09:05 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A0B394C; Fri, 19 Jun 2015 05:09:05 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 16BF21A3; Fri, 19 Jun 2015 05:09:05 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5J594hh089175; Fri, 19 Jun 2015 05:09:04 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5J593PV089167; Fri, 19 Jun 2015 05:09:03 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <201506190509.t5J593PV089167@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Fri, 19 Jun 2015 05:09:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284589 - head/usr.sbin/fstyp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 05:09:05 -0000 Author: allanjude (doc committer) Date: Fri Jun 19 05:09:02 2015 New Revision: 284589 URL: https://svnweb.freebsd.org/changeset/base/284589 Log: Add the ability to detect ZFS and GELI encrypted file systems to fstyp(8) Functionality is hidden behind the -u flag to avoid confusing automounters PR: 200823 Reviewed by: asomers, eadler, wblock (man page) Approved by: trasz MFC after: 10 days Relnotes: yes Sponsored by: ScaleEngine Inc. Differential Revision: https://reviews.freebsd.org/D2045 Added: head/usr.sbin/fstyp/geli.c (contents, props changed) head/usr.sbin/fstyp/zfs.c (contents, props changed) Modified: head/usr.sbin/fstyp/Makefile head/usr.sbin/fstyp/fstyp.8 head/usr.sbin/fstyp/fstyp.c head/usr.sbin/fstyp/fstyp.h Modified: head/usr.sbin/fstyp/Makefile ============================================================================== --- head/usr.sbin/fstyp/Makefile Fri Jun 19 01:44:17 2015 (r284588) +++ head/usr.sbin/fstyp/Makefile Fri Jun 19 05:09:02 2015 (r284589) @@ -1,9 +1,41 @@ # $FreeBSD$ +.include + PROG= fstyp -SRCS= fstyp.c ext2fs.c cd9660.c msdosfs.c ntfs.c ufs.c +SRCS= cd9660.c ext2fs.c fstyp.c geli.c msdosfs.c ntfs.c ufs.c + +.if ${MK_CDDL} != "no" +SRCS += zfs.c +.endif + MAN= fstyp.8 WARNS= 6 +.if ${MK_CDDL} != "no" +IGNORE_PRAGMA= YES + +CFLAGS+= -DNEED_SOLARIS_BOOLEAN -DHAVE_CDDL +CFLAGS+= -I${.CURDIR}/../../sys/cddl/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/head +.endif + +CFLAGS+=-I${.CURDIR}/../../sys + +DPADD= ${LIBGEOM} ${LIBMD} +LDADD= -lgeom -lmd + +.if ${MK_CDDL} != "no" +DPADD += ${LIBNVPAIR} ${LIBZFS} +LDADD += -lnvpair -lzfs +.endif + .include Modified: head/usr.sbin/fstyp/fstyp.8 ============================================================================== --- head/usr.sbin/fstyp/fstyp.8 Fri Jun 19 01:44:17 2015 (r284588) +++ head/usr.sbin/fstyp/fstyp.8 Fri Jun 19 05:09:02 2015 (r284589) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 14, 2015 +.Dd June 15, 2015 .Dt FSTYP 8 .Os .Sh NAME @@ -37,20 +37,42 @@ .Nm .Op Fl l .Op Fl s +.Op Fl u .Ar special .Sh DESCRIPTION The .Nm utility is used to determine the filesystem type on a given device. It can recognize ISO-9660, Ext2, FAT, NTFS, and UFS filesystems. +When the +.Fl u +flag is specified, +.Nm +also recognizes certain additional metadata formats that cannot be +handled using +.Xr mount 8 , +such as ZFS pools and +.Xr geli 8 +providers. +.Pp The filesystem name is printed to the standard output -as, respectively, -.Li cd9660 , -.Li ext2fs , -.Li msdosfs , -.Li ntfs , -or -.Li ufs . +as, respectively: +.Bl -item -offset indent -compact +.It +cd9660 +.It +ext2fs +.It +geli +.It +msdosfs +.It +ntfs +.It +ufs +.It +zfs +.El .Pp Because .Nm @@ -73,6 +95,9 @@ By default, only works on regular files and disk-like device nodes. Trying to read other file types might have unexpected consequences or hang indefinitely. +.It Fl u +Include filesystems and devices that cannot be mounted directly by +.Xr mount 8 . .El .Sh EXIT STATUS The @@ -82,8 +107,11 @@ type is not recognized. .Sh SEE ALSO .Xr file 1 , .Xr capsicum 4 , +.Xr autofs 8 , +.Xr geli 8 , .Xr glabel 8 , -.Xr mount 8 +.Xr mount 8 , +.Xr zpool 8 .Sh HISTORY The .Nm @@ -95,3 +123,5 @@ The utility was developed by .An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org under sponsorship from the FreeBSD Foundation. +ZFS and GELI support was added by +.An Allan Jude Aq Mt allanjude@FreeBSD.org Modified: head/usr.sbin/fstyp/fstyp.c ============================================================================== --- head/usr.sbin/fstyp/fstyp.c Fri Jun 19 01:44:17 2015 (r284588) +++ head/usr.sbin/fstyp/fstyp.c Fri Jun 19 05:09:02 2015 (r284589) @@ -55,13 +55,18 @@ typedef int (*fstyp_function)(FILE *, ch static struct { const char *name; fstyp_function function; + bool unmountable; } fstypes[] = { - { "cd9660", &fstyp_cd9660 }, - { "ext2fs", &fstyp_ext2fs }, - { "msdosfs", &fstyp_msdosfs }, - { "ntfs", &fstyp_ntfs }, - { "ufs", &fstyp_ufs }, - { NULL, NULL } + { "cd9660", &fstyp_cd9660, false }, + { "ext2fs", &fstyp_ext2fs, false }, + { "geli", &fstyp_geli, true }, + { "msdosfs", &fstyp_msdosfs, false }, + { "ntfs", &fstyp_ntfs, false }, + { "ufs", &fstyp_ufs, false }, +#ifdef HAVE_CDDL + { "zfs", &fstyp_zfs, true }, +#endif + { NULL, NULL, NULL } }; void * @@ -124,7 +129,7 @@ static void usage(void) { - fprintf(stderr, "usage: fstyp [-l][-s] special\n"); + fprintf(stderr, "usage: fstyp [-l] [-s] [-u] special\n"); exit(1); } @@ -153,13 +158,13 @@ int main(int argc, char **argv) { int ch, error, i, nbytes; - bool ignore_type = false, show_label = false; + bool ignore_type = false, show_label = false, show_unmountable = false; char label[LABEL_LEN + 1], strvised[LABEL_LEN * 4 + 1]; char *path; FILE *fp; fstyp_function fstyp_f; - while ((ch = getopt(argc, argv, "ls")) != -1) { + while ((ch = getopt(argc, argv, "lsu")) != -1) { switch (ch) { case 'l': show_label = true; @@ -167,6 +172,9 @@ main(int argc, char **argv) case 's': ignore_type = true; break; + case 'u': + show_unmountable = true; + break; default: usage(); } @@ -193,6 +201,8 @@ main(int argc, char **argv) memset(label, '\0', sizeof(label)); for (i = 0;; i++) { + if (show_unmountable == false && fstypes[i].unmountable == true) + continue; fstyp_f = fstypes[i].function; if (fstyp_f == NULL) break; Modified: head/usr.sbin/fstyp/fstyp.h ============================================================================== --- head/usr.sbin/fstyp/fstyp.h Fri Jun 19 01:44:17 2015 (r284588) +++ head/usr.sbin/fstyp/fstyp.h Fri Jun 19 05:09:02 2015 (r284589) @@ -40,8 +40,12 @@ void rtrim(char *label, size_t size); int fstyp_cd9660(FILE *fp, char *label, size_t size); int fstyp_ext2fs(FILE *fp, char *label, size_t size); +int fstyp_geli(FILE *fp, char *label, size_t size); int fstyp_msdosfs(FILE *fp, char *label, size_t size); int fstyp_ntfs(FILE *fp, char *label, size_t size); int fstyp_ufs(FILE *fp, char *label, size_t size); +#ifdef HAVE_CDDL +int fstyp_zfs(FILE *fp, char *label, size_t size); +#endif #endif /* !FSTYP_H */ Added: head/usr.sbin/fstyp/geli.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/fstyp/geli.c Fri Jun 19 05:09:02 2015 (r284589) @@ -0,0 +1,76 @@ +/*- + * Copyright (c) 2015 Allan Jude + * All rights reserved. + * + * This software was developed by Edward Tomasz Napierala under sponsorship + * from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "fstyp.h" + +int +fstyp_geli(FILE *fp, char *label __unused, size_t labelsize __unused) +{ + int error; + off_t mediasize; + u_int sectorsize; + struct g_eli_metadata md; + u_char *buf; + + error = ioctl(fileno(fp), DIOCGMEDIASIZE, &mediasize); + if (error != 0) + return (1); + error = ioctl(fileno(fp), DIOCGSECTORSIZE, §orsize); + if (error != 0) + return (1); + buf = (u_char *)read_buf(fp, mediasize - sectorsize, sectorsize); + if (buf == NULL) + goto gelierr; + error = eli_metadata_decode(buf, &md); + if (error) + goto gelierr; + + if (strncmp(md.md_magic, "GEOM::ELI", 9) == 0) { + free(buf); + return (0); + } + +gelierr: + free(buf); + + return (1); +} Added: head/usr.sbin/fstyp/zfs.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/fstyp/zfs.c Fri Jun 19 05:09:02 2015 (r284589) @@ -0,0 +1,73 @@ +/*- + * Copyright (c) 2015 Allan Jude + * All rights reserved. + * + * This software was developed by Edward Tomasz Napierala under sponsorship + * from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "fstyp.h" + +int +fstyp_zfs(FILE *fp, char *label, size_t labelsize) +{ + vdev_label_t *zpool_ptr = NULL; + vdev_label_t zpool_label; + char *buf = zpool_label.vl_vdev_phys.vp_nvlist; + char *zpool_name = NULL; + size_t buflen = sizeof (zpool_label.vl_vdev_phys.vp_nvlist); + nvlist_t *config = NULL; + + zpool_ptr = (vdev_label_t *)read_buf(fp, 0, sizeof(zpool_label)); + if (zpool_ptr == NULL) + return (1); + zpool_label = *zpool_ptr; + if (nvlist_unpack(buf, buflen, &config, 0) != 0) + goto zfserr; + if (nvlist_lookup_string(config, "name", &zpool_name) != 0) + goto zfserr; + strlcpy(label, zpool_name, labelsize); + nvlist_free(config); + free(zpool_ptr); + return (0); + +zfserr: + nvlist_free(config); + free(zpool_ptr); + + return (1); +} From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 05:42:26 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 744C7E5A; Fri, 19 Jun 2015 05:42:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4A538C5A; Fri, 19 Jun 2015 05:42:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5J5gQKx007775; Fri, 19 Jun 2015 05:42:26 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5J5gPeY007771; Fri, 19 Jun 2015 05:42:25 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506190542.t5J5gPeY007771@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 19 Jun 2015 05:42:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284590 - in head/sys/boot: . common i386/loader X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 05:42:26 -0000 Author: bapt Date: Fri Jun 19 05:42:24 2015 New Revision: 284590 URL: https://svnweb.freebsd.org/changeset/base/284590 Log: Install loader(8) and zfsloader(8) only once Differential Revision: https://reviews.freebsd.org/D2841 Reviewed by: imp Added: head/sys/boot/common/Makefile (contents, props changed) Modified: head/sys/boot/Makefile head/sys/boot/common/Makefile.inc head/sys/boot/i386/loader/Makefile Modified: head/sys/boot/Makefile ============================================================================== --- head/sys/boot/Makefile Fri Jun 19 05:09:02 2015 (r284589) +++ head/sys/boot/Makefile Fri Jun 19 05:42:24 2015 (r284590) @@ -8,6 +8,8 @@ SUBDIR+= ficl SUBDIR+= forth .endif +SUBDIR+= common + .include # Pick the machine-dependent subdir based on the target architecture. Added: head/sys/boot/common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/common/Makefile Fri Jun 19 05:42:24 2015 (r284590) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +MAN+= loader.8 +.if ${MK_ZFS} != "no" +MAN+= zfsloader.8 +.endif + +.include Modified: head/sys/boot/common/Makefile.inc ============================================================================== --- head/sys/boot/common/Makefile.inc Fri Jun 19 05:09:02 2015 (r284589) +++ head/sys/boot/common/Makefile.inc Fri Jun 19 05:42:24 2015 (r284590) @@ -68,8 +68,3 @@ CFLAGS+= -DBOOT_PROMPT_123 SRCS+= install.c CFLAGS+=-I${.CURDIR}/../../../../lib/libstand .endif - -MAN+= loader.8 -.if ${MK_ZFS} != "no" -MAN+= zfsloader.8 -.endif Modified: head/sys/boot/i386/loader/Makefile ============================================================================== --- head/sys/boot/i386/loader/Makefile Fri Jun 19 05:09:02 2015 (r284589) +++ head/sys/boot/i386/loader/Makefile Fri Jun 19 05:42:24 2015 (r284590) @@ -5,6 +5,7 @@ MK_SSP= no LOADER?= loader PROG= ${LOADER}.sym +MAN= INTERNALPROG= NEWVERSWHAT?= "bootstrap loader" x86 From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 06:41:54 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 134AE9B4; Fri, 19 Jun 2015 06:41:54 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 01065BCB; Fri, 19 Jun 2015 06:41:54 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5J6froM036755; Fri, 19 Jun 2015 06:41:53 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5J6frMA036754; Fri, 19 Jun 2015 06:41:53 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201506190641.t5J6frMA036754@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Fri, 19 Jun 2015 06:41:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284591 - head/sys/cddl/contrib/opensolaris/uts/common/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 06:41:54 -0000 Author: avg Date: Fri Jun 19 06:41:53 2015 New Revision: 284591 URL: https://svnweb.freebsd.org/changeset/base/284591 Log: illums compat: use flsl/flsll for highbit/highbit64 Do that only when when fast inline versions are available. At the moment that can be the case only in the kernel and not for all platforms. The original code uses the binary search and that's kept as a fallback. This is a micro optimization. Differential Revision: https://reviews.freebsd.org/D2839 Reviewed by: delphij, mahrens, mav MFC after: 17 days Modified: head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h Modified: head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h Fri Jun 19 05:42:24 2015 (r284590) +++ head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h Fri Jun 19 06:41:53 2015 (r284591) @@ -32,6 +32,9 @@ #include #include +#if defined(__FreeBSD__) && defined(_KERNEL) +#include +#endif #ifdef __cplusplus extern "C" { @@ -382,6 +385,9 @@ extern unsigned char bcd_to_byte[256]; static __inline int highbit(ulong_t i) { +#if defined(__FreeBSD__) && defined(_KERNEL) && defined(HAVE_INLINE_FLSL) + return (flsl(i)); +#else register int h = 1; if (i == 0) @@ -407,6 +413,7 @@ highbit(ulong_t i) h += 1; } return (h); +#endif } /* @@ -416,6 +423,9 @@ highbit(ulong_t i) static __inline int highbit64(uint64_t i) { +#if defined(__FreeBSD__) && defined(_KERNEL) && defined(HAVE_INLINE_FLSLL) + return (flsll(i)); +#else int h = 1; if (i == 0) @@ -439,6 +449,7 @@ highbit64(uint64_t i) h += 1; } return (h); +#endif } #ifdef __cplusplus From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 06:48:56 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D92F2DEF; Fri, 19 Jun 2015 06:48:56 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AEE67C32; Fri, 19 Jun 2015 06:48:56 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5J6muKc038209; Fri, 19 Jun 2015 06:48:56 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5J6mtpY038205; Fri, 19 Jun 2015 06:48:55 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201506190648.t5J6mtpY038205@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 19 Jun 2015 06:48:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284592 - in head/sys: conf modules/usb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 06:48:57 -0000 Author: hselasky Date: Fri Jun 19 06:48:55 2015 New Revision: 284592 URL: https://svnweb.freebsd.org/changeset/base/284592 Log: Add USB gold driver to default kernel build. Modified: head/sys/conf/NOTES head/sys/conf/files head/sys/modules/usb/Makefile Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Fri Jun 19 06:41:53 2015 (r284591) +++ head/sys/conf/NOTES Fri Jun 19 06:48:55 2015 (r284592) @@ -2645,6 +2645,8 @@ device usb device udbp # USB Fm Radio device ufm +# USB temperature meter +device ugold # USB LED device uled # Human Interface Device (anything with buttons and dials) Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Fri Jun 19 06:41:53 2015 (r284591) +++ head/sys/conf/files Fri Jun 19 06:48:55 2015 (r284592) @@ -2545,6 +2545,7 @@ dev/usb/serial/usb_serial.c optional uc # dev/usb/misc/ufm.c optional ufm dev/usb/misc/udbp.c optional udbp +dev/usb/misc/ugold.c optional ugold dev/usb/misc/uled.c optional uled # # USB input drivers Modified: head/sys/modules/usb/Makefile ============================================================================== --- head/sys/modules/usb/Makefile Fri Jun 19 06:41:53 2015 (r284591) +++ head/sys/modules/usb/Makefile Fri Jun 19 06:48:55 2015 (r284592) @@ -53,7 +53,7 @@ SUBDIR += ${_dwc_otg} ehci ${_musb} ohci ${_atmegadci} ${_avr32dci} ${_rsu} ${_rsufw} ${_saf1761otg} SUBDIR += ${_rum} ${_run} ${_runfw} ${_uath} upgt usie ural ${_zyd} ${_urtw} SUBDIR += ${_urtwn} ${_urtwnfw} -SUBDIR += atp uhid ukbd ums udbp ufm uep wsp uled +SUBDIR += atp uhid ukbd ums udbp ufm uep wsp ugold uled SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ umct umcs umodem umoscom uplcom uslcom uvisor uvscom SUBDIR += udl From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 06:58:07 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8787CFED; Fri, 19 Jun 2015 06:58:07 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 68E51E44; Fri, 19 Jun 2015 06:58:07 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5J6w7C4042916; Fri, 19 Jun 2015 06:58:07 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5J6w6L0042911; Fri, 19 Jun 2015 06:58:06 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201506190658.t5J6w6L0042911@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Fri, 19 Jun 2015 06:58:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284593 - in head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 06:58:07 -0000 Author: avg Date: Fri Jun 19 06:58:05 2015 New Revision: 284593 URL: https://svnweb.freebsd.org/changeset/base/284593 Log: MFV r284412: 5911 ZFS "hangs" while deleting file Reviewed by: Bayard Bell Reviewed by: Alek Pinchuk Reviewed by: Simon Klinkert Reviewed by: Dan McDonald Approved by: Richard Lowe Author: Matthew Ahrens illumos/illumos-gate@46e1baa6cf6d5432f5fd231bb588df8f9570c858 https://www.illumos.org/issues/5911 Sometimes ZFS appears to hang while deleting a file. It is actually making slow progress at the file deletion, but other operations (administrative and writes via the data path) "hang" until the file removal completes, which can take a long time if the file has many blocks. The deletion (or most of it) happens in a single txg, and the sync thread spends most of its time reading indirect blocks via this stack trace: swtch+0x141() cv_wait+0x70() zio_wait+0x5b() dbuf_read+0x2c0() free_children+0x50() free_children+0x12a() free_children+0x12a() free_children+0x12a() dnode_sync_free_range_impl+0xdf() dnode_sync_free_range+0x52() range_tree_vacate+0x65() dnode_sync+0x1d8() dmu_objset_sync_dnodes+0x77() dmu_objset_sync+0x19f() dsl_dataset_sync+0x51() dsl_pool_sync+0x9a() spa_sync+0x2ff() txg_sync_thread+0x21f() thread_start+8() One way to reproduce the problem is if we are over the arc_meta_limit, e.g. because lots of indirect blocks are pinned because we have L0 dbufs under them. It could be that most of the L1 indirects are cached, in which case when dmu_free_long_range_impl() calls dmu_tx_hold_free(), it will complete very quickly. This allows dmu_free_long_range_impl() to put many (perhaps all of its) transactions in the same TXG. However, dmu_free_long_range_impl() calls dnode_evict_dbufs (and dnode_free_range()), which removes the L0 dbufs, thus reducing the hold count on the L1 indirect blocks above it, allowing them to be evicted. Because we are over the arc_meta_limit(), these L1 blocks will be evicted ASAP. Thus when we get to syncing context, the L1 indirects are no longer cached and must be read in. Obtained from: illumos MFC after: 15 days Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h Directory Properties: head/sys/cddl/contrib/opensolaris/ (props changed) Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c Fri Jun 19 06:48:55 2015 (r284592) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c Fri Jun 19 06:58:05 2015 (r284593) @@ -21,7 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2012, 2015 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. */ @@ -1298,6 +1298,16 @@ dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_ dbuf_dirty_record_t *dr, **drp; ASSERT(txg != 0); + + /* + * Due to our use of dn_nlevels below, this can only be called + * in open context, unless we are operating on the MOS. + * From syncing context, dn_nlevels may be different from the + * dn_nlevels used when dbuf was dirtied. + */ + ASSERT(db->db_objset == + dmu_objset_pool(db->db_objset)->dp_meta_objset || + txg != spa_syncing_txg(dmu_objset_spa(db->db_objset))); ASSERT(db->db_blkid != DMU_BONUS_BLKID); ASSERT0(db->db_level); ASSERT(MUTEX_HELD(&db->db_mtx)); @@ -1320,11 +1330,8 @@ dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_ ASSERT(db->db.db_size != 0); - /* - * Any space we accounted for in dp_dirty_* will be cleaned up by - * dsl_pool_sync(). This is relatively rare so the discrepancy - * is not a big deal. - */ + dsl_pool_undirty_space(dmu_objset_pool(dn->dn_objset), + dr->dr_accounted, txg); *drp = dr->dr_next; @@ -1339,7 +1346,7 @@ dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_ list_remove(&dr->dr_parent->dt.di.dr_children, dr); mutex_exit(&dr->dr_parent->dt.di.dr_mtx); } else if (db->db_blkid == DMU_SPILL_BLKID || - db->db_level+1 == dn->dn_nlevels) { + db->db_level + 1 == dn->dn_nlevels) { ASSERT(db->db_blkptr == NULL || db->db_parent == dn->dn_dbuf); mutex_enter(&dn->dn_mtx); list_remove(&dn->dn_dirty_records[txg & TXG_MASK], dr); @@ -1356,11 +1363,6 @@ dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_ VERIFY(arc_buf_remove_ref(dr->dt.dl.dr_data, db)); } - if (db->db_level != 0) { - mutex_destroy(&dr->dt.di.dr_mtx); - list_destroy(&dr->dt.di.dr_children); - } - kmem_free(dr, sizeof (dbuf_dirty_record_t)); ASSERT(db->db_dirtycnt > 0); @@ -2318,7 +2320,7 @@ dbuf_sync_indirect(dbuf_dirty_record_t * zio = dr->dr_zio; mutex_enter(&dr->dt.di.dr_mtx); - dbuf_sync_list(&dr->dt.di.dr_children, tx); + dbuf_sync_list(&dr->dt.di.dr_children, db->db_level - 1, tx); ASSERT(list_head(&dr->dt.di.dr_children) == NULL); mutex_exit(&dr->dt.di.dr_mtx); zio_nowait(zio); @@ -2464,7 +2466,7 @@ dbuf_sync_leaf(dbuf_dirty_record_t *dr, } void -dbuf_sync_list(list_t *list, dmu_tx_t *tx) +dbuf_sync_list(list_t *list, int level, dmu_tx_t *tx) { dbuf_dirty_record_t *dr; @@ -2481,6 +2483,10 @@ dbuf_sync_list(list_t *list, dmu_tx_t *t DMU_META_DNODE_OBJECT); break; } + if (dr->dr_dbuf->db_blkid != DMU_BONUS_BLKID && + dr->dr_dbuf->db_blkid != DMU_SPILL_BLKID) { + VERIFY3U(dr->dr_dbuf->db_level, ==, level); + } list_remove(list, dr); if (dr->dr_dbuf->db_level > 0) dbuf_sync_indirect(dr, tx); Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Fri Jun 19 06:48:55 2015 (r284592) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Fri Jun 19 06:58:05 2015 (r284593) @@ -21,7 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2012, 2015 by Delphix. All rights reserved. */ #include @@ -686,7 +686,7 @@ dmu_tx_hold_free(dmu_tx_t *tx, uint64_t uint64_t ibyte = i << shift; err = dnode_next_offset(dn, 0, &ibyte, 2, 1, 0); i = ibyte >> shift; - if (err == ESRCH) + if (err == ESRCH || i > end) break; if (err) { tx->tx_err = err; Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c Fri Jun 19 06:48:55 2015 (r284592) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c Fri Jun 19 06:58:05 2015 (r284593) @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2012, 2015 by Delphix. All rights reserved. */ #include @@ -1492,6 +1492,16 @@ out: rw_downgrade(&dn->dn_struct_rwlock); } +static void +dnode_dirty_l1(dnode_t *dn, uint64_t l1blkid, dmu_tx_t *tx) +{ + dmu_buf_impl_t *db = dbuf_hold_level(dn, 1, l1blkid, FTAG); + if (db != NULL) { + dmu_buf_will_dirty(&db->db, tx); + dbuf_rele(db, FTAG); + } +} + void dnode_free_range(dnode_t *dn, uint64_t off, uint64_t len, dmu_tx_t *tx) { @@ -1612,27 +1622,67 @@ dnode_free_range(dnode_t *dn, uint64_t o nblks += 1; /* - * Dirty the first and last indirect blocks, as they (and/or their - * parents) will need to be written out if they were only - * partially freed. Interior indirect blocks will be themselves freed, - * by free_children(), so they need not be dirtied. Note that these - * interior blocks have already been prefetched by dmu_tx_hold_free(). + * Dirty all the indirect blocks in this range. Note that only + * the first and last indirect blocks can actually be written + * (if they were partially freed) -- they must be dirtied, even if + * they do not exist on disk yet. The interior blocks will + * be freed by free_children(), so they will not actually be written. + * Even though these interior blocks will not be written, we + * dirty them for two reasons: + * + * - It ensures that the indirect blocks remain in memory until + * syncing context. (They have already been prefetched by + * dmu_tx_hold_free(), so we don't have to worry about reading + * them serially here.) + * + * - The dirty space accounting will put pressure on the txg sync + * mechanism to begin syncing, and to delay transactions if there + * is a large amount of freeing. Even though these indirect + * blocks will not be written, we could need to write the same + * amount of space if we copy the freed BPs into deadlists. */ if (dn->dn_nlevels > 1) { uint64_t first, last; first = blkid >> epbs; - if (db = dbuf_hold_level(dn, 1, first, FTAG)) { - dmu_buf_will_dirty(&db->db, tx); - dbuf_rele(db, FTAG); - } + dnode_dirty_l1(dn, first, tx); if (trunc) last = dn->dn_maxblkid >> epbs; else last = (blkid + nblks - 1) >> epbs; - if (last > first && (db = dbuf_hold_level(dn, 1, last, FTAG))) { - dmu_buf_will_dirty(&db->db, tx); - dbuf_rele(db, FTAG); + if (last != first) + dnode_dirty_l1(dn, last, tx); + + int shift = dn->dn_datablkshift + dn->dn_indblkshift - + SPA_BLKPTRSHIFT; + for (uint64_t i = first + 1; i < last; i++) { + /* + * Set i to the blockid of the next non-hole + * level-1 indirect block at or after i. Note + * that dnode_next_offset() operates in terms of + * level-0-equivalent bytes. + */ + uint64_t ibyte = i << shift; + int err = dnode_next_offset(dn, DNODE_FIND_HAVELOCK, + &ibyte, 2, 1, 0); + i = ibyte >> shift; + if (i >= last) + break; + + /* + * Normally we should not see an error, either + * from dnode_next_offset() or dbuf_hold_level() + * (except for ESRCH from dnode_next_offset). + * If there is an i/o error, then when we read + * this block in syncing context, it will use + * ZIO_FLAG_MUSTSUCCEED, and thus hang/panic according + * to the "failmode" property. dnode_next_offset() + * doesn't have a flag to indicate MUSTSUCCEED. + */ + if (err != 0) + break; + + dnode_dirty_l1(dn, i, tx); } } Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c Fri Jun 19 06:48:55 2015 (r284592) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c Fri Jun 19 06:58:05 2015 (r284593) @@ -21,7 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2012, 2015 by Delphix. All rights reserved. */ #include @@ -712,7 +712,7 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx) mutex_exit(&dn->dn_mtx); } - dbuf_sync_list(list, tx); + dbuf_sync_list(list, dn->dn_phys->dn_nlevels - 1, tx); if (!DMU_OBJECT_IS_SPECIAL(dn->dn_object)) { ASSERT3P(list_head(list), ==, NULL); Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h Fri Jun 19 06:48:55 2015 (r284592) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h Fri Jun 19 06:58:05 2015 (r284593) @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2012, 2015 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. */ @@ -287,7 +287,7 @@ void dbuf_evict(dmu_buf_impl_t *db); void dbuf_setdirty(dmu_buf_impl_t *db, dmu_tx_t *tx); void dbuf_unoverride(dbuf_dirty_record_t *dr); -void dbuf_sync_list(list_t *list, dmu_tx_t *tx); +void dbuf_sync_list(list_t *list, int level, dmu_tx_t *tx); void dbuf_release_bp(dmu_buf_impl_t *db); void dbuf_free_range(struct dnode *dn, uint64_t start, uint64_t end, From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 07:25:16 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C8B21757; Fri, 19 Jun 2015 07:25:16 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6FD77B9; Fri, 19 Jun 2015 07:25:16 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5J7PGLc056984; Fri, 19 Jun 2015 07:25:16 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5J7PG24056983; Fri, 19 Jun 2015 07:25:16 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201506190725.t5J7PG24056983@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 19 Jun 2015 07:25:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284594 - head/sys/fs/tmpfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 07:25:16 -0000 Author: kib Date: Fri Jun 19 07:25:15 2015 New Revision: 284594 URL: https://svnweb.freebsd.org/changeset/base/284594 Log: Restore the td_cookie value for the tmpfs directory entry which was a dup entry, upon detach from the parent directory. If the node is renamed, the entry is re-attached at the different directory, and invalud cookie value triggers assert (or corrupts directory rb tree, it seems). Reported by: clusteradm (gjb, antoine) Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/fs/tmpfs/tmpfs_subr.c Modified: head/sys/fs/tmpfs/tmpfs_subr.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_subr.c Fri Jun 19 06:58:05 2015 (r284593) +++ head/sys/fs/tmpfs/tmpfs_subr.c Fri Jun 19 07:25:15 2015 (r284594) @@ -1031,6 +1031,7 @@ tmpfs_dir_detach(struct vnode *vp, struc tmpfs_free_dirent(tmp, xde); } } + de->td_cookie = de->td_hash; } else RB_REMOVE(tmpfs_dir, head, de); From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 09:37:38 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 67D68E6A; Fri, 19 Jun 2015 09:37:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5621EA56; Fri, 19 Jun 2015 09:37:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5J9bcDN020197; Fri, 19 Jun 2015 09:37:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5J9bcwU020196; Fri, 19 Jun 2015 09:37:38 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201506190937.t5J9bcwU020196@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 19 Jun 2015 09:37:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284595 - head/etc/devd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 09:37:38 -0000 Author: hselasky Date: Fri Jun 19 09:37:37 2015 New Revision: 284595 URL: https://svnweb.freebsd.org/changeset/base/284595 Log: Regenerate usb.conf . MFC after: 1 week Modified: head/etc/devd/usb.conf Modified: head/etc/devd/usb.conf ============================================================================== --- head/etc/devd/usb.conf Fri Jun 19 07:25:15 2015 (r284594) +++ head/etc/devd/usb.conf Fri Jun 19 09:37:37 2015 (r284595) @@ -145,7 +145,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0403"; - match "product" "(0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xa6d1|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed74|0xee1 8|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0xeeee|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8)"; + match "product" "(0x5259|0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xa6d1|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed7 4|0xee18|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0xeeee|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8)"; action "kldload -n uftdi"; }; @@ -281,7 +281,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0411"; - match "product" "(0x0148|0x0150|0x015d|0x016f|0x01a2|0x01ee)"; + match "product" "(0x0148|0x0150|0x015d|0x016f|0x01a2|0x01a8|0x01ee)"; action "kldload -n if_run"; }; @@ -1193,7 +1193,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x05c6"; - match "product" "(0x1000|0x6000|0x6500|0x6613|0x9000|0x9204|0x9205)"; + match "product" "(0x1000|0x6000|0x6500|0x6613|0x9000|0x9002|0x9204|0x9205)"; action "kldload -n u3g"; }; @@ -2561,7 +2561,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0bda"; - match "product" "(0x8176|0x8176|0x8177|0x8178|0x8179|0x817a|0x817b|0x817c|0x817d|0x817e|0x817f)"; + match "product" "(0x8176|0x8177|0x8178|0x8179|0x817a|0x817b|0x817c|0x817d|0x817e|0x817f)"; action "kldload -n if_urtwn"; }; @@ -2577,7 +2577,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0bda"; - match "product" "0x818a"; + match "product" "(0x818a|0x8191)"; action "kldload -n if_urtwn"; }; @@ -2680,6 +2680,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0c45"; + match "product" "0x7401"; + action "kldload -n ugold"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x0c52"; match "product" "(0x2101|0x2102|0x2103|0x2104|0x2211|0x2212|0x2213|0x2221|0x2222|0x2223|0x2411|0x2412|0x2413|0x2421|0x2422|0x2423|0x2431|0x2432|0x2433|0x2441|0x2442|0x2443|0x2811|0x2812|0x2813|0x2821|0x2822|0x2823|0x2831|0x2832|0x2833|0x2841|0x2842|0x2843|0x2851|0x2852|0x2853|0x2861|0x2862|0x2863|0x2871|0x2872|0x2873|0x2881|0x2882|0x2883|0x9020)"; action "kldload -n uftdi"; @@ -3521,7 +3529,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x1199"; - match "product" "(0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3)"; + match "product" "(0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3)"; action "kldload -n u3g"; }; @@ -4424,6 +4432,22 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x17e9"; + match "product" "(0x0059|0x0100|0x0117|0x0136|0x0138|0x0141|0x015a|0x0198|0x019b|0x01ba|0x01bb|0x01d4|0x01d7|0x01e2|0x0215|0x024c|0x02a9|0x0377|0x03e0|0x401a)"; + action "kldload -n udl"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x17ef"; + match "product" "0x304b"; + action "kldload -n if_axge"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x17ef"; match "product" "0x7203"; action "kldload -n if_axe"; @@ -4505,7 +4529,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x19d2"; - match "product" "(0x0001|0x0002|0x0003|0x0004|0x0005|0x0006|0x0007|0x0008|0x0009|0x000a|0x000b|0x000c|0x000d|0x000e|0x000f|0x0010|0x0011|0x0012|0x0013|0x0014|0x0015|0x0016|0x0017|0x0018|0x0019|0x0020|0x0021|0x0022|0x0023|0x0024|0x0025|0x0026|0x0027|0x0028|0x0029|0x0030|0x0031|0x0032|0x0033|0x0037|0x0039|0x0042|0x0043|0x0048|0x0049|0x0051|0x0052|0x0053|0x0054|0x0055|0x0057|0x0058|0x0059|0x0060|0x0061|0x0062|0x0063|0x0064|0x0066|0x0069|0x0070|0x0073|0x0076|0x0078|0x0082|0x0086|0x0117|0x1179|0x1181|0x1514|0x1516|0x2000|0x2002|0x2003|0xffdd|0xffde|0xfff1|0xfff5|0xfffe)"; + match "product" "(0x0001|0x0002|0x0003|0x0004|0x0005|0x0006|0x0007|0x0008|0x0009|0x000a|0x000b|0x000c|0x000d|0x000e|0x000f|0x0010|0x0011|0x0012|0x0013|0x0014|0x0015|0x0016|0x0017|0x0018|0x0019|0x0020|0x0021|0x0022|0x0023|0x0024|0x0025|0x0026|0x0027|0x0028|0x0029|0x0030|0x0031|0x0032|0x0033|0x0037|0x0039|0x0042|0x0043|0x0048|0x0049|0x0051|0x0052|0x0053|0x0054|0x0055|0x0057|0x0058|0x0059|0x0060|0x0061|0x0062|0x0063|0x0064|0x0066|0x0069|0x0070|0x0073|0x0076|0x0078|0x0082|0x0086|0x0117|0x1179|0x1181|0x1420|0x1514|0x1516|0x2000|0x2002|0x2003|0xffdd|0xffde|0xfff1|0xfff5|0xfffe)"; action "kldload -n u3g"; }; @@ -4785,7 +4809,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x2001"; - match "product" "(0x7e12|0xa805)"; + match "product" "(0x7d02|0x7e12|0xa707|0xa805)"; action "kldload -n u3g"; }; @@ -5393,7 +5417,7 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; - match "mode" "host"; + match "mode" "(host|device)"; match "intclass" "0x02"; match "intsubclass" "0x02"; match "intprotocol" "0x00"; @@ -5402,7 +5426,7 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; - match "mode" "host"; + match "mode" "(host|device)"; match "intclass" "0x02"; match "intsubclass" "0x02"; match "intprotocol" "0x01"; @@ -5552,5 +5576,5 @@ nomatch 32 { action "kldload -n umass"; }; -# 2658 USB entries processed +# 2687 USB entries processed From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 10:16:51 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B42EE535; Fri, 19 Jun 2015 10:16:51 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from theravensnest.org (theraven.freebsd.your.org [216.14.102.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cloud.theravensnest.org", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 7CDA8402; Fri, 19 Jun 2015 10:16:51 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from [192.168.0.7] (cpc16-cmbg15-2-0-cust60.5-4.cable.virginm.net [86.5.162.61]) (authenticated bits=0) by theravensnest.org (8.15.1/8.15.1) with ESMTPSA id t5JAGiYR066324 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 19 Jun 2015 10:16:49 GMT (envelope-from theraven@FreeBSD.org) X-Authentication-Warning: theravensnest.org: Host cpc16-cmbg15-2-0-cust60.5-4.cable.virginm.net [86.5.162.61] claimed to be [192.168.0.7] Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Subject: Re: svn commit: r268137 - head/sys/sys From: David Chisnall In-Reply-To: <201407020845.s628jRG5031824@svn.freebsd.org> Date: Fri, 19 Jun 2015 11:16:40 +0100 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> References: <201407020845.s628jRG5031824@svn.freebsd.org> To: Hans Petter Selasky X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 10:16:51 -0000 I only just caught this (having seen the fallout from NetBSD doing the = same thing in a shipping release and the pain that it=E2=80=99s caused): __weak is a reserved keyword in Objective-C, please pick another name = for this. This in cdefs.h makes it impossible to include any FreeBSD = standard headers in Objective-C programs (of which we have a couple of = hundred in ports) if they use any of the modern Objective-C language = modes. David > On 2 Jul 2014, at 09:45, Hans Petter Selasky = wrote: >=20 > Author: hselasky > Date: Wed Jul 2 08:45:26 2014 > New Revision: 268137 > URL: http://svnweb.freebsd.org/changeset/base/268137 >=20 > Log: > Define a "__weak" macro for declaring symbols "weak". >=20 > Modified: > head/sys/sys/cdefs.h >=20 > Modified: head/sys/sys/cdefs.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/sys/cdefs.h Wed Jul 2 05:45:40 2014 = (r268136) > +++ head/sys/sys/cdefs.h Wed Jul 2 08:45:26 2014 = (r268137) > @@ -210,7 +210,9 @@ > #define __packed > #define __aligned(x) > #define __section(x) > +#define __weak > #else > +#define __weak __attribute__((__weak__)) > #if !__GNUC_PREREQ__(2, 5) && !defined(__INTEL_COMPILER) > #define __dead2 > #define __pure2 >=20 From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 10:44:44 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0313CB6B; Fri, 19 Jun 2015 10:44:44 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (heidi.turbocat.net [88.198.202.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B924BCCE; Fri, 19 Jun 2015 10:44:43 +0000 (UTC) (envelope-from hps@selasky.org) Received: from laptop015.home.selasky.org (cm-176.74.213.204.customer.telag.net [176.74.213.204]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 5DC1D1FE023; Fri, 19 Jun 2015 12:44:35 +0200 (CEST) Message-ID: <5583F2C9.1030409@selasky.org> Date: Fri, 19 Jun 2015 12:45:29 +0200 From: Hans Petter Selasky User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: David Chisnall CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> In-Reply-To: <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 10:44:44 -0000 On 06/19/15 12:16, David Chisnall wrote: > I only just caught this (having seen the fallout from NetBSD doing the same thing in a shipping release and the pain that it’s caused): > > __weak is a reserved keyword in Objective-C, please pick another name for this. This in cdefs.h makes it impossible to include any FreeBSD standard headers in Objective-C programs (of which we have a couple of hundred in ports) if they use any of the modern Objective-C language modes. > > David Hi, Appearently this will be fixed in GNUSTEP base: http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/cdefs_elf.h?only_with_tag=MAIN Is this still an issue? --HPS From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 11:43:05 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ED6F6318; Fri, 19 Jun 2015 11:43:05 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from theravensnest.org (theraven.freebsd.your.org [216.14.102.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cloud.theravensnest.org", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id B5B1DCF9; Fri, 19 Jun 2015 11:43:04 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from [172.21.60.147] (global-1-84.nat.csx.cam.ac.uk [131.111.184.84]) (authenticated bits=0) by theravensnest.org (8.15.1/8.15.1) with ESMTPSA id t5JBh25a066707 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 19 Jun 2015 11:43:03 GMT (envelope-from theraven@FreeBSD.org) X-Authentication-Warning: theravensnest.org: Host global-1-84.nat.csx.cam.ac.uk [131.111.184.84] claimed to be [172.21.60.147] Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Subject: Re: svn commit: r268137 - head/sys/sys From: David Chisnall In-Reply-To: <5583F2C9.1030409@selasky.org> Date: Fri, 19 Jun 2015 12:42:58 +0100 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <1EB851FC-CA78-4A7B-BE5D-4F050C61A14C@FreeBSD.org> References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <5583F2C9.1030409@selasky.org> To: Hans Petter Selasky X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 11:43:06 -0000 On 19 Jun 2015, at 11:45, Hans Petter Selasky wrote: >=20 > Appearently this will be fixed in GNUSTEP base: >=20 > = http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/cdefs_elf.h?only_with_tag=3D= MAIN >=20 > Is this still an issue? It is impossible to fix it in GNUstep Base, because we can=E2=80=99t = guarantee that user code doesn=E2=80=99t include system headers after = including GNUstep headers (not to mention the fact that GNUstep is not = the only Objective-C standard library implementation out there). If the = user does, for example: #import #include void example() { __weak id foo =3D bar(); baz(foo); } Then they will get a compile error no matter what GNUstep=E2=80=99s = Foundation.h does. It can=E2=80=99t prevent cdefs.h from redefining = __weak to be something different. I=E2=80=99ve just looked at the GNUstep base changelog since that NetBSD = commit and there are no relevant changes, so I=E2=80=99ve no idea what = the NetBSD people are thinking there. David From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 11:57:04 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 380706D7; Fri, 19 Jun 2015 11:57:04 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (mail.turbocat.net [IPv6:2a01:4f8:d16:4514::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EE3C0F56; Fri, 19 Jun 2015 11:57:03 +0000 (UTC) (envelope-from hps@selasky.org) Received: from laptop015.home.selasky.org (cm-176.74.213.204.customer.telag.net [176.74.213.204]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 192BE1FE023; Fri, 19 Jun 2015 13:57:02 +0200 (CEST) Message-ID: <558403C4.4040500@selasky.org> Date: Fri, 19 Jun 2015 13:57:56 +0200 From: Hans Petter Selasky User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: David Chisnall CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <5583F2C9.1030409@selasky.org> <1EB851FC-CA78-4A7B-BE5D-4F050C61A14C@FreeBSD.org> In-Reply-To: <1EB851FC-CA78-4A7B-BE5D-4F050C61A14C@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 11:57:04 -0000 On 06/19/15 13:42, David Chisnall wrote: > On 19 Jun 2015, at 11:45, Hans Petter Selasky wrote: >> >> Appearently this will be fixed in GNUSTEP base: >> >> http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/cdefs_elf.h?only_with_tag=MAIN >> >> Is this still an issue? > > It is impossible to fix it in GNUstep Base, because we can’t guarantee that user code doesn’t include system headers after including GNUstep headers (not to mention the fact that GNUstep is not the only Objective-C standard library implementation out there). If the user does, for example: > > #import > #include > > void example() > { > __weak id foo = bar(); > baz(foo); > } > Hi, > Then they will get a compile error no matter what GNUstep’s Foundation.h does. It can’t prevent cdefs.h from redefining __weak to be something different. > Except "#undef __weak" > I’ve just looked at the GNUstep base changelog since that NetBSD commit and there are no relevant changes, so I’ve no idea what the NetBSD people are thinking there. > I think we should have a common cross-BSD solution for the proper definition of __weak, so that user-space applications which use it follow along. Is there a procedure for that? Possibly we should do an exp-run after changing this to ensure that we don't break more than we fix. I'll ask some GNUstep people I know about this. --HPS From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 12:48:23 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 44ADE2D8; Fri, 19 Jun 2015 12:48:23 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 32C45DEC; Fri, 19 Jun 2015 12:48:23 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JCmNVM011842; Fri, 19 Jun 2015 12:48:23 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JCmNml011841; Fri, 19 Jun 2015 12:48:23 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201506191248.t5JCmNml011841@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Fri, 19 Jun 2015 12:48:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284596 - head/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 12:48:23 -0000 Author: tuexen Date: Fri Jun 19 12:48:22 2015 New Revision: 284596 URL: https://svnweb.freebsd.org/changeset/base/284596 Log: When setting the primary address, return an error whenever it fails. MFC after: 3 days Modified: head/sys/netinet/sctp_usrreq.c Modified: head/sys/netinet/sctp_usrreq.c ============================================================================== --- head/sys/netinet/sctp_usrreq.c Fri Jun 19 09:37:37 2015 (r284595) +++ head/sys/netinet/sctp_usrreq.c Fri Jun 19 12:48:22 2015 (r284596) @@ -5678,16 +5678,23 @@ sctp_setopt(struct socket *so, int optna } if ((stcb != NULL) && (net != NULL)) { - if ((net != stcb->asoc.primary_destination) && - (!(net->dest_state & SCTP_ADDR_UNCONFIRMED))) { - /* Ok we need to set it */ - if (sctp_set_primary_addr(stcb, (struct sockaddr *)NULL, net) == 0) { - if ((stcb->asoc.alternate) && - (!(net->dest_state & SCTP_ADDR_PF)) && - (net->dest_state & SCTP_ADDR_REACHABLE)) { - sctp_free_remote_addr(stcb->asoc.alternate); - stcb->asoc.alternate = NULL; + if (net != stcb->asoc.primary_destination) { + if (!(net->dest_state & SCTP_ADDR_UNCONFIRMED)) { + /* Ok we need to set it */ + if (sctp_set_primary_addr(stcb, (struct sockaddr *)NULL, net) == 0) { + if ((stcb->asoc.alternate) && + (!(net->dest_state & SCTP_ADDR_PF)) && + (net->dest_state & SCTP_ADDR_REACHABLE)) { + sctp_free_remote_addr(stcb->asoc.alternate); + stcb->asoc.alternate = NULL; + } + } else { + SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL); + error = EINVAL; } + } else { + SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL); + error = EINVAL; } } } else { From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 12:54:23 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2AD34499; Fri, 19 Jun 2015 12:54:23 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from theravensnest.org (theraven.freebsd.your.org [216.14.102.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cloud.theravensnest.org", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id CC9CE8F; Fri, 19 Jun 2015 12:54:22 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from [172.21.60.147] (global-1-84.nat.csx.cam.ac.uk [131.111.184.84]) (authenticated bits=0) by theravensnest.org (8.15.1/8.15.1) with ESMTPSA id t5JCsJTT067007 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 19 Jun 2015 12:54:21 GMT (envelope-from theraven@FreeBSD.org) X-Authentication-Warning: theravensnest.org: Host global-1-84.nat.csx.cam.ac.uk [131.111.184.84] claimed to be [172.21.60.147] Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Subject: Re: svn commit: r268137 - head/sys/sys From: David Chisnall In-Reply-To: <558403C4.4040500@selasky.org> Date: Fri, 19 Jun 2015 13:54:15 +0100 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <5583F2C9.1030409@selasky.org> <1EB851FC-CA78-4A7B-BE5D-4F050C61A14C@FreeBSD.org> <558403C4.4040500@selasky.org> To: Hans Petter Selasky X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 12:54:23 -0000 On 19 Jun 2015, at 12:57, Hans Petter Selasky wrote: >=20 > Hi, >=20 >> Then they will get a compile error no matter what GNUstep=E2=80=99s = Foundation.h does. It can=E2=80=99t prevent cdefs.h from redefining = __weak to be something different. >>=20 >=20 > Except "#undef __weak=E2=80=9D Please read the example that I wrote. This will *not* be fixed by = #undef __weak. In particular, the __weak keyword is implemented in = Clang as a pre-defined macro, so after *any* inclusion of any C standard = library header, every program that uses zeroing weak references needs to = redefine __weak to whatever (implementation-defined and subject to = change thing) that the compiler defines it to. >> I=E2=80=99ve just looked at the GNUstep base changelog since that = NetBSD commit and there are no relevant changes, so I=E2=80=99ve no idea = what the NetBSD people are thinking there. >>=20 >=20 > I think we should have a common cross-BSD solution for the proper = definition of __weak, so that user-space applications which use it = follow along. Portable code should not rely on anything in cdefs.h. > Is there a procedure for that? Possibly we should do an exp-run after = changing this to ensure that we don't break more than we fix. I=E2=80=99m not sure what we have any code in ports yet that uses ARC or = GC in Objective-C, but I definitely know of people building out-of-ports = programs on FreeBSD whose code you have just broken (including myself, = though I do Objective-C stuff on 10, so haven=E2=80=99t yet encountered = the breakage). > I'll ask some GNUstep people I know about this. Taking off my FreeBSD Core Team hat and putting on my GNUstep libobjc = maintainer hat: Please fix this and do not define C-family language = keywords or compiler reserved words to be incompatible things in = cdefs.h. David From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 13:40:45 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9DDDF21A; Fri, 19 Jun 2015 13:40:45 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (mail.turbocat.net [IPv6:2a01:4f8:d16:4514::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5DEC3CE8; Fri, 19 Jun 2015 13:40:45 +0000 (UTC) (envelope-from hps@selasky.org) Received: from laptop015.home.selasky.org (cm-176.74.213.204.customer.telag.net [176.74.213.204]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 59C7B1FE023; Fri, 19 Jun 2015 15:40:13 +0200 (CEST) Message-ID: <55841BF3.8010205@selasky.org> Date: Fri, 19 Jun 2015 15:41:07 +0200 From: Hans Petter Selasky User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: David Chisnall CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <5583F2C9.1030409@selasky.org> <1EB851FC-CA78-4A7B-BE5D-4F050C61A14C@FreeBSD.org> <558403C4.4040500@selasky.org> In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 13:40:45 -0000 On 06/19/15 14:54, David Chisnall wrote: > I definitely know of people building out-of-ports programs on FreeBSD whose code you have just broken (including myself, > though I do Objective-C stuff on 10, so haven’t yet encountered the breakage). Hi David, r268137 has been in 11-current for a long time (11 months) and was MFC'ed to 10-stable not long ago. Multiple systems are defining __weak for C and C++ : Linux: > include/linux/compiler-gcc.h: #define __weak __attribute__((weak)) NetBSD: > sys/cdefs_elf.h #define __weak __attribute__((__weak__)) FreeBSD: > sys/cdefs.h #define __weak __attribute__((__weak__)) __weak is *the* way currently to say __attribute__((__weak__)) in C and C++ cross multiple systems. Are you sure you want to change that? I understand that including "sys/cdefs.h" breaks objective C-code in the kernel, but we don't have any such code, do we? In userspace, why is objective C-code including "sys/cdefs.h"? Is this perhaps a mistake in another header file which indirectly includes "sys/cdefs.h" when it shouldn't? > Portable code should not rely on anything in cdefs.h. Right - can you explain why it is ending up in your ObjC code? And you are certain this is the change causing your build breakage? https://svnweb.freebsd.org/base?view=revision&revision=283326 Hope you bear with me, I just don't want to rush a fix. --HPS From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 14:20:24 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 14A49997; Fri, 19 Jun 2015 14:20:24 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA70590F; Fri, 19 Jun 2015 14:20:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JEKNhm056559; Fri, 19 Jun 2015 14:20:23 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JEKMeO056549; Fri, 19 Jun 2015 14:20:22 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506191420.t5JEKMeO056549@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 19 Jun 2015 14:20:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284597 - in head/sys/boot: mips/beri/loader pc98/loader powerpc/kboot powerpc/ofw powerpc/ps3 sparc64/loader X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 14:20:24 -0000 Author: bapt Date: Fri Jun 19 14:20:21 2015 New Revision: 284597 URL: https://svnweb.freebsd.org/changeset/base/284597 Log: Fix fallouts from r284590 Reported by: kib Modified: head/sys/boot/mips/beri/loader/Makefile head/sys/boot/pc98/loader/Makefile head/sys/boot/powerpc/kboot/Makefile head/sys/boot/powerpc/ofw/Makefile head/sys/boot/powerpc/ps3/Makefile head/sys/boot/sparc64/loader/Makefile Modified: head/sys/boot/mips/beri/loader/Makefile ============================================================================== --- head/sys/boot/mips/beri/loader/Makefile Fri Jun 19 12:48:22 2015 (r284596) +++ head/sys/boot/mips/beri/loader/Makefile Fri Jun 19 14:20:21 2015 (r284597) @@ -31,6 +31,7 @@ .include MK_SSP= no +MAN= PROG?= loader NEWVERSWHAT= "BERI loader" ${MACHINE_CPUARCH} Modified: head/sys/boot/pc98/loader/Makefile ============================================================================== --- head/sys/boot/pc98/loader/Makefile Fri Jun 19 12:48:22 2015 (r284596) +++ head/sys/boot/pc98/loader/Makefile Fri Jun 19 14:20:21 2015 (r284597) @@ -2,6 +2,7 @@ .include MK_SSP= no +MAN= LOADER?= loader PROG= ${LOADER}.sym Modified: head/sys/boot/powerpc/kboot/Makefile ============================================================================== --- head/sys/boot/powerpc/kboot/Makefile Fri Jun 19 12:48:22 2015 (r284596) +++ head/sys/boot/powerpc/kboot/Makefile Fri Jun 19 14:20:21 2015 (r284597) @@ -2,6 +2,7 @@ .include MK_SSP= no +MAN= PROG= loader.kboot NEWVERSWHAT= "kboot loader" ${MACHINE_ARCH} Modified: head/sys/boot/powerpc/ofw/Makefile ============================================================================== --- head/sys/boot/powerpc/ofw/Makefile Fri Jun 19 12:48:22 2015 (r284596) +++ head/sys/boot/powerpc/ofw/Makefile Fri Jun 19 14:20:21 2015 (r284597) @@ -2,6 +2,7 @@ .include MK_SSP= no +MAN= PROG= loader NEWVERSWHAT= "Open Firmware loader" ${MACHINE_ARCH} Modified: head/sys/boot/powerpc/ps3/Makefile ============================================================================== --- head/sys/boot/powerpc/ps3/Makefile Fri Jun 19 12:48:22 2015 (r284596) +++ head/sys/boot/powerpc/ps3/Makefile Fri Jun 19 14:20:21 2015 (r284597) @@ -2,6 +2,7 @@ .include MK_SSP= no +MAN= PROG= loader.ps3 NEWVERSWHAT= "Playstation 3 loader" ${MACHINE_ARCH} Modified: head/sys/boot/sparc64/loader/Makefile ============================================================================== --- head/sys/boot/sparc64/loader/Makefile Fri Jun 19 12:48:22 2015 (r284596) +++ head/sys/boot/sparc64/loader/Makefile Fri Jun 19 14:20:21 2015 (r284597) @@ -2,6 +2,7 @@ .include MK_SSP= no +MAN= PROG?= loader NEWVERSWHAT?= "bootstrap loader" sparc64 From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 14:22:54 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DD641CBE; Fri, 19 Jun 2015 14:22:53 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from theravensnest.org (theraven.freebsd.your.org [216.14.102.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cloud.theravensnest.org", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 9C776ADF; Fri, 19 Jun 2015 14:22:53 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from c124.sec.cl.cam.ac.uk (c124.sec.cl.cam.ac.uk [128.232.18.124]) (authenticated bits=0) by theravensnest.org (8.15.1/8.15.1) with ESMTPSA id t5JEMo4t067462 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 19 Jun 2015 14:22:51 GMT (envelope-from theraven@FreeBSD.org) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Subject: Re: svn commit: r268137 - head/sys/sys From: David Chisnall In-Reply-To: <55841BF3.8010205@selasky.org> Date: Fri, 19 Jun 2015 15:22:49 +0100 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <74BE6DD6-1C0F-4E59-8913-CFCE7DD744CB@FreeBSD.org> References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <5583F2C9.1030409@selasky.org> <1EB851FC-CA78-4A7B-BE5D-4F050C61A14C@FreeBSD.org> <558403C4.4040500@selasky.org> <55841BF3.8010205@selasky.org> To: Hans Petter Selasky X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 14:22:54 -0000 On 19 Jun 2015, at 14:41, Hans Petter Selasky wrote: >=20 > On 06/19/15 14:54, David Chisnall wrote: >> I definitely know of people building out-of-ports programs on FreeBSD = whose code you have just broken (including myself, > > though I do Objective-C stuff on 10, so haven=E2=80=99t yet = encountered the breakage). >=20 > Hi David, >=20 > r268137 has been in 11-current for a long time (11 months) and was = MFC'ed to 10-stable not long ago.=20 We have not yet done a release from 10 with this breakage, so I=E2=80=99ve= not yet seen it in the wild. Most people doing Objective-C development = do not develop on FreeBSD -HEAD. The majority develop on OS X and port = to FreeBSD releases. I am anxious to get this fixed before the next = 10.x release is out so that we are not shipping something that is going = to force people wanting to ship Objective-C code to have to have = FreeBSD-specific work-arounds for the next few years. > I understand that including "sys/cdefs.h" breaks objective C-code in = the kernel, but we don't have any such code, do we? You fundamentally misunderstand what cdefs.h is. It is not a kernel = header, it is the header that provides all of the definitions required = for all system headers. All libc headers expect cdefs.h to be included = (either directly or indirectly) before anything else in the file. > Multiple systems are defining __weak for C and C++ : >=20 > Linux: >> include/linux/compiler-gcc.h: > #define __weak __attribute__((weak)) >=20 > NetBSD: > > sys/cdefs_elf.h > #define __weak __attribute__((__weak__)) >=20 > FreeBSD: > > sys/cdefs.h > #define __weak __attribute__((__weak__)) NetBSD is the only system that I=E2=80=99m aware of that has actually = shipped this, and it broke a lot of things. Spot the odd one out: $ cat tmp.m #include __weak id x; # FreeBSD 10.1: $ cc -E tmp.m -fobjc-arc | tail -1 __attribute__((objc_ownership(weak))) id x; # Linux $ clang -E tmp.m -fobjc-runtime=3Dgnustep-1.7 -fobjc-arc | tail -1 __attribute__((objc_ownership(weak))) id x; # FreeBSD Head: $ cc -E tmp.m -fobjc-arc | tail -1 __attribute__((__weak__)) id x; The worst thing about this is that you have broken it so that it = silently does the wrong thing, rather than raising a warning with the = default warnings enabled. >> Portable code should not rely on anything in cdefs.h. >=20 > Right - can you explain why it is ending up in your ObjC code? Because it=E2=80=99s in cdefs.h, which is included by *every single = userspace C header*. cdefs.h must work with all C-family languages. David From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 14:28:37 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 31A68120; Fri, 19 Jun 2015 14:28:37 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (heidi.turbocat.net [88.198.202.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E34E4B2F; Fri, 19 Jun 2015 14:28:36 +0000 (UTC) (envelope-from hps@selasky.org) Received: from laptop015.home.selasky.org (cm-176.74.213.204.customer.telag.net [176.74.213.204]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id A81D81FE023; Fri, 19 Jun 2015 16:28:32 +0200 (CEST) Message-ID: <55842746.5040105@selasky.org> Date: Fri, 19 Jun 2015 16:29:26 +0200 From: Hans Petter Selasky User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: David Chisnall CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <5583F2C9.1030409@selasky.org> <1EB851FC-CA78-4A7B-BE5D-4F050C61A14C@FreeBSD.org> <558403C4.4040500@selasky.org> <55841BF3.8010205@selasky.org> <74BE6DD6-1C0F-4E59-8913-CFCE7DD744CB@FreeBSD.org> In-Reply-To: <74BE6DD6-1C0F-4E59-8913-CFCE7DD744CB@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 14:28:37 -0000 On 06/19/15 16:22, David Chisnall wrote: >> >Right - can you explain why it is ending up in your ObjC code? > Because it’s in cdefs.h, which is included by*every single userspace C header*. cdefs.h must work with all C-family languages. > > David > Hi David, My buildworld and buildkernel has just successfully completed. I'll rename the define and its clients in -current shortly. Will be MFC'ed to 10-stable in 1 weeks time, so that any errors out there in ports will show up. Is this fine by you? Instead of __weak it will be __weak_symbol . Googled a bit about __weak_symbol and it seems to be free. --HPS From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 14:32:44 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C6E8E2BB; Fri, 19 Jun 2015 14:32:44 +0000 (UTC) (envelope-from araujobsdport@gmail.com) Received: from mail-ob0-x22b.google.com (mail-ob0-x22b.google.com [IPv6:2607:f8b0:4003:c01::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 85DFFD30; Fri, 19 Jun 2015 14:32:44 +0000 (UTC) (envelope-from araujobsdport@gmail.com) Received: by obbsn1 with SMTP id sn1so75407599obb.1; Fri, 19 Jun 2015 07:32:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=Vs1J8jCFX2CABblzPn7LJ6M+IZd/X8x80Nx5/YgTllU=; b=R4gWTl2uDKj/xSriRwLL2h5cIxyc/97pyR5eAzgvnBEp1eg370Q9bVpcHfPHPuSkbf CAUXBOymlrHYcqUZ81g1iacklj/ujmN4IpxpMsGPSoSB171BstR9yDColkiNwmS/33NI hMY9n4IOFFtVo/UPwZsggDy9qgOlGaHvXDc86iNwGxI5Gfls37ch/sNSh1A5BXMZtqyj fk4FAG92Fg/HOvaBaSjigRa/GeMeyKT+HTF3+Liuox/t8QM3zCRcemLb15/VM0v2r4au VwqN2RvOjr/Dm9LvCuIjmsoGdH01rMrS2S14oV3r56JyZpI4LkVW5YONA+xmvm+Rfdfe 6QwQ== MIME-Version: 1.0 X-Received: by 10.182.68.45 with SMTP id s13mr13625361obt.11.1434724363884; Fri, 19 Jun 2015 07:32:43 -0700 (PDT) Received: by 10.202.11.193 with HTTP; Fri, 19 Jun 2015 07:32:43 -0700 (PDT) Reply-To: araujo@FreeBSD.org In-Reply-To: <55842746.5040105@selasky.org> References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <5583F2C9.1030409@selasky.org> <1EB851FC-CA78-4A7B-BE5D-4F050C61A14C@FreeBSD.org> <558403C4.4040500@selasky.org> <55841BF3.8010205@selasky.org> <74BE6DD6-1C0F-4E59-8913-CFCE7DD744CB@FreeBSD.org> <55842746.5040105@selasky.org> Date: Fri, 19 Jun 2015 22:32:43 +0800 Message-ID: Subject: Re: svn commit: r268137 - head/sys/sys From: Marcelo Araujo To: Hans Petter Selasky Cc: David Chisnall , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 14:32:44 -0000 2015-06-19 22:29 GMT+08:00 Hans Petter Selasky : > On 06/19/15 16:22, David Chisnall wrote: > >> >Right - can you explain why it is ending up in your ObjC code? >>> >> Because it=E2=80=99s in cdefs.h, which is included by*every single users= pace C >> header*. cdefs.h must work with all C-family languages. >> >> David >> >> > Hi David, > > My buildworld and buildkernel has just successfully completed. I'll renam= e > the define and its clients in -current shortly. Will be MFC'ed to 10-stab= le > in 1 weeks time, so that any errors out there in ports will show up. Is > this fine by you? > > Instead of __weak it will be __weak_symbol . Googled a bit about > __weak_symbol and it seems to be free. > > Hi, Maybe would be a good idea run an 'exp run' with this patch? Just to double check if any port will break, although after you rename, I don't believe it will conflict anymore, however an 'exp run' would show you it. Best Regards, --=20 --=20 Marcelo Araujo (__)araujo@FreeBSD.org \\\'',)http://www.FreeBSD.org \/ \ ^ Power To Server. .\. /_) From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 14:36:10 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CEE77426; Fri, 19 Jun 2015 14:36:10 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from theravensnest.org (theraven.freebsd.your.org [216.14.102.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cloud.theravensnest.org", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 93FB7D4A; Fri, 19 Jun 2015 14:36:10 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from c124.sec.cl.cam.ac.uk (c124.sec.cl.cam.ac.uk [128.232.18.124]) (authenticated bits=0) by theravensnest.org (8.15.1/8.15.1) with ESMTPSA id t5JEa7os067535 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 19 Jun 2015 14:36:08 GMT (envelope-from theraven@FreeBSD.org) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Subject: Re: svn commit: r268137 - head/sys/sys From: David Chisnall In-Reply-To: Date: Fri, 19 Jun 2015 15:36:07 +0100 Cc: Hans Petter Selasky , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <89A0CAC4-60D3-4E4F-B23E-EC16DDE0460D@FreeBSD.org> References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <5583F2C9.1030409@selasky.org> <1EB851FC-CA78-4A7B-BE5D-4F050C61A14C@FreeBSD.org> <558403C4.4040500@selasky.org> <55841BF3.8010205@selasky.org> <74BE6DD6-1C0F-4E59-8913-CFCE7DD744CB@FreeBSD.org> <55842746.5040105@selasky.org> To: araujo@FreeBSD.org X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 14:36:10 -0000 On 19 Jun 2015, at 15:32, Marcelo Araujo = wrote: >=20 > Maybe would be a good idea run an 'exp run' with this patch? Just to = double check if any port will break, although after you rename, I don't = believe it will conflict anymore, however an 'exp run' would show you = it. It=E2=80=99s probably worth doing, though unfortunately the failure mode = for the previous breakage was to silently generate the wrong code in = some cases and so may not have shown up in an exp run. David From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 14:39:25 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E8A0F79B; Fri, 19 Jun 2015 14:39:25 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (heidi.turbocat.net [88.198.202.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A30CED82; Fri, 19 Jun 2015 14:39:25 +0000 (UTC) (envelope-from hps@selasky.org) Received: from laptop015.home.selasky.org (cm-176.74.213.204.customer.telag.net [176.74.213.204]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 00EC01FE023; Fri, 19 Jun 2015 16:39:22 +0200 (CEST) Message-ID: <558429D0.1000808@selasky.org> Date: Fri, 19 Jun 2015 16:40:16 +0200 From: Hans Petter Selasky User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: araujo@FreeBSD.org CC: David Chisnall , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" Subject: Re: svn commit: r268137 - head/sys/sys References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <5583F2C9.1030409@selasky.org> <1EB851FC-CA78-4A7B-BE5D-4F050C61A14C@FreeBSD.org> <558403C4.4040500@selasky.org> <55841BF3.8010205@selasky.org> <74BE6DD6-1C0F-4E59-8913-CFCE7DD744CB@FreeBSD.org> <55842746.5040105@selasky.org> In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 14:39:26 -0000 On 06/19/15 16:32, Marcelo Araujo wrote: > 2015-06-19 22:29 GMT+08:00 Hans Petter Selasky : > >> On 06/19/15 16:22, David Chisnall wrote: >> >>>> Right - can you explain why it is ending up in your ObjC code? >>>> >>> Because it’s in cdefs.h, which is included by*every single userspace C >>> header*. cdefs.h must work with all C-family languages. >>> >>> David >>> >>> >> Hi David, >> >> My buildworld and buildkernel has just successfully completed. I'll rename >> the define and its clients in -current shortly. Will be MFC'ed to 10-stable >> in 1 weeks time, so that any errors out there in ports will show up. Is >> this fine by you? >> >> Instead of __weak it will be __weak_symbol . Googled a bit about >> __weak_symbol and it seems to be free. >> >> > Hi, > > Maybe would be a good idea run an 'exp run' with this patch? Just to double > check if any port will break, although after you rename, I don't believe it > will conflict anymore, however an 'exp run' would show you it. > > > Best Regards, > Hi, Here is a PR and a patch. Let's move the discussion over there if any further issues: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=200972 --HPS From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 14:56:26 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99778B0E; Fri, 19 Jun 2015 14:56:26 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7AD112E0; Fri, 19 Jun 2015 14:56:26 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JEuQmK074341; Fri, 19 Jun 2015 14:56:26 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JEuPDU074336; Fri, 19 Jun 2015 14:56:25 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506191456.t5JEuPDU074336@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Fri, 19 Jun 2015 14:56:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284598 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 14:56:26 -0000 Author: sjg Date: Fri Jun 19 14:56:24 2015 New Revision: 284598 URL: https://svnweb.freebsd.org/changeset/base/284598 Log: Move include of make.conf back to its old position. This means moving include of local.sys.mk and src.sys.mk too. Introduce new includes to take the early slot, for the purpose of being able to influence toolchains and the like. Differential Revision: D2860 Reviewed by: imp Added: head/share/mk/local.sys.env.mk - copied, changed from r284432, head/share/mk/local.sys.mk head/share/mk/src.sys.env.mk - copied, changed from r284432, head/share/mk/src.sys.mk Modified: head/share/mk/local.sys.mk head/share/mk/src.sys.mk head/share/mk/sys.mk Copied and modified: head/share/mk/local.sys.env.mk (from r284432, head/share/mk/local.sys.mk) ============================================================================== --- head/share/mk/local.sys.mk Mon Jun 15 21:20:52 2015 (r284432, copy source) +++ head/share/mk/local.sys.env.mk Fri Jun 19 14:56:24 2015 (r284598) @@ -1,5 +1,7 @@ # $FreeBSD$ +# This makefile is for customizations that should be done early + .if !defined(_TARGETS) # some things we do only once _TARGETS:= ${.TARGETS} @@ -29,28 +31,6 @@ M_whence = ${M_type}:M/*:[1] # convert a path to a valid shell variable M_P2V = tu:C,[./-],_,g -.if ${MK_META_MODE} == "yes" -MAKE_PRINT_VAR_ON_ERROR+= \ - .CURDIR \ - .MAKE \ - .OBJDIR \ - .TARGETS \ - DESTDIR \ - LD_LIBRARY_PATH \ - MACHINE \ - MACHINE_ARCH \ - MAKEOBJDIRPREFIX \ - MAKESYSPATH \ - MAKE_VERSION\ - SRCTOP \ - OBJTOP \ - ${MAKE_PRINT_VAR_ON_ERROR_XTRAS} - -.if ${.MAKE.LEVEL} > 0 -MAKE_PRINT_VAR_ON_ERROR += .MAKE.MAKEFILES .PATH -.endif -.endif - # these are handy # we can use this for a cheap timestamp at the start of a target's script, # but not at the end - since make will expand both at the same time. @@ -60,4 +40,4 @@ TIME_STAMP = ${TIME_STAMP_FMT:localtime} TIME_STAMP_DATE = `date '+${TIME_STAMP_FMT}'` TIME_STAMP_END?= ${TIME_STAMP_DATE} -.include "src.sys.mk" +.include "src.sys.env.mk" Modified: head/share/mk/local.sys.mk ============================================================================== --- head/share/mk/local.sys.mk Fri Jun 19 14:20:21 2015 (r284597) +++ head/share/mk/local.sys.mk Fri Jun 19 14:56:24 2015 (r284598) @@ -1,34 +1,5 @@ # $FreeBSD$ -.if !defined(_TARGETS) -# some things we do only once -_TARGETS:= ${.TARGETS} -.export _TARGETS -.endif - -# some handy macros -_this = ${.PARSEDIR:tA}/${.PARSEFILE} -# some useful modifiers - -# A useful trick for testing multiple :M's against something -# :L says to use the variable's name as its value - ie. literal -# got = ${clean* destroy:${M_ListToMatch:S,V,.TARGETS,}} -M_ListToMatch = L:@m@$${V:M$$m}@ -# match against our initial targets (see above) -M_L_TARGETS = ${M_ListToMatch:S,V,_TARGETS,} - -# turn a list into a set of :N modifiers -# NskipFoo = ${Foo:${M_ListToSkip}} -M_ListToSkip= O:u:ts::S,:,:N,g:S,^,N, - -# type should be a builtin in any sh since about 1980, -# AUTOCONF := ${autoconf:L:${M_whence}} -M_type = @x@(type $$x 2> /dev/null); echo;@:sh:[0]:N* found*:[@]:C,[()],,g -M_whence = ${M_type}:M/*:[1] - -# convert a path to a valid shell variable -M_P2V = tu:C,[./-],_,g - .if ${MK_META_MODE} == "yes" MAKE_PRINT_VAR_ON_ERROR+= \ .CURDIR \ @@ -51,13 +22,4 @@ MAKE_PRINT_VAR_ON_ERROR += .MAKE.MAKEFIL .endif .endif -# these are handy -# we can use this for a cheap timestamp at the start of a target's script, -# but not at the end - since make will expand both at the same time. -TIME_STAMP_FMT = @ %s [%Y-%m-%d %T] -TIME_STAMP = ${TIME_STAMP_FMT:localtime} -# this will produce the same output but as of when date(1) is run. -TIME_STAMP_DATE = `date '+${TIME_STAMP_FMT}'` -TIME_STAMP_END?= ${TIME_STAMP_DATE} - .include "src.sys.mk" Copied and modified: head/share/mk/src.sys.env.mk (from r284432, head/share/mk/src.sys.mk) ============================================================================== --- head/share/mk/src.sys.mk Mon Jun 15 21:20:52 2015 (r284432, copy source) +++ head/share/mk/src.sys.env.mk Fri Jun 19 14:56:24 2015 (r284598) @@ -1,19 +1,17 @@ # $FreeBSD$ -# Note: This file is also duplicated in the sys/conf/kern.pre.mk so -# it will always grab SRCCONF, even if it isn't being built in-tree -# to preserve historical (and useful) behavior. Changes here need to -# be reflected there so SRCCONF isn't included multiple times. +# early setup only see also src.sys.mk # make sure this is defined in a consistent manner SRCTOP:= ${.PARSEDIR:tA:H:H} -# Allow user to configure things that only effect src tree builds. -SRCCONF?= /etc/src.conf -.if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && !target(_srcconf_included_) -.sinclude "${SRCCONF}" -_srcconf_included_: .NOTMAIN +# site customizations that do not depend on anything! +SRC_ENV_CONF?= /etc/src-env.conf +.if !empty(SRC_ENV_CONF) && !target(_src_env_conf_included_) +.-include "${SRC_ENV_CONF}" +_src_env_conf_included_: .NOTMAIN .endif + # If we were found via .../share/mk we need to replace that # with ${.PARSEDIR:tA} so that we can be found by # sub-makes launched from objdir. @@ -24,5 +22,3 @@ _srcconf_included_: .NOTMAIN MAKESYSPATH:= ${MAKESYSPATH:S,.../share/mk,${.PARSEDIR:tA},} .export MAKESYSPATH .endif -# tempting, but bsd.compiler.mk causes problems this early -#.include "src.opts.mk" Modified: head/share/mk/src.sys.mk ============================================================================== --- head/share/mk/src.sys.mk Fri Jun 19 14:20:21 2015 (r284597) +++ head/share/mk/src.sys.mk Fri Jun 19 14:56:24 2015 (r284598) @@ -5,24 +5,13 @@ # to preserve historical (and useful) behavior. Changes here need to # be reflected there so SRCCONF isn't included multiple times. -# make sure this is defined in a consistent manner -SRCTOP:= ${.PARSEDIR:tA:H:H} - # Allow user to configure things that only effect src tree builds. SRCCONF?= /etc/src.conf .if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && !target(_srcconf_included_) .sinclude "${SRCCONF}" _srcconf_included_: .NOTMAIN .endif -# If we were found via .../share/mk we need to replace that -# with ${.PARSEDIR:tA} so that we can be found by -# sub-makes launched from objdir. -.if ${.MAKEFLAGS:M.../share/mk} != "" -.MAKEFLAGS:= ${.MAKEFLAGS:S,.../share/mk,${.PARSEDIR:tA},} -.endif -.if ${MAKESYSPATH:Uno:M*.../*} != "" -MAKESYSPATH:= ${MAKESYSPATH:S,.../share/mk,${.PARSEDIR:tA},} -.export MAKESYSPATH -.endif + # tempting, but bsd.compiler.mk causes problems this early +# probably need to remove dependence on bsd.own.mk #.include "src.opts.mk" Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Fri Jun 19 14:20:21 2015 (r284597) +++ head/share/mk/sys.mk Fri Jun 19 14:56:24 2015 (r284598) @@ -31,15 +31,9 @@ __DEFAULT_DEPENDENT_OPTIONS= \ .include -# Pull in global settings. -__MAKE_CONF?=/etc/make.conf -.if exists(${__MAKE_CONF}) -.include "${__MAKE_CONF}" -.endif - -# Set any local definitions first. Place this early, but it needs -# MACHINE_CPUARCH to be defined. -.-include +# early include for customization +# see local.sys.mk below +.-include .if ${MK_META_MODE} == "yes" .-include @@ -360,6 +354,14 @@ YFLAGS ?= -d rm -f ${.PREFIX}.tmp.c ${CTFCONVERT_CMD} +# Pull in global settings. +__MAKE_CONF?=/etc/make.conf +.if exists(${__MAKE_CONF}) +.include "${__MAKE_CONF}" +.endif + +# late include for customization +.-include .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) SHELL= ${__MAKE_SHELL} From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 15:02:45 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 48273EDE for ; Fri, 19 Jun 2015 15:02:45 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm27-vm1.bullet.mail.bf1.yahoo.com (nm27-vm1.bullet.mail.bf1.yahoo.com [98.139.213.148]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E445475D for ; Fri, 19 Jun 2015 15:02:44 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1434726157; bh=IxMjUjFMh9fFkL/8sDNquXx8zms5hl3sFX2wFv0bcRM=; h=Date:From:To:CC:Subject:References:In-Reply-To:From:Subject; b=E92iXXN8y9ZXrTa32HwBs63u3Kz/6cUdn/0rXqC5HKTbYuNLUtJ0opvT8OaP+69glUW/HzVs/DGyBXirolijVdhjdrSE16eJ73TNH8qoyLtJgR/+sCexK42c7JB5IfVSz5Aa2ZYEw2bMNREIw3bw1Nrg2qMfkXjHoZreFeaQe2lb12JIndzkcha3ckOqgBnhR0EQginySdN3tyhgSLi/1XtylyUyP3ccXaY7jAbHm16pNJ1msMcCWLdDhI5jrtqW4Q1TGZXcDhnaO836yvZS6yaQEAoW8lVZbDmT/YiSZO6N9vekKVO2wpKoBP8J+JCdksryqJE+ycyovwNw+zbSwg== Received: from [98.139.215.142] by nm27.bullet.mail.bf1.yahoo.com with NNFMP; 19 Jun 2015 15:02:37 -0000 Received: from [98.139.211.161] by tm13.bullet.mail.bf1.yahoo.com with NNFMP; 19 Jun 2015 15:02:37 -0000 Received: from [127.0.0.1] by smtp218.mail.bf1.yahoo.com with NNFMP; 19 Jun 2015 15:02:37 -0000 X-Yahoo-Newman-Id: 113467.43692.bm@smtp218.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 47M3DksVM1nCtsM1wozJnVC8wLJ2PShrakD6i9o1nZ_Iq.k MAHvi8G5utYVIZyCIIui6m8r5Bbgl9C0jxG916OtkFkTK0YLUKWHMoriljA8 WJw6LRPnYoD_5P19hQJPx9o2L00udCxTm2zt0NV.7HJ93f._XOR0DOPBA2sT B5VmQswFnubWG7kuzPIutndkpHcDTA0qEb9tBtI.LSnyKwFa3q7e1ftlc1G9 A2U8FIVgFcZFUrr6XekNDUm4BWIx2dyvAzHHDEczwjr6bN85Ok9oMm1DLWBH U2YaA4nySjHpjUDfgcajUni1_sOUZVXoggVH2f5K33.DgcUILf8kzH1R0kmM WWA58mJI_JOx_PiTWprazig4Rt3lJZTcmbt4oQ54H22RJLA1.Tsqnzdeihtc 6nI1QPer0FDkfe.JM75Xn_mZSmjLRTyCzrnav4mk_T1RvpEfV0vd6uTLst0t YtautX8mkTqx4o5bLnvzIb_R1rVpP_EUvXa56SncXwC20LOzzSWIVF5RWHDO V78Oz59qJUiUVglo81hldf5elyrJgS1E5 X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Message-ID: <55842F16.5040608@FreeBSD.org> Date: Fri, 19 Jun 2015 10:02:46 -0500 From: Pedro Giffuni Organization: FreeBSD Project User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: David Chisnall CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> In-Reply-To: <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 15:02:45 -0000 Hello; Closely related to this, we are redefining _Noreturn, which is a reserved keyword in C11. Not sure what effect that mess causes. Pedro. On 19/06/2015 05:16 a.m., David Chisnall wrote: > I only just caught this (having seen the fallout from NetBSD doing the same thing in a shipping release and the pain that it’s caused): > > __weak is a reserved keyword in Objective-C, please pick another name for this. This in cdefs.h makes it impossible to include any FreeBSD standard headers in Objective-C programs (of which we have a couple of hundred in ports) if they use any of the modern Objective-C language modes. > > David > >> On 2 Jul 2014, at 09:45, Hans Petter Selasky wrote: >> >> Author: hselasky >> Date: Wed Jul 2 08:45:26 2014 >> New Revision: 268137 >> URL: http://svnweb.freebsd.org/changeset/base/268137 >> >> Log: >> Define a "__weak" macro for declaring symbols "weak". >> >> Modified: >> head/sys/sys/cdefs.h >> >> Modified: head/sys/sys/cdefs.h >> ============================================================================== >> --- head/sys/sys/cdefs.h Wed Jul 2 05:45:40 2014 (r268136) >> +++ head/sys/sys/cdefs.h Wed Jul 2 08:45:26 2014 (r268137) >> @@ -210,7 +210,9 @@ >> #define __packed >> #define __aligned(x) >> #define __section(x) >> +#define __weak >> #else >> +#define __weak __attribute__((__weak__)) >> #if !__GNUC_PREREQ__(2, 5) && !defined(__INTEL_COMPILER) >> #define __dead2 >> #define __pure2 >> > From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 16:09:32 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 80E4BDD9; Fri, 19 Jun 2015 16:09:32 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (unknown [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3FD4D87A; Fri, 19 Jun 2015 16:09:32 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from [IPv6:2001:7b8:3a7::7477:15ef:f45d:3378] (unknown [IPv6:2001:7b8:3a7:0:7477:15ef:f45d:3378]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 5E81918A66; Fri, 19 Jun 2015 18:09:14 +0200 (CEST) Subject: Re: svn commit: r284546 - head/contrib/gcc Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_C50CDF0F-26F1-4D37-AD0D-4114D90A0AE6"; protocol="application/pgp-signature"; micalg=pgp-sha1 X-Pgp-Agent: GPGMail 2.5 From: Dimitry Andric In-Reply-To: <201506181340.t5IDe9Rk017924@svn.freebsd.org> Date: Fri, 19 Jun 2015 18:09:09 +0200 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <302BF0E2-37D9-47B4-AAF0-BDFF93280845@FreeBSD.org> References: <201506181340.t5IDe9Rk017924@svn.freebsd.org> To: Adrian Chadd X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 16:09:32 -0000 --Apple-Mail=_C50CDF0F-26F1-4D37-AD0D-4114D90A0AE6 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 18 Jun 2015, at 15:40, Adrian Chadd wrote: > > Author: adrian > Date: Thu Jun 18 13:40:08 2015 > New Revision: 284546 > URL: https://svnweb.freebsd.org/changeset/base/284546 > > Log: > Fix compilation of this macro under gcc-4.9 for MIPS32. > > Some point after gcc-4.2 the MIPS inline assembly restrictions changed - > =h (hi register) disappeared from the list of restrictions and can no > longer be used. Just for reference, this happened here (though the commit message is completely unreadable, as usual): https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=208414e > So, until someone requires an assembly version of this function, > just use a non-assembly version and let the compiler sort it out. This is also precisely what upstream gcc has done. :) -Dimitry --Apple-Mail=_C50CDF0F-26F1-4D37-AD0D-4114D90A0AE6 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.27 iEYEARECAAYFAlWEPqkACgkQsF6jCi4glqNNQwCfUY2Pmyb5L8AZf9XsJ+8UYs5o 92UAn38YuzR8T3pfygq8VEFWQwrEC167 =rQnV -----END PGP SIGNATURE----- --Apple-Mail=_C50CDF0F-26F1-4D37-AD0D-4114D90A0AE6-- From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 16:24:43 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 038B844B; Fri, 19 Jun 2015 16:24:43 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (unknown [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B6C54D11; Fri, 19 Jun 2015 16:24:42 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from [IPv6:2001:7b8:3a7::7477:15ef:f45d:3378] (unknown [IPv6:2001:7b8:3a7:0:7477:15ef:f45d:3378]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id A9A7C18A9D; Fri, 19 Jun 2015 18:24:39 +0200 (CEST) Subject: Re: svn commit: r268137 - head/sys/sys Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_7CDE3707-9B66-4E2F-AEF3-D6C1201C1118"; protocol="application/pgp-signature"; micalg=pgp-sha1 X-Pgp-Agent: GPGMail 2.5 From: Dimitry Andric In-Reply-To: <55842F16.5040608@FreeBSD.org> Date: Fri, 19 Jun 2015 18:24:28 +0200 Cc: David Chisnall , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> To: Pedro Giffuni X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 16:24:43 -0000 --Apple-Mail=_7CDE3707-9B66-4E2F-AEF3-D6C1201C1118 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 On 19 Jun 2015, at 17:02, Pedro Giffuni wrote: >=20 >> On 19/06/2015 05:16 a.m., David Chisnall wrote: >>> I only just caught this (having seen the fallout from NetBSD doing = the same thing in a shipping release and the pain that it=E2=80=99s = caused): >>>=20 >>> __weak is a reserved keyword in Objective-C, please pick another = name for this. This in cdefs.h makes it impossible to include any = FreeBSD standard headers in Objective-C programs (of which we have a = couple of hundred in ports) if they use any of the modern Objective-C = language modes. ... > Closely related to this, we are redefining _Noreturn, which is a = reserved keyword in C11. No, sys/cdefs.h has: 254 /* 255 * Keywords added in C11. 256 */ 257 258 #if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112L || = defined(lint) [...] 284 #if defined(__cplusplus) && __cplusplus >=3D 201103L 285 #define _Noreturn [[noreturn]] 286 #else 287 #define _Noreturn __dead2 288 #endif [...] 320 #endif /* __STDC_VERSION__ || __STDC_VERSION__ < 201112L */ So the whole block redefining all the _Xxx identifiers is skipped for C11 and higher. E.g.: $ cpp -std=3Dc99 #include _Noreturn void foo(void); ^D # 1 "" # 1 "" 1 # 1 "" 3 # 306 "" 3 # 1 "" 1 # 1 "" 2 # 1 "" 2 # 1 "/usr/include/sys/cdefs.h" 1 3 4 # 2 "" 2 __attribute__((__noreturn__)) void foo(void); $ cpp -std=3Dc11 #include _Noreturn void foo(void); ^D # 1 "" # 1 "" 1 # 1 "" 3 # 306 "" 3 # 1 "" 1 # 1 "" 2 # 1 "" 2 # 1 "/usr/include/sys/cdefs.h" 1 3 4 # 2 "" 2 _Noreturn void foo(void); -Dimitry --Apple-Mail=_7CDE3707-9B66-4E2F-AEF3-D6C1201C1118 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.27 iEYEARECAAYFAlWEQkcACgkQsF6jCi4glqOLEwCgm0iYzbR1RXTBj9C1aKoAwc7v /mQAn05toJtilS594omNeeYlgl+tfHH1 =Lgl0 -----END PGP SIGNATURE----- --Apple-Mail=_7CDE3707-9B66-4E2F-AEF3-D6C1201C1118-- From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 16:48:00 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9FE49FF for ; Fri, 19 Jun 2015 16:48:00 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm39-vm1.bullet.mail.bf1.yahoo.com (nm39-vm1.bullet.mail.bf1.yahoo.com [72.30.239.145]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B3F5286 for ; Fri, 19 Jun 2015 16:48:00 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1434732128; bh=v4NfqvvS9kOukn5vx5NtPG1n8RY8VD4I/LQzGOILXsE=; h=Date:From:To:CC:Subject:References:In-Reply-To:From:Subject; b=EbyqBTxijZ/cus1iuSSUpWj/XxxfCsUgCyrc8ngrYlla9saQdw7vhy+wTX0LVsQ13ddEnsV5QUbYajNlADwP/V7247986A1wCM7EZFwMw81r7+0To6HC6yqXcnltzJKsApGGNuvmciZ3SD0/PMMrYEwEhuKIxrDaZUqXAgjr81fL6gKhFEizwhNzBC+44H9s1e2hrJwRsKLNBG51YRl/CiAgZfXFG7YAuzbyVFw1fGbyGgs5hzNVvXmoV4ojgzeSVTdI9ehrvr4huWJ1PyqmIClrGHshjMX6MG3cTy9atELB+afIhRXoDgUn22tnzPQESoFFmKrqbMQk1zwgHVInDA== Received: from [98.139.170.179] by nm39.bullet.mail.bf1.yahoo.com with NNFMP; 19 Jun 2015 16:42:08 -0000 Received: from [98.139.211.207] by tm22.bullet.mail.bf1.yahoo.com with NNFMP; 19 Jun 2015 16:42:08 -0000 Received: from [127.0.0.1] by smtp216.mail.bf1.yahoo.com with NNFMP; 19 Jun 2015 16:42:08 -0000 X-Yahoo-Newman-Id: 423021.7687.bm@smtp216.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: zx_u4GAVM1lSjhyej1xBLa8S0Ltm0lGe2RUkUqazcyW0b6i RAEAB733pXty765RGlfKgZxU3pj18N6332or3gUidOEadYOWRW.uep8vQRZu jkYmrDrXGxmveAn9LxkTSZzX5RHTA38qMMApK.wn_xvt4BWd0b8CBU09._Mv jGcYl17un8wG75cfnGt983MqePUeiVPHZt2aC7Bam3zoMdM8OG7gaBJGTyju vG5iLiWLoClgWAkLe0MOON5aYk8gm9vWKSdLnidSTVm_YJf2uEBL.jBzqCpe nprgCMyO5lW13OQaEalF68HjH2GwKVY33BbYKr5Zi9GkH3nLIcmffx1VPDen 8gM3txJF1CTMRtoR7446.B4u6aC5iD150zVkkidAuOxX9WY4gfeuGxOOo4Z1 jmweIXlk.x8Jwmu9eD703JC1CYgcoiJDw_gjGkQtARFKLA7OY8ktnZkWH21d buv3z2K62N_kto9_Gp8VL2T0UVgJ_rIEQwdJf1KvQjCX1kg_wYUOwC78e1Yq hiWwB7DrDkZ3AhK.diUM7sPePXJ3bKQgl X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Message-ID: <55844668.60204@FreeBSD.org> Date: Fri, 19 Jun 2015 11:42:16 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Dimitry Andric CC: David Chisnall , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> In-Reply-To: Content-Type: multipart/mixed; boundary="------------090003010508000202020705" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 16:48:00 -0000 This is a multi-part message in MIME format. --------------090003010508000202020705 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit On 06/19/15 11:24, Dimitry Andric wrote: > On 19 Jun 2015, at 17:02, Pedro Giffuni wrote: >>> On 19/06/2015 05:16 a.m., David Chisnall wrote: >>>> I only just caught this (having seen the fallout from NetBSD doing the same thing in a shipping release and the pain that it’s caused): >>>> >>>> __weak is a reserved keyword in Objective-C, please pick another name for this. This in cdefs.h makes it impossible to include any FreeBSD standard headers in Objective-C programs (of which we have a couple of hundred in ports) if they use any of the modern Objective-C language modes. > ... >> Closely related to this, we are redefining _Noreturn, which is a reserved keyword in C11. > No, sys/cdefs.h has: > > 254 /* > 255 * Keywords added in C11. > 256 */ > 257 > 258 #if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112L || defined(lint) > [...] > 284 #if defined(__cplusplus) && __cplusplus >= 201103L > 285 #define _Noreturn [[noreturn]] > 286 #else > 287 #define _Noreturn __dead2 > 288 #endif > [...] > 320 #endif /* __STDC_VERSION__ || __STDC_VERSION__ < 201112L */ > > So the whole block redefining all the _Xxx identifiers is skipped for > C11 and higher. Oh yes, I had missed line 258 (and 320), sorry for the false alarm. FWIW, there is still a minor issue: older compilers aren't supposed to take __dead2 at the beginning. When i was discussing the attached patch, bde suggested we should resurrect __dead. Pedro. > E.g.: > > $ cpp -std=c99 > #include > _Noreturn void foo(void); > ^D > # 1 "" > # 1 "" 1 > # 1 "" 3 > # 306 "" 3 > # 1 "" 1 > # 1 "" 2 > # 1 "" 2 > # 1 "/usr/include/sys/cdefs.h" 1 3 4 > # 2 "" 2 > __attribute__((__noreturn__)) void foo(void); > > $ cpp -std=c11 > #include > _Noreturn void foo(void); > ^D > # 1 "" > # 1 "" 1 > # 1 "" 3 > # 306 "" 3 > # 1 "" 1 > # 1 "" 2 > # 1 "" 2 > # 1 "/usr/include/sys/cdefs.h" 1 3 4 > # 2 "" 2 > _Noreturn void foo(void); > > -Dimitry > --------------090003010508000202020705 Content-Type: text/x-patch; name="include_Noreturn.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="include_Noreturn.diff" Index: include/assert.h =================================================================== --- include/assert.h (revision 284138) +++ include/assert.h (working copy) @@ -72,7 +72,7 @@ #endif __BEGIN_DECLS -void __assert(const char *, const char *, int, const char *) __dead2; +_Noreturn void __assert(const char *, const char *, int, const char *); __END_DECLS #endif /* !_ASSERT_H_ */ Index: include/err.h =================================================================== --- include/err.h (revision 284138) +++ include/err.h (working copy) @@ -44,21 +44,20 @@ #include __BEGIN_DECLS -void err(int, const char *, ...) __dead2 __printf0like(2, 3); -void verr(int, const char *, __va_list) __dead2 __printf0like(2, 0); -void errc(int, int, const char *, ...) __dead2 __printf0like(3, 4); -void verrc(int, int, const char *, __va_list) __dead2 - __printf0like(3, 0); -void errx(int, const char *, ...) __dead2 __printf0like(2, 3); -void verrx(int, const char *, __va_list) __dead2 __printf0like(2, 0); -void warn(const char *, ...) __printf0like(1, 2); -void vwarn(const char *, __va_list) __printf0like(1, 0); -void warnc(int, const char *, ...) __printf0like(2, 3); -void vwarnc(int, const char *, __va_list) __printf0like(2, 0); -void warnx(const char *, ...) __printflike(1, 2); -void vwarnx(const char *, __va_list) __printflike(1, 0); -void err_set_file(void *); -void err_set_exit(void (*)(int)); +_Noreturn void err(int, const char *, ...) __printf0like(2, 3); +_Noreturn void verr(int, const char *, __va_list) __printf0like(2, 0); +_Noreturn void errc(int, int, const char *, ...) __printf0like(3, 4); +_Noreturn void verrc(int, int, const char *, __va_list) __printf0like(3, 0); +_Noreturn void errx(int, const char *, ...) __printf0like(2, 3); +_Noreturn void verrx(int, const char *, __va_list) __printf0like(2, 0); +void warn(const char *, ...) __printf0like(1, 2); +void vwarn(const char *, __va_list) __printf0like(1, 0); +void warnc(int, const char *, ...) __printf0like(2, 3); +void vwarnc(int, const char *, __va_list) __printf0like(2, 0); +void warnx(const char *, ...) __printflike(1, 2); +void vwarnx(const char *, __va_list) __printflike(1, 0); +void err_set_file(void *); +void err_set_exit(void (*)(int)); __END_DECLS #endif /* !_ERR_H_ */ Index: include/pthread.h =================================================================== --- include/pthread.h (revision 284138) +++ include/pthread.h (working copy) @@ -199,7 +199,7 @@ void *(*) (void *), void *); int pthread_detach(pthread_t); int pthread_equal(pthread_t, pthread_t); -void pthread_exit(void *) __dead2; +_Noreturn void pthread_exit(void *); void *pthread_getspecific(pthread_key_t); int pthread_getcpuclockid(pthread_t, clockid_t *); int pthread_join(pthread_t, void **); Index: include/setjmp.h =================================================================== --- include/setjmp.h (revision 284138) +++ include/setjmp.h (working copy) @@ -45,17 +45,17 @@ __BEGIN_DECLS #if __BSD_VISIBLE || __XSI_VISIBLE >= 600 -void _longjmp(jmp_buf, int) __dead2; -int _setjmp(jmp_buf) __returns_twice; +_Noreturn void _longjmp(jmp_buf, int); +int _setjmp(jmp_buf) __returns_twice; #endif -void longjmp(jmp_buf, int) __dead2; +_Noreturn void longjmp(jmp_buf, int); #if __BSD_VISIBLE -void longjmperror(void); +void longjmperror(void); #endif -int setjmp(jmp_buf) __returns_twice; +int setjmp(jmp_buf) __returns_twice; #if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE -void siglongjmp(sigjmp_buf, int) __dead2; -int sigsetjmp(sigjmp_buf, int) __returns_twice; +_Noreturn void siglongjmp(sigjmp_buf, int); +int sigsetjmp(sigjmp_buf, int) __returns_twice; #endif __END_DECLS Index: include/stdlib.h =================================================================== --- include/stdlib.h (revision 284138) +++ include/stdlib.h (working copy) @@ -249,7 +249,7 @@ void *alloca(size_t); #endif -void abort2(const char *, int, void **) __dead2; +_Noreturn void abort2(const char *, int, void **); __uint32_t arc4random(void); void arc4random_addrandom(unsigned char *, int); Index: include/unistd.h =================================================================== --- include/unistd.h (revision 284138) +++ include/unistd.h (working copy) @@ -318,7 +318,7 @@ __BEGIN_DECLS /* 1003.1-1990 */ -void _exit(int) __dead2; +_Noreturn void _exit(int); int access(const char *, int); unsigned int alarm(unsigned int); int chdir(const char *); --------------090003010508000202020705-- From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 17:00:37 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1EB20553; Fri, 19 Jun 2015 17:00:37 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0CA327D4; Fri, 19 Jun 2015 17:00:37 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JH0aZe035719; Fri, 19 Jun 2015 17:00:36 GMT (envelope-from sobomax@FreeBSD.org) Received: (from sobomax@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JH0a42035718; Fri, 19 Jun 2015 17:00:36 GMT (envelope-from sobomax@FreeBSD.org) Message-Id: <201506191700.t5JH0a42035718@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sobomax set sender to sobomax@FreeBSD.org using -f From: Maxim Sobolev Date: Fri, 19 Jun 2015 17:00:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284599 - head/sys/boot/uboot/lib X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 17:00:37 -0000 Author: sobomax Date: Fri Jun 19 17:00:36 2015 New Revision: 284599 URL: https://svnweb.freebsd.org/changeset/base/284599 Log: Fix bug in the ubldr introduced in the rev.283035. The new code fails to properly consider memory regions when the loader is located below of those regions or engulfs their lower limit. This results in "not enough RAM to load kernel" panic, which is totally bogus. On top of that, there are some variables that can be left unitialized in those cases, which might cause it fail with memory access violation instead of panic while trying to load kernel to a wrong or non-existing address of memory. Augment the code to properly deal with the loader being below or at the lower bound of the memory region in question. Also, don't leave ununitialized variables behind. Reviewed by: ian Modified: head/sys/boot/uboot/lib/copy.c Modified: head/sys/boot/uboot/lib/copy.c ============================================================================== --- head/sys/boot/uboot/lib/copy.c Fri Jun 19 14:56:24 2015 (r284598) +++ head/sys/boot/uboot/lib/copy.c Fri Jun 19 17:00:36 2015 (r284599) @@ -118,6 +118,13 @@ uboot_loadaddr(u_int type, void *data, u this_block = eubldr; this_size = eblock - eubldr; } + } else if (subldr < sblock && eubldr < eblock) { + /* Loader is below or engulfs the sblock */ + this_block = (eubldr < sblock) ? sblock : eubldr; + this_size = eblock - this_block; + } else { + this_block = 0; + this_size = 0; } if (biggest_size < this_size) { biggest_block = this_block; From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 17:19:21 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E5EBC9D; Fri, 19 Jun 2015 17:19:21 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5CAD6C15; Fri, 19 Jun 2015 17:19:21 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JHJLFW045456; Fri, 19 Jun 2015 17:19:21 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JHJLhV045455; Fri, 19 Jun 2015 17:19:21 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506191719.t5JHJLhV045455@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Fri, 19 Jun 2015 17:19:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284600 - head/sys/dev/filemon X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 17:19:21 -0000 Author: sjg Date: Fri Jun 19 17:19:20 2015 New Revision: 284600 URL: https://svnweb.freebsd.org/changeset/base/284600 Log: filemon_pid_check needs to hold proctree_lock Reviewed by: kib MFC after: few days Modified: head/sys/dev/filemon/filemon_wrapper.c Modified: head/sys/dev/filemon/filemon_wrapper.c ============================================================================== --- head/sys/dev/filemon/filemon_wrapper.c Fri Jun 19 17:00:36 2015 (r284599) +++ head/sys/dev/filemon/filemon_wrapper.c Fri Jun 19 17:19:20 2015 (r284600) @@ -28,6 +28,8 @@ #include __FBSDID("$FreeBSD$"); +#include + #include "opt_compat.h" #if __FreeBSD_version > 800032 @@ -84,13 +86,17 @@ filemon_pid_check(struct proc *p) { struct filemon *filemon; - while (p->p_pptr) { + sx_slock(&proctree_lock); + while (p != initproc) { TAILQ_FOREACH(filemon, &filemons_inuse, link) { - if (p->p_pid == filemon->pid) + if (p->p_pid == filemon->pid) { + sx_xunlock(&proctree_lock); return (filemon); + } } - p = p->p_pptr; + p = proc_realparent(p); } + sx_xunlock(&proctree_lock); return (NULL); } From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 17:23:20 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C577AF3A; Fri, 19 Jun 2015 17:23:20 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail109.syd.optusnet.com.au (mail109.syd.optusnet.com.au [211.29.132.80]) by mx1.freebsd.org (Postfix) with ESMTP id 6FD58E15; Fri, 19 Jun 2015 17:23:19 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au (c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197]) by mail109.syd.optusnet.com.au (Postfix) with ESMTPS id 5FDE7D65CC1; Sat, 20 Jun 2015 03:23:11 +1000 (AEST) Date: Sat, 20 Jun 2015 03:23:03 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Dimitry Andric cc: Pedro Giffuni , David Chisnall , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys In-Reply-To: Message-ID: <20150620023835.N2562@besplex.bde.org> References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> MIME-Version: 1.0 X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=eZjABOwH c=1 sm=1 tr=0 a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=PO7r1zJSAAAA:8 a=JzwRw_2MAAAA:8 a=nlC_4_pT8q9DhB4Ho9EA:9 a=cz2ZRIgtxKwA:10 a=wJWlkF7cXJYA:10 a=c3-DdYJoA5YA:10 a=6I5d2MoRAAAA:8 a=NodfLX1Nme-3sEpuAS0A:9 a=45ClL6m2LaAA:10 Content-Type: TEXT/PLAIN; charset=X-UNKNOWN; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 17:23:20 -0000 On Fri, 19 Jun 2015, Dimitry Andric wrote: > On 19 Jun 2015, at 17:02, Pedro Giffuni wrote: >> >>> On 19/06/2015 05:16 a.m., David Chisnall wrote: >>>> I only just caught this (having seen the fallout from NetBSD doing the= same thing in a shipping release and the pain that it=E2=80=99s caused): >>>> >>>> __weak is a reserved keyword in Objective-C, please pick another name = for this. This in cdefs.h makes it impossible to include any FreeBSD stand= ard headers in Objective-C programs (of which we have a couple of hundred i= n ports) if they use any of the modern Objective-C language modes. > ... >> Closely related to this, we are redefining _Noreturn, which is a reserve= d keyword in C11. > > No, sys/cdefs.h has: > > 254 /* > 255 * Keywords added in C11. > 256 */ > 257 > 258 #if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112L || de= fined(lint) > [...] > 284 #if defined(__cplusplus) && __cplusplus >=3D 201103L > 285 #define _Noreturn [[noreturn]] > 286 #else > 287 #define _Noreturn __dead2 > 288 #endif > [...] > 320 #endif /* __STDC_VERSION__ || __STDC_VERSION__ < 201112L */ > > So the whole block redefining all the _Xxx identifiers is skipped for > C11 and higher. I probably pointed this out incorrectly to Pedro. All uses of _Noreturn are still broken, and also ugly. __dead2 is the gcc-2 compatible version of the gcc-1 compatible macro __dead. It is syntactically different from __dead and _Noreturn. It must be placed after the function parameter list instead of in the function type declarator because old versions of gcc only accept attributes there. __dead and presumably _Noreturn must be placed in the function type declarator. This is incompatible, and also uglier. > E.g.: > > $ cpp -std=3Dc99 > #include > _Noreturn void foo(void); > ^D > # 1 "" > # 1 "" 1 > # 1 "" 3 > # 306 "" 3 > # 1 "" 1 > # 1 "" 2 > # 1 "" 2 > # 1 "/usr/include/sys/cdefs.h" 1 3 4 > # 2 "" 2 > __attribute__((__noreturn__)) void foo(void); Syntax error with older versions of gcc that cdefs.h is supposed to support= =2E Thee versions that don't support attributes in the declarator also don't support c99, so the order can be anything with them, but this doesn't simplify fixing the problem -- you still need massive ifdefs or ugly declarations. > $ cpp -std=3Dc11 > #include > _Noreturn void foo(void); > ^D > # 1 "" > # 1 "" 1 > # 1 "" 3 > # 306 "" 3 > # 1 "" 1 > # 1 "" 2 > # 1 "" 2 > # 1 "/usr/include/sys/cdefs.h" 1 3 4 > # 2 "" 2 > _Noreturn void foo(void); Correct version with ugly declarations: __dead void =09foo(void) __dead2; where: 1. __dead is the gcc-1 compatible macro restored to handle the different spelling in C11. Direct spellings should not be used, since they cause namespace bugs like the current ones for __weak. 2. __dead2 is the gcc-2 compatible macro. It also works for later gcc's and clang, perhaps even in C11. 3. __dead is defined as follows: a. for gcc-1, either leave it undefined (to keep its current behaviour of breaking any use of it), or define as its gcc-1 value again. b. for C11, define it as _Noreturn c. otherwise, define it as empty 4. __dead2 is defined the same as now. Hopefully it is just redundant of __dead is defined as _Noreturn for C11. 5. the style of the above is taken from 4.4BSD-Lite2, which still has __dea= d and still defines it as __volatile and still has almost no support for gcc-2. From Lite2 stdlib.h: __dead void =09 abort __P((void)); =2E... __dead void =09 exit __P((int)); Putting __dead first messes up the formatting by requiring an extra line to keep the function names lined up. When I cleaned this up in FreeBSD, the first stage was to add __dead2 while keeping __dead in 1994, the second stage was to remove __dead from everywhere in the source tree except cdefs.h in 1996, and the "final" stage was to remove the definition of __dead from cdefs.h in 1998. The current breakage shows that this was not even the final stage. Bruce From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 17:35:00 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B3A4293; Fri, 19 Jun 2015 17:35:00 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8981E113; Fri, 19 Jun 2015 17:35:00 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JHZ0xL054817; Fri, 19 Jun 2015 17:35:00 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JHZ0IF054816; Fri, 19 Jun 2015 17:35:00 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506191735.t5JHZ0IF054816@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Fri, 19 Jun 2015 17:35:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284601 - head/sys/dev/filemon X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 17:35:00 -0000 Author: sjg Date: Fri Jun 19 17:34:59 2015 New Revision: 284601 URL: https://svnweb.freebsd.org/changeset/base/284601 Log: sx_sunlock for sx_slock Modified: head/sys/dev/filemon/filemon_wrapper.c Modified: head/sys/dev/filemon/filemon_wrapper.c ============================================================================== --- head/sys/dev/filemon/filemon_wrapper.c Fri Jun 19 17:19:20 2015 (r284600) +++ head/sys/dev/filemon/filemon_wrapper.c Fri Jun 19 17:34:59 2015 (r284601) @@ -90,13 +90,13 @@ filemon_pid_check(struct proc *p) while (p != initproc) { TAILQ_FOREACH(filemon, &filemons_inuse, link) { if (p->p_pid == filemon->pid) { - sx_xunlock(&proctree_lock); + sx_sunlock(&proctree_lock); return (filemon); } } p = proc_realparent(p); } - sx_xunlock(&proctree_lock); + sx_sunlock(&proctree_lock); return (NULL); } From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 17:44:41 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 110145C2; Fri, 19 Jun 2015 17:44:41 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: from mail.soaustin.net (mail.soaustin.net [66.135.54.68]) by mx1.freebsd.org (Postfix) with ESMTP id E753437F; Fri, 19 Jun 2015 17:44:40 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: by mail.soaustin.net (Postfix, from userid 502) id 5001C561FD; Fri, 19 Jun 2015 12:44:34 -0500 (CDT) Date: Fri, 19 Jun 2015 12:44:34 -0500 From: Mark Linimon To: Gleb Smirnoff Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284529 - in head/sys: cddl/contrib/opensolaris/uts/common/fs/zfs fs/nfsclient vm Message-ID: <20150619174434.GB17459@lonesome.com> References: <201506172244.t5HMiShN079772@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201506172244.t5HMiShN079772@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 17:44:41 -0000 On Wed, Jun 17, 2015 at 10:44:28PM +0000, Gleb Smirnoff wrote: > Log: > o Un-inline vm_pager_get_pages(), vm_pager_get_pages_async(). > o Provide an extensive set of assertions for input array of pages. > o Remove now duplicate assertions from different pagers. Out of curiosity, what is the effect of these changes? mcl From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 18:57:37 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B4DF9183; Fri, 19 Jun 2015 18:57:37 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A34578BA; Fri, 19 Jun 2015 18:57:37 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JIvb9W094204; Fri, 19 Jun 2015 18:57:37 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JIvbdP094203; Fri, 19 Jun 2015 18:57:37 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201506191857.t5JIvbdP094203@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Fri, 19 Jun 2015 18:57:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284602 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 18:57:37 -0000 Author: sbruno Date: Fri Jun 19 18:57:36 2015 New Revision: 284602 URL: https://svnweb.freebsd.org/changeset/base/284602 Log: Feedback from commit r284535 davide: imgact_binmisc_clear_entry() needs to use atomic ops to remove the enable bit. kib: M_NOWAIT is not warranted and comment is invalid. Modified: head/sys/kern/imgact_binmisc.c Modified: head/sys/kern/imgact_binmisc.c ============================================================================== --- head/sys/kern/imgact_binmisc.c Fri Jun 19 17:34:59 2015 (r284601) +++ head/sys/kern/imgact_binmisc.c Fri Jun 19 18:57:36 2015 (r284602) @@ -317,7 +317,7 @@ imgact_binmisc_disable_entry(char *name) return (ENOENT); } - ibe->ibe_flags &= ~IBF_ENABLED; + atomic_clear_32(&ibe->ibe_flags, IBF_ENABLED); sx_sunlock(&interp_list_sx); return (0); @@ -406,8 +406,7 @@ imgact_binmisc_get_all_entries(struct sy sx_slock(&interp_list_sx); count = interp_list_entry_count; - /* Don't block in malloc() while holding lock. */ - xbe = malloc(sizeof(*xbe) * count, M_BINMISC, M_NOWAIT|M_ZERO); + xbe = malloc(sizeof(*xbe) * count, M_BINMISC, M_ZERO); if (!xbe) { sx_sunlock(&interp_list_sx); return (ENOMEM); From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 19:36:30 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CA9B8A44; Fri, 19 Jun 2015 19:36:30 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9F75323C; Fri, 19 Jun 2015 19:36:30 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JJaUNK013859; Fri, 19 Jun 2015 19:36:30 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JJaUED013858; Fri, 19 Jun 2015 19:36:30 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201506191936.t5JJaUED013858@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Fri, 19 Jun 2015 19:36:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284604 - head/usr.bin/sockstat X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 19:36:30 -0000 Author: tuexen Date: Fri Jun 19 19:36:29 2015 New Revision: 284604 URL: https://svnweb.freebsd.org/changeset/base/284604 Log: Don't leak sockets. Reported by: Coverity CID: 1306785 MFC after: 3 days Modified: head/usr.bin/sockstat/sockstat.c Modified: head/usr.bin/sockstat/sockstat.c ============================================================================== --- head/usr.bin/sockstat/sockstat.c Fri Jun 19 19:36:21 2015 (r284603) +++ head/usr.bin/sockstat/sockstat.c Fri Jun 19 19:36:29 2015 (r284604) @@ -255,6 +255,26 @@ sockaddr(struct sockaddr_storage *sa, in } static void +free_socket(struct sock *sock) +{ + struct addr *cur, *next; + + cur = sock->laddr; + while (cur != NULL) { + next = cur->next; + free(cur); + cur = next; + } + cur = sock->faddr; + while (cur != NULL) { + next = cur->next; + free(cur); + cur = next; + } + free(sock); +} + +static void gather_sctp(void) { struct sock *sock; @@ -366,14 +386,17 @@ gather_sctp(void) while (offset < len) { xstcb = (struct xsctp_tcb *)(void *)(buf + offset); offset += sizeof(struct xsctp_tcb); - if (no_stcb && - opt_l && - (!opt_L || !local_all_loopback) && - ((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) || - (xstcb->last == 1))) { - hash = (int)((uintptr_t)sock->socket % HASHSIZE); - sock->next = sockhash[hash]; - sockhash[hash] = sock; + if (no_stcb) { + if (opt_l && + (!opt_L || !local_all_loopback) && + ((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) || + (xstcb->last == 1))) { + hash = (int)((uintptr_t)sock->socket % HASHSIZE); + sock->next = sockhash[hash]; + sockhash[hash] = sock; + } else { + free_socket(sock); + } } if (xstcb->last == 1) break; @@ -476,11 +499,14 @@ gather_sctp(void) prev_faddr->next = faddr; prev_faddr = faddr; } - if (opt_c && - (!opt_L || !(local_all_loopback || foreign_all_loopback))) { - hash = (int)((uintptr_t)sock->socket % HASHSIZE); - sock->next = sockhash[hash]; - sockhash[hash] = sock; + if (opt_c) { + if (!opt_L || !(local_all_loopback || foreign_all_loopback)) { + hash = (int)((uintptr_t)sock->socket % HASHSIZE); + sock->next = sockhash[hash]; + sockhash[hash] = sock; + } else { + free_socket(sock); + } } } xinpcb = (struct xsctp_inpcb *)(void *)(buf + offset); From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 19:39:26 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E3A6BB5; Fri, 19 Jun 2015 19:39:26 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wg0-x229.google.com (mail-wg0-x229.google.com [IPv6:2a00:1450:400c:c00::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B9CC325F; Fri, 19 Jun 2015 19:39:25 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by wgez8 with SMTP id z8so97391465wge.0; Fri, 19 Jun 2015 12:39:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=J66M0prIWUazUa7EWTocuwSBwJe08gd+3kb2Lj9OU7c=; b=QPs0Moi97pOaRU1LOqATC0rhQJiswSPc6bCpWwUEjEBd17BEFVX4ZBubV2Gq0Iquvr LxLcwmnlpZKEwpHSpK05O9NMH/b/6n6BTTens0viTt4s8zHd67GuN1v2Gq8uxCEpRagZ 2oXvZu7u+GECtneg+1lPh8gQ+y/YXS4QeeB0V0tgAbvNL7o3c+MkYotXzS3VoISNMYyk oo8+w++/w1ofyDBIw/cbDuqunnZchvZ7uDj9rLDMwcBfL/YDNnpD0gqdJTtGbLo/ZFjS jOdbe5gbTq/xjcoH5hDUYiJrda9En9qMKAbqaGadCQxbHCi6tP9P3pOlandvJvjCf8zI LlJA== X-Received: by 10.181.13.5 with SMTP id eu5mr9171767wid.37.1434742764277; Fri, 19 Jun 2015 12:39:24 -0700 (PDT) Received: from dft-labs.eu (n1x0n-1-pt.tunnel.tserv5.lon1.ipv6.he.net. [2001:470:1f08:1f7::2]) by mx.google.com with ESMTPSA id gj7sm5062816wib.4.2015.06.19.12.39.21 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 19 Jun 2015 12:39:22 -0700 (PDT) Date: Fri, 19 Jun 2015 21:39:19 +0200 From: Mateusz Guzik To: Sean Bruno Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284602 - head/sys/kern Message-ID: <20150619193919.GA24989@dft-labs.eu> References: <201506191857.t5JIvbdP094203@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <201506191857.t5JIvbdP094203@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 19:39:26 -0000 On Fri, Jun 19, 2015 at 06:57:37PM +0000, Sean Bruno wrote: > Author: sbruno > Date: Fri Jun 19 18:57:36 2015 > New Revision: 284602 > URL: https://svnweb.freebsd.org/changeset/base/284602 > > Log: > Feedback from commit r284535 > > davide: imgact_binmisc_clear_entry() needs to use atomic ops to remove > the enable bit. > > kib: M_NOWAIT is not warranted and comment is invalid. > > Modified: > head/sys/kern/imgact_binmisc.c > > Modified: head/sys/kern/imgact_binmisc.c > ============================================================================== > --- head/sys/kern/imgact_binmisc.c Fri Jun 19 17:34:59 2015 (r284601) > +++ head/sys/kern/imgact_binmisc.c Fri Jun 19 18:57:36 2015 (r284602) > @@ -317,7 +317,7 @@ imgact_binmisc_disable_entry(char *name) > return (ENOENT); > } > > - ibe->ibe_flags &= ~IBF_ENABLED; > + atomic_clear_32(&ibe->ibe_flags, IBF_ENABLED); > sx_sunlock(&interp_list_sx); > > return (0); > @@ -406,8 +406,7 @@ imgact_binmisc_get_all_entries(struct sy > > sx_slock(&interp_list_sx); > count = interp_list_entry_count; > - /* Don't block in malloc() while holding lock. */ > - xbe = malloc(sizeof(*xbe) * count, M_BINMISC, M_NOWAIT|M_ZERO); > + xbe = malloc(sizeof(*xbe) * count, M_BINMISC, M_ZERO); You can't just remove M_NOWAIT. You have to put M_WAITOK in its place. Once you do that, malloc cannot fail and null check below can be removed. > if (!xbe) { > sx_sunlock(&interp_list_sx); > return (ENOMEM); > -- Mateusz Guzik From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 19:57:40 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 766E99B; Fri, 19 Jun 2015 19:57:40 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6491E8F0; Fri, 19 Jun 2015 19:57:40 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JJveK9023701; Fri, 19 Jun 2015 19:57:40 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JJvelx023700; Fri, 19 Jun 2015 19:57:40 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201506191957.t5JJvelx023700@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Fri, 19 Jun 2015 19:57:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284605 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 19:57:40 -0000 Author: sbruno Date: Fri Jun 19 19:57:39 2015 New Revision: 284605 URL: https://svnweb.freebsd.org/changeset/base/284605 Log: Must have one of either M_WAITOK or M_NOWAIT, read the man page bruno. Submitted by: mjg Modified: head/sys/kern/imgact_binmisc.c Modified: head/sys/kern/imgact_binmisc.c ============================================================================== --- head/sys/kern/imgact_binmisc.c Fri Jun 19 19:36:29 2015 (r284604) +++ head/sys/kern/imgact_binmisc.c Fri Jun 19 19:57:39 2015 (r284605) @@ -406,7 +406,7 @@ imgact_binmisc_get_all_entries(struct sy sx_slock(&interp_list_sx); count = interp_list_entry_count; - xbe = malloc(sizeof(*xbe) * count, M_BINMISC, M_ZERO); + xbe = malloc(sizeof(*xbe) * count, M_BINMISC, M_WAITOK|M_ZERO); if (!xbe) { sx_sunlock(&interp_list_sx); return (ENOMEM); From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 20:35:18 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B73B3FFF; Fri, 19 Jun 2015 20:35:18 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A578D25E; Fri, 19 Jun 2015 20:35:18 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JKZIRx043079; Fri, 19 Jun 2015 20:35:18 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JKZImO043078; Fri, 19 Jun 2015 20:35:18 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201506192035.t5JKZImO043078@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Fri, 19 Jun 2015 20:35:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284606 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 20:35:18 -0000 Author: sbruno Date: Fri Jun 19 20:35:17 2015 New Revision: 284606 URL: https://svnweb.freebsd.org/changeset/base/284606 Log: Remove uneeded NULL check since malloc the malloc is now M_WAITOK Submitted by: mjg Modified: head/sys/kern/imgact_binmisc.c Modified: head/sys/kern/imgact_binmisc.c ============================================================================== --- head/sys/kern/imgact_binmisc.c Fri Jun 19 19:57:39 2015 (r284605) +++ head/sys/kern/imgact_binmisc.c Fri Jun 19 20:35:17 2015 (r284606) @@ -407,10 +407,6 @@ imgact_binmisc_get_all_entries(struct sy sx_slock(&interp_list_sx); count = interp_list_entry_count; xbe = malloc(sizeof(*xbe) * count, M_BINMISC, M_WAITOK|M_ZERO); - if (!xbe) { - sx_sunlock(&interp_list_sx); - return (ENOMEM); - } xbep = xbe; SLIST_FOREACH(ibe, &interpreter_list, link) { From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 20:39:18 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9E72027B for ; Fri, 19 Jun 2015 20:39:18 +0000 (UTC) (envelope-from bigwave@www1881.sakura.ne.jp) Received: from www1881.sakura.ne.jp (www1881.sakura.ne.jp [112.78.112.221]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4206F284 for ; Fri, 19 Jun 2015 20:39:17 +0000 (UTC) (envelope-from bigwave@www1881.sakura.ne.jp) Received: from www1881.sakura.ne.jp (localhost [127.0.0.1]) by www1881.sakura.ne.jp (8.14.5/8.14.5) with ESMTP id t5JKdAXV041042 for ; Sat, 20 Jun 2015 05:39:10 +0900 (JST) (envelope-from bigwave@www1881.sakura.ne.jp) Received: (from bigwave@localhost) by www1881.sakura.ne.jp (8.14.5/8.14.5/Submit) id t5JKdA2I041041; Sat, 20 Jun 2015 05:39:10 +0900 (JST) (envelope-from bigwave) To: svn-src-head@freebsd.org Subject: Notice to appear in Court #00000358583 Date: Sat, 20 Jun 2015 05:39:10 +0900 From: "County Court" Reply-To: "County Court" Message-ID: <126bd56154afc7725ea70a356b18b525@www1881.sakura.ne.jp> X-Priority: 3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 20:39:18 -0000 Notice to Appear, You have to appear in the Court on the June 23. Please, prepare all the documents relating to the case and bring them to Court on the specified date. Note: The case will be heard by the judge in your absence if you do not come. The copy of Court Notice is attached to this email. Yours faithfully, Marion Mcgrath, District Clerk. From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 21:26:07 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A903E38A; Fri, 19 Jun 2015 21:26:07 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 97047F3; Fri, 19 Jun 2015 21:26:07 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JLQ7sF067494; Fri, 19 Jun 2015 21:26:07 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JLQ7Qq067493; Fri, 19 Jun 2015 21:26:07 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201506192126.t5JLQ7Qq067493@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 19 Jun 2015 21:26:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284607 - head/share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 21:26:07 -0000 Author: delphij Date: Fri Jun 19 21:26:06 2015 New Revision: 284607 URL: https://svnweb.freebsd.org/changeset/base/284607 Log: Document kern.cam.ada.legacy_aliases, while I'm there also fix some typos. MFC after: 2 weeks Modified: head/share/man/man4/ada.4 Modified: head/share/man/man4/ada.4 ============================================================================== --- head/share/man/man4/ada.4 Fri Jun 19 20:35:17 2015 (r284606) +++ head/share/man/man4/ada.4 Fri Jun 19 21:26:06 2015 (r284607) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 22, 2014 +.Dd June 19, 2015 .Dt ADA 4 .Os .Sh NAME @@ -45,14 +45,14 @@ The host adapter must also be separately .Tn ATA direct access device can be configured. .Sh COMMAND QUEUING -Command queueing allows the device to process multiple transactions +Command queuing allows the device to process multiple transactions concurrently, often re-ordering them to reduce the number and length of seeks. .Tn ATA -defines two types of queueing: -.Tn TCQ (Tagged Command Queueing, PATA legacy) +defines two types of queuing: +.Tn TCQ (Tagged Command Queuing, PATA legacy) and -.Tn NCQ (Native Command Queueing, SATA) . +.Tn NCQ (Native Command Queuing, SATA) . The .Nm device driver takes full advantage of NCQ, when supported. @@ -146,6 +146,16 @@ instead of .Pa /etc/sysctl.conf . The global default is currently 1. The per-device default is to leave it as-is (follow global setting). +.It Va kern.cam.ada.legacy_aliases +.Pp +This variable determines whether +.Pa /dev/ad Ns Ar Y +symbolic links are created, +which tries to mimic old +.Xr ata 4 +numbering. +Set to 1 to enable legacy aliases symlinks, 0 to disable. +The default is currently enabled. .El .Sh FILES .Bl -tag -width ".Pa /dev/ada*" -compact From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 21:30:46 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 389335B0; Fri, 19 Jun 2015 21:30:46 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2721C24C; Fri, 19 Jun 2015 21:30:46 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JLUklm068177; Fri, 19 Jun 2015 21:30:46 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JLUkn7068176; Fri, 19 Jun 2015 21:30:46 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201506192130.t5JLUkn7068176@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 19 Jun 2015 21:30:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284608 - head/share/man/man9 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 21:30:46 -0000 Author: imp Date: Fri Jun 19 21:30:45 2015 New Revision: 284608 URL: https://svnweb.freebsd.org/changeset/base/284608 Log: Back out contested change until dispute is resolved. This proved to be more contentious than I expected. Modified: head/share/man/man9/style.9 Modified: head/share/man/man9/style.9 ============================================================================== --- head/share/man/man9/style.9 Fri Jun 19 21:26:06 2015 (r284607) +++ head/share/man/man9/style.9 Fri Jun 19 21:30:45 2015 (r284608) @@ -26,7 +26,7 @@ .\" From: @(#)style 1.14 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd June 17, 2015 +.Dd January 7, 2010 .Dt STYLE 9 .Os .Sh NAME @@ -503,14 +503,13 @@ Code which is unreachable for non-obviou .Pp Space after keywords .Pq Ic if , while , for , return , switch . -Two styles of braces +No braces .Ql ( \&{ and .Ql \&} ) -are allowed for single line statements. -Either they are used for all single statements, or -they are used only where needed for clarity. -Usage within a file should be consistent. +are +used for control statements with zero or only a single statement unless that +statement is more than a single line in which case they are permitted. Forever loops are done with .Ic for Ns 's , not From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 21:32:21 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 54CFF89B; Fri, 19 Jun 2015 21:32:21 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 42575349; Fri, 19 Jun 2015 21:32:21 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JLWLBH071976; Fri, 19 Jun 2015 21:32:21 GMT (envelope-from dteske@FreeBSD.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JLWKsU071974; Fri, 19 Jun 2015 21:32:20 GMT (envelope-from dteske@FreeBSD.org) Message-Id: <201506192132.t5JLWKsU071974@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dteske set sender to dteske@FreeBSD.org using -f From: Devin Teske Date: Fri, 19 Jun 2015 21:32:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284609 - head/usr.sbin/bsdconfig/usermgmt/share X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 21:32:21 -0000 Author: dteske Date: Fri Jun 19 21:32:20 2015 New Revision: 284609 URL: https://svnweb.freebsd.org/changeset/base/284609 Log: Interim fix for "Login not found" error. PR: bin/196514 MFC after: 3 days X-MFC-to: stable/10 Modified: head/usr.sbin/bsdconfig/usermgmt/share/group.subr head/usr.sbin/bsdconfig/usermgmt/share/user.subr Modified: head/usr.sbin/bsdconfig/usermgmt/share/group.subr ============================================================================== --- head/usr.sbin/bsdconfig/usermgmt/share/group.subr Fri Jun 19 21:30:45 2015 (r284608) +++ head/usr.sbin/bsdconfig/usermgmt/share/group.subr Fri Jun 19 21:32:20 2015 (r284609) @@ -82,9 +82,9 @@ f_group_add() # # NB: pw(8) has a ``feature'' wherein `-n name' can be taken as GID # instead of name. Work-around is to also pass `-g GID' at the same - # time (any GID will do; but `-1' is appropriate for this context). + # time (the GID is ignored in this case, so any GID will do). # - if [ "$input" ] && f_quietly pw groupshow -n "$input" -g -1; then + if [ "$input" ] && f_quietly pw groupshow -n "$input" -g 1337; then f_show_err "$msg_group_already_used" "$input" return $FAILURE fi @@ -182,7 +182,7 @@ f_group_add() 1) # Group Name (prompt for new group name) f_dialog_input_group_name input "$group_name" || continue - if f_quietly pw groupshow -n "$input" -g -1; then + if f_quietly pw groupshow -n "$input" -g 1337; then f_show_err "$msg_group_already_used" "$input" continue fi @@ -368,9 +368,9 @@ f_group_edit() # # NB: pw(8) has a ``feature'' wherein `-n name' can be taken as GID # instead of name. Work-around is to also pass `-g GID' at the same - # time (any GID will do; but `-1' is appropriate for this context). + # time (the GID is ignored in this case, so any GID will do). # - if [ "$input" ] && ! f_quietly pw groupshow -n "$input" -g -1; then + if [ "$input" ] && ! f_quietly pw groupshow -n "$input" -g 1337; then f_show_err "$msg_group_not_found" "$input" return $FAILURE fi Modified: head/usr.sbin/bsdconfig/usermgmt/share/user.subr ============================================================================== --- head/usr.sbin/bsdconfig/usermgmt/share/user.subr Fri Jun 19 21:30:45 2015 (r284608) +++ head/usr.sbin/bsdconfig/usermgmt/share/user.subr Fri Jun 19 21:32:20 2015 (r284609) @@ -231,9 +231,9 @@ f_user_add() # # NB: pw(8) has a ``feature'' wherein `-n name' can be taken as UID # instead of name. Work-around is to also pass `-u UID' at the same - # time (any UID will do; but `-1' is appropriate for this context). + # time (the UID is ignored in this case, so any UID will do). # - if [ "$input" ] && f_quietly pw usershow -n "$input" -u -1; then + if [ "$input" ] && f_quietly pw usershow -n "$input" -u 1337; then f_show_err "$msg_login_already_used" "$input" return $FAILURE fi @@ -414,7 +414,7 @@ f_user_add() 1) # Login (prompt for new login name) f_dialog_input_name input "$user_name" || continue - if f_quietly pw usershow -n "$input" -u -1; then + if f_quietly pw usershow -n "$input" -u 1337; then f_show_err "$msg_login_already_used" "$input" continue fi @@ -920,9 +920,9 @@ f_user_edit() # # NB: pw(8) has a ``feature'' wherein `-n name' can be taken as UID # instead of name. Work-around is to also pass `-u UID' at the same - # time (any UID will do; but `-1' is appropriate for this context). + # time (the UID is ignored in this case, so any UID will do). # - if [ "$input" ] && ! f_quietly pw usershow -n "$input" -u -1; then + if [ "$input" ] && ! f_quietly pw usershow -n "$input" -u 1337; then f_show_err "$msg_login_not_found" "$input" return $FAILURE fi From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 21:35:25 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A69C9C7F; Fri, 19 Jun 2015 21:35:25 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 94FA337E; Fri, 19 Jun 2015 21:35:25 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JLZPih072485; Fri, 19 Jun 2015 21:35:25 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JLZPPO072484; Fri, 19 Jun 2015 21:35:25 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201506192135.t5JLZPPO072484@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 19 Jun 2015 21:35:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284610 - head/share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 21:35:25 -0000 Author: delphij Date: Fri Jun 19 21:35:24 2015 New Revision: 284610 URL: https://svnweb.freebsd.org/changeset/base/284610 Log: Fix markups. MFC after: 2 weeks Modified: head/share/man/man4/aacraid.4 Modified: head/share/man/man4/aacraid.4 ============================================================================== --- head/share/man/man4/aacraid.4 Fri Jun 19 21:32:20 2015 (r284609) +++ head/share/man/man4/aacraid.4 Fri Jun 19 21:35:24 2015 (r284610) @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd April 09, 2013 +.Dd June 19, 2015 .Dt AACRAID 4 .Os .Sh NAME @@ -58,8 +58,9 @@ The RAID containers are handled via the bus. The physical buses are represented by the .Nm aacraidp? -devices (beginning with aacraidp1). These devices enable the -SCSI pass-thru interface and allows devices connected +devices (beginning with aacraidp1). +These devices enable the +SCSI pass-passthrough interface and allows devices connected to the card such as CD-ROMs to be available via the CAM .Xr scsi 4 subsystem. @@ -129,7 +130,7 @@ and are also queued for retrieval by a m .Xr kldload 8 .Sh AUTHORS .An Achim Leubner Aq Mt achim@FreeBSD.org -.An Ed Maste Aq Mt emaste@FreeBSD.org +.An \&Ed Maste Aq Mt emaste@FreeBSD.org .An Scott Long Aq Mt scottl@FreeBSD.org .Sh BUGS The controller is not actually paused on suspend/resume. From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 21:35:58 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 47981DC3; Fri, 19 Jun 2015 21:35:58 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 359CB386; Fri, 19 Jun 2015 21:35:58 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JLZwE2072597; Fri, 19 Jun 2015 21:35:58 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JLZvs1072590; Fri, 19 Jun 2015 21:35:57 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201506192135.t5JLZvs1072590@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 19 Jun 2015 21:35:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284611 - head/share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 21:35:58 -0000 Author: delphij Date: Fri Jun 19 21:35:56 2015 New Revision: 284611 URL: https://svnweb.freebsd.org/changeset/base/284611 Log: Fix markups and change e.g./eg. to e.g.,. MFC after: 2 weeks Modified: head/share/man/man4/acpi_hp.4 head/share/man/man4/acpi_ibm.4 head/share/man/man4/acpi_panasonic.4 Modified: head/share/man/man4/acpi_hp.4 ============================================================================== --- head/share/man/man4/acpi_hp.4 Fri Jun 19 21:35:24 2015 (r284610) +++ head/share/man/man4/acpi_hp.4 Fri Jun 19 21:35:56 2015 (r284611) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 8, 2010 +.Dd June 19, 2015 .Dt ACPI_HP 4 .Os .Sh NAME @@ -48,7 +48,7 @@ acpi_hp_load="YES" The .Nm driver provides support for ACPI-controlled features found on HP laptops -that use a WMI enabled BIOS (e.g. HP Compaq 8510p and 6510p). +that use a WMI enabled BIOS (e.g., HP Compaq 8510p and 6510p). .Pp The main purpose of this driver is to provide an interface, accessible via @@ -58,7 +58,7 @@ accessible via through which applications can determine and change the status of various laptop components and BIOS settings. .Pp -.Ss Xr devd 8 Ss Events +.Ss Xr devd 8 Events Devd events received by .Xr devd 8 provide the following information: @@ -91,7 +91,7 @@ WWAN on air status changed to 0 (not on .It Li 0xe1 WWAN on air status changed to 1 (on air) .El -.Ss Xr devfs 8 Ss Device +.Ss Xr devfs 8 Device You can read /dev/hpcmi to see your current BIOS settings. The detail level can be adjusted by setting the sysctl .Va cmi_detail @@ -197,8 +197,7 @@ Interface to read BIOS settings .Sh EXAMPLES The following can be added to .Xr devd.conf 5 -in order disable the LAN interface when WLAN on air and reenable if it's -not: +in order disable the LAN interface when WLAN on air and reenable if it is not: .Bd -literal -offset indent notify 0 { match "system" "ACPI"; @@ -281,7 +280,10 @@ This driver is experimental and has only HP Compaq 8510p which featured all supported wireless devices (WWAN/BT/WLAN). Expect undefined results when operating on different hardware. .Pp -Loading the driver is slow. Reading from /dev/hpcmi is even slower. +Loading the driver is slow. +Reading from +.Pa /dev/hpcmi +is even slower. .Pp Additional features like HP specific sensor readings or writing BIOS settings are not supported. Modified: head/share/man/man4/acpi_ibm.4 ============================================================================== --- head/share/man/man4/acpi_ibm.4 Fri Jun 19 21:35:24 2015 (r284610) +++ head/share/man/man4/acpi_ibm.4 Fri Jun 19 21:35:56 2015 (r284611) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 24, 2012 +.Dd June 19, 2015 .Dt ACPI_IBM 4 .Os .Sh NAME @@ -74,7 +74,7 @@ sysctl, is set to .Va availmask by default, a value representing all possible keypress events on the specific ThinkPad model. -.Ss Xr devd 8 Ss Events +.Ss Xr devd 8 Events Hotkey events received by .Xr devd 8 provide the following information: @@ -144,7 +144,7 @@ Mute .It Li 0x18 Access IBM Button .El -.Ss Xr led 4 Ss Interface +.Ss Xr led 4 Interface The .Nm driver provides a @@ -344,7 +344,7 @@ when is set to 1. Events are specified as a whitespace-separated list of event code in hexadecimal or decimal form. -Note that the event maybe handled twice (eg. Brightness up/down) if ACPI BIOS +Note that the event maybe handled twice (e.g., Brightness up/down) if ACPI BIOS already handled the event. .El .Pp Modified: head/share/man/man4/acpi_panasonic.4 ============================================================================== --- head/share/man/man4/acpi_panasonic.4 Fri Jun 19 21:35:24 2015 (r284610) +++ head/share/man/man4/acpi_panasonic.4 Fri Jun 19 21:35:56 2015 (r284611) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 25, 2012 +.Dd June 19, 2015 .Dt ACPI_PANASONIC 4 .Os .Sh NAME @@ -100,7 +100,7 @@ For the other events such as mixer control and showing battery status, .Xr devd 8 should take the role as described below. -.Ss Xr devd 8 Ss Events +.Ss Xr devd 8 Events When notified to .Xr devd 8 , the hotkey event provides the following information: From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 21:40:27 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C8642FD; Fri, 19 Jun 2015 21:40:27 +0000 (UTC) (envelope-from gallatin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2AB12670; Fri, 19 Jun 2015 21:40:27 +0000 (UTC) (envelope-from gallatin@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JLeRMW073907; Fri, 19 Jun 2015 21:40:27 GMT (envelope-from gallatin@FreeBSD.org) Received: (from gallatin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JLeRTY073906; Fri, 19 Jun 2015 21:40:27 GMT (envelope-from gallatin@FreeBSD.org) Message-Id: <201506192140.t5JLeRTY073906@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gallatin set sender to gallatin@FreeBSD.org using -f From: Andrew Gallatin Date: Fri, 19 Jun 2015 21:40:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284612 - head/sys/dev/ixl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 21:40:27 -0000 Author: gallatin Date: Fri Jun 19 21:40:26 2015 New Revision: 284612 URL: https://svnweb.freebsd.org/changeset/base/284612 Log: Fix typo in baudrate initialization that was causing ixl to be seen as a 4GbE NIC, rather than a 40GbE NIC. Reviewed by: Eric Joyner MFC after: 3 days Sponsored by: Netflix Modified: head/sys/dev/ixl/if_ixl.c Modified: head/sys/dev/ixl/if_ixl.c ============================================================================== --- head/sys/dev/ixl/if_ixl.c Fri Jun 19 21:35:56 2015 (r284611) +++ head/sys/dev/ixl/if_ixl.c Fri Jun 19 21:40:26 2015 (r284612) @@ -2551,7 +2551,7 @@ ixl_setup_interface(device_t dev, struct } if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; - ifp->if_baudrate = 4000000000; // ?? + ifp->if_baudrate = IF_Gbps(40); ifp->if_init = ixl_init; ifp->if_softc = vsi; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 21:54:28 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D058B89E; Fri, 19 Jun 2015 21:54:28 +0000 (UTC) (envelope-from jilles@stack.nl) Received: from mx1.stack.nl (relay02.stack.nl [IPv6:2001:610:1108:5010::104]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mailhost.stack.nl", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 9575EA15; Fri, 19 Jun 2015 21:54:28 +0000 (UTC) (envelope-from jilles@stack.nl) Received: from snail.stack.nl (snail.stack.nl [IPv6:2001:610:1108:5010::131]) by mx1.stack.nl (Postfix) with ESMTP id 36A49358C57; Fri, 19 Jun 2015 23:54:24 +0200 (CEST) Received: by snail.stack.nl (Postfix, from userid 1677) id 00D0428494; Fri, 19 Jun 2015 23:54:23 +0200 (CEST) Date: Fri, 19 Jun 2015 23:54:23 +0200 From: Jilles Tjoelker To: Xin LI Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284162 - head/bin/ls Message-ID: <20150619215423.GA34741@stack.nl> References: <201506081913.t58JD5KX090442@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201506081913.t58JD5KX090442@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 21:54:28 -0000 On Mon, Jun 08, 2015 at 07:13:05PM +0000, Xin LI wrote: > Author: delphij > Date: Mon Jun 8 19:13:04 2015 > New Revision: 284162 > URL: https://svnweb.freebsd.org/changeset/base/284162 > Log: > It has been long time that when doing 'ls -G /path/to/a/symlink', instead of > using the color of symbolic link, the color is determined by the link target. > This behavior was quite confusing. > Looking at the file history, it looks like that r203665 intends to fix this > but the issue was never actually fixed. > Fix this by not setting FTS_COMFOLLOW when color is requested like what was > done in r203665. > MFC after: 2 weeks > Modified: > head/bin/ls/ls.c > Modified: head/bin/ls/ls.c > ============================================================================== > --- head/bin/ls/ls.c Mon Jun 8 18:59:14 2015 (r284161) > +++ head/bin/ls/ls.c Mon Jun 8 19:13:04 2015 (r284162) > @@ -413,9 +413,14 @@ main(int argc, char *argv[]) > > /* > * If not -F, -P, -d or -l options, follow any symbolic links listed on > - * the command line. > + * the command line, unless in color mode in which case we need to > + * distinguish file type for a symbolic link itself and its target. > */ > - if (!f_nofollow && !f_longform && !f_listdir && (!f_type || f_slash)) > + if (!f_nofollow && !f_longform && !f_listdir && (!f_type || f_slash) > +#ifdef COLORLS > + && !f_color > +#endif > + ) > fts_options |= FTS_COMFOLLOW; > > /* Hmm. This makes -G or CLICOLOR env behave like -F in that symlinks are no longer followed by default. This at least needs a change in the man page to document it, and I'm not sure whether -G should actually modify ls's action beyond adding colour. For example, in stable/10 doing ls /sys, ls -p /sys and ls -G /sys show a directory listing of the kernel source, while ls -F /sys shows just the symlink. What r203665 fixed was colour, inode number, etc. when -P was given and -F/-d/-l were not. I'll admit that this -F/-d/-l thing is bizarre but it has grown that way historically and I've found ls implementations that deviate from this annoying (e.g. on some embedded systems). -- Jilles Tjoelker From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 21:55:12 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EAEF2A2A; Fri, 19 Jun 2015 21:55:12 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D93A3A22; Fri, 19 Jun 2015 21:55:12 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JLtCBl082231; Fri, 19 Jun 2015 21:55:12 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JLtC7K082230; Fri, 19 Jun 2015 21:55:12 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201506192155.t5JLtC7K082230@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Fri, 19 Jun 2015 21:55:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284613 - head/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 21:55:13 -0000 Author: tuexen Date: Fri Jun 19 21:55:12 2015 New Revision: 284613 URL: https://svnweb.freebsd.org/changeset/base/284613 Log: Fix two KTRACE related bugs. Reported by: Coverity CID: 1018058, 1018060 MFC after: 3 days Modified: head/sys/netinet/sctp_syscalls.c Modified: head/sys/netinet/sctp_syscalls.c ============================================================================== --- head/sys/netinet/sctp_syscalls.c Fri Jun 19 21:40:26 2015 (r284612) +++ head/sys/netinet/sctp_syscalls.c Fri Jun 19 21:55:12 2015 (r284613) @@ -277,6 +277,10 @@ sys_sctp_generic_sendmsg (td, uap) auio.uio_td = td; auio.uio_offset = 0; /* XXX */ auio.uio_resid = 0; +#ifdef KTRACE + if (KTRPOINT(td, KTR_GENIO)) + ktruio = cloneuio(&auio); +#endif /* KTRACE */ len = auio.uio_resid = uap->mlen; CURVNET_SET(so->so_vnet); error = sctp_lower_sosend(so, to, &auio, (struct mbuf *)NULL, @@ -400,6 +404,10 @@ sys_sctp_generic_sendmsg_iov(td, uap) goto sctp_bad; } } +#ifdef KTRACE + if (KTRPOINT(td, KTR_GENIO)) + ktruio = cloneuio(&auio); +#endif /* KTRACE */ len = auio.uio_resid; CURVNET_SET(so->so_vnet); error = sctp_lower_sosend(so, to, &auio, From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 22:24:59 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B251A9D2; Fri, 19 Jun 2015 22:24:59 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A0494156; Fri, 19 Jun 2015 22:24:59 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JMOxMS097307; Fri, 19 Jun 2015 22:24:59 GMT (envelope-from sobomax@FreeBSD.org) Received: (from sobomax@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JMOxpC097306; Fri, 19 Jun 2015 22:24:59 GMT (envelope-from sobomax@FreeBSD.org) Message-Id: <201506192224.t5JMOxpC097306@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sobomax set sender to sobomax@FreeBSD.org using -f From: Maxim Sobolev Date: Fri, 19 Jun 2015 22:24:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284614 - head/sys/boot/uboot/lib X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 22:24:59 -0000 Author: sobomax Date: Fri Jun 19 22:24:58 2015 New Revision: 284614 URL: https://svnweb.freebsd.org/changeset/base/284614 Log: Provide bug4bug workaround for certain dumbiness of the u-boot's API_env_enum function, which is expected to set returned env to NULL upon reaching the end of the environment list but fails to do so in certain cases. The respective u-boot code looks like the following (HEAD at the time of this commit): --- api.c --- 496 static int API_env_enum(va_list ap) ... 510 *next = last; 511 512 for (i = 0; env_get_char(i) != '\0'; i = n + 1) { 513 for (n = i; env_get_char(n) != '\0'; ++n) { 514 if (n >= CONFIG_ENV_SIZE) { 515 /* XXX shouldn't we set *next = NULL?? */ 516 return 0; 517 } 518 } ------------- The net result is that any unfortunate user of the loader's ub_env_enum() function hitting this condition would be trapped in the infinite loop, as the main use pattern of ub_env_enum() is basically the following: while ((env = ub_env_enum(env)) != NULL) { DO STUFF } Which would stuck forever with the last element. Modified: head/sys/boot/uboot/lib/glue.c Modified: head/sys/boot/uboot/lib/glue.c ============================================================================== --- head/sys/boot/uboot/lib/glue.c Fri Jun 19 21:55:12 2015 (r284613) +++ head/sys/boot/uboot/lib/glue.c Fri Jun 19 22:24:58 2015 (r284614) @@ -513,7 +513,7 @@ ub_env_enum(const char *last) if (!syscall(API_ENV_ENUM, NULL, (uint32_t)last, (uint32_t)&env)) return (NULL); - if (env == NULL) + if (env == NULL || last == env) /* no more env. variables to enumerate */ return (NULL); From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 22:29:38 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 91EE1D14; Fri, 19 Jun 2015 22:29:38 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-qk0-x232.google.com (mail-qk0-x232.google.com [IPv6:2607:f8b0:400d:c09::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F6E3182; Fri, 19 Jun 2015 22:29:38 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by qkfe185 with SMTP id e185so67982312qkf.3; Fri, 19 Jun 2015 15:29:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=Nfdn1DlKfgXhRyyVPaMY0rSJZdv4VYQBkAtiJoqqxqc=; b=0CZnsdILQNn/n+F5uc4D29Ns27LvTcRWHvTgRqT2yw3/YwYeEuy0nheYY3017Z8Esu u6uzjjl6p4uHDLjXBLdxrcciSyUcafiA8vqC+2NeWjTRwFRrllmrPb7XkdzLyan81yZD nKiZL/w6f7G6mpVtaVB0fGtFDwVKn9Wmf8pqarAl0xTY5dzKESFtkNGa5/77Suhw7zHn tPn/HadOeVl1HUDIhQR3guy+wK6HElp1/Tm71bcLqubYs2UoPRC9WF65+rdc9IePkUPf 5CarbAY2fXhr+HluCxQ0guPQCFUfi2OljoI92lFr3YKjSS5tebZUdJyb7/I5PXWjuiP9 OKpg== MIME-Version: 1.0 X-Received: by 10.140.232.131 with SMTP id d125mr25842292qhc.80.1434752976999; Fri, 19 Jun 2015 15:29:36 -0700 (PDT) Received: by 10.140.98.73 with HTTP; Fri, 19 Jun 2015 15:29:36 -0700 (PDT) In-Reply-To: <201506192155.t5JLtC7K082230@svn.freebsd.org> References: <201506192155.t5JLtC7K082230@svn.freebsd.org> Date: Fri, 19 Jun 2015 15:29:36 -0700 Message-ID: Subject: Re: svn commit: r284613 - head/sys/netinet From: NGie Cooper To: Michael Tuexen Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 22:29:38 -0000 On Fri, Jun 19, 2015 at 2:55 PM, Michael Tuexen wrote: > Author: tuexen > Date: Fri Jun 19 21:55:12 2015 > New Revision: 284613 > URL: https://svnweb.freebsd.org/changeset/base/284613 > > Log: > Fix two KTRACE related bugs. > > Reported by: Coverity > CID: 1018058, 1018060 The commit doesn't tell me what the two KTRACE bugs were... From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 22:40:59 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7B935213; Fri, 19 Jun 2015 22:40:59 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FC24759; Fri, 19 Jun 2015 22:40:59 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JMexGJ006166; Fri, 19 Jun 2015 22:40:59 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JMexLw006165; Fri, 19 Jun 2015 22:40:59 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201506192240.t5JMexLw006165@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Fri, 19 Jun 2015 22:40:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284615 - head/sys/dev/xen/blkfront X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 22:40:59 -0000 Author: cperciva Date: Fri Jun 19 22:40:58 2015 New Revision: 284615 URL: https://svnweb.freebsd.org/changeset/base/284615 Log: Minor clean up to xbd_queue_cb: * nsegs must be at most BLKIF_MAX_SEGMENTS_PER_REQUEST (since we specify that limit to bus_dma_tag_create), so KASSERT that rather than silently adjusting the request. * block_segs is now a synonym for nsegs, so garbage collect that variable. * nsegs is never read during or after the while loop, so remove the dead decrement from the loop. These were all left behind from the pre-r284296 support for a "segment block" extension. Modified: head/sys/dev/xen/blkfront/blkfront.c Modified: head/sys/dev/xen/blkfront/blkfront.c ============================================================================== --- head/sys/dev/xen/blkfront/blkfront.c Fri Jun 19 22:24:58 2015 (r284614) +++ head/sys/dev/xen/blkfront/blkfront.c Fri Jun 19 22:40:58 2015 (r284615) @@ -168,7 +168,6 @@ xbd_queue_cb(void *arg, bus_dma_segment_ uint64_t fsect, lsect; int ref; int op; - int block_segs; cm = arg; sc = cm->cm_sc; @@ -180,6 +179,9 @@ xbd_queue_cb(void *arg, bus_dma_segment_ return; } + KASSERT(nsegs <= BLKIF_MAX_SEGMENTS_PER_REQUEST, + ("Too many segments in a blkfront I/O")); + /* Fill out a communications ring structure. */ ring_req = RING_GET_REQUEST(&sc->xbd_ring, sc->xbd_ring.req_prod_pvt); sc->xbd_ring.req_prod_pvt++; @@ -190,9 +192,8 @@ xbd_queue_cb(void *arg, bus_dma_segment_ ring_req->nr_segments = nsegs; cm->cm_nseg = nsegs; - block_segs = MIN(nsegs, BLKIF_MAX_SEGMENTS_PER_REQUEST); sg = ring_req->seg; - last_block_sg = sg + block_segs; + last_block_sg = sg + nsegs; sg_ref = cm->cm_sg_refs; while (sg < last_block_sg) { @@ -227,7 +228,6 @@ xbd_queue_cb(void *arg, bus_dma_segment_ sg++; sg_ref++; segs++; - nsegs--; } if (cm->cm_operation == BLKIF_OP_READ) From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 22:42:27 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70F45523; Fri, 19 Jun 2015 22:42:27 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F88F826; Fri, 19 Jun 2015 22:42:27 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JMgR8a006907; Fri, 19 Jun 2015 22:42:27 GMT (envelope-from jmg@FreeBSD.org) Received: (from jmg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JMgR8m006906; Fri, 19 Jun 2015 22:42:27 GMT (envelope-from jmg@FreeBSD.org) Message-Id: <201506192242.t5JMgR8m006906@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jmg set sender to jmg@FreeBSD.org using -f From: John-Mark Gurney Date: Fri, 19 Jun 2015 22:42:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284616 - head/sys/opencrypto X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 22:42:27 -0000 Author: jmg Date: Fri Jun 19 22:42:26 2015 New Revision: 284616 URL: https://svnweb.freebsd.org/changeset/base/284616 Log: change the KASSERT so it is meaningful, var is unsigned, so even when it wraps, it's still >= 0... Reported by: Coverity CID: 1017564 Modified: head/sys/opencrypto/crypto.c Modified: head/sys/opencrypto/crypto.c ============================================================================== --- head/sys/opencrypto/crypto.c Fri Jun 19 22:40:58 2015 (r284615) +++ head/sys/opencrypto/crypto.c Fri Jun 19 22:42:26 2015 (r284616) @@ -1181,8 +1181,8 @@ crypto_kdone(struct cryptkop *krp) /* XXX: What if driver is loaded in the meantime? */ if (krp->krp_hid < crypto_drivers_num) { cap = &crypto_drivers[krp->krp_hid]; + KASSERT(cap->cc_koperations > 0, ("cc_koperations == 0")); cap->cc_koperations--; - KASSERT(cap->cc_koperations >= 0, ("cc_koperations < 0")); if (cap->cc_flags & CRYPTOCAP_F_CLEANUP) crypto_remove(cap); } From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 23:03:06 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8B76C924; Fri, 19 Jun 2015 23:03:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 79F6BC73; Fri, 19 Jun 2015 23:03:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JN36aZ016892; Fri, 19 Jun 2015 23:03:06 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JN36Rr016891; Fri, 19 Jun 2015 23:03:06 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506192303.t5JN36Rr016891@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 19 Jun 2015 23:03:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284617 - head/release/tools X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 23:03:06 -0000 Author: gjb Date: Fri Jun 19 23:03:05 2015 New Revision: 284617 URL: https://svnweb.freebsd.org/changeset/base/284617 Log: Fix path to waagent. MFC after: 3 days Sponsored by: The FreeBSD Foundation Modified: head/release/tools/azure.conf Modified: head/release/tools/azure.conf ============================================================================== --- head/release/tools/azure.conf Fri Jun 19 22:42:26 2015 (r284616) +++ head/release/tools/azure.conf Fri Jun 19 23:03:05 2015 (r284617) @@ -14,8 +14,8 @@ export VM_EXTRA_PACKAGES="sysutils/azure export VM_RC_LIST= vm_extra_pre_umount() { - chroot ${DESTDIR} /usr/sbin/waagent -verbose -install - yes | chroot ${DESTDIR} /usr/sbin/waagent -deprovision + chroot ${DESTDIR} /usr/local/sbin/waagent -verbose -install + yes | chroot ${DESTDIR} /usr/local/sbin/waagent -deprovision echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf echo 'ifconfig_hn0="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf echo 'waagent_enable="YES"' >> ${DESTDIR}/etc/rc.conf From owner-svn-src-head@FreeBSD.ORG Fri Jun 19 23:09:48 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E072ACB for ; Fri, 19 Jun 2015 23:09:48 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from pmta2.delivery6.ore.mailhop.org (pmta2.delivery6.ore.mailhop.org [54.200.129.228]) by mx1.freebsd.org (Postfix) with SMTP id D63F9C9C for ; Fri, 19 Jun 2015 23:09:47 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from ilsoft.org (unknown [73.34.117.227]) by outbound2.ore.mailhop.org (Halon Mail Gateway) with ESMTPSA; Fri, 19 Jun 2015 23:10:03 +0000 (UTC) Received: from revolution.hippie.lan (revolution.hippie.lan [172.22.42.240]) by ilsoft.org (8.14.9/8.14.9) with ESMTP id t5JN9jZ5018148; Fri, 19 Jun 2015 17:09:45 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1434755385.1415.114.camel@freebsd.org> Subject: Re: svn commit: r284614 - head/sys/boot/uboot/lib From: Ian Lepore To: Maxim Sobolev Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Fri, 19 Jun 2015 17:09:45 -0600 In-Reply-To: <201506192224.t5JMOxpC097306@svn.freebsd.org> References: <201506192224.t5JMOxpC097306@svn.freebsd.org> Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.12.10 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 19 Jun 2015 23:09:48 -0000 On Fri, 2015-06-19 at 22:24 +0000, Maxim Sobolev wrote: > Author: sobomax > Date: Fri Jun 19 22:24:58 2015 > New Revision: 284614 > URL: https://svnweb.freebsd.org/changeset/base/284614 > > Log: > Provide bug4bug workaround for certain dumbiness of the u-boot's API_env_enum > function, which is expected to set returned env to NULL upon reaching the end > of the environment list but fails to do so in certain cases. The respective > u-boot code looks like the following (HEAD at the time of this commit): > > --- api.c --- > 496 static int API_env_enum(va_list ap) > ... > 510 *next = last; > 511 > 512 for (i = 0; env_get_char(i) != '\0'; i = n + 1) { > 513 for (n = i; env_get_char(n) != '\0'; ++n) { > 514 if (n >= CONFIG_ENV_SIZE) { > 515 /* XXX shouldn't we set *next = NULL?? */ > 516 return 0; > 517 } > 518 } > ------------- > > The net result is that any unfortunate user of the loader's ub_env_enum() > function hitting this condition would be trapped in the infinite loop, as > the main use pattern of ub_env_enum() is basically the following: > > while ((env = ub_env_enum(env)) != NULL) { DO STUFF } > > Which would stuck forever with the last element. > > Modified: > head/sys/boot/uboot/lib/glue.c > > Modified: head/sys/boot/uboot/lib/glue.c > ============================================================================== > --- head/sys/boot/uboot/lib/glue.c Fri Jun 19 21:55:12 2015 (r284613) > +++ head/sys/boot/uboot/lib/glue.c Fri Jun 19 22:24:58 2015 (r284614) > @@ -513,7 +513,7 @@ ub_env_enum(const char *last) > if (!syscall(API_ENV_ENUM, NULL, (uint32_t)last, (uint32_t)&env)) > return (NULL); > > - if (env == NULL) > + if (env == NULL || last == env) > /* no more env. variables to enumerate */ > return (NULL); > > This is only a problem with an unpatched u-boot, which has a completely bogus and un-useful implementation of API_env_enum(). That's why every one of our u-boot ports has the same patch to put in an implementation that actually works. Your change works around the worst part of the bug (the infinite loop) but leaves the major problem of the implementation only returning values initially loaded from the saved environment, not anything set by the scripts that loaded ubldr(). -- Ian From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 00:02:04 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 64219A90; Sat, 20 Jun 2015 00:02:04 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5215DC7C; Sat, 20 Jun 2015 00:02:04 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K024oi046310; Sat, 20 Jun 2015 00:02:04 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K024Ys046309; Sat, 20 Jun 2015 00:02:04 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201506200002.t5K024Ys046309@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Sat, 20 Jun 2015 00:02:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284618 - head/sys/dev/xen/blkfront X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 00:02:04 -0000 Author: cperciva Date: Sat Jun 20 00:02:03 2015 New Revision: 284618 URL: https://svnweb.freebsd.org/changeset/base/284618 Log: Refactor xbd_queue_cb, extracting the code which converts bus_dma segments into blkif segments, and moving it into a new function. This will be used by upcoming support for indirect-segment blkif requests. This commit should not result in any functional changes. Modified: head/sys/dev/xen/blkfront/blkfront.c Modified: head/sys/dev/xen/blkfront/blkfront.c ============================================================================== --- head/sys/dev/xen/blkfront/blkfront.c Fri Jun 19 23:03:05 2015 (r284617) +++ head/sys/dev/xen/blkfront/blkfront.c Sat Jun 20 00:02:03 2015 (r284618) @@ -156,45 +156,14 @@ xbd_free_command(struct xbd_command *cm) } static void -xbd_queue_cb(void *arg, bus_dma_segment_t *segs, int nsegs, int error) +mksegarray(bus_dma_segment_t *segs, int nsegs, + grant_ref_t * gref_head, int otherend_id, int readonly, + grant_ref_t * sg_ref, blkif_request_segment_t * sg) { - struct xbd_softc *sc; - struct xbd_command *cm; - blkif_request_t *ring_req; - struct blkif_request_segment *sg; - struct blkif_request_segment *last_block_sg; - grant_ref_t *sg_ref; + struct blkif_request_segment *last_block_sg = sg + nsegs; vm_paddr_t buffer_ma; uint64_t fsect, lsect; int ref; - int op; - - cm = arg; - sc = cm->cm_sc; - - if (error) { - cm->cm_bp->bio_error = EIO; - biodone(cm->cm_bp); - xbd_free_command(cm); - return; - } - - KASSERT(nsegs <= BLKIF_MAX_SEGMENTS_PER_REQUEST, - ("Too many segments in a blkfront I/O")); - - /* Fill out a communications ring structure. */ - ring_req = RING_GET_REQUEST(&sc->xbd_ring, sc->xbd_ring.req_prod_pvt); - sc->xbd_ring.req_prod_pvt++; - ring_req->id = cm->cm_id; - ring_req->operation = cm->cm_operation; - ring_req->sector_number = cm->cm_sector_number; - ring_req->handle = (blkif_vdev_t)(uintptr_t)sc->xbd_disk; - ring_req->nr_segments = nsegs; - cm->cm_nseg = nsegs; - - sg = ring_req->seg; - last_block_sg = sg + nsegs; - sg_ref = cm->cm_sg_refs; while (sg < last_block_sg) { buffer_ma = segs->ds_addr; @@ -205,7 +174,7 @@ xbd_queue_cb(void *arg, bus_dma_segment_ "cross a page boundary")); /* install a grant reference. */ - ref = gnttab_claim_grant_reference(&cm->cm_gref_head); + ref = gnttab_claim_grant_reference(gref_head); /* * GNTTAB_LIST_END == 0xffffffff, but it is private @@ -215,9 +184,9 @@ xbd_queue_cb(void *arg, bus_dma_segment_ gnttab_grant_foreign_access_ref( ref, - xenbus_get_otherend_id(sc->xbd_dev), + otherend_id, buffer_ma >> PAGE_SHIFT, - ring_req->operation == BLKIF_OP_WRITE); + readonly); *sg_ref = ref; *sg = (struct blkif_request_segment) { @@ -229,6 +198,42 @@ xbd_queue_cb(void *arg, bus_dma_segment_ sg_ref++; segs++; } +} + +static void +xbd_queue_cb(void *arg, bus_dma_segment_t *segs, int nsegs, int error) +{ + struct xbd_softc *sc; + struct xbd_command *cm; + blkif_request_t *ring_req; + int op; + + cm = arg; + sc = cm->cm_sc; + + if (error) { + cm->cm_bp->bio_error = EIO; + biodone(cm->cm_bp); + xbd_free_command(cm); + return; + } + + KASSERT(nsegs <= BLKIF_MAX_SEGMENTS_PER_REQUEST, + ("Too many segments in a blkfront I/O")); + + /* Fill out a communications ring structure. */ + ring_req = RING_GET_REQUEST(&sc->xbd_ring, sc->xbd_ring.req_prod_pvt); + sc->xbd_ring.req_prod_pvt++; + ring_req->id = cm->cm_id; + ring_req->operation = cm->cm_operation; + ring_req->sector_number = cm->cm_sector_number; + ring_req->handle = (blkif_vdev_t)(uintptr_t)sc->xbd_disk; + ring_req->nr_segments = nsegs; + cm->cm_nseg = nsegs; + mksegarray(segs, nsegs, &cm->cm_gref_head, + xenbus_get_otherend_id(sc->xbd_dev), + cm->cm_operation == BLKIF_OP_WRITE, + cm->cm_sg_refs, ring_req->seg); if (cm->cm_operation == BLKIF_OP_READ) op = BUS_DMASYNC_PREREAD; From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 00:13:29 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9BBDEF29; Sat, 20 Jun 2015 00:13:29 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 700E3EA0; Sat, 20 Jun 2015 00:13:29 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K0DTb2051919; Sat, 20 Jun 2015 00:13:29 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K0DTxn051917; Sat, 20 Jun 2015 00:13:29 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506200013.t5K0DTxn051917@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 20 Jun 2015 00:13:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284619 - head/share/doc/usd/13.viref X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 00:13:29 -0000 Author: bapt Date: Sat Jun 20 00:13:28 2015 New Revision: 284619 URL: https://svnweb.freebsd.org/changeset/base/284619 Log: Readd merge.awk forgotten while importing the old vi documentation directly into the tree. Do not rely on SRCDIR to find the merge.awk script but use .CURDIR Fix a long standing bug making the generated documents never including the index Added: head/share/doc/usd/13.viref/merge.awk (contents, props changed) Modified: head/share/doc/usd/13.viref/Makefile Modified: head/share/doc/usd/13.viref/Makefile ============================================================================== --- head/share/doc/usd/13.viref/Makefile Sat Jun 20 00:02:03 2015 (r284618) +++ head/share/doc/usd/13.viref/Makefile Sat Jun 20 00:13:28 2015 (r284619) @@ -2,7 +2,6 @@ # $FreeBSD$ VOLUME= usd/13.viref -SRCS= vi.ref-patched EXTRA= ex.cmd.roff ref.so set.opt.roff vi.cmd.roff MACROS= -me CLEANFILES= vi.ref-patched index @@ -15,18 +14,22 @@ vi.ref-patched: vi.ref PRINTERDEVICE?= ascii .for _dev in ${PRINTERDEVICE} +SRCS+= vi.ref-${_dev} EXTRA+= index.so.${_dev} -CLEANFILES+= index.so.${_dev} +CLEANFILES+= index.so.${_dev} vi.ref-${_dev} + +vi.ref-${_dev}: index.so.${_dev} + sed -e 's:^\.so index\.so\.\\\*\[\.T\]$$:${_dev}:' vi.ref-patched > ${.TARGET} # Build index.so as a side-effect of building the paper. -index.so.${_dev}: ${SRCS} ${EXTRA:Nindex.so.${_dev}} +index.so.${_dev}: vi.ref-patched ${EXTRA:Nindex.so.${_dev}} sed -e 's:^\.so index\.so\.\\\*\[\.T\]$$::' vi.ref-patched | \ ${ROFF.${_dev}} -U -z sed -e 's/MINUSSIGN/-/' \ -e 's/DOUBLEQUOTE/""/' \ -e "s/SQUOTE/'/" \ -e 's/ /__SPACE/g' < index | \ - sort -u '-t ' -k 1,1 -k 2n | awk -f ${SRCDIR}/merge.awk | \ + sort -u '-t ' -k 1,1 -k 2n | awk -f ${.CURDIR}/merge.awk | \ sed -e 's/__SPACE/ /g' \ -e "s/^\\(['\\.]\\)/\\\\\&\\1/" > ${.TARGET} .endfor Added: head/share/doc/usd/13.viref/merge.awk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/doc/usd/13.viref/merge.awk Sat Jun 20 00:13:28 2015 (r284619) @@ -0,0 +1,17 @@ +# $FreeBSD$ +# @(#)merge.awk 8.3 (Berkeley) 5/25/94 +# +# merge index entries into one line per label +$1 == prev { + printf ", %s", $2; + next; +} +{ + if (NR != 1) + printf "\n"; + printf "%s \t%s", $1, $2; + prev = $1; +} +END { + printf "\n" +} From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 00:17:58 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65845169; Sat, 20 Jun 2015 00:17:58 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 53D88EBA; Sat, 20 Jun 2015 00:17:58 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K0HwZS052545; Sat, 20 Jun 2015 00:17:58 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K0HwqM052544; Sat, 20 Jun 2015 00:17:58 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506200017.t5K0HwqM052544@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 20 Jun 2015 00:17:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284620 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 00:17:58 -0000 Author: bapt Date: Sat Jun 20 00:17:57 2015 New Revision: 284620 URL: https://svnweb.freebsd.org/changeset/base/284620 Log: Use .CURDIR in soelim's include path instead of SRCDIR This fixes build when a user has defined SRCDIR in make.conf as required by some ports Modified: head/share/mk/bsd.doc.mk Modified: head/share/mk/bsd.doc.mk ============================================================================== --- head/share/mk/bsd.doc.mk Sat Jun 20 00:13:28 2015 (r284619) +++ head/share/mk/bsd.doc.mk Sat Jun 20 00:17:57 2015 (r284620) @@ -75,7 +75,7 @@ TRFLAGS+= -p TRFLAGS+= -R .endif .if defined(USE_SOELIM) -TRFLAGS+= -I${SRCDIR} +TRFLAGS+= -I${.CURDIR} .endif .if defined(USE_TBL) TRFLAGS+= -t From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 00:23:04 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F3FE52F7 for ; Sat, 20 Jun 2015 00:23:03 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 88240146 for ; Sat, 20 Jun 2015 00:23:03 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: by wgbhy7 with SMTP id hy7so100975913wgb.2 for ; Fri, 19 Jun 2015 17:22:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=6wNrYAU4Q7jTfbSxEgMHZDf3xSL1mT91+FjTS7M6zPE=; b=EcNuQiXKy+aQT4F8OGbD6n9unlTVb8Xn5+ecNvFVDssIuB2q6ll+/HIriWQ5zWnSJv 0PbgyoD/0cXz8s2K4MIeaADCQgy4KCuQSKh+N6I1aYxch4zAhR6DUw1r2mzeZx1L03oK KLT52ELIdnYsSmmhsmLOXLwIlCvfqpfaHEamXTYmPsWr37HDe741xyv6J0obSwvOy9Qm 8rcuAJcNanj3Gc5ucaKY+ZH7PnYM0qrwfzspIkiFuvbMR+fyCPgxDdcBRC+0o2jVcu3i 71x80aTP7YnFqHzLGr1rEGCgqpr+6Pwd3Cvx+YmPF4onxI+kkVpBo3qJjspciAOReAvI 5+Rg== X-Gm-Message-State: ALoCoQlAI2j6hMp2j/cC/BMv+N/Pw/DiNwjQ3C8oVLW+58uf72mVd8y1CvZtAdNYXWuZeyNMIJj6 MIME-Version: 1.0 X-Received: by 10.180.72.176 with SMTP id e16mr11329339wiv.12.1434758207467; Fri, 19 Jun 2015 16:56:47 -0700 (PDT) Sender: sobomax@sippysoft.com Received: by 10.27.205.66 with HTTP; Fri, 19 Jun 2015 16:56:47 -0700 (PDT) In-Reply-To: <1434755385.1415.114.camel@freebsd.org> References: <201506192224.t5JMOxpC097306@svn.freebsd.org> <1434755385.1415.114.camel@freebsd.org> Date: Fri, 19 Jun 2015 16:56:47 -0700 X-Google-Sender-Auth: nNqOVZRIjAgJSlcjasnpgpq55fE Message-ID: Subject: Re: svn commit: r284614 - head/sys/boot/uboot/lib From: Maxim Sobolev To: Ian Lepore Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 00:23:04 -0000 Ian, that's cool and dandy, but I still suggest we put some sanity checking and have certain workarounds in the loader (whenever it does not add ambiguity or blows up a code too much of course), so that new folks in town trying to port to new platforms like myself won't spend hours and hours hunting known issues and bugs. And hitting those infinite loops is very frustrating with no errors or anything. On top of that, in some cases you may be stuck with vendor-provided u-boot with no way to patch and re-compile. BTW, there is another stupid bug existing in the u-boot loader, which basically sets fdtaddr in decimal not in hex. On my particular board this makes ubldr to blow up with CPU exception, unfortunately no workaround is possible since there is no 0x for hex values and majority of cases when this variable is set is in hex. -Maxim On Fri, Jun 19, 2015 at 4:09 PM, Ian Lepore wrote: > On Fri, 2015-06-19 at 22:24 +0000, Maxim Sobolev wrote: > > Author: sobomax > > Date: Fri Jun 19 22:24:58 2015 > > New Revision: 284614 > > URL: https://svnweb.freebsd.org/changeset/base/284614 > > > > Log: > > Provide bug4bug workaround for certain dumbiness of the u-boot's > API_env_enum > > function, which is expected to set returned env to NULL upon reaching > the end > > of the environment list but fails to do so in certain cases. The > respective > > u-boot code looks like the following (HEAD at the time of this commit): > > > > --- api.c --- > > 496 static int API_env_enum(va_list ap) > > ... > > 510 *next = last; > > 511 > > 512 for (i = 0; env_get_char(i) != '\0'; i = n + 1) { > > 513 for (n = i; env_get_char(n) != '\0'; ++n) > { > > 514 if (n >= CONFIG_ENV_SIZE) { > > 515 /* XXX shouldn't we set > *next = NULL?? */ > > 516 return 0; > > 517 } > > 518 } > > ------------- > > > > The net result is that any unfortunate user of the loader's > ub_env_enum() > > function hitting this condition would be trapped in the infinite loop, > as > > the main use pattern of ub_env_enum() is basically the following: > > > > while ((env = ub_env_enum(env)) != NULL) { DO STUFF } > > > > Which would stuck forever with the last element. > > > > Modified: > > head/sys/boot/uboot/lib/glue.c > > > > Modified: head/sys/boot/uboot/lib/glue.c > > > ============================================================================== > > --- head/sys/boot/uboot/lib/glue.c Fri Jun 19 21:55:12 2015 > (r284613) > > +++ head/sys/boot/uboot/lib/glue.c Fri Jun 19 22:24:58 2015 > (r284614) > > @@ -513,7 +513,7 @@ ub_env_enum(const char *last) > > if (!syscall(API_ENV_ENUM, NULL, (uint32_t)last, (uint32_t)&env)) > > return (NULL); > > > > - if (env == NULL) > > + if (env == NULL || last == env) > > /* no more env. variables to enumerate */ > > return (NULL); > > > > > > This is only a problem with an unpatched u-boot, which has a completely > bogus and un-useful implementation of API_env_enum(). That's why every > one of our u-boot ports has the same patch to put in an implementation > that actually works. > > Your change works around the worst part of the bug (the infinite loop) > but leaves the major problem of the implementation only returning values > initially loaded from the saved environment, not anything set by the > scripts that loaded ubldr(). > > -- Ian > > From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 03:40:20 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D8F422E4; Sat, 20 Jun 2015 03:40:19 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BA35D304; Sat, 20 Jun 2015 03:40:19 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K3eJqv052732; Sat, 20 Jun 2015 03:40:19 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K3eJB3052731; Sat, 20 Jun 2015 03:40:19 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201506200340.t5K3eJB3052731@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sat, 20 Jun 2015 03:40:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284622 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 03:40:20 -0000 Author: mav Date: Sat Jun 20 03:40:19 2015 New Revision: 284622 URL: https://svnweb.freebsd.org/changeset/base/284622 Log: Remove device queue freeze handling and replace it with dummy. At this point CTL has no known use case for device queue freezes. Same time existing (considered to be broken) code was found to cause modify-after-free issues. Discussed with: ken MFC after: 1 week Modified: head/sys/cam/ctl/scsi_ctl.c Modified: head/sys/cam/ctl/scsi_ctl.c ============================================================================== --- head/sys/cam/ctl/scsi_ctl.c Sat Jun 20 00:58:46 2015 (r284621) +++ head/sys/cam/ctl/scsi_ctl.c Sat Jun 20 03:40:19 2015 (r284622) @@ -848,15 +848,6 @@ ctlfestart(struct cam_periph *periph, un atio->ccb_h.target_lun = CAM_LUN_WILDCARD; } - if ((atio->ccb_h.status & CAM_DEV_QFRZN) != 0) { - cam_release_devq(periph->path, - /*relsim_flags*/0, - /*reduction*/0, - /*timeout*/0, - /*getcount_only*/0); - atio->ccb_h.status &= ~CAM_DEV_QFRZN; - } - if (atio->ccb_h.func_code != XPT_ACCEPT_TARGET_IO) { xpt_print(periph->path, "%s: func_code " "is %#x\n", __func__, @@ -966,15 +957,6 @@ ctlfestart(struct cam_periph *periph, un xpt_action(start_ccb); cam_periph_lock(periph); - if ((atio->ccb_h.status & CAM_DEV_QFRZN) != 0) { - cam_release_devq(periph->path, - /*relsim_flags*/0, - /*reduction*/0, - /*timeout*/0, - /*getcount_only*/0); - atio->ccb_h.status &= ~CAM_DEV_QFRZN; - } - /* * If we still have work to do, ask for another CCB. */ @@ -1107,6 +1089,19 @@ ctlfedone(struct cam_periph *periph, uni done_ccb->ccb_h.func_code); #endif + /* + * At this point CTL has no known use case for device queue freezes. + * In case some SIM think different -- drop its freeze right here. + */ + if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { + cam_release_devq(periph->path, + /*relsim_flags*/0, + /*reduction*/0, + /*timeout*/0, + /*getcount_only*/0); + done_ccb->ccb_h.status &= ~CAM_DEV_QFRZN; + } + softc = (struct ctlfe_lun_softc *)periph->softc; bus_softc = softc->parent_softc; mtx = cam_periph_mtx(periph); @@ -1417,12 +1412,9 @@ ctlfedone(struct cam_periph *periph, uni union ctl_io *io; struct ccb_immediate_notify *inot; cam_status status; - int frozen, send_ctl_io; + int send_ctl_io; inot = &done_ccb->cin1; - - frozen = (done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0; - printf("%s: got XPT_IMMEDIATE_NOTIFY status %#x tag %#x " "seq %#x\n", __func__, inot->ccb_h.status, inot->tag_id, inot->seq_id); @@ -1524,14 +1516,6 @@ ctlfedone(struct cam_periph *periph, uni done_ccb->ccb_h.func_code = XPT_NOTIFY_ACKNOWLEDGE; xpt_action(done_ccb); } - - if (frozen != 0) { - cam_release_devq(periph->path, - /*relsim_flags*/ 0, - /*opening reduction*/ 0, - /*timeout*/ 0, - /*getcount_only*/ 0); - } break; } case XPT_NOTIFY_ACKNOWLEDGE: From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 04:02:33 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CFC425A9; Sat, 20 Jun 2015 04:02:33 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BD81FB18; Sat, 20 Jun 2015 04:02:33 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K42XY9064316; Sat, 20 Jun 2015 04:02:33 GMT (envelope-from marcel@FreeBSD.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K42Xqb064315; Sat, 20 Jun 2015 04:02:33 GMT (envelope-from marcel@FreeBSD.org) Message-Id: <201506200402.t5K42Xqb064315@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marcel set sender to marcel@FreeBSD.org using -f From: Marcel Moolenaar Date: Sat, 20 Jun 2015 04:02:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284623 - head/sys/dev/uart X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 04:02:33 -0000 Author: marcel Date: Sat Jun 20 04:02:33 2015 New Revision: 284623 URL: https://svnweb.freebsd.org/changeset/base/284623 Log: Add support for the Intel Atom E3800 series SoC (aka Bay Trail). Sponsored by: XipLink, Inc Modified: head/sys/dev/uart/uart_bus_pci.c Modified: head/sys/dev/uart/uart_bus_pci.c ============================================================================== --- head/sys/dev/uart/uart_bus_pci.c Sat Jun 20 03:40:19 2015 (r284622) +++ head/sys/dev/uart/uart_bus_pci.c Sat Jun 20 04:02:33 2015 (r284623) @@ -69,6 +69,7 @@ struct pci_id { const char *desc; int rid; int rclk; + int regshft; }; static const struct pci_id pci_ns8250_ids[] = { @@ -118,6 +119,10 @@ static const struct pci_id pci_ns8250_id { 0x151f, 0x0000, 0xffff, 0, "TOPIC Semiconductor TP560 56k modem", 0x10 }, { 0x1fd4, 0x1999, 0x1fd4, 0x0001, "Sunix SER5xxxx Serial Port", 0x10, 8 * DEFAULT_RCLK }, +{ 0x8086, 0x0f0a, 0xffff, 0, "Intel ValleyView LPIO1 HSUART#1", 0x10, + 24 * DEFAULT_RCLK, 2 }, +{ 0x8086, 0x0f0c, 0xffff, 0, "Intel ValleyView LPIO1 HSUART#2", 0x10, + 24 * DEFAULT_RCLK, 2 }, { 0x8086, 0x1c3d, 0xffff, 0, "Intel AMT - KT Controller", 0x10 }, { 0x8086, 0x1d3d, 0xffff, 0, "Intel C600/X79 Series Chipset KT Controller", 0x10 }, { 0x8086, 0x2a07, 0xffff, 0, "Intel AMT - PM965/GM965 KT Controller", 0x10 }, @@ -186,7 +191,7 @@ uart_pci_probe(device_t dev) return (ENXIO); match: - result = uart_bus_probe(dev, 0, id->rclk, id->rid, 0); + result = uart_bus_probe(dev, id->regshft, id->rclk, id->rid, 0); /* Bail out on error. */ if (result > 0) return (result); From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 04:10:19 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4061B759; Sat, 20 Jun 2015 04:10:19 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AB002C28; Sat, 20 Jun 2015 04:10:18 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id t5K4ACDl061618 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Sat, 20 Jun 2015 07:10:12 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua t5K4ACDl061618 Received: (from kostik@localhost) by tom.home (8.14.9/8.14.9/Submit) id t5K4AC0R061616; Sat, 20 Jun 2015 07:10:12 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 20 Jun 2015 07:10:12 +0300 From: Konstantin Belousov To: Sean Bruno Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284602 - head/sys/kern Message-ID: <20150620041012.GQ2080@kib.kiev.ua> References: <201506191857.t5JIvbdP094203@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201506191857.t5JIvbdP094203@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 04:10:19 -0000 On Fri, Jun 19, 2015 at 06:57:37PM +0000, Sean Bruno wrote: > Author: sbruno > Date: Fri Jun 19 18:57:36 2015 > New Revision: 284602 > URL: https://svnweb.freebsd.org/changeset/base/284602 > > Log: > Feedback from commit r284535 > > davide: imgact_binmisc_clear_entry() needs to use atomic ops to remove > the enable bit. > > kib: M_NOWAIT is not warranted and comment is invalid. > > Modified: > head/sys/kern/imgact_binmisc.c > > Modified: head/sys/kern/imgact_binmisc.c > ============================================================================== > --- head/sys/kern/imgact_binmisc.c Fri Jun 19 17:34:59 2015 (r284601) > +++ head/sys/kern/imgact_binmisc.c Fri Jun 19 18:57:36 2015 (r284602) > @@ -317,7 +317,7 @@ imgact_binmisc_disable_entry(char *name) > return (ENOENT); > } > > - ibe->ibe_flags &= ~IBF_ENABLED; > + atomic_clear_32(&ibe->ibe_flags, IBF_ENABLED); > sx_sunlock(&interp_list_sx); > > return (0); > @@ -406,8 +406,7 @@ imgact_binmisc_get_all_entries(struct sy > > sx_slock(&interp_list_sx); > count = interp_list_entry_count; > - /* Don't block in malloc() while holding lock. */ > - xbe = malloc(sizeof(*xbe) * count, M_BINMISC, M_NOWAIT|M_ZERO); > + xbe = malloc(sizeof(*xbe) * count, M_BINMISC, M_ZERO); Was the change tested at all ? Malloc(9) requires either M_WAITOK or M_NOWAIT flags to be present. > if (!xbe) { > sx_sunlock(&interp_list_sx); > return (ENOMEM); As I noted in my mail, xbe == NULL is impossible with M_WAITOK. From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 04:48:50 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0BD90E01; Sat, 20 Jun 2015 04:48:50 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D4456782; Sat, 20 Jun 2015 04:48:49 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K4mnrs088550; Sat, 20 Jun 2015 04:48:49 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K4mnAB088545; Sat, 20 Jun 2015 04:48:49 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201506200448.t5K4mnAB088545@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 20 Jun 2015 04:48:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284624 - head/sys/dev/ofw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 04:48:50 -0000 Author: imp Date: Sat Jun 20 04:48:48 2015 New Revision: 284624 URL: https://svnweb.freebsd.org/changeset/base/284624 Log: Add ofw_bus_find_child_by_phandle, a helper routine to find a device_t child matchig a given phandle_t. Differential Revision: https://reviews.freebsd.org/D2871 Modified: head/sys/dev/ofw/ofw_bus_subr.c head/sys/dev/ofw/ofw_bus_subr.h Modified: head/sys/dev/ofw/ofw_bus_subr.c ============================================================================== --- head/sys/dev/ofw/ofw_bus_subr.c Sat Jun 20 04:02:33 2015 (r284623) +++ head/sys/dev/ofw/ofw_bus_subr.c Sat Jun 20 04:48:48 2015 (r284624) @@ -551,3 +551,44 @@ ofw_bus_find_compatible(phandle_t node, } return (0); } + +/** + * @brief Return child of bus whose phandle is node + * + * A direct child of @p will be returned if it its phandle in the + * OFW tree is @p node. Otherwise, NULL is returned. + * + * @param bus The bus to examine + * @param node The phandle_t to look for. + */ +device_t +ofw_bus_find_child_device_by_phandle(device_t bus, phandle_t node) +{ + device_t *children, retval, child; + int nkid, i; + + /* + * Nothing can match the flag value for no node. + */ + if (node == -1) + return (NULL); + + /* + * Search the children for a match. We microoptimize + * a bit by not using ofw_bus_get since we already know + * the parent. We do not recurse. + */ + if (device_get_children(bus, &children, &nkid) != 0) + return (NULL); + retval = NULL; + for (i = 0; i < nkid; i++) { + child = children[i]; + if (OFW_BUS_GET_NODE(bus, child) == node) { + retval = child; + break; + } + } + free(children, M_TEMP); + + return (retval); +} Modified: head/sys/dev/ofw/ofw_bus_subr.h ============================================================================== --- head/sys/dev/ofw/ofw_bus_subr.h Sat Jun 20 04:02:33 2015 (r284623) +++ head/sys/dev/ofw/ofw_bus_subr.h Sat Jun 20 04:48:48 2015 (r284624) @@ -107,4 +107,7 @@ phandle_t ofw_bus_find_compatible(phandl /* Helper to search for a child with a given name */ phandle_t ofw_bus_find_child(phandle_t, const char *); +/* Helper routine to find a device_t child matchig a given phandle_t */ +device_t ofw_bus_find_child_device_by_phandle(device_t bus, phandle_t node); + #endif /* !_DEV_OFW_OFW_BUS_SUBR_H_ */ From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 04:48:53 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E65E2F46; Sat, 20 Jun 2015 04:48:53 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D49B0789; Sat, 20 Jun 2015 04:48:53 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K4mrLD088606; Sat, 20 Jun 2015 04:48:53 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K4mrFT088605; Sat, 20 Jun 2015 04:48:53 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201506200448.t5K4mrFT088605@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 20 Jun 2015 04:48:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284625 - head/sys/dev/gpio X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 04:48:54 -0000 Author: imp Date: Sat Jun 20 04:48:53 2015 New Revision: 284625 URL: https://svnweb.freebsd.org/changeset/base/284625 Log: Use ofw_bus_find_child_device_by_phandle to see if the child we're adding already exists and if so just return that. The typical use case is from identify routines, which shouldn't be adding multiple copies of the same phandle_t to the gpiobus. Only one per phandle_t is needed (or expected by the current code). Differential Revision: https://reviews.freebsd.org/D2871 Modified: head/sys/dev/gpio/ofw_gpiobus.c Modified: head/sys/dev/gpio/ofw_gpiobus.c ============================================================================== --- head/sys/dev/gpio/ofw_gpiobus.c Sat Jun 20 04:48:48 2015 (r284624) +++ head/sys/dev/gpio/ofw_gpiobus.c Sat Jun 20 04:48:53 2015 (r284625) @@ -56,6 +56,14 @@ ofw_gpiobus_add_fdt_child(device_t bus, struct ofw_gpiobus_devinfo *dinfo; /* + * Check to see if we already have a child for @p child, and if so + * return it. + */ + childdev = ofw_bus_find_child_device_by_phandle(bus, child); + if (childdev != NULL) + return (childdev); + + /* * Set up the GPIO child and OFW bus layer devinfo and add it to bus. */ childdev = device_add_child(bus, drvname, -1); From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 05:40:36 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 879A766F; Sat, 20 Jun 2015 05:40:36 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 763E12C5; Sat, 20 Jun 2015 05:40:36 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K5eab8013228; Sat, 20 Jun 2015 05:40:36 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K5ea6d013226; Sat, 20 Jun 2015 05:40:36 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201506200540.t5K5ea6d013226@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sat, 20 Jun 2015 05:40:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284626 - head/sys/compat/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 05:40:36 -0000 Author: dchagin Date: Sat Jun 20 05:40:35 2015 New Revision: 284626 URL: https://svnweb.freebsd.org/changeset/base/284626 Log: Add EPOLLRDHUP support. Tested by: abi at abinet dot ru Modified: head/sys/compat/linux/linux_event.c head/sys/compat/linux/linux_event.h Modified: head/sys/compat/linux/linux_event.c ============================================================================== --- head/sys/compat/linux/linux_event.c Sat Jun 20 04:48:53 2015 (r284625) +++ head/sys/compat/linux/linux_event.c Sat Jun 20 05:40:35 2015 (r284626) @@ -260,6 +260,8 @@ epoll_to_kevent(struct thread *td, struc *kev_flags |= EV_CLEAR; if ((levents & LINUX_EPOLLERR) != 0) *kev_flags |= EV_ERROR; + if ((levents & LINUX_EPOLLRDHUP) != 0) + *kev_flags |= EV_EOF; /* flags related to what event is registered */ if ((levents & LINUX_EPOLL_EVRD) != 0) { @@ -309,6 +311,8 @@ kevent_to_epoll(struct kevent *kevent, s switch (kevent->filter) { case EVFILT_READ: l_event->events = LINUX_EPOLLIN|LINUX_EPOLLRDNORM|LINUX_EPOLLPRI; + if ((kevent->flags & EV_EOF) != 0) + l_event->events |= LINUX_EPOLLRDHUP; break; case EVFILT_WRITE: l_event->events = LINUX_EPOLLOUT|LINUX_EPOLLWRNORM; Modified: head/sys/compat/linux/linux_event.h ============================================================================== --- head/sys/compat/linux/linux_event.h Sat Jun 20 04:48:53 2015 (r284625) +++ head/sys/compat/linux/linux_event.h Sat Jun 20 05:40:35 2015 (r284626) @@ -49,7 +49,7 @@ |LINUX_EPOLLHUP|LINUX_EPOLLERR|LINUX_EPOLLPRI) #define LINUX_EPOLL_EVWR (LINUX_EPOLLOUT|LINUX_EPOLLWRNORM) #define LINUX_EPOLL_EVSUP (LINUX_EPOLLET|LINUX_EPOLLONESHOT \ - |LINUX_EPOLL_EVRD|LINUX_EPOLL_EVWR) + |LINUX_EPOLL_EVRD|LINUX_EPOLL_EVWR|LINUX_EPOLLRDHUP) #define LINUX_EPOLL_CTL_ADD 1 #define LINUX_EPOLL_CTL_DEL 2 From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 07:10:23 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E58A297; Sat, 20 Jun 2015 07:10:23 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from mail-n.franken.de (drew.ipv6.franken.de [IPv6:2001:638:a02:a001:20e:cff:fe4a:feaa]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mail-n.franken.de", Issuer "Thawte DV SSL CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id A8537ADB; Sat, 20 Jun 2015 07:10:23 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from [192.168.1.200] (p4FE3163A.dip0.t-ipconnect.de [79.227.22.58]) (Authenticated sender: macmic) by mail-n.franken.de (Postfix) with ESMTP id C40D71C104DF9; Sat, 20 Jun 2015 09:10:17 +0200 (CEST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Subject: Re: svn commit: r284613 - head/sys/netinet From: Michael Tuexen In-Reply-To: Date: Sat, 20 Jun 2015 09:10:14 +0200 Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Transfer-Encoding: 7bit Message-Id: References: <201506192155.t5JLtC7K082230@svn.freebsd.org> To: NGie Cooper X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 07:10:24 -0000 > On 20 Jun 2015, at 00:29, NGie Cooper wrote: > > On Fri, Jun 19, 2015 at 2:55 PM, Michael Tuexen wrote: >> Author: tuexen >> Date: Fri Jun 19 21:55:12 2015 >> New Revision: 284613 >> URL: https://svnweb.freebsd.org/changeset/base/284613 >> >> Log: >> Fix two KTRACE related bugs. >> >> Reported by: Coverity >> CID: 1018058, 1018060 > > The commit doesn't tell me what the two KTRACE bugs were... The variable ktruio wasn't set, so it stayed to be NULL as initialised. Best regards Michael > From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 07:33:07 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AFE6A552; Sat, 20 Jun 2015 07:33:07 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9E307A2; Sat, 20 Jun 2015 07:33:07 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K7X7kA069026; Sat, 20 Jun 2015 07:33:07 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K7X7Mh069023; Sat, 20 Jun 2015 07:33:07 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201506200733.t5K7X7Mh069023@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sat, 20 Jun 2015 07:33:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284627 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 07:33:07 -0000 Author: mav Date: Sat Jun 20 07:33:06 2015 New Revision: 284627 URL: https://svnweb.freebsd.org/changeset/base/284627 Log: Remove some dead and duplicate LUN enabling code. Modified: head/sys/cam/ctl/ctl.c head/sys/cam/ctl/ctl_frontend.h Modified: head/sys/cam/ctl/ctl.c ============================================================================== --- head/sys/cam/ctl/ctl.c Sat Jun 20 05:40:35 2015 (r284626) +++ head/sys/cam/ctl/ctl.c Sat Jun 20 07:33:06 2015 (r284627) @@ -4535,7 +4535,6 @@ ctl_alloc_lun(struct ctl_softc *ctl_soft struct ctl_be_lun *const be_lun, struct ctl_id target_id) { struct ctl_lun *nlun, *lun; - struct ctl_port *port; struct scsi_vpd_id_descriptor *desc; struct scsi_vpd_id_t10 *t10id; const char *eui, *naa, *scsiname, *vendor, *value; @@ -4765,24 +4764,6 @@ ctl_alloc_lun(struct ctl_softc *ctl_soft mtx_unlock(&ctl_softc->ctl_lock); lun->be_lun->lun_config_status(lun->be_lun->be_lun, CTL_LUN_CONFIG_OK); - - /* - * Run through each registered FETD and bring it online if it isn't - * already. Enable the target ID if it hasn't been enabled, and - * enable this particular LUN. - */ - STAILQ_FOREACH(port, &ctl_softc->port_list, links) { - int retval; - - retval = port->lun_enable(port->targ_lun_arg, target_id,lun_number); - if (retval != 0) { - printf("ctl_alloc_lun: FETD %s port %d returned error " - "%d for lun_enable on target %ju lun %d\n", - port->port_name, port->targ_port, retval, - (uintmax_t)target_id.id, lun_number); - } else - port->status |= CTL_PORT_STATUS_LUN_ONLINE; - } return (0); } @@ -4819,58 +4800,6 @@ ctl_free_lun(struct ctl_lun *lun) softc->num_luns--; /* - * XXX KDM this scheme only works for a single target/multiple LUN - * setup. It needs to be revamped for a multiple target scheme. - * - * XXX KDM this results in port->lun_disable() getting called twice, - * once when ctl_disable_lun() is called, and a second time here. - * We really need to re-think the LUN disable semantics. There - * should probably be several steps/levels to LUN removal: - * - disable - * - invalidate - * - free - * - * Right now we only have a disable method when communicating to - * the front end ports, at least for individual LUNs. - */ -#if 0 - STAILQ_FOREACH(port, &softc->port_list, links) { - int retval; - - retval = port->lun_disable(port->targ_lun_arg, lun->target, - lun->lun); - if (retval != 0) { - printf("ctl_free_lun: FETD %s port %d returned error " - "%d for lun_disable on target %ju lun %jd\n", - port->port_name, port->targ_port, retval, - (uintmax_t)lun->target.id, (intmax_t)lun->lun); - } - - if (STAILQ_FIRST(&softc->lun_list) == NULL) { - port->status &= ~CTL_PORT_STATUS_LUN_ONLINE; - - retval = port->targ_disable(port->targ_lun_arg,lun->target); - if (retval != 0) { - printf("ctl_free_lun: FETD %s port %d " - "returned error %d for targ_disable on " - "target %ju\n", port->port_name, - port->targ_port, retval, - (uintmax_t)lun->target.id); - } else - port->status &= ~CTL_PORT_STATUS_TARG_ONLINE; - - if ((port->status & CTL_PORT_STATUS_TARG_ONLINE) != 0) - continue; - -#if 0 - port->port_offline(port->onoff_arg); - port->status &= ~CTL_PORT_STATUS_ONLINE; -#endif - } - } -#endif - - /* * Tell the backend to free resources, if this LUN has a backend. */ atomic_subtract_int(&lun->be_lun->be->num_luns, 1); @@ -4964,12 +4893,6 @@ ctl_enable_lun(struct ctl_be_lun *be_lun __func__, port->port_name, port->targ_port, retval, (uintmax_t)lun->target.id, (intmax_t)lun->lun); } -#if 0 - else { - /* NOTE: TODO: why does lun enable affect port status? */ - port->status |= CTL_PORT_STATUS_LUN_ONLINE; - } -#endif } mtx_unlock(&softc->ctl_lock); Modified: head/sys/cam/ctl/ctl_frontend.h ============================================================================== --- head/sys/cam/ctl/ctl_frontend.h Sat Jun 20 05:40:35 2015 (r284626) +++ head/sys/cam/ctl/ctl_frontend.h Sat Jun 20 07:33:06 2015 (r284627) @@ -41,9 +41,7 @@ typedef enum { CTL_PORT_STATUS_NONE = 0x00, - CTL_PORT_STATUS_ONLINE = 0x01, - CTL_PORT_STATUS_TARG_ONLINE = 0x02, - CTL_PORT_STATUS_LUN_ONLINE = 0x04 + CTL_PORT_STATUS_ONLINE = 0x01 } ctl_port_status; typedef int (*fe_init_t)(void); From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 07:35:02 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ED0976AC; Sat, 20 Jun 2015 07:35:02 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB363B1; Sat, 20 Jun 2015 07:35:02 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K7Z2B5069338; Sat, 20 Jun 2015 07:35:02 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K7Z28L069337; Sat, 20 Jun 2015 07:35:02 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201506200735.t5K7Z28L069337@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 20 Jun 2015 07:35:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284628 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 07:35:03 -0000 Author: antoine Date: Sat Jun 20 07:35:02 2015 New Revision: 284628 URL: https://svnweb.freebsd.org/changeset/base/284628 Log: Add some files to remove when MK_BSD_GREP=no Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Jun 20 07:33:06 2015 (r284627) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Jun 20 07:35:02 2015 (r284628) @@ -410,6 +410,21 @@ OLD_FILES+=usr/share/man/man1/bsdcpio.1. OLD_FILES+=usr/share/man/man1/cpio.1.gz .endif +.if ${MK_BSD_GREP} == no +OLD_FILES+=usr/bin/lzegrep +OLD_FILES+=usr/bin/lzfgrep +OLD_FILES+=usr/bin/lzgrep +OLD_FILES+=usr/bin/xzegrep +OLD_FILES+=usr/bin/xzfgrep +OLD_FILES+=usr/bin/xzgrep +OLD_FILES+=usr/share/man/man1/lzegrep.1.gz +OLD_FILES+=usr/share/man/man1/lzfgrep.1.gz +OLD_FILES+=usr/share/man/man1/lzgrep.1.gz +OLD_FILES+=usr/share/man/man1/xzegrep.1.gz +OLD_FILES+=usr/share/man/man1/xzfgrep.1.gz +OLD_FILES+=usr/share/man/man1/xzgrep.1.gz +.endif + .if ${MK_BSDINSTALL} == no OLD_FILES+=usr/libexec/bsdinstall/adduser OLD_FILES+=usr/libexec/bsdinstall/auto From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 07:42:55 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1310C866; Sat, 20 Jun 2015 07:42:55 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB4A32E3; Sat, 20 Jun 2015 07:42:54 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K7gsRX073838; Sat, 20 Jun 2015 07:42:54 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K7gs7u073837; Sat, 20 Jun 2015 07:42:54 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201506200742.t5K7gs7u073837@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 20 Jun 2015 07:42:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284629 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 07:42:55 -0000 Author: antoine Date: Sat Jun 20 07:42:54 2015 New Revision: 284629 URL: https://svnweb.freebsd.org/changeset/base/284629 Log: Fix a few obsolete files entries, man pages must be listed compressed Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sat Jun 20 07:35:02 2015 (r284628) +++ head/ObsoleteFiles.inc Sat Jun 20 07:42:54 2015 (r284629) @@ -39,9 +39,9 @@ # done # 20150528: PCI IOV device driver methods moved to a separate kobj interface. -OLD_FILES+=usr/share/man/man9/PCI_ADD_VF.9 -OLD_FILES+=usr/share/man/man9/PCI_INIT_IOV.9 -OLD_FILES+=usr/share/man/man9/PCI_UNINIT_IOV.9 +OLD_FILES+=usr/share/man/man9/PCI_ADD_VF.9.gz +OLD_FILES+=usr/share/man/man9/PCI_INIT_IOV.9.gz +OLD_FILES+=usr/share/man/man9/PCI_UNINIT_IOV.9.gz # 20150525: new clang import which bumps version from 3.6.0 to 3.6.1. OLD_FILES+=usr/lib/clang/3.6.0/include/__stddef_max_align_t.h OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_aes.h @@ -317,19 +317,19 @@ OLD_DIRS+=usr/games # 20150209: liblzma header OLD_FILES+=usr/include/lzma/lzma.h # 20150124: spl.9 and friends -OLD_FILES+=usr/share/man/man9/spl.9 -OLD_FILES+=usr/share/man/man9/spl0.9 -OLD_FILES+=usr/share/man/man9/splbio.9 -OLD_FILES+=usr/share/man/man9/splclock.9 -OLD_FILES+=usr/share/man/man9/splhigh.9 -OLD_FILES+=usr/share/man/man9/splimp.9 -OLD_FILES+=usr/share/man/man9/splnet.9 -OLD_FILES+=usr/share/man/man9/splsoftclock.9 -OLD_FILES+=usr/share/man/man9/splsofttty.9 -OLD_FILES+=usr/share/man/man9/splstatclock.9 -OLD_FILES+=usr/share/man/man9/spltty.9 -OLD_FILES+=usr/share/man/man9/splvm.9 -OLD_FILES+=usr/share/man/man9/splx.9 +OLD_FILES+=usr/share/man/man9/spl.9.gz +OLD_FILES+=usr/share/man/man9/spl0.9.gz +OLD_FILES+=usr/share/man/man9/splbio.9.gz +OLD_FILES+=usr/share/man/man9/splclock.9.gz +OLD_FILES+=usr/share/man/man9/splhigh.9.gz +OLD_FILES+=usr/share/man/man9/splimp.9.gz +OLD_FILES+=usr/share/man/man9/splnet.9.gz +OLD_FILES+=usr/share/man/man9/splsoftclock.9.gz +OLD_FILES+=usr/share/man/man9/splsofttty.9.gz +OLD_FILES+=usr/share/man/man9/splstatclock.9.gz +OLD_FILES+=usr/share/man/man9/spltty.9.gz +OLD_FILES+=usr/share/man/man9/splvm.9.gz +OLD_FILES+=usr/share/man/man9/splx.9.gz # 20150118: new clang import which bumps version from 3.5.0 to 3.5.1. OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 07:49:09 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7CC4DA03; Sat, 20 Jun 2015 07:49:09 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6B2D630F; Sat, 20 Jun 2015 07:49:09 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K7n9V6074666; Sat, 20 Jun 2015 07:49:09 GMT (envelope-from jmg@FreeBSD.org) Received: (from jmg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K7n942074665; Sat, 20 Jun 2015 07:49:09 GMT (envelope-from jmg@FreeBSD.org) Message-Id: <201506200749.t5K7n942074665@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jmg set sender to jmg@FreeBSD.org using -f From: John-Mark Gurney Date: Sat, 20 Jun 2015 07:49:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284630 - head/usr.sbin/bhyve X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 07:49:09 -0000 Author: jmg Date: Sat Jun 20 07:49:08 2015 New Revision: 284630 URL: https://svnweb.freebsd.org/changeset/base/284630 Log: add SO_REUSEADDR when starting debug port, lets you still bind when a TIME_WAIT socket is still around... Reviewed by: grehan Review: https://reviews.freebsd.org/D2875 Modified: head/usr.sbin/bhyve/dbgport.c Modified: head/usr.sbin/bhyve/dbgport.c ============================================================================== --- head/usr.sbin/bhyve/dbgport.c Sat Jun 20 07:42:54 2015 (r284629) +++ head/usr.sbin/bhyve/dbgport.c Sat Jun 20 07:49:08 2015 (r284630) @@ -116,6 +116,8 @@ SYSRES_IO(BVM_DBG_PORT, 4); void init_dbgport(int sport) { + int reuse; + conn_fd = -1; if ((listen_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) { @@ -128,6 +130,13 @@ init_dbgport(int sport) sin.sin_addr.s_addr = htonl(INADDR_ANY); sin.sin_port = htons(sport); + reuse = 1; + if (setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, &reuse, + sizeof(reuse)) < 0) { + perror("setsockopt"); + exit(1); + } + if (bind(listen_fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) { perror("bind"); exit(1); From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 07:58:10 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 16CA6B97; Sat, 20 Jun 2015 07:58:10 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 046F36F1; Sat, 20 Jun 2015 07:58:10 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K7w9iO079346; Sat, 20 Jun 2015 07:58:09 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K7w9QF079345; Sat, 20 Jun 2015 07:58:09 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201506200758.t5K7w9QF079345@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 20 Jun 2015 07:58:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284631 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 07:58:10 -0000 Author: antoine Date: Sat Jun 20 07:58:09 2015 New Revision: 284631 URL: https://svnweb.freebsd.org/changeset/base/284631 Log: Add more nvlist man pages to obsolete files Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sat Jun 20 07:49:08 2015 (r284630) +++ head/ObsoleteFiles.inc Sat Jun 20 07:58:09 2015 (r284631) @@ -160,6 +160,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_add OLD_FILES+=usr/share/man/man3/nvlist_addv_number.3.gz OLD_FILES+=usr/share/man/man3/nvlist_addv_nvlist.3.gz OLD_FILES+=usr/share/man/man3/nvlist_addv_string.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_existsf.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsf_binary.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsf_bool.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsf_descriptor.3.gz @@ -168,6 +169,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_exi OLD_FILES+=usr/share/man/man3/nvlist_existsf_nvlist.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsf_string.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsf_type.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_existsv.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsv_binary.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsv_bool.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsv_descriptor.3.gz @@ -176,6 +178,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_exi OLD_FILES+=usr/share/man/man3/nvlist_existsv_nvlist.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsv_string.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsv_type.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_freef.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freef_binary.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freef_bool.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freef_descriptor.3.gz @@ -184,6 +187,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_fre OLD_FILES+=usr/share/man/man3/nvlist_freef_nvlist.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freef_string.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freef_type.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_freev.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freev_binary.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freev_bool.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freev_descriptor.3.gz @@ -204,6 +208,26 @@ OLD_FILES+=usr/share/man/man3/nvlist_get OLD_FILES+=usr/share/man/man3/nvlist_getv_number.3.gz OLD_FILES+=usr/share/man/man3/nvlist_getv_nvlist.3.gz OLD_FILES+=usr/share/man/man3/nvlist_getv_string.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_movef_binary.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_movef_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_movef_nvlist.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_movef_string.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_movev_binary.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_movev_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_movev_nvlist.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_movev_string.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takef_binary.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takef_bool.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takef_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takef_number.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takef_nvlist.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takef_string.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takev_binary.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takev_bool.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takev_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takev_number.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takev_nvlist.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takev_string.3.gz # 20150429: OLD_FILES+=usr/share/docs/papers/hwpmc.ascii.gz # 20150427: test/sys/kern/mmap_test moved to test/sys/vm/mmap_test From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 08:24:18 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A281E332; Sat, 20 Jun 2015 08:24:18 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9030FD62; Sat, 20 Jun 2015 08:24:18 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K8OI6C094227; Sat, 20 Jun 2015 08:24:18 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K8OIgP094226; Sat, 20 Jun 2015 08:24:18 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201506200824.t5K8OIgP094226@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 20 Jun 2015 08:24:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284632 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 08:24:18 -0000 Author: antoine Date: Sat Jun 20 08:24:17 2015 New Revision: 284632 URL: https://svnweb.freebsd.org/changeset/base/284632 Log: Add miscellaneous obsolete files Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sat Jun 20 07:58:09 2015 (r284631) +++ head/ObsoleteFiles.inc Sat Jun 20 08:24:17 2015 (r284632) @@ -120,6 +120,7 @@ OLD_FILES+=usr/lib32/libheimsqlite_p.a # 20150506 OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz # 20150504 +OLD_FILES+=usr/include/bsdstat.h OLD_LIBS+=usr/lib32/private/libatf-c++.so.2 OLD_LIBS+=usr/lib32/private/libbsdstat.so.1 OLD_LIBS+=usr/lib32/private/libheimipcs.so.11 @@ -232,6 +233,9 @@ OLD_FILES+=usr/share/man/man3/nvlist_tak OLD_FILES+=usr/share/docs/papers/hwpmc.ascii.gz # 20150427: test/sys/kern/mmap_test moved to test/sys/vm/mmap_test OLD_FILES+=usr/tests/sys/kern/mmap_test +# 20150422: zlib.c moved from net to libkern +OLD_FILES+=usr/include/net/zlib.h +OLD_FILES+=usr/include/net/zutil.h # 20150418 OLD_FILES+=sbin/mount_oldnfs OLD_FILES+=usr/share/man/man8/mount_oldnfs.8.gz @@ -321,7 +325,7 @@ OLD_FILES+=usr/bin/ppt OLD_FILES+=usr/share/man/man6/bcd.6.gz OLD_FILES+=usr/share/man/man6/ppt.6.gz # 20150217: Removed remnants of ar(4) driver -OLD_FILES+=usr/include/sys/dev/ic/hd64570.h +OLD_FILES+=usr/include/dev/ic/hd64570.h # 20150212: /usr/games moving into /usr/bin OLD_FILES+=usr/games/bcd OLD_FILES+=usr/games/caesar @@ -354,6 +358,8 @@ OLD_FILES+=usr/share/man/man9/splstatclo OLD_FILES+=usr/share/man/man9/spltty.9.gz OLD_FILES+=usr/share/man/man9/splvm.9.gz OLD_FILES+=usr/share/man/man9/splx.9.gz +# 20150118: toeplitz.c moved from netinet to net +OLD_FILES+=usr/include/netinet/toeplitz.h # 20150118: new clang import which bumps version from 3.5.0 to 3.5.1. OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h @@ -516,6 +522,9 @@ OLD_FILES+=usr/tests/sbin/mdconfig/mdcon OLD_FILES+=usr/tests/sbin/mdconfig/run.pl # 20141126: remove xform_ipip decapsulation fallback OLD_FILES+=usr/include/netipsec/ipip_var.h +# 20141111: SF_KQUEUE code removed +OLD_FILES+=usr/include/sys/sf_base.h +OLD_FILES+=usr/include/sys/sf_sync.h # 20141109: faith/faithd removal OLD_FILES+=etc/rc.d/faith OLD_FILES+=usr/share/man/man4/faith.4.gz @@ -535,6 +544,9 @@ OLD_FILES+=usr/lib/debug/usr/lib32/i18n OLD_FILES+=usr/lib/debug/usr/lib32/private # 20141015: OpenSSL 1.0.1j import OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz +# 20141003: libproc version bump +OLD_LIBS+=usr/lib/libproc.so.2 +OLD_LIBS+=usr/lib32/libproc.so.2 # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz @@ -609,6 +621,7 @@ OLD_FILES+=usr/lib/private/libucl_p.a OLD_FILES+=usr/share/man/man9/pmap_change_wiring.9.gz # 20140728: libsbuf restored to old version. OLD_LIBS+=lib/libsbuf.so.7 +OLD_LIBS+=usr/lib32/libsbuf.so.7 # 20140728: Remove an obsolete man page OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz @@ -635,6 +648,14 @@ OLD_FILES+=usr/lib/libhistory.a OLD_FILES+=usr/lib/libhistory_p.a OLD_FILES+=usr/lib/libhistory.so OLD_LIBS+=usr/lib/libhistory.so.8 +OLD_FILES+=usr/lib32/libhistory.a +OLD_FILES+=usr/lib32/libhistory.so +OLD_LIBS+=usr/lib32/libhistory.so.8 +OLD_FILES+=usr/lib32/libhistory_p.a +OLD_FILES+=usr/lib32/libreadline.a +OLD_FILES+=usr/lib32/libreadline.so +OLD_LIBS+=usr/lib32/libreadline.so.8 +OLD_FILES+=usr/lib32/libreadline_p.a OLD_FILES+=usr/include/readline/chardefs.h OLD_FILES+=usr/include/readline/history.h OLD_FILES+=usr/include/readline/keymaps.h @@ -647,6 +668,7 @@ OLD_FILES+=usr/include/readline/rltypede OLD_DIRS+=usr/include/readline OLD_FILES+=usr/share/info/readline.info.gz OLD_FILES+=usr/share/man/man3/readline.3.gz +OLD_FILES+=usr/share/man/man3/rlhistory.3.gz # 20140625: csup removal OLD_FILES+=usr/bin/csup OLD_FILES+=usr/bin/cpasswd @@ -2025,7 +2047,6 @@ OLD_LIBS+=usr/lib/libpanel.so.4 OLD_LIBS+=usr/lib/libpanelw.so.4 OLD_LIBS+=usr/lib/libpmc.so.4 OLD_LIBS+=usr/lib/libproc.so.1 -OLD_LIBS+=usr/lib/libproc.so.2 OLD_LIBS+=usr/lib/libradius.so.3 OLD_LIBS+=usr/lib/librpcsvc.so.4 OLD_LIBS+=usr/lib/libsdp.so.3 From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 08:52:45 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B2E71B84; Sat, 20 Jun 2015 08:52:45 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9427B654; Sat, 20 Jun 2015 08:52:45 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K8qj1c008852; Sat, 20 Jun 2015 08:52:45 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K8qjae008848; Sat, 20 Jun 2015 08:52:45 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201506200852.t5K8qjae008848@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 20 Jun 2015 08:52:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284635 - in head: . tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 08:52:45 -0000 Author: antoine Date: Sat Jun 20 08:52:44 2015 New Revision: 284635 URL: https://svnweb.freebsd.org/changeset/base/284635 Log: Add more obsolete files Modified: head/ObsoleteFiles.inc head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sat Jun 20 08:28:47 2015 (r284634) +++ head/ObsoleteFiles.inc Sat Jun 20 08:52:44 2015 (r284635) @@ -117,9 +117,12 @@ OLD_FILES+=usr/lib32/libheimsqlite.a OLD_FILES+=usr/lib32/libheimsqlite.so OLD_LIBS+=usr/lib32/libheimsqlite.so.11 OLD_FILES+=usr/lib32/libheimsqlite_p.a +# 20150518: tzdata2015c update +OLD_FILES+=usr/share/zoneinfo/America/Montreal # 20150506 OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz # 20150504 +OLD_FILES+=usr/share/examples/etc/libmap32.conf OLD_FILES+=usr/include/bsdstat.h OLD_LIBS+=usr/lib32/private/libatf-c++.so.2 OLD_LIBS+=usr/lib32/private/libbsdstat.so.1 @@ -522,6 +525,8 @@ OLD_FILES+=usr/tests/sbin/mdconfig/mdcon OLD_FILES+=usr/tests/sbin/mdconfig/run.pl # 20141126: remove xform_ipip decapsulation fallback OLD_FILES+=usr/include/netipsec/ipip_var.h +# 20141122: mandoc updated to 1.13.1 +OLD_FILES+=usr/share/mdocml/external.png # 20141111: SF_KQUEUE code removed OLD_FILES+=usr/include/sys/sf_base.h OLD_FILES+=usr/include/sys/sf_sync.h @@ -556,6 +561,10 @@ OLD_FILES+=etc/rc.d/hv_kvpd OLD_LIBS+=usr/lib/libnv.so.0 # 20140829: rc.d/kerberos removed OLD_FILES+=etc/rc.d/kerberos +# 20140827: tzdata2014f import +OLD_FILES+=usr/share/zoneinfo/Asia/Chongqing +OLD_FILES+=usr/share/zoneinfo/Asia/Harbin +OLD_FILES+=usr/share/zoneinfo/Asia/Kashgar # 20140814: libopie version bump OLD_LIBS+=usr/lib/libopie.so.7 OLD_LIBS+=usr/lib32/libopie.so.7 @@ -628,6 +637,8 @@ OLD_FILES+=usr/share/man/man9/VOP_CREATE OLD_FILES+=usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz # 20140723: renamed to PCBGROUP.9 OLD_FILES+=usr/share/man/man9/PCBGROUPS.9.gz +# 20140722: browse_packages_ftp.sh removed +OLD_FILES+=usr/share/examples/bsdconfig/browse_packages_ftp.sh # 20140718: Remove obsolete man pages OLD_FILES+=usr/share/man/man9/zero_copy.9.gz OLD_FILES+=usr/share/man/man9/zero_copy_sockets.9.gz Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Jun 20 08:28:47 2015 (r284634) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Jun 20 08:52:44 2015 (r284635) @@ -1768,6 +1768,11 @@ OLD_FILES+=usr/lib/libgomp.a OLD_FILES+=usr/lib/libgomp.so OLD_LIBS+=usr/lib/libgomp.so.1 OLD_FILES+=usr/lib/libgomp_p.a +OLD_FILES+=usr/lib32/libgcov.a +OLD_FILES+=usr/lib32/libgomp.a +OLD_FILES+=usr/lib32/libgomp.so +OLD_LIBS+=usr/lib32/libgomp.so.1 +OLD_FILES+=usr/lib32/libgomp_p.a OLD_FILES+=usr/libexec/cc1 OLD_FILES+=usr/libexec/cc1plus OLD_FILES+=usr/share/info/cpp.info.gz From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 08:59:51 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B57E7DCB; Sat, 20 Jun 2015 08:59:51 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A33D166E; Sat, 20 Jun 2015 08:59:51 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K8xp3Y010005; Sat, 20 Jun 2015 08:59:51 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K8xpFn010000; Sat, 20 Jun 2015 08:59:51 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201506200859.t5K8xpFn010000@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Sat, 20 Jun 2015 08:59:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284636 - head/usr.bin/sockstat X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 08:59:51 -0000 Author: hrs Date: Sat Jun 20 08:59:50 2015 New Revision: 284636 URL: https://svnweb.freebsd.org/changeset/base/284636 Log: - Add SOCK_SEQPACKET support in UNIX-domain socket. - Display zoneid using % notation in an IPv6 address. - Use nitems(). - Use sstos{in,in6,un} macros to simplify casts. - style(9). Modified: head/usr.bin/sockstat/sockstat.1 head/usr.bin/sockstat/sockstat.c Modified: head/usr.bin/sockstat/sockstat.1 ============================================================================== --- head/usr.bin/sockstat/sockstat.1 Sat Jun 20 08:52:44 2015 (r284635) +++ head/usr.bin/sockstat/sockstat.1 Sat Jun 20 08:59:50 2015 (r284636) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 13, 2015 +.Dd June 20, 2015 .Dt SOCKSTAT 1 .Os .Sh NAME @@ -119,7 +119,9 @@ The process ID of the command which hold The file descriptor number of the socket. .It Li PROTO The transport protocol associated with the socket for Internet -sockets, or the type of socket (stream or datagram) for +sockets, or the type of socket +.Pq stream, datagram, or seqpacket +for .Ux sockets. .It Li LOCAL ADDRESS Modified: head/usr.bin/sockstat/sockstat.c ============================================================================== --- head/usr.bin/sockstat/sockstat.c Sat Jun 20 08:52:44 2015 (r284635) +++ head/usr.bin/sockstat/sockstat.c Sat Jun 20 08:59:50 2015 (r284636) @@ -60,6 +60,11 @@ __FBSDID("$FreeBSD$"); #include #include +#define sstosin(ss) ((struct sockaddr_in *)(ss)) +#define sstosin6(ss) ((struct sockaddr_in6 *)(ss)) +#define sstosun(ss) ((struct sockaddr_un *)(ss)) +#define sstosa(ss) ((struct sockaddr *)(ss)) + static int opt_4; /* Show IPv4 sockets */ static int opt_6; /* Show IPv6 sockets */ static int opt_c; /* Show connected sockets */ @@ -73,8 +78,7 @@ static int opt_v; /* Verbose mode */ * Default protocols to use if no -P was defined. */ static const char *default_protos[] = {"sctp", "tcp", "udp", "divert" }; -static size_t default_numprotos = - sizeof(default_protos) / sizeof(default_protos[0]); +static size_t default_numprotos = nitems(default_protos); static int *protos; /* protocols to use */ static size_t numprotos; /* allocated size of protos[] */ @@ -140,7 +144,8 @@ get_proto_type(const char *proto) } -static void init_protos(int num) +static void +init_protos(int num) { int proto_count = 0; @@ -163,7 +168,6 @@ static int parse_protos(char *protospec) { char *prot; - char *tmp = protospec; int proto_type, proto_index; if (protospec == NULL) @@ -171,7 +175,7 @@ parse_protos(char *protospec) init_protos(0); proto_index = 0; - while ((prot = strsep(&tmp, ",")) != NULL) { + while ((prot = strsep(&protospec, ",")) != NULL) { if (strlen(prot) == 0) continue; proto_type = get_proto_type(prot); @@ -228,26 +232,32 @@ parse_ports(const char *portspec) } static void -sockaddr(struct sockaddr_storage *sa, int af, void *addr, int port) +sockaddr(struct sockaddr_storage *ss, int af, void *addr, int port) { struct sockaddr_in *sin4; struct sockaddr_in6 *sin6; - bzero(sa, sizeof *sa); + bzero(ss, sizeof(*ss)); switch (af) { case AF_INET: - sin4 = (struct sockaddr_in *)sa; - sin4->sin_len = sizeof *sin4; + sin4 = sstosin(ss); + sin4->sin_len = sizeof(*sin4); sin4->sin_family = af; sin4->sin_port = port; sin4->sin_addr = *(struct in_addr *)addr; break; case AF_INET6: - sin6 = (struct sockaddr_in6 *)sa; - sin6->sin6_len = sizeof *sin6; + sin6 = sstosin6(ss); + sin6->sin6_len = sizeof(*sin6); sin6->sin6_family = af; sin6->sin6_port = port; sin6->sin6_addr = *(struct in6_addr *)addr; +#define s6_addr16 __u6_addr.__u6_addr16 + if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) { + sin6->sin6_scope_id = + ntohs(sin6->sin6_addr.s6_addr16[1]); + sin6->sin6_addr.s6_addr16[1] = 0; + } break; default: abort(); @@ -587,7 +597,7 @@ gather_inet(int proto) switch (proto) { case IPPROTO_TCP: xtp = (struct xtcpcb *)xig; - if (xtp->xt_len != sizeof *xtp) { + if (xtp->xt_len != sizeof(*xtp)) { warnx("struct xtcpcb size mismatch"); goto out; } @@ -598,7 +608,7 @@ gather_inet(int proto) case IPPROTO_UDP: case IPPROTO_DIVERT: xip = (struct xinpcb *)xig; - if (xip->xi_len != sizeof *xip) { + if (xip->xi_len != sizeof(*xip)) { warnx("struct xinpcb size mismatch"); goto out; } @@ -634,7 +644,7 @@ gather_inet(int proto) warnx("invalid vflag 0x%x", inp->inp_vflag); continue; } - if ((sock = calloc(1, sizeof *sock)) == NULL) + if ((sock = calloc(1, sizeof(*sock))) == NULL) err(1, "malloc()"); if ((laddr = calloc(1, sizeof *laddr)) == NULL) err(1, "malloc()"); @@ -690,6 +700,10 @@ gather_unix(int proto) varname = "net.local.dgram.pcblist"; protoname = "dgram"; break; + case SOCK_SEQPACKET: + varname = "net.local.seqpacket.pcblist"; + protoname = "seqpac"; + break; default: abort(); } @@ -709,9 +723,9 @@ gather_unix(int proto) } xug = (struct xunpgen *)buf; exug = (struct xunpgen *)(void *) - ((char *)buf + len - sizeof *exug); - if (xug->xug_len != sizeof *xug || - exug->xug_len != sizeof *exug) { + ((char *)buf + len - sizeof(*exug)); + if (xug->xug_len != sizeof(*xug) || + exug->xug_len != sizeof(*exug)) { warnx("struct xinpgen size mismatch"); goto out; } @@ -725,14 +739,14 @@ gather_unix(int proto) if (xug >= exug) break; xup = (struct xunpcb *)xug; - if (xup->xu_len != sizeof *xup) { + if (xup->xu_len != sizeof(*xup)) { warnx("struct xunpcb size mismatch"); goto out; } if ((xup->xu_unp.unp_conn == NULL && !opt_l) || (xup->xu_unp.unp_conn != NULL && !opt_c)) continue; - if ((sock = calloc(1, sizeof *sock)) == NULL) + if ((sock = calloc(1, sizeof(*sock))) == NULL) err(1, "malloc()"); if ((laddr = calloc(1, sizeof *laddr)) == NULL) err(1, "malloc()"); @@ -765,7 +779,7 @@ getfiles(void) { size_t len, olen; - olen = len = sizeof *xfiles; + olen = len = sizeof(*xfiles); if ((xfiles = malloc(len)) == NULL) err(1, "malloc()"); while (sysctlbyname("kern.file", xfiles, &len, 0, 0) == -1) { @@ -775,39 +789,40 @@ getfiles(void) if ((xfiles = realloc(xfiles, len)) == NULL) err(1, "realloc()"); } - if (len > 0 && xfiles->xf_size != sizeof *xfiles) + if (len > 0 && xfiles->xf_size != sizeof(*xfiles)) errx(1, "struct xfile size mismatch"); - nxfiles = len / sizeof *xfiles; + nxfiles = len / sizeof(*xfiles); } static int printaddr(struct sockaddr_storage *ss) { - char addrstr[INET6_ADDRSTRLEN] = { '\0', '\0' }; struct sockaddr_un *sun; - void *addr = NULL; /* Keep compiler happy. */ - int off, port = 0; + char addrstr[NI_MAXHOST] = { '\0', '\0' }; + int error, off, port = 0; switch (ss->ss_family) { case AF_INET: - addr = &((struct sockaddr_in *)ss)->sin_addr; - if (inet_lnaof(*(struct in_addr *)addr) == INADDR_ANY) + if (inet_lnaof(sstosin(ss)->sin_addr) == INADDR_ANY) addrstr[0] = '*'; - port = ntohs(((struct sockaddr_in *)ss)->sin_port); + port = ntohs(sstosin(ss)->sin_port); break; case AF_INET6: - addr = &((struct sockaddr_in6 *)ss)->sin6_addr; - if (IN6_IS_ADDR_UNSPECIFIED((struct in6_addr *)addr)) + if (IN6_IS_ADDR_UNSPECIFIED(&sstosin6(ss)->sin6_addr)) addrstr[0] = '*'; - port = ntohs(((struct sockaddr_in6 *)ss)->sin6_port); + port = ntohs(sstosin6(ss)->sin6_port); break; case AF_UNIX: - sun = (struct sockaddr_un *)ss; + sun = sstosun(ss); off = (int)((char *)&sun->sun_path - (char *)sun); return (xprintf("%.*s", sun->sun_len - off, sun->sun_path)); } - if (addrstr[0] == '\0') - inet_ntop(ss->ss_family, addr, addrstr, sizeof addrstr); + if (addrstr[0] == '\0') { + error = getnameinfo(sstosa(ss), ss->ss_len, addrstr, + sizeof(addrstr), NULL, 0, NI_NUMERICHOST); + if (error) + errx(1, "getnameinfo()"); + } if (port == 0) return xprintf("%s:*", addrstr); else @@ -825,8 +840,8 @@ getprocname(pid_t pid) mib[1] = KERN_PROC; mib[2] = KERN_PROC_PID; mib[3] = (int)pid; - len = sizeof proc; - if (sysctl(mib, 4, &proc, &len, NULL, 0) == -1) { + len = sizeof(proc); + if (sysctl(mib, nitems(mib), &proc, &len, NULL, 0) == -1) { /* Do not warn if the process exits before we get its name. */ if (errno != ESRCH) warn("sysctl()"); @@ -846,8 +861,8 @@ getprocjid(pid_t pid) mib[1] = KERN_PROC; mib[2] = KERN_PROC_PID; mib[3] = (int)pid; - len = sizeof proc; - if (sysctl(mib, 4, &proc, &len, NULL, 0) == -1) { + len = sizeof(proc); + if (sysctl(mib, nitems(mib), &proc, &len, NULL, 0) == -1) { /* Do not warn if the process exits before we get its jid. */ if (errno != ESRCH) warn("sysctl()"); @@ -867,18 +882,18 @@ check_ports(struct sock *s) if ((s->family != AF_INET) && (s->family != AF_INET6)) return (1); for (addr = s->laddr; addr != NULL; addr = addr->next) { - if (addr->address.ss_family == AF_INET) - port = ntohs(((struct sockaddr_in *)(&addr->address))->sin_port); + if (s->family == AF_INET) + port = ntohs(sstosin(&addr->address)->sin_port); else - port = ntohs(((struct sockaddr_in6 *)(&addr->address))->sin6_port); + port = ntohs(sstosin6(&addr->address)->sin6_port); if (CHK_PORT(port)) return (1); } for (addr = s->faddr; addr != NULL; addr = addr->next) { - if (addr->address.ss_family == AF_INET) - port = ntohs(((struct sockaddr_in *)&(addr->address))->sin_port); + if (s->family == AF_INET) + port = ntohs(sstosin(&addr->address)->sin_port); else - port = ntohs(((struct sockaddr_in6 *)&(addr->address))->sin6_port); + port = ntohs(sstosin6(&addr->address)->sin6_port); if (CHK_PORT(port)) return (1); } @@ -1119,6 +1134,7 @@ main(int argc, char *argv[]) if (opt_u || (protos_defined == -1 && !opt_4 && !opt_6)) { gather_unix(SOCK_STREAM); gather_unix(SOCK_DGRAM); + gather_unix(SOCK_SEQPACKET); } getfiles(); display(); From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 09:06:49 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC179B0; Sat, 20 Jun 2015 09:06:48 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CDA238F1; Sat, 20 Jun 2015 09:06:48 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5K96m8k014540; Sat, 20 Jun 2015 09:06:48 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5K96mY8014539; Sat, 20 Jun 2015 09:06:48 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201506200906.t5K96mY8014539@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 20 Jun 2015 09:06:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284637 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 09:06:49 -0000 Author: antoine Date: Sat Jun 20 09:06:48 2015 New Revision: 284637 URL: https://svnweb.freebsd.org/changeset/base/284637 Log: Add more obsolete files Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sat Jun 20 08:59:50 2015 (r284636) +++ head/ObsoleteFiles.inc Sat Jun 20 09:06:48 2015 (r284637) @@ -417,6 +417,8 @@ OLD_FILES+=usr/lib/clang/3.5.0/lib/freeb OLD_DIRS+=usr/lib/clang/3.5.0/lib/freebsd OLD_DIRS+=usr/lib/clang/3.5.0/lib OLD_DIRS+=usr/lib/clang/3.5.0 +# 20150102: removal of asr(4) +OLD_FILES+=usr/share/man/man4/asr.4.gz # 20150102: removal of texinfo OLD_FILES+=usr/bin/info OLD_FILES+=usr/bin/infokey @@ -485,7 +487,7 @@ OLD_FILES+=usr/include/clang/3.4.1/x86in OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h OLD_DIRS+=usr/include/clang/3.4.1 -# 20141226: Remove gpib/ieee488 +# 20141225: Remove gpib/ieee488 OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h OLD_FILES+=usr/include/dev/ieee488/tnt4882.h OLD_FILES+=usr/include/dev/ieee488/ugpib.h @@ -498,16 +500,28 @@ OLD_FILES+=usr/lib/libgpib_p.a OLD_FILES+=usr/lib/libgpib.so OLD_LIBS+=usr/lib/libgpib.so.3 OLD_FILES+=usr/lib/libgpib_p.a -OLD_FILES+=share/man/man4/pcii.4.gz -OLD_FILES+=share/man/man4/gpib.4.gz -OLD_FILES+=share/man/man4/tnt4882.4.gz -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/libgpib.a OLD_FILES+=usr/lib32/libgpib_p.a OLD_FILES+=usr/lib32/libgpib.so OLD_LIBS+=usr/lib32/libgpib.so.3 -.endif - +OLD_FILES+=usr/share/man/man3/gpib.3.gz +OLD_FILES+=usr/share/man/man3/ibclr.3.gz +OLD_FILES+=usr/share/man/man3/ibdev.3.gz +OLD_FILES+=usr/share/man/man3/ibdma.3.gz +OLD_FILES+=usr/share/man/man3/ibeos.3.gz +OLD_FILES+=usr/share/man/man3/ibeot.3.gz +OLD_FILES+=usr/share/man/man3/ibloc.3.gz +OLD_FILES+=usr/share/man/man3/ibonl.3.gz +OLD_FILES+=usr/share/man/man3/ibpad.3.gz +OLD_FILES+=usr/share/man/man3/ibrd.3.gz +OLD_FILES+=usr/share/man/man3/ibsad.3.gz +OLD_FILES+=usr/share/man/man3/ibsic.3.gz +OLD_FILES+=usr/share/man/man3/ibtmo.3.gz +OLD_FILES+=usr/share/man/man3/ibtrg.3.gz +OLD_FILES+=usr/share/man/man3/ibwrt.3.gz +OLD_FILES+=usr/share/man/man4/gpib.4.gz +OLD_FILES+=usr/share/man/man4/pcii.4.gz +OLD_FILES+=usr/share/man/man4/tnt4882.4.gz # 20141224: libxo moved to /lib OLD_LIBS+=usr/lib/libxo.so.0 # 20141223: remove in6_gif.h, in_gif.h and if_stf.h @@ -542,6 +556,8 @@ OLD_FILES+=usr/include/netinet/ip_gre.h OLD_FILES+=etc/rc.d/postrandom # 20141031: initrandom obsoleted by new /dev/random code OLD_FILES+=etc/rc.d/initrandom +# 20141030: atf 0.21 import +OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz # 20141028: debug files accidentally installed as directory name OLD_FILES+=usr/lib/debug/usr/lib/i18n OLD_FILES+=usr/lib/debug/usr/lib/private From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 09:11:28 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 94D022A9; Sat, 20 Jun 2015 09:11:28 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-qk0-x22f.google.com (mail-qk0-x22f.google.com [IPv6:2607:f8b0:400d:c09::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 53574A86; Sat, 20 Jun 2015 09:11:28 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by qkbp125 with SMTP id p125so69124848qkb.2; Sat, 20 Jun 2015 02:11:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=fbz6jD04DBLl1Ha2tR6D8L+4l4jNkn7oeF22kkpxD84=; b=vk4OC5ySN9HMVbjnCwGTHgdmRqrsv1UvcEqMaTiyB9q9UEcAvhu1YrPxOyjYyfKkN+ oD7wCHmrBJrrJI64PGpvq7M4bcD7IB0E7BOsvHQWoOZWkdiwIMtgg2fv7nz5B6SewNo+ t83Cee0+EPwInMQ7VI/Bjq7qqyrIUlrxexDKrDnWe1yfvHpjDgjifvGnMFRokN6LR1uA lhGJQkMU4yfve0eCFBmh6I8fPQw7VAtpZWZ6v3xMXjETfDNnVgw2LfhQhPyl0GjPbo0F VoJvc/jiYqawM/+Zm573lR8KxSI77n5kSC+QmvRQRJQcr0A0I0F+5U35Jg0FQMUzM3Cy C5GQ== MIME-Version: 1.0 X-Received: by 10.140.235.68 with SMTP id g65mr27981936qhc.96.1434791487466; Sat, 20 Jun 2015 02:11:27 -0700 (PDT) Received: by 10.140.98.73 with HTTP; Sat, 20 Jun 2015 02:11:27 -0700 (PDT) In-Reply-To: <201506200906.t5K96mY8014539@svn.freebsd.org> References: <201506200906.t5K96mY8014539@svn.freebsd.org> Date: Sat, 20 Jun 2015 02:11:27 -0700 Message-ID: Subject: Re: svn commit: r284637 - head From: NGie Cooper To: Antoine Brodin Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 09:11:28 -0000 On Sat, Jun 20, 2015 at 2:06 AM, Antoine Brodin wrote: > Author: antoine > Date: Sat Jun 20 09:06:48 2015 > New Revision: 284637 > URL: https://svnweb.freebsd.org/changeset/base/284637 > > Log: > Add more obsolete files ... > +# 20141030: atf 0.21 import > +OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz Is this correct? $ pkg query '%Fp' atf | grep man/ /usr/local/man/man1/atf-check.1.gz /usr/local/man/man1/atf-sh.1.gz /usr/local/man/man1/atf-test-program.1.gz /usr/local/man/man3/atf-c++-api.3.gz /usr/local/man/man3/atf-c++.3.gz /usr/local/man/man3/atf-c-api.3.gz /usr/local/man/man3/atf-c.3.gz /usr/local/man/man3/atf-sh-api.3.gz /usr/local/man/man3/atf-sh.3.gz /usr/local/man/man4/atf-test-case.4.gz /usr/local/man/man7/atf.7.gz Also, you're removing some lib32 stuff that might have been valid once upon a time... From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 09:41:43 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 91198963; Sat, 20 Jun 2015 09:41:43 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-wg0-x230.google.com (mail-wg0-x230.google.com [IPv6:2a00:1450:400c:c00::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 28C7D1B2; Sat, 20 Jun 2015 09:41:43 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: by wgfq1 with SMTP id q1so59570481wgf.1; Sat, 20 Jun 2015 02:41:41 -0700 (PDT) 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=gMXFFYaW9pljZ3HCmwcPev52I/KCgBoLx6rlZm0y8ag=; b=ztK3oi5rUEe0WXl3Bl3D4UIi0+hP+OixCgtXgjRdaM5+Fy6hKrUsUMLFvc/C9jsWPl sNihtV3pbGHfc3hJhOY/FVCfpyK7I7jlxRr4EUBBMyuPcwuZ963hj+xO9OTaPpJ042Q3 Y+w4Ze/Nao6YJBJ8advKFTLP97Wx7ZtXkqpoiprqomM+pZmTpaTG5Bc7hrP5Hpe845SD r2dmv/0spxaYqs7S2EQ9kRLz6WHMYtWdGewA7jIAAAMn4G2gHLlKA1VmY8pfIpwT70AO mWaCMcl2RDYeAT4F0V6qZ92sE0lfwqCF56xzEOU/qhr+RbFAciUBRvRdlzlq7DkTykT3 WJpA== MIME-Version: 1.0 X-Received: by 10.194.177.230 with SMTP id ct6mr32237872wjc.31.1434793301688; Sat, 20 Jun 2015 02:41:41 -0700 (PDT) Sender: antoine.brodin.freebsd@gmail.com Received: by 10.194.17.130 with HTTP; Sat, 20 Jun 2015 02:41:41 -0700 (PDT) In-Reply-To: References: <201506200906.t5K96mY8014539@svn.freebsd.org> Date: Sat, 20 Jun 2015 09:41:41 +0000 X-Google-Sender-Auth: jpB221FSnyKoHEFSXsrgY_12WVQ Message-ID: Subject: Re: svn commit: r284637 - head From: Antoine Brodin To: NGie Cooper Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 09:41:43 -0000 On Sat, Jun 20, 2015 at 9:11 AM, NGie Cooper wrote: > On Sat, Jun 20, 2015 at 2:06 AM, Antoine Brodin wrote: >> Author: antoine >> Date: Sat Jun 20 09:06:48 2015 >> New Revision: 284637 >> URL: https://svnweb.freebsd.org/changeset/base/284637 >> >> Log: >> Add more obsolete files > > ... > >> +# 20141030: atf 0.21 import >> +OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz > > Is this correct? This file is not installed from base/head. It may still be installed by the port but it's unrelated. ... > Also, you're removing some lib32 stuff that might have been valid once > upon a time... This is exactly the purpose of ObsoleteFiles.inc, list files that might have been valid but are no longer. Cheers, Antoine From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 09:48:55 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4BC54AC1; Sat, 20 Jun 2015 09:48:55 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-qg0-x231.google.com (mail-qg0-x231.google.com [IPv6:2607:f8b0:400d:c04::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 07ACE1FD; Sat, 20 Jun 2015 09:48:55 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by qgal13 with SMTP id l13so42794665qga.3; Sat, 20 Jun 2015 02:48:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=tNvTqD1sqruwHF9P0w9V7MuNVtznKymrPKfzXYOd8XA=; b=of6RLqVzMfOCL4lvJ1covfN6DDo8ixyxwWQdvTsdv6ifzTMbzBNbNu+bFftOAP7z7j 1/ATKjrfVXTxUIRlGulYSL1EZqZNZVOcgyXHNUl55CQY2fHDUDyk+qSX8z+Tllt/L6jH AJBePjfnFmOkegV5FMSYbCO8VdTYxhxqKpEVs8x0B1fsGGnL3eXmiPWERqxqddDei0pd FwVLSpfMS44fY5YucOSlplQdpH5J6QEA9by0WbOrJIBRQEmK3wki4GgGaO2Z40Ey73yS tf7Ksx8cEBoTwUSlfZJQoX3rcX3IteRJyjG9aEH+0YMokiaVMPiuNa5wlZN/1QrStSv+ ceLA== MIME-Version: 1.0 X-Received: by 10.55.52.12 with SMTP id b12mr42945022qka.22.1434793733943; Sat, 20 Jun 2015 02:48:53 -0700 (PDT) Received: by 10.140.98.73 with HTTP; Sat, 20 Jun 2015 02:48:53 -0700 (PDT) In-Reply-To: References: <201506200906.t5K96mY8014539@svn.freebsd.org> Date: Sat, 20 Jun 2015 02:48:53 -0700 Message-ID: Subject: Re: svn commit: r284637 - head From: NGie Cooper To: Antoine Brodin Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 09:48:55 -0000 On Sat, Jun 20, 2015 at 2:41 AM, Antoine Brodin wrote: > On Sat, Jun 20, 2015 at 9:11 AM, NGie Cooper wrote: >> On Sat, Jun 20, 2015 at 2:06 AM, Antoine Brodin wrote: >>> Author: antoine >>> Date: Sat Jun 20 09:06:48 2015 >>> New Revision: 284637 >>> URL: https://svnweb.freebsd.org/changeset/base/284637 >>> >>> Log: >>> Add more obsolete files >> >> ... >> >>> +# 20141030: atf 0.21 import >>> +OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz >> >> Is this correct? > > This file is not installed from base/head. It may still be installed > by the port but it's unrelated. It's still being installed in base -- just as a hardlink: 72 MAN= atf-c++.3 73 MLINKS+= atf-c++.3 atf-c-api++.3 # Backwards compatibility. $ make -n maninstall install -o root -g wheel -m 444 atf-c++.3.gz /usr/share/man/man3 set atf-c++.3 3 atf-c-api++.3 3; while : ; do case $# in 0) break;; [123]) echo "warn: empty MLINK: $1 $2 $3"; break;; esac; name=$1; shift; sect=$1; shift; l=/usr/share/man/man${sect}/$name; name=$1; shift; sect=$1; shift; t=/usr/share/man/man${sect}/$name; echo ${t}.gz -\> ${l}.gz; rm -f ${t} ${t}.gz; install -l h ${l}.gz ${t}.gz; done ===> tests (maninstall) ===> tests/detail (maninstall) Is your script/method of finding obsolete files correct? Thanks, -NGie From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 09:52:08 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70035D21; Sat, 20 Jun 2015 09:52:08 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-wi0-x22d.google.com (mail-wi0-x22d.google.com [IPv6:2a00:1450:400c:c05::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 06263604; Sat, 20 Jun 2015 09:52:08 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: by wicnd19 with SMTP id nd19so37902040wic.1; Sat, 20 Jun 2015 02:52:06 -0700 (PDT) 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=jnrEBRRKj9bK2Lem3TVHmVwyRjtDLYitb9mpMGvQBOs=; b=DiA6amTrYGH3F20WuRz8nkhQOa9LB4Us2TPDggf0PawwvnBDMnxUP1smafh2UQGqNn 8Xl5DZgERb6Q5G40k1bwY9EXTL9yq1oUVDuiUmsvQvBLCdLdlRj8sZ/wxGi/2IhMWArx nGmXD9Vh99+6HLg/Y3UxG5MUqWZo4u5Jedb/2rDLgxTOaRafGMYD6qe+/nwxGdHsuE4v GLNo9XKBU/6/sra8yAFQP2iUdTogO6hLL20L6Z4HjjbC3Qk6JJlYJDQPClblRxiMSq5B a6B+GUj66ls4HEAChkhXuBMbcFTnVZffil7q2klxfbz4f3IkrwhbXDarUV366n/UypxI XjZQ== MIME-Version: 1.0 X-Received: by 10.194.47.196 with SMTP id f4mr23442396wjn.46.1434793926431; Sat, 20 Jun 2015 02:52:06 -0700 (PDT) Sender: antoine.brodin.freebsd@gmail.com Received: by 10.194.17.130 with HTTP; Sat, 20 Jun 2015 02:52:06 -0700 (PDT) In-Reply-To: References: <201506200906.t5K96mY8014539@svn.freebsd.org> Date: Sat, 20 Jun 2015 09:52:06 +0000 X-Google-Sender-Auth: e8jWL7LLDtUt32Gs2oxZ_h4ItSY Message-ID: Subject: Re: svn commit: r284637 - head From: Antoine Brodin To: NGie Cooper Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 09:52:08 -0000 On Sat, Jun 20, 2015 at 9:48 AM, NGie Cooper wrote: > On Sat, Jun 20, 2015 at 2:41 AM, Antoine Brodin wrote: >> On Sat, Jun 20, 2015 at 9:11 AM, NGie Cooper wrote: >>> On Sat, Jun 20, 2015 at 2:06 AM, Antoine Brodin wrote: >>>> Author: antoine >>>> Date: Sat Jun 20 09:06:48 2015 >>>> New Revision: 284637 >>>> URL: https://svnweb.freebsd.org/changeset/base/284637 >>>> >>>> Log: >>>> Add more obsolete files >>> >>> ... >>> >>>> +# 20141030: atf 0.21 import >>>> +OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz >>> >>> Is this correct? >> >> This file is not installed from base/head. It may still be installed >> by the port but it's unrelated. > > It's still being installed in base -- just as a hardlink: > > 72 MAN= atf-c++.3 > 73 MLINKS+= atf-c++.3 atf-c-api++.3 # Backwards compatibility. > > $ make -n maninstall > install -o root -g wheel -m 444 atf-c++.3.gz /usr/share/man/man3 > set atf-c++.3 3 atf-c-api++.3 3; while : ; do case $# in 0) break;; > [123]) echo "warn: empty MLINK: $1 $2 $3"; break;; esac; name=$1; > shift; sect=$1; shift; l=/usr/share/man/man${sect}/$name; name=$1; > shift; sect=$1; shift; t=/usr/share/man/man${sect}/$name; echo > ${t}.gz -\> ${l}.gz; rm -f ${t} ${t}.gz; install -l h ${l}.gz > ${t}.gz; done > ===> tests (maninstall) > ===> tests/detail (maninstall) > > Is your script/method of finding obsolete files correct? c++-api is different from c-api++ Antoine From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 09:53:24 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D31E2E5F; Sat, 20 Jun 2015 09:53:24 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-qk0-x229.google.com (mail-qk0-x229.google.com [IPv6:2607:f8b0:400d:c09::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8CD4E609; Sat, 20 Jun 2015 09:53:24 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by qkeo142 with SMTP id o142so56611529qke.1; Sat, 20 Jun 2015 02:53:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=zWf6vUmpjfnLQgrUBr8j+qjGG5bojJ1hoOYM04x9GhM=; b=xxFok54ZmItRWvWMv6LC5sH4LS5MkP+BPPROtaihRUJgfMSi52uyckxQF5dPtuLtkH iH8M5awZghU7CeU0vFIXOS3PCOxfNk7R6/iXK4uDTKgS2ZF8TwOvzJYeBj9kEEWtCCh0 d6K2DNSx2bOJYUOYEFMMlTyfma7xfkpPm+c4uLjfyqKmm4E1qyTCOtX8vltFHr6yVZ2w kwC/uUivfputW+ZbMtfJGuH+QNdUtsQhzwgzMYrogfpj+GKtzULPvuyrhEFd0GbcrMm2 L7r6GwI0J4oszNXe3wy3hASpLZoc/d7HnuswEE4V88inGMpGtg16bCICnT8IH8UGGFHj kSDg== MIME-Version: 1.0 X-Received: by 10.140.29.55 with SMTP id a52mr26029735qga.25.1434794003671; Sat, 20 Jun 2015 02:53:23 -0700 (PDT) Received: by 10.140.98.73 with HTTP; Sat, 20 Jun 2015 02:53:23 -0700 (PDT) In-Reply-To: References: <201506200906.t5K96mY8014539@svn.freebsd.org> Date: Sat, 20 Jun 2015 02:53:23 -0700 Message-ID: Subject: Re: svn commit: r284637 - head From: NGie Cooper To: Antoine Brodin Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 09:53:24 -0000 On Sat, Jun 20, 2015 at 2:52 AM, Antoine Brodin wrote: ... > c++-api is different from c-api++ Agh. Good eyes. That's a typo in the Makefile. I'll fix that soon... From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 11:11:14 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 799BCA5A; Sat, 20 Jun 2015 11:11:14 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6834194B; Sat, 20 Jun 2015 11:11:14 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5KBBEfd074628; Sat, 20 Jun 2015 11:11:14 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5KBBEvZ074627; Sat, 20 Jun 2015 11:11:14 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506201111.t5KBBEvZ074627@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 20 Jun 2015 11:11:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284638 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 11:11:14 -0000 Author: bapt Date: Sat Jun 20 11:11:13 2015 New Revision: 284638 URL: https://svnweb.freebsd.org/changeset/base/284638 Log: Remove temporary changes that crept in r284417 when it should not have Reported by: antoine, jbeich Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sat Jun 20 09:06:48 2015 (r284637) +++ head/Makefile.inc1 Sat Jun 20 11:11:13 2015 (r284638) @@ -451,8 +451,6 @@ LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${LIB32 LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \ CXX="${XCXX} ${LIB32FLAGS}" \ DESTDIR=${LIB32TMP} \ - SHLIBDIR=/usr/lib32 \ - LIBDIR=/usr/lib32 \ -DCOMPAT_32BIT \ -DLIBRARIES_ONLY \ -DNO_CPU_CFLAGS \ From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 11:20:26 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6F945C6F; Sat, 20 Jun 2015 11:20:26 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 50E5BA46; Sat, 20 Jun 2015 11:20:26 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5KBKQp5079944; Sat, 20 Jun 2015 11:20:26 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5KBKPwY079942; Sat, 20 Jun 2015 11:20:25 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201506201120.t5KBKPwY079942@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sat, 20 Jun 2015 11:20:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284639 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 11:20:26 -0000 Author: mav Date: Sat Jun 20 11:20:25 2015 New Revision: 284639 URL: https://svnweb.freebsd.org/changeset/base/284639 Log: Introduce separate lock for tokens to reduce ctl_lock scope. Modified: head/sys/cam/ctl/ctl_private.h head/sys/cam/ctl/ctl_tpc.c Modified: head/sys/cam/ctl/ctl_private.h ============================================================================== --- head/sys/cam/ctl/ctl_private.h Sat Jun 20 11:11:13 2015 (r284638) +++ head/sys/cam/ctl/ctl_private.h Sat Jun 20 11:20:25 2015 (r284639) @@ -494,6 +494,7 @@ struct ctl_softc { struct ctl_thread threads[CTL_MAX_THREADS]; TAILQ_HEAD(tpc_tokens, tpc_token) tpc_tokens; struct callout tpc_timeout; + struct mtx tpc_lock; }; #ifdef _KERNEL Modified: head/sys/cam/ctl/ctl_tpc.c ============================================================================== --- head/sys/cam/ctl/ctl_tpc.c Sat Jun 20 11:11:13 2015 (r284638) +++ head/sys/cam/ctl/ctl_tpc.c Sat Jun 20 11:20:25 2015 (r284639) @@ -167,6 +167,7 @@ tpc_timeout(void *arg) } /* Free inactive ROD tokens with expired timeout. */ + mtx_lock(&softc->tpc_lock); TAILQ_FOREACH_SAFE(token, &softc->tpc_tokens, links, ttoken) { if (token->active || time_uptime < token->last_active + token->timeout + 1) @@ -175,6 +176,7 @@ tpc_timeout(void *arg) free(token->params, M_CTL); free(token, M_CTL); } + mtx_unlock(&softc->tpc_lock); callout_schedule(&softc->tpc_timeout, hz); } @@ -182,6 +184,7 @@ void ctl_tpc_init(struct ctl_softc *softc) { + mtx_init(&softc->tpc_lock, "CTL TPC mutex", NULL, MTX_DEF); TAILQ_INIT(&softc->tpc_tokens); callout_init_mtx(&softc->tpc_timeout, &softc->ctl_lock, 0); callout_reset(&softc->tpc_timeout, hz, tpc_timeout, softc); @@ -195,13 +198,14 @@ ctl_tpc_shutdown(struct ctl_softc *softc callout_drain(&softc->tpc_timeout); /* Free ROD tokens. */ - mtx_lock(&softc->ctl_lock); + mtx_lock(&softc->tpc_lock); while ((token = TAILQ_FIRST(&softc->tpc_tokens)) != NULL) { TAILQ_REMOVE(&softc->tpc_tokens, token, links); free(token->params, M_CTL); free(token, M_CTL); } - mtx_unlock(&softc->ctl_lock); + mtx_unlock(&softc->tpc_lock); + mtx_destroy(&softc->tpc_lock); } void @@ -227,7 +231,7 @@ ctl_tpc_lun_shutdown(struct ctl_lun *lun } /* Free ROD tokens for this LUN. */ - mtx_assert(&softc->ctl_lock, MA_OWNED); + mtx_lock(&softc->tpc_lock); TAILQ_FOREACH_SAFE(token, &softc->tpc_tokens, links, ttoken) { if (token->lun != lun->lun || token->active) continue; @@ -235,6 +239,7 @@ ctl_tpc_lun_shutdown(struct ctl_lun *lun free(token->params, M_CTL); free(token, M_CTL); } + mtx_unlock(&softc->tpc_lock); } int @@ -1394,10 +1399,10 @@ done: free(list->params, M_CTL); list->params = NULL; if (list->token) { - mtx_lock(&softc->ctl_lock); + mtx_lock(&softc->tpc_lock); if (--list->token->active == 0) list->token->last_active = time_uptime; - mtx_unlock(&softc->ctl_lock); + mtx_unlock(&softc->tpc_lock); list->token = NULL; } mtx_lock(&lun->lun_lock); @@ -1991,9 +1996,9 @@ ctl_populate_token(struct ctl_scsiio *ct list->curseg = 0; list->completed = 1; list->last_active = time_uptime; - mtx_lock(&softc->ctl_lock); + mtx_lock(&softc->tpc_lock); TAILQ_INSERT_TAIL(&softc->tpc_tokens, token, links); - mtx_unlock(&softc->ctl_lock); + mtx_unlock(&softc->tpc_lock); ctl_set_success(ctsio); ctl_done((union ctl_io *)ctsio); return (CTL_RETVAL_COMPLETE); @@ -2100,7 +2105,7 @@ ctl_write_using_token(struct ctl_scsiio return (CTL_RETVAL_COMPLETE); } - mtx_lock(&softc->ctl_lock); + mtx_lock(&softc->tpc_lock); TAILQ_FOREACH(token, &softc->tpc_tokens, links) { if (memcmp(token->token, data->rod_token, sizeof(data->rod_token)) == 0) @@ -2112,7 +2117,7 @@ ctl_write_using_token(struct ctl_scsiio if (data->flags & EC_WUT_DEL_TKN) token->timeout = 0; } - mtx_unlock(&softc->ctl_lock); + mtx_unlock(&softc->tpc_lock); if (token == NULL) { mtx_lock(&lun->lun_lock); TAILQ_REMOVE(&lun->tpc_lists, list, links); @@ -2254,10 +2259,10 @@ ctl_report_all_rod_tokens(struct ctl_scs retval = CTL_RETVAL_COMPLETE; tokens = 0; - mtx_lock(&softc->ctl_lock); + mtx_lock(&softc->tpc_lock); TAILQ_FOREACH(token, &softc->tpc_tokens, links) tokens++; - mtx_unlock(&softc->ctl_lock); + mtx_unlock(&softc->tpc_lock); if (tokens > 512) tokens = 512; @@ -2282,7 +2287,7 @@ ctl_report_all_rod_tokens(struct ctl_scs data = (struct scsi_report_all_rod_tokens_data *)ctsio->kern_data_ptr; i = 0; - mtx_lock(&softc->ctl_lock); + mtx_lock(&softc->tpc_lock); TAILQ_FOREACH(token, &softc->tpc_tokens, links) { if (i >= tokens) break; @@ -2290,7 +2295,7 @@ ctl_report_all_rod_tokens(struct ctl_scs token->token, 96); i++; } - mtx_unlock(&softc->ctl_lock); + mtx_unlock(&softc->tpc_lock); scsi_ulto4b(sizeof(*data) - 4 + i * 96, data->available_data); /* printf("RART tokens=%d\n", i); From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 12:43:57 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A2BCA1A; Sat, 20 Jun 2015 12:43:57 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 477D4FA1; Sat, 20 Jun 2015 12:43:57 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5KChv0x023346; Sat, 20 Jun 2015 12:43:57 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5KChsIv023337; Sat, 20 Jun 2015 12:43:54 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201506201243.t5KChsIv023337@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sat, 20 Jun 2015 12:43:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284640 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 12:43:57 -0000 Author: mav Date: Sat Jun 20 12:43:54 2015 New Revision: 284640 URL: https://svnweb.freebsd.org/changeset/base/284640 Log: Bring per-port LUN enable/disable code up to date: - remove last remnants of never implemented multiple targets support; - implement missing support for LUN mapping in this area. Due to existing locking constraints LUN mapping code is practically unlocked at this point. Hopefully it is not racy enough to live until somebody get idea how to call sleeping fronend methods under lock also taken by the same frontend in non-sleepable context. :( Modified: head/sys/cam/ctl/ctl.c head/sys/cam/ctl/ctl_frontend.c head/sys/cam/ctl/ctl_frontend.h head/sys/cam/ctl/ctl_frontend_cam_sim.c head/sys/cam/ctl/ctl_frontend_internal.c head/sys/cam/ctl/ctl_frontend_iscsi.c head/sys/cam/ctl/ctl_private.h head/sys/cam/ctl/ctl_tpc_local.c head/sys/cam/ctl/scsi_ctl.c Modified: head/sys/cam/ctl/ctl.c ============================================================================== --- head/sys/cam/ctl/ctl.c Sat Jun 20 11:20:25 2015 (r284639) +++ head/sys/cam/ctl/ctl.c Sat Jun 20 12:43:54 2015 (r284640) @@ -383,8 +383,8 @@ static int ctl_open(struct cdev *dev, in static int ctl_close(struct cdev *dev, int flags, int fmt, struct thread *td); static void ctl_ioctl_online(void *arg); static void ctl_ioctl_offline(void *arg); -static int ctl_ioctl_lun_enable(void *arg, struct ctl_id targ_id, int lun_id); -static int ctl_ioctl_lun_disable(void *arg, struct ctl_id targ_id, int lun_id); +static int ctl_ioctl_lun_enable(void *arg, int lun_id); +static int ctl_ioctl_lun_disable(void *arg, int lun_id); static int ctl_ioctl_do_datamove(struct ctl_scsiio *ctsio); static int ctl_serialize_other_sc_cmd(struct ctl_scsiio *ctsio); static int ctl_ioctl_submit_wait(union ctl_io *io); @@ -399,7 +399,7 @@ static int ctl_ioctl_fill_ooa(struct ctl static int ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td); static int ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *lun, - struct ctl_be_lun *be_lun, struct ctl_id target_id); + struct ctl_be_lun *be_lun); static int ctl_free_lun(struct ctl_lun *lun); static void ctl_create_lun(struct ctl_be_lun *be_lun); static struct ctl_port * ctl_io_port(struct ctl_io_hdr *io_hdr); @@ -1128,13 +1128,6 @@ ctl_init(void) softc->port_offset = (softc->ha_id - 1) * CTL_MAX_PORTS; softc->persis_offset = softc->port_offset * CTL_MAX_INIT_PER_PORT; - /* - * XXX KDM need to figure out where we want to get our target ID - * and WWID. Is it different on each port? - */ - softc->target.id = 0; - softc->target.wwid[0] = 0x12345678; - softc->target.wwid[1] = 0x87654321; STAILQ_INIT(&softc->lun_list); STAILQ_INIT(&softc->pending_lun_queue); STAILQ_INIT(&softc->fe_list); @@ -1647,13 +1640,13 @@ ctl_create_iid(struct ctl_port *port, in } static int -ctl_ioctl_lun_enable(void *arg, struct ctl_id targ_id, int lun_id) +ctl_ioctl_lun_enable(void *arg, int lun_id) { return (0); } static int -ctl_ioctl_lun_disable(void *arg, struct ctl_id targ_id, int lun_id) +ctl_ioctl_lun_disable(void *arg, int lun_id) { return (0); } @@ -2478,28 +2471,9 @@ ctl_ioctl(struct cdev *dev, u_long cmd, mtx_unlock(&softc->ctl_lock); if (cmd == CTL_ENABLE_PORT) { - struct ctl_lun *lun; - - STAILQ_FOREACH(lun, &softc->lun_list, - links) { - port->lun_enable(port->targ_lun_arg, - lun->target, - lun->lun); - } - ctl_port_online(port); } else if (cmd == CTL_DISABLE_PORT) { - struct ctl_lun *lun; - ctl_port_offline(port); - - STAILQ_FOREACH(lun, &softc->lun_list, - links) { - port->lun_disable( - port->targ_lun_arg, - lun->target, - lun->lun); - } } mtx_lock(&softc->ctl_lock); @@ -3560,26 +3534,22 @@ ctl_ioctl(struct cdev *dev, u_long cmd, mtx_unlock(&softc->ctl_lock); return (ENXIO); } + mtx_unlock(&softc->ctl_lock); // XXX: port_enable sleeps if (lm->plun < CTL_MAX_LUNS) { if (lm->lun == UINT32_MAX) retval = ctl_lun_map_unset(port, lm->plun); else if (lm->lun < CTL_MAX_LUNS && softc->ctl_luns[lm->lun] != NULL) retval = ctl_lun_map_set(port, lm->plun, lm->lun); - else { - mtx_unlock(&softc->ctl_lock); + else return (ENXIO); - } } else if (lm->plun == UINT32_MAX) { if (lm->lun == UINT32_MAX) retval = ctl_lun_map_deinit(port); else retval = ctl_lun_map_init(port); - } else { - mtx_unlock(&softc->ctl_lock); + } else return (ENXIO); - } - mtx_unlock(&softc->ctl_lock); break; } default: { @@ -3649,6 +3619,8 @@ ctl_port_idx(int port_num) int ctl_lun_map_init(struct ctl_port *port) { + struct ctl_softc *softc = control_softc; + struct ctl_lun *lun; uint32_t i; if (port->lun_map == NULL) @@ -3658,17 +3630,27 @@ ctl_lun_map_init(struct ctl_port *port) return (ENOMEM); for (i = 0; i < CTL_MAX_LUNS; i++) port->lun_map[i] = UINT32_MAX; + if (port->status & CTL_PORT_STATUS_ONLINE) { + STAILQ_FOREACH(lun, &softc->lun_list, links) + port->lun_disable(port->targ_lun_arg, lun->lun); + } return (0); } int ctl_lun_map_deinit(struct ctl_port *port) { + struct ctl_softc *softc = control_softc; + struct ctl_lun *lun; if (port->lun_map == NULL) return (0); free(port->lun_map, M_CTL); port->lun_map = NULL; + if (port->status & CTL_PORT_STATUS_ONLINE) { + STAILQ_FOREACH(lun, &softc->lun_list, links) + port->lun_enable(port->targ_lun_arg, lun->lun); + } return (0); } @@ -3676,37 +3658,31 @@ int ctl_lun_map_set(struct ctl_port *port, uint32_t plun, uint32_t glun) { int status; + uint32_t old; if (port->lun_map == NULL) { status = ctl_lun_map_init(port); if (status != 0) return (status); } + old = port->lun_map[plun]; port->lun_map[plun] = glun; + if ((port->status & CTL_PORT_STATUS_ONLINE) && old >= CTL_MAX_LUNS) + port->lun_enable(port->targ_lun_arg, plun); return (0); } int ctl_lun_map_unset(struct ctl_port *port, uint32_t plun) { + uint32_t old; if (port->lun_map == NULL) return (0); + old = port->lun_map[plun]; port->lun_map[plun] = UINT32_MAX; - return (0); -} - -int -ctl_lun_map_unsetg(struct ctl_port *port, uint32_t glun) -{ - int i; - - if (port->lun_map == NULL) - return (0); - for (i = 0; i < CTL_MAX_LUNS; i++) { - if (port->lun_map[i] == glun) - port->lun_map[i] = UINT32_MAX; - } + if ((port->status & CTL_PORT_STATUS_ONLINE) && old < CTL_MAX_LUNS) + port->lun_disable(port->targ_lun_arg, plun); return (0); } @@ -4532,7 +4508,7 @@ hex2bin(const char *str, uint8_t *buf, i */ static int ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *ctl_lun, - struct ctl_be_lun *const be_lun, struct ctl_id target_id) + struct ctl_be_lun *const be_lun) { struct ctl_lun *nlun, *lun; struct scsi_vpd_id_descriptor *desc; @@ -4669,8 +4645,7 @@ ctl_alloc_lun(struct ctl_softc *ctl_soft lun_number = ctl_ffz(ctl_softc->ctl_lun_mask, CTL_MAX_LUNS); if (lun_number == -1) { mtx_unlock(&ctl_softc->ctl_lock); - printf("ctl: can't allocate LUN on target %ju, out of " - "LUNs\n", (uintmax_t)target_id.id); + printf("ctl: can't allocate LUN, out of LUNs\n"); if (lun->flags & CTL_LUN_MALLOCED) free(lun, M_CTL); be_lun->lun_config_status(be_lun->be_lun, @@ -4681,7 +4656,6 @@ ctl_alloc_lun(struct ctl_softc *ctl_soft ctl_set_mask(ctl_softc->ctl_lun_mask, lun_number); mtx_init(&lun->lun_lock, "CTL LUN", NULL, MTX_DEF); - lun->target = target_id; lun->lun = lun_number; lun->be_lun = be_lun; /* @@ -4777,7 +4751,6 @@ static int ctl_free_lun(struct ctl_lun *lun) { struct ctl_softc *softc; - struct ctl_port *port; struct ctl_lun *nlun; int i; @@ -4785,9 +4758,6 @@ ctl_free_lun(struct ctl_lun *lun) mtx_assert(&softc->ctl_lock, MA_OWNED); - STAILQ_FOREACH(port, &softc->port_list, links) - ctl_lun_map_unsetg(port, lun->lun); - STAILQ_REMOVE(&softc->lun_list, lun, ctl_lun, links); ctl_clear_mask(softc->ctl_lun_mask, lun->lun); @@ -4835,7 +4805,7 @@ ctl_create_lun(struct ctl_be_lun *be_lun /* * ctl_alloc_lun() should handle all potential failure cases. */ - ctl_alloc_lun(softc, NULL, be_lun, softc->target); + ctl_alloc_lun(softc, NULL, be_lun); } int @@ -4878,6 +4848,9 @@ ctl_enable_lun(struct ctl_be_lun *be_lun for (port = STAILQ_FIRST(&softc->port_list); port != NULL; port = nport) { nport = STAILQ_NEXT(port, links); + if ((port->status & CTL_PORT_STATUS_ONLINE) == 0 || + port->lun_map != NULL) + continue; /* * Drop the lock while we call the FETD's enable routine. @@ -4885,13 +4858,13 @@ ctl_enable_lun(struct ctl_be_lun *be_lun * case of the internal initiator frontend. */ mtx_unlock(&softc->ctl_lock); - retval = port->lun_enable(port->targ_lun_arg, lun->target,lun->lun); + retval = port->lun_enable(port->targ_lun_arg, lun->lun); mtx_lock(&softc->ctl_lock); if (retval != 0) { printf("%s: FETD %s port %d returned error " - "%d for lun_enable on target %ju lun %jd\n", - __func__, port->port_name, port->targ_port, retval, - (uintmax_t)lun->target.id, (intmax_t)lun->lun); + "%d for lun_enable on lun %jd\n", + __func__, port->port_name, port->targ_port, + retval, (intmax_t)lun->lun); } } @@ -4922,6 +4895,9 @@ ctl_disable_lun(struct ctl_be_lun *be_lu mtx_unlock(&lun->lun_lock); STAILQ_FOREACH(port, &softc->port_list, links) { + if ((port->status & CTL_PORT_STATUS_ONLINE) == 0 || + port->lun_map != NULL) + continue; mtx_unlock(&softc->ctl_lock); /* * Drop the lock before we call the frontend's disable @@ -4930,14 +4906,13 @@ ctl_disable_lun(struct ctl_be_lun *be_lu * XXX KDM what happens if the frontend list changes while * we're traversing it? It's unlikely, but should be handled. */ - retval = port->lun_disable(port->targ_lun_arg, lun->target, - lun->lun); + retval = port->lun_disable(port->targ_lun_arg, lun->lun); mtx_lock(&softc->ctl_lock); if (retval != 0) { printf("%s: FETD %s port %d returned error " - "%d for lun_disable on target %ju lun %jd\n", - __func__, port->port_name, port->targ_port, retval, - (uintmax_t)lun->target.id, (intmax_t)lun->lun); + "%d for lun_disable on lun %jd\n", + __func__, port->port_name, port->targ_port, + retval, (intmax_t)lun->lun); } } Modified: head/sys/cam/ctl/ctl_frontend.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend.c Sat Jun 20 11:20:25 2015 (r284639) +++ head/sys/cam/ctl/ctl_frontend.c Sat Jun 20 12:43:54 2015 (r284640) @@ -301,6 +301,20 @@ ctl_port_set_wwns(struct ctl_port *port, void ctl_port_online(struct ctl_port *port) { + struct ctl_softc *softc = control_softc; + struct ctl_lun *lun; + uint32_t l; + + if (port->lun_map) { + for (l = 0; l < CTL_MAX_LUNS; l++) { + if (ctl_lun_map_from_port(port, l) >= CTL_MAX_LUNS) + continue; + port->lun_enable(port->targ_lun_arg, l); + } + } else { + STAILQ_FOREACH(lun, &softc->lun_list, links) + port->lun_enable(port->targ_lun_arg, lun->lun); + } port->port_online(port->onoff_arg); /* XXX KDM need a lock here? */ port->status |= CTL_PORT_STATUS_ONLINE; @@ -309,7 +323,21 @@ ctl_port_online(struct ctl_port *port) void ctl_port_offline(struct ctl_port *port) { + struct ctl_softc *softc = control_softc; + struct ctl_lun *lun; + uint32_t l; + port->port_offline(port->onoff_arg); + if (port->lun_map) { + for (l = 0; l < CTL_MAX_LUNS; l++) { + if (ctl_lun_map_from_port(port, l) >= CTL_MAX_LUNS) + continue; + port->lun_disable(port->targ_lun_arg, l); + } + } else { + STAILQ_FOREACH(lun, &softc->lun_list, links) + port->lun_disable(port->targ_lun_arg, lun->lun); + } /* XXX KDM need a lock here? */ port->status &= ~CTL_PORT_STATUS_ONLINE; } Modified: head/sys/cam/ctl/ctl_frontend.h ============================================================================== --- head/sys/cam/ctl/ctl_frontend.h Sat Jun 20 11:20:25 2015 (r284639) +++ head/sys/cam/ctl/ctl_frontend.h Sat Jun 20 12:43:54 2015 (r284640) @@ -48,7 +48,7 @@ typedef int (*fe_init_t)(void); typedef void (*fe_shutdown_t)(void); typedef void (*port_func_t)(void *onoff_arg); typedef int (*port_info_func_t)(void *onoff_arg, struct sbuf *sb); -typedef int (*lun_func_t)(void *arg, struct ctl_id targ_id, int lun_id); +typedef int (*lun_func_t)(void *arg, int lun_id); typedef int (*fe_ioctl_t)(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td); Modified: head/sys/cam/ctl/ctl_frontend_cam_sim.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend_cam_sim.c Sat Jun 20 11:20:25 2015 (r284639) +++ head/sys/cam/ctl/ctl_frontend_cam_sim.c Sat Jun 20 12:43:54 2015 (r284640) @@ -99,8 +99,8 @@ int cfcs_init(void); static void cfcs_poll(struct cam_sim *sim); static void cfcs_online(void *arg); static void cfcs_offline(void *arg); -static int cfcs_lun_enable(void *arg, struct ctl_id target_id, int lun_id); -static int cfcs_lun_disable(void *arg, struct ctl_id target_id, int lun_id); +static int cfcs_lun_enable(void *arg, int lun_id); +static int cfcs_lun_disable(void *arg, int lun_id); static void cfcs_datamove(union ctl_io *io); static void cfcs_done(union ctl_io *io); void cfcs_action(struct cam_sim *sim, union ccb *ccb); @@ -303,12 +303,12 @@ cfcs_offline(void *arg) } static int -cfcs_lun_enable(void *arg, struct ctl_id target_id, int lun_id) +cfcs_lun_enable(void *arg, int lun_id) { return (0); } static int -cfcs_lun_disable(void *arg, struct ctl_id target_id, int lun_id) +cfcs_lun_disable(void *arg, int lun_id) { return (0); } Modified: head/sys/cam/ctl/ctl_frontend_internal.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend_internal.c Sat Jun 20 11:20:25 2015 (r284639) +++ head/sys/cam/ctl/ctl_frontend_internal.c Sat Jun 20 12:43:54 2015 (r284640) @@ -144,7 +144,6 @@ typedef enum { } cfi_lun_state; struct cfi_lun { - struct ctl_id target_id; int lun_id; struct scsi_inquiry_data inq_data; uint64_t num_blocks; @@ -192,8 +191,8 @@ int cfi_init(void); void cfi_shutdown(void) __unused; static void cfi_online(void *arg); static void cfi_offline(void *arg); -static int cfi_lun_enable(void *arg, struct ctl_id target_id, int lun_id); -static int cfi_lun_disable(void *arg, struct ctl_id target_id, int lun_id); +static int cfi_lun_enable(void *arg, int lun_id); +static int cfi_lun_disable(void *arg, int lun_id); static void cfi_datamove(union ctl_io *io); static cfi_error_action cfi_checkcond_parse(union ctl_io *io, struct cfi_lun_io *lun_io); @@ -324,7 +323,7 @@ cfi_offline(void *arg) } static int -cfi_lun_enable(void *arg, struct ctl_id target_id, int lun_id) +cfi_lun_enable(void *arg, int lun_id) { struct cfi_softc *softc; struct cfi_lun *lun; @@ -335,8 +334,7 @@ cfi_lun_enable(void *arg, struct ctl_id found = 0; mtx_lock(&softc->lock); STAILQ_FOREACH(lun, &softc->lun_list, links) { - if ((lun->target_id.id == target_id.id) - && (lun->lun_id == lun_id)) { + if (lun->lun_id == lun_id) { found = 1; break; } @@ -356,7 +354,6 @@ cfi_lun_enable(void *arg, struct ctl_id return (1); } - lun->target_id = target_id; lun->lun_id = lun_id; lun->cur_tag_num = 0; lun->state = CFI_LUN_INQUIRY; @@ -373,7 +370,7 @@ cfi_lun_enable(void *arg, struct ctl_id } static int -cfi_lun_disable(void *arg, struct ctl_id target_id, int lun_id) +cfi_lun_disable(void *arg, int lun_id) { struct cfi_softc *softc; struct cfi_lun *lun; @@ -391,8 +388,7 @@ cfi_lun_disable(void *arg, struct ctl_id */ mtx_lock(&softc->lock); STAILQ_FOREACH(lun, &softc->lun_list, links) { - if ((lun->target_id.id == target_id.id) - && (lun->lun_id == lun_id)) { + if (lun->lun_id == lun_id) { found = 1; break; } @@ -403,8 +399,7 @@ cfi_lun_disable(void *arg, struct ctl_id mtx_unlock(&softc->lock); if (found == 0) { - printf("%s: can't find target %ju lun %d\n", __func__, - (uintmax_t)target_id.id, lun_id); + printf("%s: can't find lun %d\n", __func__, lun_id); return (1); } @@ -700,7 +695,7 @@ cfi_init_io(union ctl_io *io, struct cfi io->io_hdr.nexus.initid.id = 7; io->io_hdr.nexus.targ_port = lun->softc->port.targ_port; - io->io_hdr.nexus.targ_target.id = lun->target_id.id; + io->io_hdr.nexus.targ_target.id = 0; io->io_hdr.nexus.targ_lun = lun->lun_id; io->io_hdr.retries = retries; lun_io = (struct cfi_lun_io *)io->io_hdr.port_priv; @@ -1008,8 +1003,7 @@ cfi_lun_probe(struct cfi_lun *lun, int h M_CTL_CFI, M_NOWAIT); if (dataptr == NULL) { printf("%s: unable to allocate SCSI read capacity " - "buffer for target %ju lun %d\n", __func__, - (uintmax_t)lun->target_id.id, lun->lun_id); + "buffer for lun %d\n", __func__, lun->lun_id); return; } if (lun->state == CFI_LUN_READCAPACITY) { Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.c Sat Jun 20 11:20:25 2015 (r284639) +++ head/sys/cam/ctl/ctl_frontend_iscsi.c Sat Jun 20 12:43:54 2015 (r284640) @@ -147,10 +147,8 @@ int cfiscsi_init(void); static void cfiscsi_online(void *arg); static void cfiscsi_offline(void *arg); static int cfiscsi_info(void *arg, struct sbuf *sb); -static int cfiscsi_lun_enable(void *arg, - struct ctl_id target_id, int lun_id); -static int cfiscsi_lun_disable(void *arg, - struct ctl_id target_id, int lun_id); +static int cfiscsi_lun_enable(void *arg, int lun_id); +static int cfiscsi_lun_disable(void *arg, int lun_id); static int cfiscsi_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td); static void cfiscsi_datamove(union ctl_io *io); @@ -2373,14 +2371,14 @@ cfiscsi_target_find_or_create(struct cfi } static int -cfiscsi_lun_enable(void *arg, struct ctl_id target_id, int lun_id) +cfiscsi_lun_enable(void *arg, int lun_id) { return (0); } static int -cfiscsi_lun_disable(void *arg, struct ctl_id target_id, int lun_id) +cfiscsi_lun_disable(void *arg, int lun_id) { return (0); Modified: head/sys/cam/ctl/ctl_private.h ============================================================================== --- head/sys/cam/ctl/ctl_private.h Sat Jun 20 11:20:25 2015 (r284639) +++ head/sys/cam/ctl/ctl_private.h Sat Jun 20 12:43:54 2015 (r284640) @@ -397,7 +397,6 @@ struct ctl_devid { struct tpc_list; struct ctl_lun { struct mtx lun_lock; - struct ctl_id target; uint64_t lun; ctl_lun_flags flags; ctl_lun_serseq serseq; @@ -460,7 +459,6 @@ struct ctl_softc { struct mtx ctl_lock; struct cdev *dev; int open_count; - struct ctl_id target; int num_disks; int num_luns; ctl_gen_flags flags; @@ -508,7 +506,6 @@ int ctl_lun_map_init(struct ctl_port *po int ctl_lun_map_deinit(struct ctl_port *port); int ctl_lun_map_set(struct ctl_port *port, uint32_t plun, uint32_t glun); int ctl_lun_map_unset(struct ctl_port *port, uint32_t plun); -int ctl_lun_map_unsetg(struct ctl_port *port, uint32_t glun); uint32_t ctl_lun_map_from_port(struct ctl_port *port, uint32_t plun); uint32_t ctl_lun_map_to_port(struct ctl_port *port, uint32_t glun); int ctl_pool_create(struct ctl_softc *ctl_softc, const char *pool_name, Modified: head/sys/cam/ctl/ctl_tpc_local.c ============================================================================== --- head/sys/cam/ctl/ctl_tpc_local.c Sat Jun 20 11:20:25 2015 (r284639) +++ head/sys/cam/ctl/ctl_tpc_local.c Sat Jun 20 12:43:54 2015 (r284640) @@ -69,8 +69,8 @@ static int tpcl_init(void); static void tpcl_shutdown(void); static void tpcl_online(void *arg); static void tpcl_offline(void *arg); -static int tpcl_lun_enable(void *arg, struct ctl_id target_id, int lun_id); -static int tpcl_lun_disable(void *arg, struct ctl_id target_id, int lun_id); +static int tpcl_lun_enable(void *arg, int lun_id); +static int tpcl_lun_disable(void *arg, int lun_id); static void tpcl_datamove(union ctl_io *io); static void tpcl_done(union ctl_io *io); @@ -152,14 +152,14 @@ tpcl_offline(void *arg) } static int -tpcl_lun_enable(void *arg, struct ctl_id target_id, int lun_id) +tpcl_lun_enable(void *arg, int lun_id) { return (0); } static int -tpcl_lun_disable(void *arg, struct ctl_id target_id, int lun_id) +tpcl_lun_disable(void *arg, int lun_id) { return (0); Modified: head/sys/cam/ctl/scsi_ctl.c ============================================================================== --- head/sys/cam/ctl/scsi_ctl.c Sat Jun 20 11:20:25 2015 (r284639) +++ head/sys/cam/ctl/scsi_ctl.c Sat Jun 20 12:43:54 2015 (r284640) @@ -202,10 +202,8 @@ static void ctlfedone(struct cam_periph static void ctlfe_onoffline(void *arg, int online); static void ctlfe_online(void *arg); static void ctlfe_offline(void *arg); -static int ctlfe_lun_enable(void *arg, struct ctl_id targ_id, - int lun_id); -static int ctlfe_lun_disable(void *arg, struct ctl_id targ_id, - int lun_id); +static int ctlfe_lun_enable(void *arg, int lun_id); +static int ctlfe_lun_disable(void *arg, int lun_id); static void ctlfe_dump_sim(struct cam_sim *sim); static void ctlfe_dump_queue(struct ctlfe_lun_softc *softc); static void ctlfe_datamove(union ctl_io *io); @@ -1800,7 +1798,7 @@ ctlfe_offline(void *arg) * CTL. So we only need to create a path/periph for this particular bus. */ static int -ctlfe_lun_enable(void *arg, struct ctl_id targ_id, int lun_id) +ctlfe_lun_enable(void *arg, int lun_id) { struct ctlfe_softc *bus_softc; struct ctlfe_lun_softc *softc; @@ -1811,8 +1809,7 @@ ctlfe_lun_enable(void *arg, struct ctl_i bus_softc = (struct ctlfe_softc *)arg; status = xpt_create_path(&path, /*periph*/ NULL, - bus_softc->path_id, - targ_id.id, lun_id); + bus_softc->path_id, 0, lun_id); /* XXX KDM need some way to return status to CTL here? */ if (status != CAM_REQ_CMP) { printf("%s: could not create path, status %#x\n", __func__, @@ -1863,7 +1860,7 @@ ctlfe_lun_enable(void *arg, struct ctl_i * on every bus that is attached to CTL. */ static int -ctlfe_lun_disable(void *arg, struct ctl_id targ_id, int lun_id) +ctlfe_lun_disable(void *arg, int lun_id) { struct ctlfe_softc *softc; struct ctlfe_lun_softc *lun_softc; @@ -1876,15 +1873,14 @@ ctlfe_lun_disable(void *arg, struct ctl_ path = lun_softc->periph->path; - if ((xpt_path_target_id(path) == targ_id.id) + if ((xpt_path_target_id(path) == 0) && (xpt_path_lun_id(path) == lun_id)) { break; } } if (lun_softc == NULL) { mtx_unlock(&softc->lun_softc_mtx); - printf("%s: can't find target %d lun %d\n", __func__, - targ_id.id, lun_id); + printf("%s: can't find lun %d\n", __func__, lun_id); return (1); } cam_periph_acquire(lun_softc->periph); From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 13:01:39 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4DFA6CC6; Sat, 20 Jun 2015 13:01:39 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 262FA612; Sat, 20 Jun 2015 13:01:38 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from Julian-MBP3.local (50-196-156-133-static.hfc.comcastbusiness.net [50.196.156.133]) (authenticated bits=0) by vps1.elischer.org (8.14.9/8.14.9) with ESMTP id t5KD1V3q014740 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sat, 20 Jun 2015 06:01:35 -0700 (PDT) (envelope-from julian@freebsd.org) Message-ID: <55856426.2090709@freebsd.org> Date: Sat, 20 Jun 2015 21:01:26 +0800 From: Julian Elischer User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284608 - head/share/man/man9 References: <201506192130.t5JLUkn7068176@svn.freebsd.org> In-Reply-To: <201506192130.t5JLUkn7068176@svn.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 13:01:39 -0000 On 6/20/15 5:30 AM, Warner Losh wrote: > Author: imp > Date: Fri Jun 19 21:30:45 2015 > New Revision: 284608 > URL: https://svnweb.freebsd.org/changeset/base/284608 > > Log: > Back out contested change until dispute is resolved. This proved to be > more contentious than I expected. > > Modified: > head/share/man/man9/style.9 > > Modified: head/share/man/man9/style.9 > ============================================================================== > --- head/share/man/man9/style.9 Fri Jun 19 21:26:06 2015 (r284607) > +++ head/share/man/man9/style.9 Fri Jun 19 21:30:45 2015 (r284608) > @@ -26,7 +26,7 @@ > .\" From: @(#)style 1.14 (Berkeley) 4/28/95 > .\" $FreeBSD$ > .\" > -.Dd June 17, 2015 > +.Dd January 7, 2010 > .Dt STYLE 9 > .Os > .Sh NAME > @@ -503,14 +503,13 @@ Code which is unreachable for non-obviou > .Pp > Space after keywords > .Pq Ic if , while , for , return , switch . > -Two styles of braces > +No braces > .Ql ( \&{ > and > .Ql \&} ) > -are allowed for single line statements. > -Either they are used for all single statements, or > -they are used only where needed for clarity. > -Usage within a file should be consistent. > +are > +used for control statements with zero or only a single statement unless that > +statement is more than a single line in which case they are permitted. > Forever loops are done with > .Ic for Ns 's , > not > > man those trolls are hard to get around From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 13:02:58 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 325CEE17; Sat, 20 Jun 2015 13:02:58 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 20D8466A; Sat, 20 Jun 2015 13:02:58 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5KD2viX033068; Sat, 20 Jun 2015 13:02:57 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5KD2vNH033067; Sat, 20 Jun 2015 13:02:57 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201506201302.t5KD2vNH033067@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sat, 20 Jun 2015 13:02:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284641 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 13:02:58 -0000 Author: mav Date: Sat Jun 20 13:02:57 2015 New Revision: 284641 URL: https://svnweb.freebsd.org/changeset/base/284641 Log: Fix REPORT LUNS command output for the case when same LUN mapped to same port several times. While it is unusual configuration, it is not illegal. MFC after: 1 week Modified: head/sys/cam/ctl/ctl.c Modified: head/sys/cam/ctl/ctl.c ============================================================================== --- head/sys/cam/ctl/ctl.c Sat Jun 20 12:43:54 2015 (r284640) +++ head/sys/cam/ctl/ctl.c Sat Jun 20 13:02:57 2015 (r284641) @@ -9348,11 +9348,16 @@ ctl_report_luns(struct ctl_scsiio *ctsio well_known = 0; cdb = (struct scsi_report_luns *)ctsio->cdb; + port = ctl_io_port(&ctsio->io_hdr); CTL_DEBUG_PRINT(("ctl_report_luns\n")); mtx_lock(&softc->ctl_lock); - num_luns = softc->num_luns; + num_luns = 0; + for (targ_lun_id = 0; targ_lun_id < CTL_MAX_LUNS; targ_lun_id++) { + if (ctl_lun_map_from_port(port, targ_lun_id) < CTL_MAX_LUNS) + num_luns++; + } mtx_unlock(&softc->ctl_lock); switch (cdb->select_report) { @@ -9395,7 +9400,6 @@ ctl_report_luns(struct ctl_scsiio *ctsio request_lun = (struct ctl_lun *) ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr; - port = ctl_io_port(&ctsio->io_hdr); lun_datalen = sizeof(*lun_data) + (num_luns * sizeof(struct scsi_report_luns_lundata)); From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 13:21:37 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C2D4C2EF; Sat, 20 Jun 2015 13:21:37 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9C7E8AB5; Sat, 20 Jun 2015 13:21:37 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (d-69-161-105-82.cpe.metrocast.net [69.161.105.82]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id CF778B962; Sat, 20 Jun 2015 09:21:35 -0400 (EDT) Message-ID: <558568DF.3060902@FreeBSD.org> Date: Sat, 20 Jun 2015 09:21:35 -0400 From: John Baldwin User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Gleb Smirnoff , Mateusz Guzik CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284211 - in head/sys: kern sys References: <201506100934.t5A9YpoN093925@svn.freebsd.org> <20150610154445.GJ73119@FreeBSD.org> <20150616134352.GI73119@FreeBSD.org> In-Reply-To: <20150616134352.GI73119@FreeBSD.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Sat, 20 Jun 2015 09:21:36 -0400 (EDT) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 13:21:37 -0000 On 6/16/15 9:43 AM, Gleb Smirnoff wrote: > Mateusz, > > have you noticed this email? > > On Wed, Jun 10, 2015 at 06:44:45PM +0300, Gleb Smirnoff wrote: > T> On Wed, Jun 10, 2015 at 09:34:51AM +0000, Mateusz Guzik wrote: > T> M> Author: mjg > T> M> Date: Wed Jun 10 09:34:50 2015 > T> M> New Revision: 284211 > T> M> URL: https://svnweb.freebsd.org/changeset/base/284211 > T> M> > T> M> Log: > T> M> fd: use atomics to manage fd_refcnt and fd_holcnt > T> M> > T> M> This gets rid of fdesc_mtx. > T> .. > T> M> Modified: head/sys/sys/filedesc.h > T> M> ============================================================================== > T> M> --- head/sys/sys/filedesc.h Wed Jun 10 05:39:48 2015 (r284210) > T> M> +++ head/sys/sys/filedesc.h Wed Jun 10 09:34:50 2015 (r284211) > T> M> @@ -83,8 +83,8 @@ struct filedesc { > T> M> int fd_lastfile; /* high-water mark of fd_ofiles */ > T> M> int fd_freefile; /* approx. next free file */ > T> M> u_short fd_cmask; /* mask for file creation */ > T> M> - u_short fd_refcnt; /* thread reference count */ > T> M> - u_short fd_holdcnt; /* hold count on structure + mutex */ > T> M> + int fd_refcnt; /* thread reference count */ > T> M> + int fd_holdcnt; /* hold count on structure + mutex */ > T> M> struct sx fd_sx; /* protects members of this struct */ > T> M> struct kqlist fd_kqlist; /* list of kqueues on this filedesc */ > T> M> int fd_holdleaderscount; /* block fdfree() for shared close() */ > T> > T> Shouldn't they be volatile u_int? Agreed. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 13:32:04 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E6FCCC0; Sat, 20 Jun 2015 13:32:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EBDC1D2D; Sat, 20 Jun 2015 13:32:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (d-69-161-105-82.cpe.metrocast.net [69.161.105.82]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id AC236B91F; Sat, 20 Jun 2015 09:32:02 -0400 (EDT) Message-ID: <55856B52.9040802@FreeBSD.org> Date: Sat, 20 Jun 2015 09:32:02 -0400 From: John Baldwin User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Konstantin Belousov , Sean Bruno CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284535 - head/sys/kern References: <201506180204.t5I24LJm079537@svn.freebsd.org> <20150618030715.GD2080@kib.kiev.ua> In-Reply-To: <20150618030715.GD2080@kib.kiev.ua> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Sat, 20 Jun 2015 09:32:03 -0400 (EDT) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 13:32:04 -0000 On 6/17/15 11:07 PM, Konstantin Belousov wrote: > On Thu, Jun 18, 2015 at 02:04:21AM +0000, Sean Bruno wrote: >> Author: sbruno >> Date: Thu Jun 18 02:04:20 2015 >> New Revision: 284535 >> URL: https://svnweb.freebsd.org/changeset/base/284535 >> >> Log: >> This change replaces the mutex with a sx lock for the interpreter list to >> avoid the problem of holding a non-sleep lock during a page fault as >> reported by witness. It also uses atomics where possible to avoid having >> to acquire the exclusive lock. In addition, it consistently uses >> memset()/memcpy() instead of bzero()/bcopy(). >> >> Differential Revision: https://reviews.freebsd.org/D1971 >> Submitted by: sson >> Reviewed by: jhb > What are the page faults during image activator run ? > Or, if the page faults are not during image activation, then where ? It took me a while to figure out while reviewing, but the exec_map memory is pageable, so the bcopy to move things around inside of it can fault. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 13:53:36 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 04C29187; Sat, 20 Jun 2015 13:53:36 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D3EE21F0; Sat, 20 Jun 2015 13:53:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (d-69-161-105-82.cpe.metrocast.net [69.161.105.82]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 99970B91F; Sat, 20 Jun 2015 09:53:34 -0400 (EDT) Message-ID: <5585705E.9040004@FreeBSD.org> Date: Sat, 20 Jun 2015 09:53:34 -0400 From: John Baldwin User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Sean Bruno , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284602 - head/sys/kern References: <201506191857.t5JIvbdP094203@svn.freebsd.org> In-Reply-To: <201506191857.t5JIvbdP094203@svn.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Sat, 20 Jun 2015 09:53:34 -0400 (EDT) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 13:53:36 -0000 On 6/19/15 2:57 PM, Sean Bruno wrote: > Author: sbruno > Date: Fri Jun 19 18:57:36 2015 > New Revision: 284602 > URL: https://svnweb.freebsd.org/changeset/base/284602 > > Log: > Feedback from commit r284535 > > davide: imgact_binmisc_clear_entry() needs to use atomic ops to remove > the enable bit. I had asked you to remove the atomics and instead use an exclusive lock in the enable/disable routines as these are not hotpaths and that is simpler. Stacey agreed with that assessment in his review comment. It looks like you removed the atomics but forgot to switch the shared locks to exclusive locks. I would still prefer using exclusive locks and removing the atomics. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 14:35:00 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 089B7656; Sat, 20 Jun 2015 14:35:00 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id CB4C6CFB; Sat, 20 Jun 2015 14:34:59 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from Julian-MBP3.local (50-196-156-133-static.hfc.comcastbusiness.net [50.196.156.133]) (authenticated bits=0) by vps1.elischer.org (8.14.9/8.14.9) with ESMTP id t5KEYnd6015056 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sat, 20 Jun 2015 07:34:53 -0700 (PDT) (envelope-from julian@freebsd.org) Message-ID: <55857A03.3040206@freebsd.org> Date: Sat, 20 Jun 2015 22:34:43 +0800 From: Julian Elischer User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Ian Lepore , "Simon J. Gerraty" CC: Garrett Cooper , Craig Rodrigues , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Baptiste Daroussin Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <950C4B23-B625-4173-A7C4-A4F1B2C5771D@gmail.com> <306889B5-3417-467C-965F-B011866E6F15@gmail.com> <450D8D9A-CBF2-445A-8221-4CD353591549@gmail.com> <16996.1434316874@chaos> <094A5FA6-7DB8-485E-84A8-C15D2A0BC9F6@gmail.com> <4710.1434319205@chaos> <1434635292.1415.93.camel@freebsd.org> In-Reply-To: <1434635292.1415.93.camel@freebsd.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 14:35:00 -0000 On 6/18/15 9:48 PM, Ian Lepore wrote: > On Sun, 2015-06-14 at 15:00 -0700, Simon J. Gerraty wrote: >> Garrett Cooper wrote: >> >>> Breaking source upgrades to later versions is painful. We want to make >>> sure fmake at least works with upgrade_checks so people can upgrade >>> from earlier versions of 8/9/10 to 11 without having to deal with a >>> lot of pain. >> I agree but 8 -> 11 is a very big jump. >> > Not really. We're in the midst of such a change at $work, but it will > be literally years before we're no longer doing anything with 8 and are > fully converted to 11. We'll have completely skipped 9 and 10 in the > process. That's the reality of being a company smaller than Yahoo or > Juniper -- we just don't have the resources to track -current. We're > lucky if we can get enough resources to make a jump every 4 or 5 years. > > In the meantime I've got to support building products on everything from > 6.x through -current using basically the same source base and build > machinery. The fmake->bmake change has been fairly painful; it's only > working at all for us because I've hacked fmake on 6.x and 8.x to > support a few crucial bmake features. > > -- Ian you could be working at my $JOB. we are upgrading from 8.0 to 10.x with an eye on 11.x as a possible next small hop. but we'll be shipping and fixing 8.0 for years. From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 15:03:03 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9D3FAAAD; Sat, 20 Jun 2015 15:03:03 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8B46C5E6; Sat, 20 Jun 2015 15:03:03 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5KF339Q091796; Sat, 20 Jun 2015 15:03:03 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5KF33Km091795; Sat, 20 Jun 2015 15:03:03 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <201506201503.t5KF33Km091795@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Sat, 20 Jun 2015 15:03:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284644 - head/usr.sbin/fstyp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 15:03:03 -0000 Author: allanjude (doc committer) Date: Sat Jun 20 15:03:02 2015 New Revision: 284644 URL: https://svnweb.freebsd.org/changeset/base/284644 Log: Fix the build for gcc by lowering the WARNS level Approved by: sbruno X-MFC-With: r284589 Modified: head/usr.sbin/fstyp/Makefile Modified: head/usr.sbin/fstyp/Makefile ============================================================================== --- head/usr.sbin/fstyp/Makefile Sat Jun 20 13:30:09 2015 (r284643) +++ head/usr.sbin/fstyp/Makefile Sat Jun 20 15:03:02 2015 (r284644) @@ -11,7 +11,7 @@ SRCS += zfs.c MAN= fstyp.8 -WARNS= 6 +WARNS?= 0 .if ${MK_CDDL} != "no" IGNORE_PRAGMA= YES From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 15:05:49 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A352FC0B; Sat, 20 Jun 2015 15:05:49 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Received: from mail-wi0-x22f.google.com (mail-wi0-x22f.google.com [IPv6:2a00:1450:400c:c05::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3ADFF5F5; Sat, 20 Jun 2015 15:05:49 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Received: by wibdq8 with SMTP id dq8so40807493wib.1; Sat, 20 Jun 2015 08:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=+SgOHGDVNFH28kKoziBcCmyBfYzzexGwySOAego3g/Y=; b=COjifJkm+eDg4g/MYj4drzCFFWZpTlnmzwxzqXrDEwPVBgxwOgrTD9qYwJMccY4C5E 8JRCr/5/5p701ERNQ8dkAgUwFom4xJ9cOD5mYdyLSkbiiRlb6u9TVgmgD57mEg7iFkF6 Yq/WAizLlC1TlXSl3PR/KvoEM5rZBAMXolwWDQPlOfM87TjN50NnO+gKMlzQ8JT3jx+X +k8g40F7fncVQSoxaDPNP8POuRYRgF6kMvjETpK92wDBCYXXs0m9gbdVjO2cslGrAebX ipt0MsBgq+jRg3sSSpwZhhWfWPkPe/ny/A3+pQz6sN+QieIB6uoh+1avSlpcJdbWXK6Z 2ShQ== MIME-Version: 1.0 X-Received: by 10.194.103.97 with SMTP id fv1mr21993836wjb.100.1434812747778; Sat, 20 Jun 2015 08:05:47 -0700 (PDT) Received: by 10.27.87.195 with HTTP; Sat, 20 Jun 2015 08:05:47 -0700 (PDT) In-Reply-To: <201506201503.t5KF33Km091795@svn.freebsd.org> References: <201506201503.t5KF33Km091795@svn.freebsd.org> Date: Sat, 20 Jun 2015 11:05:47 -0400 Message-ID: Subject: Re: svn commit: r284644 - head/usr.sbin/fstyp From: Benjamin Kaduk To: Allan Jude Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 15:05:49 -0000 On Sat, Jun 20, 2015 at 11:03 AM, Allan Jude wrote: > Author: allanjude (doc committer) > Date: Sat Jun 20 15:03:02 2015 > New Revision: 284644 > URL: https://svnweb.freebsd.org/changeset/base/284644 > > Log: > Fix the build for gcc by lowering the WARNS level > Are the warnings emitted by gcc posted somewhere so that I can convince myself dropping WARNS is better than changing the code to work around them? -Ben From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 15:08:37 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 777A9DEF; Sat, 20 Jun 2015 15:08:37 +0000 (UTC) (envelope-from allanjude@freebsd.org) Received: from mx1.scaleengine.net (mx1.scaleengine.net [209.51.186.6]) by mx1.freebsd.org (Postfix) with ESMTP id 4D7CE60E; Sat, 20 Jun 2015 15:08:37 +0000 (UTC) (envelope-from allanjude@freebsd.org) Received: from [192.168.1.2] (unknown [192.168.1.2]) (Authenticated sender: allanjude.freebsd@scaleengine.com) by mx1.scaleengine.net (Postfix) with ESMTPSA id EE98B9DC1; Sat, 20 Jun 2015 15:08:35 +0000 (UTC) Message-ID: <5585820C.4000209@freebsd.org> Date: Sat, 20 Jun 2015 11:09:00 -0400 From: Allan Jude User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Benjamin Kaduk CC: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284644 - head/usr.sbin/fstyp References: <201506201503.t5KF33Km091795@svn.freebsd.org> In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="llURIrChPInLdEM0mepEIrjWU8VLFCcUP" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 15:08:37 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --llURIrChPInLdEM0mepEIrjWU8VLFCcUP Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2015-06-20 11:05, Benjamin Kaduk wrote: > On Sat, Jun 20, 2015 at 11:03 AM, Allan Jude > wrote: >=20 > Author: allanjude (doc committer) > Date: Sat Jun 20 15:03:02 2015 > New Revision: 284644 > URL: https://svnweb.freebsd.org/changeset/base/284644 >=20 > Log: > Fix the build for gcc by lowering the WARNS level >=20 >=20 > Are the warnings emitted by gcc posted somewhere so that I can convince= > myself dropping WARNS is better than changing the code to work around t= hem? >=20 > -Ben=20 The warnings come from the ZFS contrib code, so I was under the impression we didn't want to fix those and diverge form upstream. via kib on irc: =3D=3D=3D> usr.sbin/fstyp (all) cc1: warnings being treated as errors In file included from /scratch/tmp/kib/src/usr.sbin/fstyp/../../sys/cddl/contrib from /scratch/tmp/kib/src/usr.sbin/fstyp/zfs.c:41: n/fs/zfs/sys/dmu.h:638: warning: function declaration isn't a prototype n/fs/zfs/sys/dmu.h:639: warning: function declaration isn't a prototype --=20 Allan Jude --llURIrChPInLdEM0mepEIrjWU8VLFCcUP Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (MingW32) iQIcBAEBAgAGBQJVhYISAAoJEBmVNT4SmAt+aDEP/iO/7XvIawBk2KUs3ZpeYC1z ZIXd+f/qmG0NEMEZILiUgjZRgi2YgzDeXo6brDwRsJYLvuqpXxqjgs2p1Suuwl56 rb0UfjZ1vLPVknB1Mlfd9fjAWX5loOTcX/HcrORZ3Olc5/O25VZ/BsoD4f7pBo1k +lJuzidVOInNA/Tqf3nv25WN3kVH3Hhgu2n7FLWkBlzDjfc3mJ4rqlPN7ho4YURI H371hAwQibtuvdm48m+uJUoACsJz5k5vkZ3/OJgLa+xFRxl+Ui8lJ/MptUbbeB6F s47OEfz0fO6NqkRjVslPsL3q+CEZo+OPU02ghJbCqTQo4vVUZM+HwiKhOU2zzJ+k Z0IPrcytEiEUBERY1xrpyQ+/t7HhE07upZ9jdrTo2YSrV+G2jBvS2w54/ed21wm9 zC7Q4beuFnwSuKnlMC5Pupal6MTFxT5gmXeLelRRwplsXLL6t15rA4MbMc4ppJte Mvq7gsI7fGpLwnoamMLSeMqx0+qxJOZD9vSITTWROqI6kZhxzYvDcA2cFbAS4BBx LQ64QFCEXqn/UHsUlEvuBHN0e/bX50cBPBJxySnKZSkTLVmlMQhwsvTDkCnlxqIs alP2tmGxAn11LNwXGNYOEG8QDOsuPQ7Ejl44pAIx+vTaEz2mURchJ6hmHCMgEFJU yaDQiNUF0QQ7jJq16Jax =s1+p -----END PGP SIGNATURE----- --llURIrChPInLdEM0mepEIrjWU8VLFCcUP-- From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 15:15:12 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 460A9105; Sat, 20 Jun 2015 15:15:12 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 028C5890; Sat, 20 Jun 2015 15:15:11 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from [IPv6:2001:7b8:3a7::40f9:e9b6:a14d:99c3] (unknown [IPv6:2001:7b8:3a7:0:40f9:e9b6:a14d:99c3]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 8228D264DD; Sat, 20 Jun 2015 17:15:03 +0200 (CEST) Subject: Re: svn commit: r284644 - head/usr.sbin/fstyp Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_20283D61-8B2E-4A5B-A995-D7F30BFE20A3"; protocol="application/pgp-signature"; micalg=pgp-sha1 X-Pgp-Agent: GPGMail 2.5 From: Dimitry Andric In-Reply-To: <5585820C.4000209@freebsd.org> Date: Sat, 20 Jun 2015 17:14:54 +0200 Cc: Benjamin Kaduk , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-Id: References: <201506201503.t5KF33Km091795@svn.freebsd.org> <5585820C.4000209@freebsd.org> To: Allan Jude X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 15:15:12 -0000 --Apple-Mail=_20283D61-8B2E-4A5B-A995-D7F30BFE20A3 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 20 Jun 2015, at 17:09, Allan Jude wrote: >=20 > On 2015-06-20 11:05, Benjamin Kaduk wrote: ... >> Are the warnings emitted by gcc posted somewhere so that I can = convince >> myself dropping WARNS is better than changing the code to work around = them? >>=20 >> -Ben >=20 > The warnings come from the ZFS contrib code, so I was under the > impression we didn't want to fix those and diverge form upstream. >=20 > via kib on irc: >=20 > =3D=3D=3D> usr.sbin/fstyp (all) > cc1: warnings being treated as errors > In file included from > /scratch/tmp/kib/src/usr.sbin/fstyp/../../sys/cddl/contrib > from /scratch/tmp/kib/src/usr.sbin/fstyp/zfs.c:41: > n/fs/zfs/sys/dmu.h:638: warning: function declaration isn't a = prototype > n/fs/zfs/sys/dmu.h:639: warning: function declaration isn't a = prototype Those functions are declared like this, without any parameters, as if they were K&R functions: void xuio_stat_wbuf_copied(); void xuio_stat_wbuf_nocopy(); and also their definitions lack any parameters: void xuio_stat_wbuf_copied() { XUIOSTAT_BUMP(xuiostat_wbuf_copied); } void xuio_stat_wbuf_nocopy() { XUIOSTAT_BUMP(xuiostat_wbuf_nocopy); } Obviously, these should just have (void) as their parameter list. For such a trivial change, it should be no problem to modify it locally, and then notify upstream. -Dimitry --Apple-Mail=_20283D61-8B2E-4A5B-A995-D7F30BFE20A3 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.27 iEYEARECAAYFAlWFg3cACgkQsF6jCi4glqPrUACeOl26oJdE/H7n820Bjkckmq+r heEAn1L60F7mnFJ7Pb37bwwoLoCxOXWs =RUIB -----END PGP SIGNATURE----- --Apple-Mail=_20283D61-8B2E-4A5B-A995-D7F30BFE20A3-- From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 15:15:22 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4CFB825F; Sat, 20 Jun 2015 15:15:22 +0000 (UTC) (envelope-from araujobsdport@gmail.com) Received: from mail-ob0-x229.google.com (mail-ob0-x229.google.com [IPv6:2607:f8b0:4003:c01::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0F11D894; Sat, 20 Jun 2015 15:15:22 +0000 (UTC) (envelope-from araujobsdport@gmail.com) Received: by obbsn1 with SMTP id sn1so90574905obb.1; Sat, 20 Jun 2015 08:15:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=t9J3lywQLbKCNh/QvBVezqUjjbffNc5yPR2RGwl7yGg=; b=OWH7qsNzyBJR7o+pWr8fmsEl4caLQTxWDD4KSnxBzndrhahHwWDr+3dBnggqpc1kay hEXegZuYYltpxn4YlvnTQVdWcvo2bPHWpooR/5IEceKDN4CK3hMxpYAmRKBey3KN7DRf 4Ang9pq58MkSQ5HGJUwzVPnt8BM2cyKzYgptgNXDl2jjtqCIx6SWtyES0xTYsOeYBSkV Hzxu4AEbAEj05ClgYgG2RWGtyyPf0+h4qcXnT+oyIYWzd3Exi9iz/ierLp3XEIyI2ZGz 4KtuJGNd6vj96H/XxRc8xu03cA0wiijeWY9Kxr11f5jOVIzRvEbP0O2pe8xDcH3Xr2d5 EBhg== MIME-Version: 1.0 X-Received: by 10.202.190.134 with SMTP id o128mr17132897oif.111.1434813321456; Sat, 20 Jun 2015 08:15:21 -0700 (PDT) Received: by 10.202.11.193 with HTTP; Sat, 20 Jun 2015 08:15:21 -0700 (PDT) Received: by 10.202.11.193 with HTTP; Sat, 20 Jun 2015 08:15:21 -0700 (PDT) Reply-To: araujo@FreeBSD.org In-Reply-To: <5585820C.4000209@freebsd.org> References: <201506201503.t5KF33Km091795@svn.freebsd.org> <5585820C.4000209@freebsd.org> Date: Sat, 20 Jun 2015 23:15:21 +0800 Message-ID: Subject: Re: svn commit: r284644 - head/usr.sbin/fstyp From: Marcelo Araujo To: Allan Jude Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, Benjamin Kaduk , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 15:15:22 -0000 You should fix and upstream, I just did that last week. On Jun 20, 2015 11:08 PM, "Allan Jude" wrote: > On 2015-06-20 11:05, Benjamin Kaduk wrote: > > On Sat, Jun 20, 2015 at 11:03 AM, Allan Jude > > wrote: > > > > Author: allanjude (doc committer) > > Date: Sat Jun 20 15:03:02 2015 > > New Revision: 284644 > > URL: https://svnweb.freebsd.org/changeset/base/284644 > > > > Log: > > Fix the build for gcc by lowering the WARNS level > > > > > > Are the warnings emitted by gcc posted somewhere so that I can convince > > myself dropping WARNS is better than changing the code to work around > them? > > > > -Ben > > The warnings come from the ZFS contrib code, so I was under the > impression we didn't want to fix those and diverge form upstream. > > via kib on irc: > > ===> usr.sbin/fstyp (all) > cc1: warnings being treated as errors > In file included from > /scratch/tmp/kib/src/usr.sbin/fstyp/../../sys/cddl/contrib > from /scratch/tmp/kib/src/usr.sbin/fstyp/zfs.c:41: > n/fs/zfs/sys/dmu.h:638: warning: function declaration isn't a prototype > n/fs/zfs/sys/dmu.h:639: warning: function declaration isn't a prototype > > -- > Allan Jude > > From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 16:49:50 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 802516AD for ; Sat, 20 Jun 2015 16:49:50 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from pmta2.delivery6.ore.mailhop.org (pmta2.delivery6.ore.mailhop.org [54.200.129.228]) by mx1.freebsd.org (Postfix) with SMTP id 5DEFAF00 for ; Sat, 20 Jun 2015 16:49:49 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from ilsoft.org (unknown [73.34.117.227]) by outbound2.ore.mailhop.org (Halon Mail Gateway) with ESMTPSA; Sat, 20 Jun 2015 16:50:06 +0000 (UTC) Received: from revolution.hippie.lan (revolution.hippie.lan [172.22.42.240]) by ilsoft.org (8.14.9/8.14.9) with ESMTP id t5KGnlx8020234; Sat, 20 Jun 2015 10:49:47 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1434818987.1415.120.camel@freebsd.org> Subject: Re: svn commit: r284614 - head/sys/boot/uboot/lib From: Ian Lepore To: Maxim Sobolev Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Sat, 20 Jun 2015 10:49:47 -0600 In-Reply-To: References: <201506192224.t5JMOxpC097306@svn.freebsd.org> <1434755385.1415.114.camel@freebsd.org> Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.12.10 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 16:49:50 -0000 On Fri, 2015-06-19 at 16:56 -0700, Maxim Sobolev wrote: > Ian, that's cool and dandy, but I still suggest we put some sanity checking > and have certain workarounds in the loader (whenever it does not add > ambiguity or blows up a code too much of course), so that new folks in town > trying to port to new platforms like myself won't spend hours and hours > hunting known issues and bugs. And hitting those infinite loops is very > frustrating with no errors or anything. On top of that, in some cases you > may be stuck with vendor-provided u-boot with no way to patch and > re-compile. BTW, there is another stupid bug existing in the u-boot loader, > which basically sets fdtaddr in decimal not in hex. On my particular board > this makes ubldr to blow up with CPU exception, unfortunately no workaround > is possible since there is no 0x for hex values and majority of cases when > this variable is set is in hex. > > -Maxim Yeah, I wasn't complaining about the change, I just wanted to let you know you're not the first one down this path. Now that you've fixed the lockup, you'll run into other odd behavior with env vars. I'm not sure I understand the second problem you mention. When numbers are represented as ascii text in the u-boot env, they're always interpretted as hex constants whether they have a leading 0x or not. This seems to be a u-boot convention. Are you saying ubldr is failing to convert them back to binary correctly if they lack the 0x? -- Ian From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 17:18:46 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D5A54D34; Sat, 20 Jun 2015 17:18:46 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C3FD2832; Sat, 20 Jun 2015 17:18:46 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5KHIk15056427; Sat, 20 Jun 2015 17:18:46 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5KHIkM2056426; Sat, 20 Jun 2015 17:18:46 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201506201718.t5KHIkM2056426@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 20 Jun 2015 17:18:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284646 - head/share/man/man9 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 17:18:47 -0000 Author: kib Date: Sat Jun 20 17:18:46 2015 New Revision: 284646 URL: https://svnweb.freebsd.org/changeset/base/284646 Log: The barriers, provided by _acq and _rel atomics, are acquire and release barriers, not read and write barriers. They fence all memory accesses from the respective side, not limited by the kind of operation. Reviewed by: jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/share/man/man9/atomic.9 Modified: head/share/man/man9/atomic.9 ============================================================================== --- head/share/man/man9/atomic.9 Sat Jun 20 15:55:53 2015 (r284645) +++ head/share/man/man9/atomic.9 Sat Jun 20 17:18:46 2015 (r284646) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 20, 2013 +.Dd June 20, 2015 .Dt ATOMIC 9 .Os .Sh NAME @@ -123,7 +123,9 @@ The first form just performs the operati The second form uses a read memory barrier, and the third variant uses a write memory barrier. .Pp -The second variant of each operation includes a read memory barrier. +The second variant of each operation includes an +.Em acquire +memory barrier. This barrier ensures that the effects of this operation are completed before the effects of any later data accesses. As a result, the operation is said to have acquire semantics as it acquires a @@ -137,7 +139,9 @@ For example, to subtract two integers en happen after the subtraction is performed, use .Fn atomic_subtract_acq_int . .Pp -The third variant of each operation includes a write memory barrier. +The third variant of each operation includes a +.Em release +memory barrier. This ensures that all effects of all previous data accesses are completed before this operation takes place. As a result, the operation is said to have release semantics as it releases From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 19:42:33 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 57AC5226 for ; Sat, 20 Jun 2015 19:42:33 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E8236D1B for ; Sat, 20 Jun 2015 19:42:32 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: by wibdq8 with SMTP id dq8so43885510wib.1 for ; Sat, 20 Jun 2015 12:42:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=gYgeRizwZ3LEan9eXA25RG1Ir8J7zd//d5dNDqjD1E8=; b=K3s8tNjhMxoY2CflXvgGh19f2AifyewRLAQNmmdrH/jKqvCxEdQsq0ApSnKgwfE878 S2ovvpDTdssHXkqDujD2cbQlbyUbfsKBO1gwrHXb4FdZAZGMFCpovZUXyftvL6qPDiz3 mSam6BV+yV9iy8BVLBXoiO0B5iByTJVwdktvo9MvyvadnHFdz78EeSSq7yV45+rVnVU0 kIkUQpwp2lRxdb8Iz5i8mc9cicFooSUuZtRhYM/W5dwAn4lCsJxmy77OLraH+bCSWyML x5MDS3xwN4AeXslOS2Qq8CN2IVMY3mtLiZ3MrTXb2SiHRRInG4P/qtdarhdVbPbDQ2m0 /Zcw== X-Gm-Message-State: ALoCoQlGHf4w1EH5OYxTpBboUguMBGdOXqVPcRuIlr5GOwL2THI0AzMWqrkhtony/c34jzxVbbs4 MIME-Version: 1.0 X-Received: by 10.194.189.80 with SMTP id gg16mr27282344wjc.9.1434829345052; Sat, 20 Jun 2015 12:42:25 -0700 (PDT) Received: by 10.27.205.66 with HTTP; Sat, 20 Jun 2015 12:42:24 -0700 (PDT) Received: by 10.27.205.66 with HTTP; Sat, 20 Jun 2015 12:42:24 -0700 (PDT) In-Reply-To: <1434818987.1415.120.camel@freebsd.org> References: <201506192224.t5JMOxpC097306@svn.freebsd.org> <1434755385.1415.114.camel@freebsd.org> <1434818987.1415.120.camel@freebsd.org> Date: Sat, 20 Jun 2015 12:42:24 -0700 Message-ID: Subject: Re: svn commit: r284614 - head/sys/boot/uboot/lib From: Maxim Sobolev To: Ian Lepore Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 19:42:33 -0000 No, what I am saying is that it sets "fdtaddr=4096" for the value of 0x1000 and that drives btloader nuts. Dumb, yeah! On the positive note got redpitaya fully working (except lack of the I2C support and actual fpga support being unknown). But at least I can try to dual-boot it now. -Max On Fri, 2015-06-19 at 16:56 -0700, Maxim Sobolev wrote: > Ian, that's cool and dandy, but I still suggest we put some sanity checking > and have certain workarounds in the loader (whenever it does not add > ambiguity or blows up a code too much of course), so that new folks in town > trying to port to new platforms like myself won't spend hours and hours > hunting known issues and bugs. And hitting those infinite loops is very > frustrating with no errors or anything. On top of that, in some cases you > may be stuck with vendor-provided u-boot with no way to patch and > re-compile. BTW, there is another stupid bug existing in the u-boot loader, > which basically sets fdtaddr in decimal not in hex. On my particular board > this makes ubldr to blow up with CPU exception, unfortunately no workaround > is possible since there is no 0x for hex values and majority of cases when > this variable is set is in hex. > > -Maxim Yeah, I wasn't complaining about the change, I just wanted to let you know you're not the first one down this path. Now that you've fixed the lockup, you'll run into other odd behavior with env vars. I'm not sure I understand the second problem you mention. When numbers are represented as ascii text in the u-boot env, they're always interpretted as hex constants whether they have a leading 0x or not. This seems to be a u-boot convention. Are you saying ubldr is failing to convert them back to binary correctly if they lack the 0x? -- Ian From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 20:11:08 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E33506AD; Sat, 20 Jun 2015 20:11:08 +0000 (UTC) (envelope-from loos.br@gmail.com) Received: from mail-la0-x229.google.com (mail-la0-x229.google.com [IPv6:2a00:1450:4010:c03::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 83C3129B; Sat, 20 Jun 2015 20:11:08 +0000 (UTC) (envelope-from loos.br@gmail.com) Received: by lacny3 with SMTP id ny3so90933592lac.3; Sat, 20 Jun 2015 13:11:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=iT401v/gMCBbjTrCb0PgAeqNAR9FwjMySytLdh5I7pw=; b=vLLySW4VCJIYKE4wXY7MapL6S6hfHAlbuSqtJ/7e7A4oiizBpCsjA0tzked31woFtG D+4E4JJsmjVvnVnqRNMnNz7ZtuUFiGglrrW0cQZJzXWinVnRybFkA4UfS7BFMifNqhpI mklAlFDT3Jourm+n1ceWuALWYJj3iF1VrIzhWq2jhy7nekt729GZA4rJz0vtYg95udIY HiwK6VwKWcjDSRxQdpiGtLBCvTR1KHgGwwMa7HQMGqFGmeCMYjBOcmrGp4PfTA6imstD WnjWIXFSZ3fVLPvgVJ6n0CeHE+gprc6jeacitNDvGXNONx89hpHrPK3RLGfSkqH2ehQS tcJg== MIME-Version: 1.0 X-Received: by 10.112.171.68 with SMTP id as4mr23504827lbc.64.1434831066457; Sat, 20 Jun 2015 13:11:06 -0700 (PDT) Received: by 10.112.36.98 with HTTP; Sat, 20 Jun 2015 13:11:06 -0700 (PDT) In-Reply-To: References: <201506192224.t5JMOxpC097306@svn.freebsd.org> <1434755385.1415.114.camel@freebsd.org> <1434818987.1415.120.camel@freebsd.org> Date: Sat, 20 Jun 2015 17:11:06 -0300 Message-ID: Subject: Re: svn commit: r284614 - head/sys/boot/uboot/lib From: Luiz Otavio O Souza To: Maxim Sobolev Cc: Ian Lepore , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 20:11:09 -0000 On Sat, Jun 20, 2015 at 4:42 PM, Maxim Sobolev wrote: > No, what I am saying is that it sets "fdtaddr=4096" for the value of 0x1000 > and that drives btloader nuts. Dumb, yeah! On the positive note got > redpitaya fully working (except lack of the I2C support and actual fpga > support being unknown). But at least I can try to dual-boot it now. > > -Max Yeah, I'd to fix that for RPi 2 too: https://svnweb.freebsd.org/ports/head/sysutils/u-boot-rpi2/files/patch-common_cmd__fdt.c?view=markup Luiz From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 20:16:40 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9100810; Sat, 20 Jun 2015 20:16:40 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pd0-x230.google.com (mail-pd0-x230.google.com [IPv6:2607:f8b0:400e:c02::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 887835EF; Sat, 20 Jun 2015 20:16:40 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by pdjn11 with SMTP id n11so112556787pdj.0; Sat, 20 Jun 2015 13:16:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=517H5nKpWRivv4kbalFoQ8wRi+dITwUIzFl7wMLUtoM=; b=lG6FqLzh9leQbNmdLhi1FGECVNJMmVQ2V1W3VGC1AuX96pQYLrr29+uvb3hRwwILWA doYxnzUWEhM6Sb95SO+pf38+o7fz34M8biqxPkZwhqgPeOECyXSUq1Ah7jdZlIOaJer6 FrPM02anUgaRNEtQTO3mmyeQs0thH+zEXYTgAsyTatb/CC42MpI2rtWUTxeGY7m2npCX xTY/Kv9cKzlKJ7WZxv/XBz5BvzGRcp6XBWy+70UfPj4LwaCZItfbTFk4ACXGeoi4pyuR Pen7+59gWlqm4gXFT5+VvAPNB0g1fB3SEIN2oKEhgtDr3bU1nXkiAcMFgIco4eqXy1xg fo9g== X-Received: by 10.66.141.48 with SMTP id rl16mr43220250pab.147.1434831399795; Sat, 20 Jun 2015 13:16:39 -0700 (PDT) Received: from ?IPv6:2601:602:8001:6c87:955f:edd5:f668:13c0? ([2601:602:8001:6c87:955f:edd5:f668:13c0]) by mx.google.com with ESMTPSA id ho10sm15023485pbc.27.2015.06.20.13.16.38 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Jun 2015 13:16:39 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r284644 - head/usr.sbin/fstyp From: Garrett Cooper X-Mailer: iPhone Mail (12F70) In-Reply-To: <201506201503.t5KF33Km091795@svn.freebsd.org> Date: Sat, 20 Jun 2015 13:16:36 -0700 Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <201506201503.t5KF33Km091795@svn.freebsd.org> To: Allan Jude X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 20:16:40 -0000 > On Jun 20, 2015, at 08:03, Allan Jude wrote: >=20 > Author: allanjude (doc committer) > Date: Sat Jun 20 15:03:02 2015 > New Revision: 284644 > URL: https://svnweb.freebsd.org/changeset/base/284644 >=20 > Log: > Fix the build for gcc by lowering the WARNS level >=20 > Approved by: sbruno > X-MFC-With: r284589 >=20 > Modified: > head/usr.sbin/fstyp/Makefile >=20 > Modified: head/usr.sbin/fstyp/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/usr.sbin/fstyp/Makefile Sat Jun 20 13:30:09 2015 (r284643) > +++ head/usr.sbin/fstyp/Makefile Sat Jun 20 15:03:02 2015 (r284644) > @@ -11,7 +11,7 @@ SRCS +=3D zfs.c >=20 > MAN=3D fstyp.8 >=20 > -WARNS=3D 6 > +WARNS?=3D 0 You could also guard it by COMPILER_TYPE. As others have stated though, fixi= ng the prototypes issues is relatively trivial...= From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 20:46:51 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5D2CB77; Sat, 20 Jun 2015 20:46:51 +0000 (UTC) (envelope-from allanjude@freebsd.org) Received: from mx1.scaleengine.net (mx1.scaleengine.net [209.51.186.6]) by mx1.freebsd.org (Postfix) with ESMTP id 8F733C7C; Sat, 20 Jun 2015 20:46:50 +0000 (UTC) (envelope-from allanjude@freebsd.org) Received: from [192.168.1.2] (unknown [192.168.1.2]) (Authenticated sender: allanjude.freebsd@scaleengine.com) by mx1.scaleengine.net (Postfix) with ESMTPSA id 585B59195; Sat, 20 Jun 2015 20:46:49 +0000 (UTC) Message-ID: <5585D153.9020508@freebsd.org> Date: Sat, 20 Jun 2015 16:47:15 -0400 From: Allan Jude User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Garrett Cooper CC: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284644 - head/usr.sbin/fstyp References: <201506201503.t5KF33Km091795@svn.freebsd.org> In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="PeSXSMQePM2gORHcGjlJDEp1t97PxbNuX" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 20:46:51 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --PeSXSMQePM2gORHcGjlJDEp1t97PxbNuX Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 2015-06-20 16:16, Garrett Cooper wrote: >=20 >> On Jun 20, 2015, at 08:03, Allan Jude wrote: >> >> Author: allanjude (doc committer) >> Date: Sat Jun 20 15:03:02 2015 >> New Revision: 284644 >> URL: https://svnweb.freebsd.org/changeset/base/284644 >> >> Log: >> Fix the build for gcc by lowering the WARNS level >> >> Approved by: sbruno >> X-MFC-With: r284589 >> >> Modified: >> head/usr.sbin/fstyp/Makefile >> >> Modified: head/usr.sbin/fstyp/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/usr.sbin/fstyp/Makefile Sat Jun 20 13:30:09 2015 (r2846= 43) >> +++ head/usr.sbin/fstyp/Makefile Sat Jun 20 15:03:02 2015 (r2846= 44) >> @@ -11,7 +11,7 @@ SRCS +=3D zfs.c >> >> MAN=3D fstyp.8 >> >> -WARNS=3D 6 >> +WARNS?=3D 0 >=20 > You could also guard it by COMPILER_TYPE. As others have stated though,= fixing the prototypes issues is relatively trivial... >=20 This set of changes [1] allows WARNS=3D5, but 6 still has some outstandin= g issues [2] [1] https://github.com/illumos/illumos-gate/compare/master...allanjude:fix_gc= c_warnings?expand=3D1 [2] https://reviews.freebsd.org/D2045#55692 --=20 Allan Jude --PeSXSMQePM2gORHcGjlJDEp1t97PxbNuX Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (MingW32) iQIcBAEBAgAGBQJVhdFZAAoJEBmVNT4SmAt+058P/RF/rBQWd40aBKlIBNPUImll Dtu6MNm8tbWwQ8d06oelXnjhWWJOGO11LP8BoL5iOWy1LZQDS+IIGU1+nNud32YB nw3yJ8emX6ZBXIL3d1xFKU9LOS84aN7ma2XZKtvzmCQtVY+qAVzYijUW+CBa/QTB nMy8lHYIrTHm66HsQKEyxvkUbFOQTHq6BXJyQBVKX9V3LVApje/lOWXd05XH6RwU M2sVcP/TzGwiYRqLoBAIahI5tpbHrGeIYBrfNl0rEMwsDGr7oUbuV69Wb36EAfYC 7MuNX35c9KuhC8OUxjDvvPhSKeDSIqU5QCPXenAm7CNMo4mTtaG8DI17g0UhBbWZ kcKQ+iy5XvxTY/YW0L4pDTuiq4R+d1tMF47Bb5IdItJWFiUkQnFJxaxE6lKw76N5 bcPk4NFjsUOTO/rKvmU+BNB42DJvL5px6JNWVuHmZxKIN6osmRGWRuNHaojr/CCK d8E+OeSl/gCy3O23J483S95L/lzcYGCMJUxNlmkTmQPJeb0OUxC28+Se3selSFlf Ex+CA64IvzUoHWxBMbeoRKkQhlDBEQXzmMAGw3nUXyukJKHUmuL4LGkfDx7kd8id SUH9glIyJe2Hc4cguXItzDwO4aPm2x0CevC6E/OrXxN+Awkd32lgJqqttQDn9jqa abeKt+w5In0yOyit9mWB =o9sb -----END PGP SIGNATURE----- --PeSXSMQePM2gORHcGjlJDEp1t97PxbNuX-- From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 20:54:06 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0FC3FD72; Sat, 20 Jun 2015 20:54:06 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F1EA7E76; Sat, 20 Jun 2015 20:54:05 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5KKs51A066337; Sat, 20 Jun 2015 20:54:05 GMT (envelope-from jilles@FreeBSD.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5KKs5a3066336; Sat, 20 Jun 2015 20:54:05 GMT (envelope-from jilles@FreeBSD.org) Message-Id: <201506202054.t5KKs5a3066336@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jilles set sender to jilles@FreeBSD.org using -f From: Jilles Tjoelker Date: Sat, 20 Jun 2015 20:54:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284649 - head/lib/libc/gen X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 20:54:06 -0000 Author: jilles Date: Sat Jun 20 20:54:05 2015 New Revision: 284649 URL: https://svnweb.freebsd.org/changeset/base/284649 Log: fts_children: preserve errno after running close/fchdir PR: 200942 Submitted by: Conrad Meyer Differential Revision: https://reviews.freebsd.org/D2852 MFC after: 1 week Modified: head/lib/libc/gen/fts.c Modified: head/lib/libc/gen/fts.c ============================================================================== --- head/lib/libc/gen/fts.c Sat Jun 20 19:34:50 2015 (r284648) +++ head/lib/libc/gen/fts.c Sat Jun 20 20:54:05 2015 (r284649) @@ -515,7 +515,7 @@ FTSENT * fts_children(FTS *sp, int instr) { FTSENT *p; - int fd; + int fd, rc, serrno; if (instr != 0 && instr != FTS_NAMEONLY) { errno = EINVAL; @@ -571,11 +571,14 @@ fts_children(FTS *sp, int instr) if ((fd = _open(".", O_RDONLY | O_CLOEXEC, 0)) < 0) return (NULL); sp->fts_child = fts_build(sp, instr); - if (fchdir(fd)) { - (void)_close(fd); - return (NULL); - } + serrno = (sp->fts_child == NULL) ? errno : 0; + rc = fchdir(fd); + if (rc < 0 && serrno == 0) + serrno = errno; (void)_close(fd); + errno = serrno; + if (rc < 0) + return (NULL); return (sp->fts_child); } From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 21:48:07 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E5641469; Sat, 20 Jun 2015 21:48:07 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D37A5BE7; Sat, 20 Jun 2015 21:48:07 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5KLm7Vl091031; Sat, 20 Jun 2015 21:48:07 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5KLm7hI091030; Sat, 20 Jun 2015 21:48:07 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506202148.t5KLm7hI091030@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sat, 20 Jun 2015 21:48:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284650 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 21:48:08 -0000 Author: sjg Date: Sat Jun 20 21:48:07 2015 New Revision: 284650 URL: https://svnweb.freebsd.org/changeset/base/284650 Log: Deal with MAKEOBJDIRPREFIX MAKEOBJDIRPREFIX does not really fit our model. Use it to set OBJROOT to about where user expects and set MAKEOBJDIR to do what we want. Modified: head/share/mk/local.meta.sys.mk Modified: head/share/mk/local.meta.sys.mk ============================================================================== --- head/share/mk/local.meta.sys.mk Sat Jun 20 20:54:05 2015 (r284649) +++ head/share/mk/local.meta.sys.mk Sat Jun 20 21:48:07 2015 (r284650) @@ -8,6 +8,18 @@ MK_INSTALL_AS_USER= yes .if empty(OBJROOT) || ${.MAKE.LEVEL} == 0 +.if defined(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX}) +.warning MAKEOBJDIRPREFIX not supported; setting MAKEOBJDIR... +# put things approximately where they want +OBJROOT:=${MAKEOBJDIRPREFIX}${SRCTOP:S,/src,,}/ +# OBJTOP set below +MAKEOBJDIR=$${.CURDIR:S,$${SRCTOP},$${OBJTOP},} +MAKEOBJDIRPREFIX= +# export but do not track +.export-env MAKEOBJDIRPREFIX MAKEOBJDIR +# now for our own use +MAKEOBJDIR= ${.CURDIR:S,${SRCTOP},${OBJTOP},} +.endif .if !empty(SB) SB_OBJROOT ?= ${SB}/obj/ # this is what we use below From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 22:24:45 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6B30A7B6; Sat, 20 Jun 2015 22:24:45 +0000 (UTC) (envelope-from davidcs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 58E916B7; Sat, 20 Jun 2015 22:24:45 +0000 (UTC) (envelope-from davidcs@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5KMOjcQ010062; Sat, 20 Jun 2015 22:24:45 GMT (envelope-from davidcs@FreeBSD.org) Received: (from davidcs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5KMOj8l010061; Sat, 20 Jun 2015 22:24:45 GMT (envelope-from davidcs@FreeBSD.org) Message-Id: <201506202224.t5KMOj8l010061@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: davidcs set sender to davidcs@FreeBSD.org using -f From: David C Somayajulu Date: Sat, 20 Jun 2015 22:24:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284651 - head/sys/dev/bxe X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 22:24:45 -0000 Author: davidcs Date: Sat Jun 20 22:24:44 2015 New Revision: 284651 URL: https://svnweb.freebsd.org/changeset/base/284651 Log: Simplified implementation of bxe_set_mc_list() removed bxe_free_mcast_macs_list() and bxe_init_mcast_macs_list() fixed bug where copy of multicast list mta was deleted prior to passing the list to firmware MFC after:5 days Modified: head/sys/dev/bxe/bxe.c Modified: head/sys/dev/bxe/bxe.c ============================================================================== --- head/sys/dev/bxe/bxe.c Sat Jun 20 21:48:07 2015 (r284650) +++ head/sys/dev/bxe/bxe.c Sat Jun 20 22:24:44 2015 (r284651) @@ -12499,24 +12499,21 @@ bxe_initial_phy_init(struct bxe_softc *s } /* must be called under IF_ADDR_LOCK */ + static int -bxe_init_mcast_macs_list(struct bxe_softc *sc, - struct ecore_mcast_ramrod_params *p) +bxe_set_mc_list(struct bxe_softc *sc) { - if_t ifp = sc->ifp; + struct ecore_mcast_ramrod_params rparam = { NULL }; + int rc = 0; int mc_count = 0; int mcnt, i; - struct ecore_mcast_list_elem *mc_mac; + struct ecore_mcast_list_elem *mc_mac, *mc_mac_start; unsigned char *mta; + if_t ifp = sc->ifp; mc_count = if_multiaddr_count(ifp, -1);/* XXX they don't have a limit */ - /* should we enforce one? */ - ECORE_LIST_INIT(&p->mcast_list); - p->mcast_list_len = 0; - - if (!mc_count) { + if (!mc_count) return (0); - } mta = malloc(sizeof(unsigned char) * ETHER_ADDR_LEN * mc_count, M_DEVBUF, M_NOWAIT); @@ -12527,8 +12524,9 @@ bxe_init_mcast_macs_list(struct bxe_soft } bzero(mta, (sizeof(unsigned char) * ETHER_ADDR_LEN * mc_count)); - mc_mac = malloc(sizeof(*mc_mac) * mc_count, M_DEVBUF, - (M_NOWAIT | M_ZERO)); + mc_mac = malloc(sizeof(*mc_mac) * mc_count, M_DEVBUF, (M_NOWAIT | M_ZERO)); + mc_mac_start = mc_mac; + if (!mc_mac) { free(mta, M_DEVBUF); BLOGE(sc, "Failed to allocate temp mcast list\n"); @@ -12536,12 +12534,17 @@ bxe_init_mcast_macs_list(struct bxe_soft } bzero(mc_mac, (sizeof(*mc_mac) * mc_count)); - if_multiaddr_array(ifp, mta, &mcnt, mc_count); /* mta and mcnt not expected - to be different */ + /* mta and mcnt not expected to be different */ + if_multiaddr_array(ifp, mta, &mcnt, mc_count); + + + rparam.mcast_obj = &sc->mcast_obj; + ECORE_LIST_INIT(&rparam.mcast_list); + for(i=0; i< mcnt; i++) { - mc_mac->mac = (uint8_t *)(mta + (i * ETHER_ADDR_LEN)); - ECORE_LIST_PUSH_TAIL(&mc_mac->link, &p->mcast_list); + mc_mac->mac = (uint8_t *)(mta + (i * ETHER_ADDR_LEN)); + ECORE_LIST_PUSH_TAIL(&mc_mac->link, &rparam.mcast_list); BLOGD(sc, DBG_LOAD, "Setting MCAST %02X:%02X:%02X:%02X:%02X:%02X\n", @@ -12550,34 +12553,7 @@ bxe_init_mcast_macs_list(struct bxe_soft mc_mac++; } - - p->mcast_list_len = mc_count; - free(mta, M_DEVBUF); - - return (0); -} - -static void -bxe_free_mcast_macs_list(struct ecore_mcast_ramrod_params *p) -{ - struct ecore_mcast_list_elem *mc_mac = - ECORE_LIST_FIRST_ENTRY(&p->mcast_list, - struct ecore_mcast_list_elem, - link); - - if (mc_mac) { - /* only a single free as all mc_macs are in the same heap array */ - free(mc_mac, M_DEVBUF); - } -} - -static int -bxe_set_mc_list(struct bxe_softc *sc) -{ - struct ecore_mcast_ramrod_params rparam = { NULL }; - int rc = 0; - - rparam.mcast_obj = &sc->mcast_obj; + rparam.mcast_list_len = mc_count; BXE_MCAST_LOCK(sc); @@ -12586,14 +12562,8 @@ bxe_set_mc_list(struct bxe_softc *sc) if (rc < 0) { BLOGE(sc, "Failed to clear multicast configuration: %d\n", rc); BXE_MCAST_UNLOCK(sc); - return (rc); - } - - /* configure a new MACs list */ - rc = bxe_init_mcast_macs_list(sc, &rparam); - if (rc) { - BLOGE(sc, "Failed to create mcast MACs list (%d)\n", rc); - BXE_MCAST_UNLOCK(sc); + free(mc_mac_start, M_DEVBUF); + free(mta, M_DEVBUF); return (rc); } @@ -12603,10 +12573,11 @@ bxe_set_mc_list(struct bxe_softc *sc) BLOGE(sc, "Failed to set new mcast config (%d)\n", rc); } - bxe_free_mcast_macs_list(&rparam); - BXE_MCAST_UNLOCK(sc); + free(mc_mac_start, M_DEVBUF); + free(mta, M_DEVBUF); + return (rc); } From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 22:57:11 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5CEDEAB9 for ; Sat, 20 Jun 2015 22:57:11 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from mail-pa0-f44.google.com (mail-pa0-f44.google.com [209.85.220.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 30FD2D24 for ; Sat, 20 Jun 2015 22:57:10 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: by pacyo7 with SMTP id yo7so5105282pac.2 for ; Sat, 20 Jun 2015 15:57:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:mime-version:content-type:from :in-reply-to:date:cc:message-id:references:to; bh=jFCNLMl7NFSIpEuLgbCCS1wHnkN4BGua7XDvoAdNmL8=; b=SGM5puw55hckkWmA2JJoVHs3JLkQt0p7r+pymgS9p+OTHRFOGlsXtsQIg8jH2vgq7+ p5I+w2cGG+Y6SC2qP+2XMzIUB5rbFotBNEVgw3ehBLDR5STlxMAEuZoPff2CKtBfoHrX O1RepQTmak6nZChkM+1+IkKtbh55L7eWCKpnf7OwI72+URLDVnCChPmD/jKlvC0VJUL3 5Gk2nLV1Chvvbt6VKEz8deQPIBahh1iVt2bVFAWnjIQPbKK0nMMf16bFmEozpGc2MeNL 76i0X13iW5H6smJ/Sb/L8tUMfb++brHLr+KMeVR9Yxon0onc1weQ6yFNBdcNgdSjyT/t gvSw== X-Gm-Message-State: ALoCoQlxdT9353e+tEaSPhFugSdsDBJbvN207XBXMhrkLlkGZ9sYGH+tviqMON1nAr3eRRt2lTDV X-Received: by 10.68.185.37 with SMTP id ez5mr45511301pbc.74.1434841029621; Sat, 20 Jun 2015 15:57:09 -0700 (PDT) Received: from [10.64.27.92] ([69.53.236.236]) by mx.google.com with ESMTPSA id tr3sm15188560pbc.75.2015.06.20.15.57.07 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Jun 2015 15:57:07 -0700 (PDT) Sender: Warner Losh Subject: Re: svn commit: r284650 - head/share/mk Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_D055BF88-ED9B-485C-BC84-7850938303FD"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5 From: Warner Losh In-Reply-To: <201506202148.t5KLm7hI091030@svn.freebsd.org> Date: Sat, 20 Jun 2015 16:57:07 -0600 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <93269D94-59D9-4643-9EE1-12B3A78A3B00@bsdimp.com> References: <201506202148.t5KLm7hI091030@svn.freebsd.org> To: "Simon J. Gerraty" X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 22:57:11 -0000 --Apple-Mail=_D055BF88-ED9B-485C-BC84-7850938303FD Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Jun 20, 2015, at 3:48 PM, Simon J. Gerraty wrote: >=20 > Author: sjg > Date: Sat Jun 20 21:48:07 2015 > New Revision: 284650 > URL: https://svnweb.freebsd.org/changeset/base/284650 >=20 > Log: > Deal with MAKEOBJDIRPREFIX >=20 > MAKEOBJDIRPREFIX does not really fit our model. > Use it to set OBJROOT to about where user expects > and set MAKEOBJDIR to do what we want. >=20 > Modified: > head/share/mk/local.meta.sys.mk >=20 > Modified: head/share/mk/local.meta.sys.mk > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/share/mk/local.meta.sys.mk Sat Jun 20 20:54:05 2015 = (r284649) > +++ head/share/mk/local.meta.sys.mk Sat Jun 20 21:48:07 2015 = (r284650) > @@ -8,6 +8,18 @@ > MK_INSTALL_AS_USER=3D yes >=20 > .if empty(OBJROOT) || ${.MAKE.LEVEL} =3D=3D 0 > +.if defined(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX}) > +.warning MAKEOBJDIRPREFIX not supported; setting MAKEOBJDIR... > +# put things approximately where they want > +OBJROOT:=3D${MAKEOBJDIRPREFIX}${SRCTOP:S,/src,,}/ > +# OBJTOP set below > +MAKEOBJDIR=3D$${.CURDIR:S,$${SRCTOP},$${OBJTOP},} > +MAKEOBJDIRPREFIX=3D > +# export but do not track > +.export-env MAKEOBJDIRPREFIX MAKEOBJDIR > +# now for our own use > +MAKEOBJDIR=3D ${.CURDIR:S,${SRCTOP},${OBJTOP},} > +.endif > .if !empty(SB) > SB_OBJROOT ?=3D ${SB}/obj/ > # this is what we use below MAKEOBJDIRPREFIX has been *THE* way to do things in FreeBSD since = ~forever. How does it not fit our model? It is our model. This change is ill = advised. Also, this change will generate about a billion warnings for a = buildworld (one per makefile, per tree traverse). That=E2=80=99s not acceptable. Warner --Apple-Mail=_D055BF88-ED9B-485C-BC84-7850938303FD Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJVhe/EAAoJEGwc0Sh9sBEAp74P/0rVGgYROcgdeMWX9nfzmi0S tduM7XOOuGu93x/bnQ3drNNWlRWzC2gFFmybx26qvMcJYht/35RosQ+WdXUwlJhn 6SXigz4dGDS5lCe6sr6RNb0d+qOeS5MCLCB0U/Vsp4AYSkiFki9eak987as7KbNF Hyqm1ch+1dL1gJ1g0hb9T5AHPrl4YRR5546HzTwZEGqDmR5APtWLpqs8yzX+/uDh ADUQX6FG1Qjfwf5woGcs2ZJGU+LheZaiySvSlAxXlQzIQb2sWUoeaE1aypyuUEsE +2yzpivDU4Y8jWjL29yhzgt9Z2utdOjq1CNL3JDLIkg12sC8X4EzL9De0H+Z0Qsh WtVGAvsvuH6NS9Fae2CpzI2Gik3MQa5KmhHKr0Jrs21rUCTqoQI30kDbunrWYbXp +0CoUcXlUzLGjuW+T5WVWZJZkIlddtyL5XOvbrupUPZA9cfhHb672MLf0FnmddaM xcfpxxgRT1Lk4U4d2inWjtVHd+Lkphg0xDMtp+gFOPB31P6Aml+k9xT0Jepi5en4 PWtAo3V2KXx7PV7jRWWWS8Hi9m29K+6gw5BpwbJPoD3u6rL3+fYvdgzTKdyMGNct OAPy74v2Z+0+9RkyCEEVZEt/i0NT79Om0Vk8FKKbtuiNC2FFKfR8fTC+upYfWfXF oz5fTH1mrI2a1pkZ+dqb =Sk0s -----END PGP SIGNATURE----- --Apple-Mail=_D055BF88-ED9B-485C-BC84-7850938303FD-- From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 23:33:34 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 08071F89; Sat, 20 Jun 2015 23:33:34 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0144.outbound.protection.outlook.com [157.56.110.144]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 404F1836; Sat, 20 Jun 2015 23:33:32 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from BY1PR0501CA0034.namprd05.prod.outlook.com (10.162.139.44) by BY2PR05MB709.namprd05.prod.outlook.com (10.141.222.142) with Microsoft SMTP Server (TLS) id 15.1.190.14; Sat, 20 Jun 2015 23:33:23 +0000 Received: from BN1AFFO11FD034.protection.gbl (2a01:111:f400:7c10::167) by BY1PR0501CA0034.outlook.office365.com (2a01:111:e400:4821::44) with Microsoft SMTP Server (TLS) id 15.1.195.15 via Frontend Transport; Sat, 20 Jun 2015 23:33:24 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BN1AFFO11FD034.mail.protection.outlook.com (10.58.52.158) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Sat, 20 Jun 2015 23:33:23 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Sat, 20 Jun 2015 16:33:21 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5KNXLD96314; Sat, 20 Jun 2015 16:33:21 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id 21338580AA; Sat, 20 Jun 2015 16:33:21 -0700 (PDT) To: Warner Losh CC: , , Subject: Re: svn commit: r284650 - head/share/mk In-Reply-To: <93269D94-59D9-4643-9EE1-12B3A78A3B00@bsdimp.com> References: <201506202148.t5KLm7hI091030@svn.freebsd.org> <93269D94-59D9-4643-9EE1-12B3A78A3B00@bsdimp.com> Comments: In-reply-to: Warner Losh message dated "Sat, 20 Jun 2015 16:57:07 -0600." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Date: Sat, 20 Jun 2015 16:33:21 -0700 Message-ID: <17256.1434843201@chaos> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD034; 1:VqyGNPL3R5UlDlZQCfWnQvDKtTGkn983rpTsoc3Iha6LyEC+H8o9mTvbmSnXKxHhtGMqNbAkgtsPj7uWhzHB4NwnUNvNiH9smkbrikcUewgGR3B7FP83dnCEl+/O694IE79g16wRvrtODFBuuFSfXulmjPeMDLl1fp+HgsyDBc3b0vq8QjZcD+WawgfMxEUG2ef/4ZSu/OK0SDUYGZLrM8KILHXdgLqmp3o+ZqSJNZzyztIar7FxOgjC7rPpk4U9r90KjYmceFi3Qhl4RUNfdLYTZ+hLm+aCPH0LForfA1Xr4Qd+pNcDKqp/GbFNaJcfcJWtCmioL7B0jPQ/OBAyGQ== X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(199003)(24454002)(189002)(6806004)(68736005)(50466002)(5001960100002)(110136002)(105596002)(76506005)(2950100001)(77096005)(92566002)(189998001)(19580405001)(76176999)(19580395003)(57986006)(106466001)(50986999)(77156002)(62966003)(50226001)(47776003)(86362001)(117636001)(87936001)(46102003)(97736004)(33716001)(23676002)(62816006)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR05MB709; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2PR05MB709; 2:jctCR3H1LlnPkuHItzyYisNlPj1eER5TaR2TY6aTEbJFXyvtBzYTW8DOQP0HFc0y; 2:oBKYSwt96RN7NkZBfvailB4vWz6b3IBHTqRX1J729cpajLhLV1rcS7wsUon8dN8ihEnsITna/29L7l7R1fuzlHoM86GYK0eNp/i3RpQPzCaV+VxwTl7ipfZZLoHzg2tWTFYwoQUphiLTpq14zk+R/wr/USm+cFGV5qfnpnqCsUL0bPtwwlbOlcMaRgygZa5V/BaW5SWXt+J7ZbZW9LZ5FK+HgnrePYI1kYCbrB6coNU=; 6:tF24TGtCivRi4PBALtGB0nkFoaWQH+UB/JuEGcgt7AH9l5xMaH1G3SNThDgcno8LNbLemtKZ3p3aBGjQnCDCQq9qoAjHPcTKT/3mPzp2u/mHThWecXKc3yDpiWrjxWv9eKSKincDHBcuebDqhobc8nDVFPzi8hCwzYLjS0v0IheCjRRckXTdOXm3pr7KvRo4A9Z2nRzrwh+m/ILsCoidL8Je2nnJ4x0uOz0jbwi1G5zrKWNLLBqSxXIdcprtkRWwWxD3rFx6nXDLsfF0sVjbBAiivFm9s8EOv7YwiWfn11nmgtncWGCLlouqaH4annROMAr51SeRxMDEuB5yDqACDcn38lzF+NQ7feYIDVFg2Cj6Tg/oywo6lVED2dyEz04Jgr7xumDbtw90TcjnpMg9AusR8cuvUjsVvbBwj2HD3/r76qVjOi7/+WeBwYGPV8a9OeTxFKYMmP2Vx1vr49AEpnbVECGNT4QAOdDzs5ph3N5owyrPc8FTJqSQY1ke6MKm X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR05MB709; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(520004)(5005006)(3002001); SRVR:BY2PR05MB709; BCL:0; PCL:0; RULEID:; SRVR:BY2PR05MB709; X-Microsoft-Exchange-Diagnostics: 1; BY2PR05MB709; 3:9kXaLzgEIJl+tbRmHyBmPrcyWO3q/FSy4IeD+Uz7k0UQeIlAF6De8iURTmsDKPK1G+gbT8F0o/X0p45tiH3iM9tHJvJp/QyGaUWOEDWcDcoF8ukvr+3D72D29E0Db5Hj/kwvZhDoQ1QQvDGMjE4ZCdJilMytyjmYo6MIxiFpPzhMZH5fOF6U38UtSKICDLcEydIVpT8B1/F45+Uu6VKCro052cuwataVIzmexWptOIYrjELtfDMwURenqRrpkrOVQA7JgLyU2wq/4vkaLGdWmZYez/w4WA8rT9fJn7npPVrQh7IWM71c+3SY4NxhYqyW X-Forefront-PRVS: 0613912E23 X-Microsoft-Exchange-Diagnostics: 1; BY2PR05MB709; 9:1QP/6JLNZYVC9B7q7b8uAzDqF9Pd13e70k3oB6gUOdvhMRzI64GYfM0gYUohPiHhv+Kv0mIvxdpmmT7lRVYgi3crJTL1yDvhIw4utk8/nmyAsR6hMjOrKhNo6f166TVjGCB7ssiAGqYfSbsa2TZfzqiAf9fR6kFuG/atf4fnGynNAqrD9m3tW/IsutEFIrceBLLLmQg8OESpwCP6xPGwn2vSTpq7xxQIVI7SRYn2rcHY6/UalREjV6Cxe26DtKz6D/QHkQz4OccADpDzMoPj52xUuAgIUvlcQu6WXBFdkh6NzbO68ecaDLOgVpB7UTxJzm6R7rcN98XhdTL09Gk3Xg+cKNZxHxPpfz4o7zr7+f/rVcAFvggyhIgE0VXoYXrO9z2yXekh98ryyLOtbNXF4Maah8HuW9o9mvQ+oVyY4QQLtJk+cHsteNyvXqzLKD0PbMiIlKTAVvnoasTNUGd7aX6QqadJGUDd5d+Hq7eXLzxgCWMmDF1JpZzTCLzCUmYQxf6+kfhxbgruJKuVql/ytEXRKJcA5O8zhENrpSfotYpq/nr7dDq0+WbupI5/nPpr874jdyIJtyqEX7tsjh6+AcCF24bqQ3aTnKNM7FXbdoX94wD0tyRPbhsILt2WFgJckK+OzhXGoBdhNr3nXoOURWeuUfaxEfMKaOu3gNEOxWA6oke4OuXOhmuwI48u2mMT4ffSQAfRqzyxTxC+Gkq8krd7A6YU0yK6wmMAZcRJ8uLcrrRM+KQDuQi9sy+I9o+MAKV/mCUR2A8rWnnu/beZi6SNaV7U6YIZfZ9fiXx3DdwBdGyx6hKPEHz/6byNb3kgt5hpwj4mQGmROn2zohu6StNl/ICQqRdDrqCEy3CU+VAxhn98zVVIs4y75TEysYKVyOjUfMRApHKjMDhMJffpQeJgCzAcubCxReYjNT2jsUI= X-Microsoft-Exchange-Diagnostics: 1; BY2PR05MB709; 3:ga7NYCyvQPEBtPCb4Y6UvPQ9NFNyTtJN3WjymbhKR7oKGtKyEPsOAR5RTFtvYOO+UzxKPu4jN1K7NNKfbpKngpx3bURxigo8ZW+K3kfWpp1SzGvJuIRGP7aei8lOlrDjDSseyu3vfP0/kquF091r4g==; 10:hhV9TaMafnnu3ldSBA9gYH0ikkSZ5uwu31NMUmcAiwORdDZc9610pjwVce4chC6Puc3Z5+BnJXCZTsfWwAKAcm1bUrbsQfZbNL+XYlERgCU=; 6:SgmDQfyIA+oGjQ+YFZJrDfUbkEpKqJezSZ91tBr32OteoRj0AFqi+Ql+L+KYSA+m X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jun 2015 23:33:23.1060 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR05MB709 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 23:33:34 -0000 Warner Losh wrote: > MAKEOBJDIRPREFIX has been *THE* way to do things in FreeBSD since ~foreve= r. > How does it not fit our model? It is our model. This change is ill advise= d. Note: this is only relevant for meta mode (MK_META_MODE=3D=3Dyes) which wants to be able to tweak objdirs for building for multiple machines at the same time. MAKEOBJDIRPREFIX doesn't fit well with that, this provides a reasonaby painless compromise so those used to using MAKEOBJDIRPREFIX can try it out with minimal pain. > Also, this change will generate about a billion warnings for a buildworld= (one per makefile, > per tree traverse). That=E2=80=99s not acceptable. No, this file (local.meta.sys.mk) doesn't get included by buildworld. It will only be included if MK_META_MODE=3D=3Dyes