From owner-svn-src-user@FreeBSD.ORG Sun Feb 1 09:53:56 2015 Return-Path: Delivered-To: svn-src-user@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 0A93B7A9; Sun, 1 Feb 2015 09:53:56 +0000 (UTC) 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 EA6EEEB0; Sun, 1 Feb 2015 09:53:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t119rttS078308; Sun, 1 Feb 2015 09:53:55 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t119rtph078303; Sun, 1 Feb 2015 09:53:55 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502010953.t119rtph078303@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 1 Feb 2015 09:53:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278024 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 09:53:56 -0000 Author: pho Date: Sun Feb 1 09:53:55 2015 New Revision: 278024 URL: https://svnweb.freebsd.org/changeset/base/278024 Log: Add new finding, fix copy/paste and fix wrong index number. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/mmap11.sh Modified: user/pho/stress2/misc/mmap11.sh ============================================================================== --- user/pho/stress2/misc/mmap11.sh Sun Feb 1 09:50:33 2015 (r278023) +++ user/pho/stress2/misc/mmap11.sh Sun Feb 1 09:53:55 2015 (r278024) @@ -33,6 +33,8 @@ # http://people.freebsd.org/~pho/stress/log/mmap11.txt # No problems seen after r271681. +# http://people.freebsd.org/~pho/stress/log/kostik730.txt, Fixed in r273784 + [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 here=`pwd` @@ -127,8 +129,7 @@ tmmap(void *arg __unused) len = 1LL * 1024 * 1024 * 1024; for (i = 0; i < 100; i++) { - if ((fd = open("/dev/zero", O_CREAT | O_TRUNC | O_RDWR, - 0622)) == -1) + if ((fd = open("/dev/zero", O_RDWR)) == -1) err(1,"open()"); if ((p = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE, @@ -255,7 +256,7 @@ test(void) errc(1, rc, "tmprotect()"); if ((rc = pthread_create(&tid[3], NULL, tmlockall, NULL)) != 0) errc(1, rc, "tmlockall()"); - if ((rc = pthread_create(&tid[3], NULL, tmsync, NULL)) != 0) + if ((rc = pthread_create(&tid[4], NULL, tmsync, NULL)) != 0) errc(1, rc, "tmlockall()"); for (i = 0; i < 100; i++) { From owner-svn-src-user@FreeBSD.ORG Sun Feb 1 09:55:30 2015 Return-Path: Delivered-To: svn-src-user@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 9DE31A1B; Sun, 1 Feb 2015 09:55:30 +0000 (UTC) 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 8A29BED0; Sun, 1 Feb 2015 09:55:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t119tUZn082419; Sun, 1 Feb 2015 09:55:30 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t119tUKT082418; Sun, 1 Feb 2015 09:55:30 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502010955.t119tUKT082418@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 1 Feb 2015 09:55:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278025 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 09:55:30 -0000 Author: pho Date: Sun Feb 1 09:55:29 2015 New Revision: 278025 URL: https://svnweb.freebsd.org/changeset/base/278025 Log: Fix copy/paste error. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/mmap19.sh Modified: user/pho/stress2/misc/mmap19.sh ============================================================================== --- user/pho/stress2/misc/mmap19.sh Sun Feb 1 09:53:55 2015 (r278024) +++ user/pho/stress2/misc/mmap19.sh Sun Feb 1 09:55:29 2015 (r278025) @@ -128,8 +128,7 @@ tmmap(void *arg __unused) len = 1LL * 1024 * 1024 * 1024; for (i = 0; i < 100; i++) { - if ((fd = open("/dev/zero", O_CREAT | O_TRUNC | O_RDWR, - 0622)) == -1) + if ((fd = open("/dev/zero", O_RDWR)) == -1) err(1,"open()"); if ((p = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE, From owner-svn-src-user@FreeBSD.ORG Sun Feb 1 12:08:12 2015 Return-Path: Delivered-To: svn-src-user@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 00ABB245; Sun, 1 Feb 2015 12:08:11 +0000 (UTC) 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 E1196CDE; Sun, 1 Feb 2015 12:08:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11C8BsH044331; Sun, 1 Feb 2015 12:08:11 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11C8BSK044330; Sun, 1 Feb 2015 12:08:11 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502011208.t11C8BSK044330@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 1 Feb 2015 12:08:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278026 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 12:08:12 -0000 Author: pho Date: Sun Feb 1 12:08:11 2015 New Revision: 278026 URL: https://svnweb.freebsd.org/changeset/base/278026 Log: Script cleanup. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/mmap2.sh Modified: user/pho/stress2/misc/mmap2.sh ============================================================================== --- user/pho/stress2/misc/mmap2.sh Sun Feb 1 09:55:29 2015 (r278025) +++ user/pho/stress2/misc/mmap2.sh Sun Feb 1 12:08:11 2015 (r278026) @@ -36,9 +36,8 @@ odir=`pwd` cd /tmp sed '1,/^EOF/d' < $odir/$0 > mmap2.c -#cc -o mmap2 -Wall -O2 -g mmap2.c -lpthread cc -o mmap2 -Wall -g mmap2.c -lpthread -#rm -f mmap2.c +rm -f mmap2.c for i in `jot 10`; do ./mmap2 From owner-svn-src-user@FreeBSD.ORG Sun Feb 1 14:41:11 2015 Return-Path: Delivered-To: svn-src-user@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 5663585D; Sun, 1 Feb 2015 14:41:11 +0000 (UTC) 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 37091C60; Sun, 1 Feb 2015 14:41:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11EfBhg017264; Sun, 1 Feb 2015 14:41:11 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11EfB8j017259; Sun, 1 Feb 2015 14:41:11 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502011441.t11EfB8j017259@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 1 Feb 2015 14:41:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278029 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 14:41:11 -0000 Author: pho Date: Sun Feb 1 14:41:10 2015 New Revision: 278029 URL: https://svnweb.freebsd.org/changeset/base/278029 Log: Added a PTHREAD_PRIO_INHERIT regression test. Submitted by: Eric van Gyzen Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/kern_umtx_inf_loop.sh (contents, props changed) Added: user/pho/stress2/misc/kern_umtx_inf_loop.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/kern_umtx_inf_loop.sh Sun Feb 1 14:41:10 2015 (r278029) @@ -0,0 +1,150 @@ +#!/bin/sh + +# $FreeBSD$ + +# The program is a test case by Eric which demonstrates the +# bug, unkillable spinning thread, owning a spinlock. + +# "panic: spin lock held too long" seen. +# Fixed in r277970. + +. ../default.cfg + +here=`pwd` +cd /tmp +sed '1,/^EOF/d' < $here/$0 > kern_umtx_inf_loop.c +cc -o kern_umtx_inf_loop -Wall -Wextra -O0 -g kern_umtx_inf_loop.c \ + -lpthread || exit 1 +rm -f kern_umtx_inf_loop.c + +/tmp/kern_umtx_inf_loop + +rm -f /tmp/kern_umtx_inf_loop +exit 0 +EOF +/*- + * Copyright (c) 2015 Eric van Gyzen + * 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 +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +pthread_mutex_t the_mutex = PTHREAD_MUTEX_INITIALIZER; + +pthread_t contender; + +static void * +contender_func(void *arg) +{ + int error; + + (void) arg; + + error = pthread_mutex_lock(&the_mutex); + if (error) errc(1, error, "pthread_mutex_lock contender"); + + fprintf(stderr, "contender lock succeeded\n"); + + error = pthread_mutex_unlock(&the_mutex); + if (error) errc(1, error, "pthread_mutex_unlock contender"); + + fprintf(stderr, "contender unlock succeeded; exiting\n"); + + return (NULL); +} + +static void * +signaler_func(void *arg __unused) +{ + int error; + + // Wait for the main thread to sleep. + usleep(100000); + + error = pthread_kill(contender, SIGHUP); + if (error) errc(1, error, "pthread_kill"); + + // Wait for the contender to lock umtx_lock + // in umtx_repropagate_priority. + usleep(100000); + + error = pthread_mutex_lock(&the_mutex); + if (error) errc(1, error, "pthread_mutex_lock signaler"); + + return (NULL); +} + +int +main(void) +{ + int error; + + pthread_mutexattr_t mattr; + + error = pthread_mutexattr_init(&mattr); + if (error) errc(1, error, "pthread_mutexattr_init"); + + error = pthread_mutexattr_setprotocol(&mattr, PTHREAD_PRIO_INHERIT); + if (error) errc(1, error, "pthread_mutexattr_setprotocol"); + + error = pthread_mutex_init(&the_mutex, &mattr); + if (error) errc(1, error, "pthread_mutex_init"); + + error = pthread_mutexattr_destroy(&mattr); + if (error) errc(1, error, "pthread_mutexattr_destroy"); + + //error = pthread_mutex_lock(&the_mutex); + //if (error) errc(1, error, "pthread_mutex_lock"); + + // Hack lock. + *(int *)the_mutex = pthread_getthreadid_np(); + + error = pthread_create(&contender, NULL, contender_func, NULL); + if (error) errc(1, error, "pthread_create"); + + // Wait for the contender to sleep. + usleep(100000); + + pthread_t signaler; + error = pthread_create(&signaler, NULL, signaler_func, NULL); + if (error) errc(1, error, "pthread_create"); + + error = pthread_mutex_lock(&the_mutex); + if (error) errc(1, error, "pthread_mutex_lock recurse"); + + return (0); +} + From owner-svn-src-user@FreeBSD.ORG Sun Feb 1 14:45:42 2015 Return-Path: Delivered-To: svn-src-user@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 D2DCD997; Sun, 1 Feb 2015 14:45:42 +0000 (UTC) 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 BF878D12; Sun, 1 Feb 2015 14:45:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11EjgSK019349; Sun, 1 Feb 2015 14:45:42 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11EjgWb019348; Sun, 1 Feb 2015 14:45:42 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502011445.t11EjgWb019348@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 1 Feb 2015 14:45:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278030 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 14:45:42 -0000 Author: pho Date: Sun Feb 1 14:45:41 2015 New Revision: 278030 URL: https://svnweb.freebsd.org/changeset/base/278030 Log: Make test less verbose. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/mmap4.sh Modified: user/pho/stress2/misc/mmap4.sh ============================================================================== --- user/pho/stress2/misc/mmap4.sh Sun Feb 1 14:41:10 2015 (r278029) +++ user/pho/stress2/misc/mmap4.sh Sun Feb 1 14:45:41 2015 (r278030) @@ -54,8 +54,6 @@ newfs $newfs_flags md${mdstart}$part > / mount /dev/md${mdstart}$part $mntpoint /tmp/mmap4 /$mntpoint/file -ls -lh $mntpoint -df -h cd $here rm -f /tmp/mmap4 From owner-svn-src-user@FreeBSD.ORG Sun Feb 1 19:07:43 2015 Return-Path: Delivered-To: svn-src-user@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 B89F278F; Sun, 1 Feb 2015 19:07:43 +0000 (UTC) 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 A4EC682F; Sun, 1 Feb 2015 19:07:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11J7h5J044824; Sun, 1 Feb 2015 19:07:43 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11J7hjF044823; Sun, 1 Feb 2015 19:07:43 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201502011907.t11J7hjF044823@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sun, 1 Feb 2015 19:07:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278033 - user/dchagin/lemul/sys/kern X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 19:07:43 -0000 Author: dchagin Date: Sun Feb 1 19:07:42 2015 New Revision: 278033 URL: https://svnweb.freebsd.org/changeset/base/278033 Log: Reduce diff with #lemul Phabricator. Thanks to abi at abinet dot ru. Modified: user/dchagin/lemul/sys/kern/p1003_1b.c Modified: user/dchagin/lemul/sys/kern/p1003_1b.c ============================================================================== --- user/dchagin/lemul/sys/kern/p1003_1b.c Sun Feb 1 18:21:16 2015 (r278032) +++ user/dchagin/lemul/sys/kern/p1003_1b.c Sun Feb 1 19:07:42 2015 (r278033) @@ -130,7 +130,9 @@ sys_sched_setparam(struct thread *td, st targettd = FIRST_THREAD_IN_PROC(targetp); } - return (kern_sched_setparam(td, targettd, &sched_param)); + e = kern_sched_setparam(td, targettd, &sched_param); + PROC_UNLOCK(targetp); + return (e); } int @@ -145,8 +147,8 @@ kern_sched_setparam(struct thread *td, s error = p_cansched(td, targetp); if (error == 0) - error = ksched_setparam(ksched, targettd, param); - PROC_UNLOCK(targetp); + error = ksched_setparam(ksched, targettd, + (const struct sched_param *)param); return (error); } @@ -170,7 +172,8 @@ sys_sched_getparam(struct thread *td, st targettd = FIRST_THREAD_IN_PROC(targetp); } - e = ksched_getparam(ksched, targettd, &sched_param); + e = kern_sched_getparam(td, targettd, &sched_param); + PROC_UNLOCK(targetp); if (e == 0) e = copyout(&sched_param, uap->param, sizeof(sched_param)); return (e); @@ -189,7 +192,6 @@ kern_sched_getparam(struct thread *td, s error = p_cansee(td, targetp); if (error == 0) error = ksched_getparam(ksched, targettd, param); - PROC_UNLOCK(targetp); return (error); } @@ -216,8 +218,10 @@ sys_sched_setscheduler(struct thread *td targettd = FIRST_THREAD_IN_PROC(targetp); } - return (kern_sched_setscheduler(td, targettd, uap->policy, - &sched_param)); + e = kern_sched_setscheduler(td, targettd, uap->policy, + &sched_param); + PROC_UNLOCK(targetp); + return (e); } int @@ -232,16 +236,13 @@ kern_sched_setscheduler(struct thread *t /* Don't allow non root user to set a scheduler policy. */ error = priv_check(td, PRIV_SCHED_SET); - if (error) { - PROC_UNLOCK(targetp); + if (error) return (error); - } error = p_cansched(td, targetp); if (error == 0) error = ksched_setscheduler(ksched, targettd, policy, - param); - PROC_UNLOCK(targetp); + (const struct sched_param *)param); return (error); } @@ -263,7 +264,8 @@ sys_sched_getscheduler(struct thread *td targettd = FIRST_THREAD_IN_PROC(targetp); } - e = ksched_getscheduler(ksched, targettd, &policy); + e = kern_sched_getscheduler(td, targettd, &policy); + PROC_UNLOCK(targetp); if (e == 0) td->td_retval[0] = policy; @@ -283,8 +285,6 @@ kern_sched_getscheduler(struct thread *t error = p_cansee(td, targetp); if (error == 0) error = ksched_getscheduler(ksched, targettd, policy); - PROC_UNLOCK(targetp); - return (error); } @@ -323,44 +323,53 @@ sys_sched_rr_get_interval(struct thread struct sched_rr_get_interval_args *uap) { struct timespec timespec; - struct thread *targettd; - struct proc *p; int error; - if (uap->pid == 0) { + error = kern_sched_rr_get_interval(td, uap->pid, ×pec); + if (error == 0) + error = copyout(×pec, uap->interval, sizeof(timespec)); + return (error); +} + +int +kern_sched_rr_get_interval(struct thread *td, pid_t pid, + struct timespec *ts) +{ + int e; + struct thread *targettd; + struct proc *targetp; + + if (pid == 0) { targettd = td; - p = td->td_proc; - PROC_LOCK(p); + targetp = td->td_proc; + PROC_LOCK(targetp); } else { - p = pfind(uap->pid); - if (p == NULL) + targetp = pfind(pid); + if (targetp == NULL) return (ESRCH); - targettd = FIRST_THREAD_IN_PROC(p); + targettd = FIRST_THREAD_IN_PROC(targetp); } - error = kern_sched_rr_get_interval_td(td, targettd, ×pec); - if (error == 0) - error = copyout(×pec, uap->interval, sizeof(timespec)); - return (error); + e = kern_sched_rr_get_interval_td(td, targettd, ts); + PROC_UNLOCK(targetp); + return (e); } int kern_sched_rr_get_interval_td(struct thread *td, struct thread *targettd, struct timespec *ts) { - struct proc *targetp; + struct proc *p; int error; - targetp = targettd->td_proc; - PROC_LOCK_ASSERT(targetp, MA_OWNED); + p = targettd->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); - error = p_cansee(td, targetp); + error = p_cansee(td, p); if (error == 0) error = ksched_rr_get_interval(ksched, targettd, ts); - PROC_UNLOCK(targetp); return (error); } - #endif static void From owner-svn-src-user@FreeBSD.ORG Sun Feb 1 20:14:19 2015 Return-Path: Delivered-To: svn-src-user@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 0FC2555B; Sun, 1 Feb 2015 20:14:19 +0000 (UTC) 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 D5462E83; Sun, 1 Feb 2015 20:14:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11KEIam077512; Sun, 1 Feb 2015 20:14:18 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11KEIYR077510; Sun, 1 Feb 2015 20:14:18 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502012014.t11KEIYR077510@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 1 Feb 2015 20:14:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278035 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 20:14:19 -0000 Author: pho Date: Sun Feb 1 20:14:17 2015 New Revision: 278035 URL: https://svnweb.freebsd.org/changeset/base/278035 Log: Added a comment. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/mmap8.sh user/pho/stress2/misc/mmap9.sh Modified: user/pho/stress2/misc/mmap8.sh ============================================================================== --- user/pho/stress2/misc/mmap8.sh Sun Feb 1 20:00:08 2015 (r278034) +++ user/pho/stress2/misc/mmap8.sh Sun Feb 1 20:14:17 2015 (r278035) @@ -38,6 +38,7 @@ dir=/tmp odir=`pwd` cd $dir sed '1,/^EOF/d' < $odir/$0 > $dir/mmap8.c +# At one point during the fix development, only the thread version would panic cc -o mmap8 -Wall -Wextra mmap8.c || exit 1 cc -o mmap8p -Wall -Wextra mmap8.c -pthread || exit 1 rm -f mmap8.c @@ -63,6 +64,10 @@ main(void) size_t sz = 1; char *addr; +/* + * This is the minimum amount of C code it takes to panic the kernel. + * This is as submitted and thus not a complete and correct test program. + */ addr = mmap(NULL, sz, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); if (addr == NULL) err(1, "mmap"); Modified: user/pho/stress2/misc/mmap9.sh ============================================================================== --- user/pho/stress2/misc/mmap9.sh Sun Feb 1 20:00:08 2015 (r278034) +++ user/pho/stress2/misc/mmap9.sh Sun Feb 1 20:14:17 2015 (r278035) @@ -38,6 +38,7 @@ dir=/tmp odir=`pwd` cd $dir sed '1,/^EOF/d' < $odir/$0 > $dir/mmap9.c +# At one point during the fix development, only the thread version would panic cc -o mmap9 -O2 -Wall -Wextra mmap9.c || exit 1 cc -o mmap9p -O2 -Wall -Wextra mmap9.c -lpthread || exit 1 rm -f mmap9.c @@ -63,6 +64,10 @@ main(void) size_t sz = 1; char *addr; +/* + * This is the minimum amount of C code it takes to panic the kernel. + * This is as submitted and thus not a complete and correct test program. + */ addr = mmap(NULL, sz, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); if (addr == NULL) From owner-svn-src-user@FreeBSD.ORG Sun Feb 1 20:16:19 2015 Return-Path: Delivered-To: svn-src-user@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 A859D671; Sun, 1 Feb 2015 20:16:19 +0000 (UTC) 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 953A5EA5; Sun, 1 Feb 2015 20:16:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11KGJlW077844; Sun, 1 Feb 2015 20:16:19 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11KGJWK077843; Sun, 1 Feb 2015 20:16:19 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502012016.t11KGJWK077843@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 1 Feb 2015 20:16:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278036 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 20:16:19 -0000 Author: pho Date: Sun Feb 1 20:16:18 2015 New Revision: 278036 URL: https://svnweb.freebsd.org/changeset/base/278036 Log: Added link to new finding. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/msdos5.sh Modified: user/pho/stress2/misc/msdos5.sh ============================================================================== --- user/pho/stress2/misc/msdos5.sh Sun Feb 1 20:14:17 2015 (r278035) +++ user/pho/stress2/misc/msdos5.sh Sun Feb 1 20:16:18 2015 (r278036) @@ -31,6 +31,8 @@ # "panic: Freeing unused sector 79510 22 ff800000" seen. # http://people.freebsd.org/~pho/stress/log/msdos5.txt +# FS corruption seen: http://people.freebsd.org/~pho/stress/log/msdos5-2.txt + [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 [ -x /sbin/mount_msdosfs ] || exit From owner-svn-src-user@FreeBSD.ORG Mon Feb 2 16:19:12 2015 Return-Path: Delivered-To: svn-src-user@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 206A4C63; Mon, 2 Feb 2015 16:19:12 +0000 (UTC) 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 0D5EAB19; Mon, 2 Feb 2015 16:19:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12GJBST050872; Mon, 2 Feb 2015 16:19:11 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12GJBcv050871; Mon, 2 Feb 2015 16:19:11 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502021619.t12GJBcv050871@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 2 Feb 2015 16:19:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278102 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 16:19:12 -0000 Author: pho Date: Mon Feb 2 16:19:11 2015 New Revision: 278102 URL: https://svnweb.freebsd.org/changeset/base/278102 Log: Fix trailing whitespace. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/mlockall3.sh Modified: user/pho/stress2/misc/mlockall3.sh ============================================================================== --- user/pho/stress2/misc/mlockall3.sh Mon Feb 2 16:10:03 2015 (r278101) +++ user/pho/stress2/misc/mlockall3.sh Mon Feb 2 16:19:11 2015 (r278102) @@ -151,11 +151,11 @@ main(void) arc4random_stir(); for (j = 0; j < N; j++) r[j] = arc4random(); - for (j = 0; j < 50; j++) + for (j = 0; j < 50; j++) if (pthread_create(&cp[j], NULL, calls, NULL) != 0) perror("pthread_create"); - for (j = 0; j < 50; j++) + for (j = 0; j < 50; j++) pthread_join(cp[j], NULL); _exit(0); } From owner-svn-src-user@FreeBSD.ORG Tue Feb 3 08:59:43 2015 Return-Path: Delivered-To: svn-src-user@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 9BC53182; Tue, 3 Feb 2015 08:59:43 +0000 (UTC) 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 6E4D3A48; Tue, 3 Feb 2015 08:59:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t138xhiP023518; Tue, 3 Feb 2015 08:59:43 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t138xhZd023516; Tue, 3 Feb 2015 08:59:43 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502030859.t138xhZd023516@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 3 Feb 2015 08:59:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278144 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 08:59:43 -0000 Author: pho Date: Tue Feb 3 08:59:42 2015 New Revision: 278144 URL: https://svnweb.freebsd.org/changeset/base/278144 Log: Trailing whitespace fix and added a fail message to namecache.sh Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/msync.sh user/pho/stress2/misc/namecache.sh Modified: user/pho/stress2/misc/msync.sh ============================================================================== --- user/pho/stress2/misc/msync.sh Tue Feb 3 08:06:59 2015 (r278143) +++ user/pho/stress2/misc/msync.sh Tue Feb 3 08:59:42 2015 (r278144) @@ -186,11 +186,11 @@ main(void) arc4random_stir(); for (j = 0; j < N; j++) r[j] = arc4random(); - for (j = 0; j < 50; j++) + for (j = 0; j < 50; j++) if (pthread_create(&cp[j], NULL, calls, NULL) != 0) perror("pthread_create"); - for (j = 0; j < 50; j++) + for (j = 0; j < 50; j++) pthread_join(cp[j], NULL); _exit(0); } Modified: user/pho/stress2/misc/namecache.sh ============================================================================== --- user/pho/stress2/misc/namecache.sh Tue Feb 3 08:06:59 2015 (r278143) +++ user/pho/stress2/misc/namecache.sh Tue Feb 3 08:59:42 2015 (r278144) @@ -53,7 +53,7 @@ # ATIME=Apr 2 11:24:33 2009 [0 nsec] # OWNER=pho GRP=wheel LINKCNT=1 FLAGS=0 BLKCNT=0 GEN=1deaab3a # fsdb (inum: 198)> quit -# $ +# $ # Consistency is restored by a umount + mount of the FS @@ -87,6 +87,7 @@ for i in `jot 30`; do done if ls -l ${dir}/file.0* 2>&1 | egrep "file.0[0-9]" | grep -q "No such file"; then + echo FAIL echo "ls -l ${dir}/file.0*" ls -l ${dir}/file.0* fi @@ -144,7 +145,7 @@ pm(void) if (stat(dp->d_name, &statb) == -1) { warn("stat(%s)", dp->d_name); printf("name: %-10s, inode %7d, type %2d, namelen %d, d_reclen %d\n", - dp->d_name, dp->d_fileno, dp->d_type, dp->d_namlen, + dp->d_name, dp->d_fileno, dp->d_type, dp->d_namlen, dp->d_reclen); fflush(stdout); } else { @@ -207,7 +208,7 @@ main(int argc, char **argv) reader(); if (waitpid(pid, &status, 0) == -1) warn("waitpid(%d)", pid); - } else + } else err(1, "fork(), %s:%d", __FILE__, __LINE__); if (unlink(path) == -1) From owner-svn-src-user@FreeBSD.ORG Tue Feb 3 18:33:24 2015 Return-Path: Delivered-To: svn-src-user@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 6DD704EF; Tue, 3 Feb 2015 18:33:24 +0000 (UTC) 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 5B14D9D; Tue, 3 Feb 2015 18:33:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13IXOPo081417; Tue, 3 Feb 2015 18:33:24 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13IXOwY081416; Tue, 3 Feb 2015 18:33:24 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502031833.t13IXOwY081416@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 3 Feb 2015 18:33:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278162 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 18:33:24 -0000 Author: pho Date: Tue Feb 3 18:33:23 2015 New Revision: 278162 URL: https://svnweb.freebsd.org/changeset/base/278162 Log: Use mount points based on $mntpoint. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/nbufkv.sh Modified: user/pho/stress2/misc/nbufkv.sh ============================================================================== --- user/pho/stress2/misc/nbufkv.sh Tue Feb 3 16:17:54 2015 (r278161) +++ user/pho/stress2/misc/nbufkv.sh Tue Feb 3 18:33:23 2015 (r278162) @@ -49,8 +49,10 @@ u1=$mdstart u2=$((u1 + 1)) d1=/tmp/diskimage1 d2=/tmp/diskimage2 -[ -d mp1 ] || mkdir mp1 -[ -d mp2 ] || mkdir mp2 +mp1=$mntpoint +mp2=${mntpoint}2 +[ -d $mp1 ] || mkdir $mp1 +[ -d $mp2 ] || mkdir $mp2 truncate -s 20g $d1 truncate -s 20g $d2 @@ -61,17 +63,17 @@ mdconfig -l | grep -q md${u1} && mdconfi mdconfig -a -t vnode -f $d1 -u $u1 bsdlabel -w md$u1 auto -newfs -b 65536 -f 65536 -O2 md${u1}${part} > /dev/null +newfs -b 65536 -f 65536 -O2 md${u1}$part > /dev/null mdconfig -a -t vnode -f $d2 -u $u2 bsdlabel -w md$u2 auto -newfs -b 65536 -f 65536 -O2 md${u2}${part} > /dev/null +newfs -b 65536 -f 65536 -O2 md${u2}$part > /dev/null -mount /dev/md${u1}$part mp1 -mount /dev/md${u2}$part mp2 +mount /dev/md${u1}$part $mp1 +mount /dev/md${u2}$part $mp2 -/tmp/nbufkv `pwd`/mp1 & -/tmp/nbufkv `pwd`/mp2 & +/tmp/nbufkv /$mp1 & +/tmp/nbufkv /$mp2 & wait;wait umount /dev/md${u2}$part @@ -83,7 +85,7 @@ mount | grep -q /dev/md${u1}$part && umo mdconfig -d -u $u2 mdconfig -d -u $u1 -rm -rf mp1 mp2 $d1 $d2 /tmp/nbufkv +rm -rf $d1 $d2 /tmp/nbufkv exit EOF #include @@ -122,7 +124,7 @@ main(int argc, char **argv) sprintf(path, "%s/nbufkv.%06d", argv[1], getpid()); if ((fd = open(path, O_CREAT | O_TRUNC | O_RDWR, 0640)) == -1) - err(1,"open()"); + err(1,"open(%s)", path); if (ftruncate(fd, len) == -1) err(1, "ftruncate"); From owner-svn-src-user@FreeBSD.ORG Tue Feb 3 18:42:30 2015 Return-Path: Delivered-To: svn-src-user@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 6810E69A; Tue, 3 Feb 2015 18:42:30 +0000 (UTC) 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 3CBB7114; Tue, 3 Feb 2015 18:42:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13IgUh5006610; Tue, 3 Feb 2015 18:42:30 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13IgUlW006609; Tue, 3 Feb 2015 18:42:30 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502031842.t13IgUlW006609@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 3 Feb 2015 18:42:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278163 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 18:42:30 -0000 Author: pho Date: Tue Feb 3 18:42:28 2015 New Revision: 278163 URL: https://svnweb.freebsd.org/changeset/base/278163 Log: Rename test program and cleanup script. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/newfs4.sh Modified: user/pho/stress2/misc/newfs4.sh ============================================================================== --- user/pho/stress2/misc/newfs4.sh Tue Feb 3 18:33:23 2015 (r278162) +++ user/pho/stress2/misc/newfs4.sh Tue Feb 3 18:42:28 2015 (r278163) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2013 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -39,45 +39,45 @@ odir=`pwd` cd /tmp -sed '1,/^EOF/d' < $odir/$0 > io.c -cc -o io -Wall io.c -rm -f io.c +sed '1,/^EOF/d' < $odir/$0 > newfs4.c +cc -o newfs4 -Wall -Wextra newfs4.c +rm -f newfs4.c cd $odir -mount | grep "$mntpoint" | grep md${mdstart}${part} > /dev/null && umount $mntpoint +mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart size=9 # Gb -[ `df -k $(dirname $diskimage) | tail -1 | awk '{print $4'}` -lt $((size * 1024 * 1024)) ] && \ - echo "Not enough disk space." && exit 1 +[ `df -k $(dirname $diskimage) | tail -1 | \ + awk '{print $4'}` -lt $((size * 1024 * 1024)) ] && \ + echo "Not enough disk space on `dirname $diskimage`." && exit 1 truncate -s ${size}G $diskimage blocksize="-b 65536" opt="-O2 -U" mdconfig -a -t vnode -f $diskimage -u $mdstart bsdlabel -w md$mdstart auto -newfs $blocksize $opt md${mdstart}${part} > /dev/null -mount /dev/md${mdstart}${part} $mntpoint +newfs $blocksize $opt md${mdstart}$part > /dev/null +mount /dev/md${mdstart}$part $mntpoint cd $mntpoint truncate -s 2g f1 truncate -s 2g f2 truncate -s 2g f3 truncate -s 2g f4 -/tmp/io f1 & -/tmp/io f2 & -/tmp/io f3 & -/tmp/io f4 & -wait;wait;wait;wait +/tmp/newfs4 f1 & +/tmp/newfs4 f2 & +/tmp/newfs4 f3 & +/tmp/newfs4 f4 & +wait -while mount | grep "$mntpoint" | grep -q md${mdstart}${part}; do - umount -f $mntpoint > /dev/null 2>&1 +while mount | grep "$mntpoint" | grep -q md${mdstart}$part; do + umount -f $mntpoint || sleep 1 done mdconfig -d -u $mdstart rm -f $diskimage -rm -f $RUNDIR/fsx.$$.* -rm -f /tmp/io +rm -f /tmp/newfs4 exit EOF From owner-svn-src-user@FreeBSD.ORG Tue Feb 3 18:45:44 2015 Return-Path: Delivered-To: svn-src-user@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 A2C88949; Tue, 3 Feb 2015 18:45:44 +0000 (UTC) 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 902F1165; Tue, 3 Feb 2015 18:45:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13Iji7j007257; Tue, 3 Feb 2015 18:45:44 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13Ijidq007256; Tue, 3 Feb 2015 18:45:44 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502031845.t13Ijidq007256@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 3 Feb 2015 18:45:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278164 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 18:45:44 -0000 Author: pho Date: Tue Feb 3 18:45:43 2015 New Revision: 278164 URL: https://svnweb.freebsd.org/changeset/base/278164 Log: Fix trailing whitespace. Improve unmount code. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/pfl.sh Modified: user/pho/stress2/misc/pfl.sh ============================================================================== --- user/pho/stress2/misc/pfl.sh Tue Feb 3 18:42:28 2015 (r278163) +++ user/pho/stress2/misc/pfl.sh Tue Feb 3 18:45:43 2015 (r278164) @@ -48,7 +48,7 @@ md1=$mdstart md2=$((mdstart + 1)) opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-j" || echo "-U") -mount | grep $mp1 | grep -q /dev/md && umount -f $mp1 +mount | grep "on $mp1 " | grep -q /dev/md && umount -f $mp1 mdconfig -l | grep -q md$md1 && mdconfig -d -u $md1 mdconfig -a -t swap -s 2g -u $md1 bsdlabel -w md$md1 auto @@ -56,7 +56,7 @@ newfs $opt md${md1}$part > /dev/null mount /dev/md${md1}$part $mp1 chmod 777 $mp1 -mount | grep $mp2 | grep -q /dev/md && umount -f $mp2 +mount | grep "on $mp2 " | grep -q /dev/md && umount -f $mp2 mdconfig -l | grep -q md$md2 && mdconfig -d -u $md2 mdconfig -a -t swap -s 2g -u $md2 bsdlabel -w md$md2 auto @@ -127,7 +127,7 @@ test(void) sprintf(file,"p%05d.%05d", pid, i); if (unlink(file) == -1) err(3, "unlink(%s)", file); - + } chdir(".."); sprintf(file,"d%05d", pid); @@ -152,7 +152,7 @@ main(void) exit(0); } } - + for (j = 0; j < PARALLEL; j++) wait(NULL); From owner-svn-src-user@FreeBSD.ORG Wed Feb 4 09:16:15 2015 Return-Path: Delivered-To: svn-src-user@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 C7B611F6; Wed, 4 Feb 2015 09:16:15 +0000 (UTC) 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 B3DCC2F1; Wed, 4 Feb 2015 09:16:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t149GFaY020119; Wed, 4 Feb 2015 09:16:15 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t149GF2i020118; Wed, 4 Feb 2015 09:16:15 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502040916.t149GF2i020118@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 4 Feb 2015 09:16:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278187 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 09:16:15 -0000 Author: pho Date: Wed Feb 4 09:16:14 2015 New Revision: 278187 URL: https://svnweb.freebsd.org/changeset/base/278187 Log: Use jot(1) to generate a random value. Fix trailing whitespace. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/pthread6.sh Modified: user/pho/stress2/misc/pthread6.sh ============================================================================== --- user/pho/stress2/misc/pthread6.sh Wed Feb 4 09:14:07 2015 (r278186) +++ user/pho/stress2/misc/pthread6.sh Wed Feb 4 09:16:14 2015 (r278187) @@ -39,8 +39,7 @@ rm -f pthread6.c /tmp/pthread6.core rm -f /tmp/pthread6.core daemon sh -c "(cd $here/../testcases/swap; ./swap -t 2m -i 20 -k)" -rnd=`od -An -N1 -t u1 /dev/urandom | sed 's/ //g'` -sleep $((rnd % 10)) +sleep `jot -r 1 1 9` for i in `jot 50`; do /tmp/pthread6 done @@ -299,7 +298,7 @@ main(void) test(); } - for (j = 0; j < PARALLEL; j++) + for (j = 0; j < PARALLEL; j++) wait(NULL); } From owner-svn-src-user@FreeBSD.ORG Wed Feb 4 11:21:55 2015 Return-Path: Delivered-To: svn-src-user@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 98FDE7E5; Wed, 4 Feb 2015 11:21:55 +0000 (UTC) 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 85B3C3E4; Wed, 4 Feb 2015 11:21:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14BLtal080190; Wed, 4 Feb 2015 11:21:55 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14BLtHK080189; Wed, 4 Feb 2015 11:21:55 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502041121.t14BLtHK080189@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 4 Feb 2015 11:21:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278200 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 11:21:55 -0000 Author: pho Date: Wed Feb 4 11:21:54 2015 New Revision: 278200 URL: https://svnweb.freebsd.org/changeset/base/278200 Log: Remove trailing whitespace. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/rename.sh Modified: user/pho/stress2/misc/rename.sh ============================================================================== --- user/pho/stress2/misc/rename.sh Wed Feb 4 11:05:08 2015 (r278199) +++ user/pho/stress2/misc/rename.sh Wed Feb 4 11:21:54 2015 (r278200) @@ -69,7 +69,7 @@ EOF static char dir1[128]; static char dir2[128]; -int +int main(int argc, char **argv) { int i, status; From owner-svn-src-user@FreeBSD.ORG Wed Feb 4 13:50:51 2015 Return-Path: Delivered-To: svn-src-user@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 854DBDF2; Wed, 4 Feb 2015 13:50:51 +0000 (UTC) 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 717438A6; Wed, 4 Feb 2015 13:50:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14DopFe047564; Wed, 4 Feb 2015 13:50:51 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14Dop80047563; Wed, 4 Feb 2015 13:50:51 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502041350.t14Dop80047563@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 4 Feb 2015 13:50:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278207 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 13:50:51 -0000 Author: pho Date: Wed Feb 4 13:50:50 2015 New Revision: 278207 URL: https://svnweb.freebsd.org/changeset/base/278207 Log: Make script less verbose and cleanup trailing whitespace. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/revoke.sh Modified: user/pho/stress2/misc/revoke.sh ============================================================================== --- user/pho/stress2/misc/revoke.sh Wed Feb 4 11:55:32 2015 (r278206) +++ user/pho/stress2/misc/revoke.sh Wed Feb 4 13:50:50 2015 (r278207) @@ -35,21 +35,21 @@ dir=/tmp cd $dir sed '1,/^EOF/d' < $odir/$0 > $dir/revoke.c -cc -o revoke -Wall revoke.c +cc -o revoke -Wall revoke.c || exit 1 rm -f revoke.c n=100 # Number of times to test for i in `jot $n`; do - ./revoke /dev/ttyv9& - ./revoke /dev/ttyva& - ./revoke /dev/ttyvb& - ./revoke /dev/ttyvc& + ./revoke /dev/ttyv9 > /dev/null 2>&1 & + ./revoke /dev/ttyva > /dev/null 2>&1 & + ./revoke /dev/ttyvb > /dev/null 2>&1 & + ./revoke /dev/ttyvc > /dev/null 2>&1 & for j in `jot 4`; do wait done done -#rm -f revoke +rm -f revoke exit EOF @@ -67,7 +67,7 @@ EOF /*#define TTY "/dev/ttyv9"*/ /* should be totally unused */ #define CTTY "/dev/tty" -int +int main(int argc, char **argv) { int ttyfd; From owner-svn-src-user@FreeBSD.ORG Wed Feb 4 13:56:39 2015 Return-Path: Delivered-To: svn-src-user@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 E8A8617B; Wed, 4 Feb 2015 13:56:39 +0000 (UTC) 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 BAE099BB; Wed, 4 Feb 2015 13:56:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14DudeR051691; Wed, 4 Feb 2015 13:56:39 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14DudB4051690; Wed, 4 Feb 2015 13:56:39 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502041356.t14DudB4051690@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 4 Feb 2015 13:56:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278208 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 13:56:40 -0000 Author: pho Date: Wed Feb 4 13:56:38 2015 New Revision: 278208 URL: https://svnweb.freebsd.org/changeset/base/278208 Log: Sort include files, fix trailing whitespace and add missing zero of inetaddr. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/sendfile3.sh Modified: user/pho/stress2/misc/sendfile3.sh ============================================================================== --- user/pho/stress2/misc/sendfile3.sh Wed Feb 4 13:50:50 2015 (r278207) +++ user/pho/stress2/misc/sendfile3.sh Wed Feb 4 13:56:38 2015 (r278208) @@ -31,8 +31,7 @@ # Test scenario for sendfile deadlock (processes stuck in sfbufa) # Variation of sendfile.sh - -. ../default.cfg +# kern.ipc.nsfbufs should be low for this test odir=`pwd` @@ -47,7 +46,6 @@ in=/tmp/inputFile out=/tmp/outputFile parallel=20 -[ `sysctl kern.ipc.nsfbufs | awk '{print $NF}'` -gt 512 ] && echo "kern.ipc.nsfbufs should be low for this test" for i in 50m 100m; do rm -f $in dd if=/dev/random of=$in bs=$i count=1 2>&1 | \ @@ -66,18 +64,20 @@ done rm -f $in /tmp/sendfile3 exit EOF +#include +#include +#include +#include + +#include + #include #include #include -#include #include #include #include #include -#include -#include -#include -#include #include int port; @@ -149,7 +149,7 @@ writer(void) { off_t off = 0; on = 1; - for (i = 1; i < 5; i++) { + for (i = 0; i < 5; i++) { if ((tcpsock = socket(AF_INET, SOCK_STREAM, 0)) < 0) err(1, "socket(), %s:%d", __FILE__, __LINE__); @@ -157,6 +157,7 @@ writer(void) { SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on)) < 0) err(1, "setsockopt(), %s:%d", __FILE__, __LINE__); + bzero((char *) &inetaddr, sizeof(inetaddr)); hostent = gethostbyname ("localhost"); memcpy (&inetaddr.sin_addr.s_addr, hostent->h_addr, sizeof (struct in_addr)); @@ -184,8 +185,6 @@ writer(void) { if (sendfile(fd, tcpsock, 0, statb.st_size, NULL, &off, 0) == -1) err(1, "sendfile"); - - return; } int @@ -209,7 +208,7 @@ main(int argc, char **argv) reader(); kill(pid, SIGINT); waitpid(pid, NULL, 0); - } else + } else err(1, "fork(), %s:%d", __FILE__, __LINE__); return (0); From owner-svn-src-user@FreeBSD.ORG Wed Feb 4 18:56:23 2015 Return-Path: Delivered-To: svn-src-user@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 4CE40A3E; Wed, 4 Feb 2015 18:56:23 +0000 (UTC) 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 3908E5EF; Wed, 4 Feb 2015 18:56:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14IuNRn095478; Wed, 4 Feb 2015 18:56:23 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14IuMUI095476; Wed, 4 Feb 2015 18:56:22 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201502041856.t14IuMUI095476@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Wed, 4 Feb 2015 18:56:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278217 - user/dchagin/lemul/sys/compat/linux X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 18:56:23 -0000 Author: dchagin Date: Wed Feb 4 18:56:22 2015 New Revision: 278217 URL: https://svnweb.freebsd.org/changeset/base/278217 Log: Add EPOLLERR flag handling to epoll. Tested by: abi at abinet dot ru Modified: user/dchagin/lemul/sys/compat/linux/linux_event.c user/dchagin/lemul/sys/compat/linux/linux_event.h Modified: user/dchagin/lemul/sys/compat/linux/linux_event.c ============================================================================== --- user/dchagin/lemul/sys/compat/linux/linux_event.c Wed Feb 4 18:35:49 2015 (r278216) +++ user/dchagin/lemul/sys/compat/linux/linux_event.c Wed Feb 4 18:56:22 2015 (r278217) @@ -255,6 +255,8 @@ epoll_to_kevent(struct thread *td, struc *kev_flags |= EV_ONESHOT; if ((levents & LINUX_EPOLLET) != 0) *kev_flags |= EV_CLEAR; + if ((levents & LINUX_EPOLLERR) != 0) + *kev_flags |= EV_ERROR; /* flags related to what event is registered */ if ((levents & LINUX_EPOLL_EVRD) != 0) { @@ -296,8 +298,10 @@ static void kevent_to_epoll(struct kevent *kevent, struct epoll_event *l_event) { - if ((kevent->flags & EV_ERROR) != 0) + if ((kevent->flags & EV_ERROR) != 0) { + l_event->events = LINUX_EPOLLERR; return; + } switch (kevent->filter) { case EVFILT_READ: Modified: user/dchagin/lemul/sys/compat/linux/linux_event.h ============================================================================== --- user/dchagin/lemul/sys/compat/linux/linux_event.h Wed Feb 4 18:35:49 2015 (r278216) +++ user/dchagin/lemul/sys/compat/linux/linux_event.h Wed Feb 4 18:56:22 2015 (r278217) @@ -46,7 +46,7 @@ #define LINUX_EPOLLET 1u<<31 #define LINUX_EPOLL_EVRD (LINUX_EPOLLIN|LINUX_EPOLLRDNORM \ - |LINUX_EPOLLHUP|LINUX_EPOLLPRI) + |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) From owner-svn-src-user@FreeBSD.ORG Wed Feb 4 18:58:10 2015 Return-Path: Delivered-To: svn-src-user@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 84477B45; Wed, 4 Feb 2015 18:58:10 +0000 (UTC) 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 70DAE609; Wed, 4 Feb 2015 18:58:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14IwA8U095760; Wed, 4 Feb 2015 18:58:10 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14IwA0G095759; Wed, 4 Feb 2015 18:58:10 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201502041858.t14IwA0G095759@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Wed, 4 Feb 2015 18:58:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278218 - user/dchagin/lemul/sys/i386/linux X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 18:58:10 -0000 Author: dchagin Date: Wed Feb 4 18:58:09 2015 New Revision: 278218 URL: https://svnweb.freebsd.org/changeset/base/278218 Log: Fix build on i386. Reported by: abi at abinet dot ru Modified: user/dchagin/lemul/sys/i386/linux/linux_machdep.c Modified: user/dchagin/lemul/sys/i386/linux/linux_machdep.c ============================================================================== --- user/dchagin/lemul/sys/i386/linux/linux_machdep.c Wed Feb 4 18:56:22 2015 (r278217) +++ user/dchagin/lemul/sys/i386/linux/linux_machdep.c Wed Feb 4 18:58:09 2015 (r278218) @@ -1126,7 +1126,6 @@ linux_waitid(struct thread *td, struct l sig = BSD_TO_LINUX_SIGNAL(siginfo.si_signo); siginfo_to_lsiginfo(&siginfo, &lsi, sig); } - siginfo_to_lsiginfo(&siginfo, &lsi, sig); error = copyout(&lsi, args->info, sizeof(lsi)); } td->td_retval[0] = 0; From owner-svn-src-user@FreeBSD.ORG Thu Feb 5 07:24:31 2015 Return-Path: Delivered-To: svn-src-user@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 4422C284; Thu, 5 Feb 2015 07:24:31 +0000 (UTC) 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 2C058D60; Thu, 5 Feb 2015 07:24:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t157OVi1052308; Thu, 5 Feb 2015 07:24:31 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t157OJXO052244; Thu, 5 Feb 2015 07:24:19 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201502050724.t157OJXO052244@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Thu, 5 Feb 2015 07:24:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278235 - in user/dchagin/lemul: . cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid cddl/contrib/opensolaris/cmd/dtrace/t... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 07:24:31 -0000 Author: dchagin Date: Thu Feb 5 07:24:17 2015 New Revision: 278235 URL: https://svnweb.freebsd.org/changeset/base/278235 Log: Merge from head. Added: user/dchagin/lemul/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff - copied unchanged from r278234, head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff user/dchagin/lemul/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff - copied unchanged from r278234, head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff user/dchagin/lemul/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff - copied unchanged from r278234, head/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff user/dchagin/lemul/sys/amd64/include/pvclock.h - copied unchanged from r278234, head/sys/amd64/include/pvclock.h user/dchagin/lemul/sys/i386/include/pvclock.h - copied unchanged from r278234, head/sys/i386/include/pvclock.h user/dchagin/lemul/sys/x86/include/pvclock.h - copied unchanged from r278234, head/sys/x86/include/pvclock.h user/dchagin/lemul/sys/x86/x86/pvclock.c - copied unchanged from r278234, head/sys/x86/x86/pvclock.c user/dchagin/lemul/tools/build/options/WITHOUT_BOOTPARAMD - copied unchanged from r278234, head/tools/build/options/WITHOUT_BOOTPARAMD user/dchagin/lemul/tools/build/options/WITHOUT_BOOTPD - copied unchanged from r278234, head/tools/build/options/WITHOUT_BOOTPD user/dchagin/lemul/tools/build/options/WITHOUT_FILE - copied unchanged from r278234, head/tools/build/options/WITHOUT_FILE user/dchagin/lemul/tools/build/options/WITHOUT_FINGER - copied unchanged from r278234, head/tools/build/options/WITHOUT_FINGER user/dchagin/lemul/tools/build/options/WITHOUT_FTP - copied unchanged from r278234, head/tools/build/options/WITHOUT_FTP user/dchagin/lemul/tools/build/options/WITHOUT_INETD - copied unchanged from r278234, head/tools/build/options/WITHOUT_INETD user/dchagin/lemul/tools/build/options/WITHOUT_RADIUS_SUPPORT - copied unchanged from r278234, head/tools/build/options/WITHOUT_RADIUS_SUPPORT user/dchagin/lemul/tools/build/options/WITHOUT_RBOOTD - copied unchanged from r278234, head/tools/build/options/WITHOUT_RBOOTD user/dchagin/lemul/tools/build/options/WITHOUT_TCP_WRAPPERS - copied unchanged from r278234, head/tools/build/options/WITHOUT_TCP_WRAPPERS user/dchagin/lemul/tools/build/options/WITHOUT_TFTP - copied unchanged from r278234, head/tools/build/options/WITHOUT_TFTP user/dchagin/lemul/tools/build/options/WITHOUT_TIMED - copied unchanged from r278234, head/tools/build/options/WITHOUT_TIMED Deleted: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile user/dchagin/lemul/contrib/llvm/patches/patch-29-llvm-r226664-aarch64-x18.diff user/dchagin/lemul/contrib/llvm/patches/patch-30-clang-r227062-fixes-x18.diff Modified: user/dchagin/lemul/Makefile.inc1 user/dchagin/lemul/UPDATING user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe (contents, props changed) user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe (contents, props changed) user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.c user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.h user/dchagin/lemul/contrib/libcxxrt/exception.cc user/dchagin/lemul/contrib/libcxxrt/typeinfo.cc user/dchagin/lemul/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c user/dchagin/lemul/etc/Makefile user/dchagin/lemul/etc/rc.d/Makefile user/dchagin/lemul/include/Makefile user/dchagin/lemul/lib/Makefile user/dchagin/lemul/lib/clang/clang.build.mk user/dchagin/lemul/lib/csu/powerpc64/Makefile user/dchagin/lemul/lib/libc/gen/ttyname.c user/dchagin/lemul/lib/libc/rpc/crypt_client.c user/dchagin/lemul/lib/libc/rpc/svc_vc.c user/dchagin/lemul/lib/libpam/modules/modules.inc user/dchagin/lemul/lib/msun/src/s_scalbln.c user/dchagin/lemul/libexec/Makefile user/dchagin/lemul/release/doc/en_US.ISO8859-1/relnotes/article.xml user/dchagin/lemul/release/doc/share/mk/doc.relnotes.mk user/dchagin/lemul/release/release.sh user/dchagin/lemul/release/tools/gce.conf user/dchagin/lemul/sbin/Makefile user/dchagin/lemul/sbin/ifconfig/af_inet6.c user/dchagin/lemul/sbin/ifconfig/ifconfig.c user/dchagin/lemul/share/examples/Makefile user/dchagin/lemul/share/man/man4/Makefile user/dchagin/lemul/share/man/man5/src.conf.5 user/dchagin/lemul/share/man/man9/Makefile user/dchagin/lemul/share/misc/Makefile user/dchagin/lemul/share/mk/src.opts.mk user/dchagin/lemul/sys/amd64/amd64/machdep.c user/dchagin/lemul/sys/amd64/ia32/ia32_signal.c user/dchagin/lemul/sys/arm/allwinner/a10_gpio.c user/dchagin/lemul/sys/arm/altera/socfpga/socfpga_gpio.c user/dchagin/lemul/sys/arm/arm/busdma_machdep-v6.c user/dchagin/lemul/sys/arm/arm/machdep.c user/dchagin/lemul/sys/arm/broadcom/bcm2835/bcm2835_gpio.c user/dchagin/lemul/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c user/dchagin/lemul/sys/arm/freescale/imx/imx_gpio.c user/dchagin/lemul/sys/arm/freescale/vybrid/vf_gpio.c user/dchagin/lemul/sys/arm/include/profile.h user/dchagin/lemul/sys/arm/lpc/lpc_gpio.c user/dchagin/lemul/sys/arm/rockchip/rk30xx_gpio.c user/dchagin/lemul/sys/arm/samsung/exynos/exynos5_pad.c user/dchagin/lemul/sys/arm/ti/am335x/am335x_prcm.c user/dchagin/lemul/sys/arm/ti/ti_gpio.c user/dchagin/lemul/sys/arm/ti/ti_gpio.h user/dchagin/lemul/sys/arm/xilinx/zy7_gpio.c user/dchagin/lemul/sys/arm/xscale/ixp425/avila_gpio.c user/dchagin/lemul/sys/arm/xscale/ixp425/cambria_gpio.c user/dchagin/lemul/sys/boot/amd64/efi/main.c user/dchagin/lemul/sys/boot/common/load_elf.c user/dchagin/lemul/sys/boot/efi/include/efiapi.h user/dchagin/lemul/sys/boot/fdt/fdt_loader_cmd.c user/dchagin/lemul/sys/boot/powerpc/kboot/conf.c user/dchagin/lemul/sys/boot/powerpc/kboot/host_syscall.S user/dchagin/lemul/sys/boot/powerpc/kboot/host_syscall.h user/dchagin/lemul/sys/boot/powerpc/kboot/hostdisk.c user/dchagin/lemul/sys/boot/powerpc/kboot/kbootfdt.c user/dchagin/lemul/sys/boot/powerpc/kboot/kerneltramp.S user/dchagin/lemul/sys/boot/powerpc/kboot/main.c user/dchagin/lemul/sys/boot/powerpc/kboot/ppc64_elf_freebsd.c user/dchagin/lemul/sys/cam/cam.h user/dchagin/lemul/sys/cam/cam_ccb.h user/dchagin/lemul/sys/cam/cam_periph.c user/dchagin/lemul/sys/cam/cam_xpt.c user/dchagin/lemul/sys/cam/cam_xpt_internal.h user/dchagin/lemul/sys/cam/ctl/ctl.c user/dchagin/lemul/sys/cam/ctl/ctl_frontend.c user/dchagin/lemul/sys/cam/ctl/ctl_frontend.h user/dchagin/lemul/sys/cam/ctl/ctl_frontend_iscsi.c user/dchagin/lemul/sys/cam/ctl/ctl_frontend_iscsi.h user/dchagin/lemul/sys/cam/ctl/ctl_ioctl.h user/dchagin/lemul/sys/cam/ctl/ctl_private.h user/dchagin/lemul/sys/cam/ctl/ctl_tpc_local.c user/dchagin/lemul/sys/cam/scsi/scsi_cd.c user/dchagin/lemul/sys/cam/scsi/scsi_da.c user/dchagin/lemul/sys/cam/scsi/scsi_xpt.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c user/dchagin/lemul/sys/cddl/dev/dtrace/dtrace_load.c user/dchagin/lemul/sys/cddl/dev/dtrace/dtrace_unload.c user/dchagin/lemul/sys/conf/Makefile.powerpc user/dchagin/lemul/sys/conf/files.amd64 user/dchagin/lemul/sys/conf/files.i386 user/dchagin/lemul/sys/conf/kern.mk user/dchagin/lemul/sys/conf/options user/dchagin/lemul/sys/dev/ahci/ahci.h user/dchagin/lemul/sys/dev/ahci/ahci_pci.c user/dchagin/lemul/sys/dev/drm2/i915/i915_drv.c user/dchagin/lemul/sys/dev/drm2/i915/i915_drv.h user/dchagin/lemul/sys/dev/drm2/i915/intel_dp.c user/dchagin/lemul/sys/dev/drm2/i915/intel_iic.c user/dchagin/lemul/sys/dev/drm2/radeon/ni.c user/dchagin/lemul/sys/dev/drm2/radeon/si.c user/dchagin/lemul/sys/dev/drm2/ttm/ttm_bo.c user/dchagin/lemul/sys/dev/drm2/ttm/ttm_page_alloc.c user/dchagin/lemul/sys/dev/ed/if_ed.c user/dchagin/lemul/sys/dev/fdt/fdt_clock.c user/dchagin/lemul/sys/dev/fe/if_fe_isa.c user/dchagin/lemul/sys/dev/gpio/gpiobus.c user/dchagin/lemul/sys/dev/gpio/gpiobusvar.h user/dchagin/lemul/sys/dev/gpio/ofw_gpiobus.c user/dchagin/lemul/sys/dev/iscsi/icl.h user/dchagin/lemul/sys/dev/iscsi/icl_soft.c user/dchagin/lemul/sys/dev/iscsi/iscsi.c user/dchagin/lemul/sys/dev/iscsi/iscsi_ioctl.h user/dchagin/lemul/sys/dev/iscsi/iscsi_proto.h user/dchagin/lemul/sys/dev/sfxge/common/efsys.h user/dchagin/lemul/sys/dev/sfxge/sfxge.c user/dchagin/lemul/sys/dev/sfxge/sfxge.h user/dchagin/lemul/sys/dev/sfxge/sfxge_ev.c user/dchagin/lemul/sys/dev/sfxge/sfxge_mcdi.c user/dchagin/lemul/sys/dev/sfxge/sfxge_port.c user/dchagin/lemul/sys/dev/sfxge/sfxge_rx.c user/dchagin/lemul/sys/dev/sfxge/sfxge_tx.c user/dchagin/lemul/sys/dev/sfxge/sfxge_tx.h user/dchagin/lemul/sys/dev/usb/controller/xhci.c user/dchagin/lemul/sys/dev/usb/usb_core.h user/dchagin/lemul/sys/dev/usb/usb_msctest.c user/dchagin/lemul/sys/dev/usb/usb_transfer.c user/dchagin/lemul/sys/dev/xen/timer/timer.c user/dchagin/lemul/sys/fs/tmpfs/tmpfs_subr.c user/dchagin/lemul/sys/i386/i386/machdep.c user/dchagin/lemul/sys/i386/xen/clock.c user/dchagin/lemul/sys/kern/kern_clock.c user/dchagin/lemul/sys/kern/kern_clocksource.c user/dchagin/lemul/sys/kern/sys_pipe.c user/dchagin/lemul/sys/mips/atheros/ar71xx_gpio.c user/dchagin/lemul/sys/mips/atheros/ar71xx_gpiovar.h user/dchagin/lemul/sys/mips/atheros/if_argevar.h user/dchagin/lemul/sys/mips/cavium/octeon_gpio.c user/dchagin/lemul/sys/mips/cavium/octeon_gpiovar.h user/dchagin/lemul/sys/mips/mips/freebsd32_machdep.c user/dchagin/lemul/sys/mips/mips/pm_machdep.c user/dchagin/lemul/sys/mips/rt305x/rt305x_gpio.c user/dchagin/lemul/sys/mips/rt305x/rt305x_gpiovar.h user/dchagin/lemul/sys/netinet/ip_output.c user/dchagin/lemul/sys/ofed/include/linux/linux_idr.c user/dchagin/lemul/sys/powerpc/ofw/ofw_machdep.c user/dchagin/lemul/sys/powerpc/powerpc/exec_machdep.c user/dchagin/lemul/sys/rpc/svc_vc.c user/dchagin/lemul/sys/sparc64/sparc64/machdep.c user/dchagin/lemul/sys/sys/cdefs.h user/dchagin/lemul/sys/sys/param.h user/dchagin/lemul/sys/sys/ucontext.h user/dchagin/lemul/tools/build/mk/OptionalObsoleteFiles.inc user/dchagin/lemul/usr.bin/Makefile user/dchagin/lemul/usr.bin/iscsictl/iscsi.conf.5 user/dchagin/lemul/usr.bin/iscsictl/iscsictl.c user/dchagin/lemul/usr.bin/iscsictl/iscsictl.h user/dchagin/lemul/usr.bin/iscsictl/parse.y user/dchagin/lemul/usr.bin/iscsictl/token.l user/dchagin/lemul/usr.sbin/Makefile user/dchagin/lemul/usr.sbin/ctladm/ctladm.8 user/dchagin/lemul/usr.sbin/ctladm/ctladm.c user/dchagin/lemul/usr.sbin/ctld/ctl.conf.5 user/dchagin/lemul/usr.sbin/ctld/ctld.c user/dchagin/lemul/usr.sbin/ctld/ctld.h user/dchagin/lemul/usr.sbin/ctld/kernel.c user/dchagin/lemul/usr.sbin/ctld/parse.y user/dchagin/lemul/usr.sbin/iscsid/iscsid.c user/dchagin/lemul/usr.sbin/iscsid/iscsid.h user/dchagin/lemul/usr.sbin/iscsid/login.c user/dchagin/lemul/usr.sbin/pkg/pkg.c user/dchagin/lemul/usr.sbin/ppp/Makefile Directory Properties: user/dchagin/lemul/ (props changed) user/dchagin/lemul/cddl/ (props changed) user/dchagin/lemul/cddl/contrib/opensolaris/ (props changed) user/dchagin/lemul/contrib/gcc/ (props changed) user/dchagin/lemul/contrib/libcxxrt/ (props changed) user/dchagin/lemul/contrib/llvm/ (props changed) user/dchagin/lemul/etc/ (props changed) user/dchagin/lemul/include/ (props changed) user/dchagin/lemul/lib/libc/ (props changed) user/dchagin/lemul/sbin/ (props changed) user/dchagin/lemul/share/ (props changed) user/dchagin/lemul/share/man/man4/ (props changed) user/dchagin/lemul/sys/ (props changed) user/dchagin/lemul/sys/boot/ (props changed) user/dchagin/lemul/sys/boot/powerpc/kboot/ (props changed) user/dchagin/lemul/sys/cddl/contrib/opensolaris/ (props changed) user/dchagin/lemul/sys/conf/ (props changed) Modified: user/dchagin/lemul/Makefile.inc1 ============================================================================== --- user/dchagin/lemul/Makefile.inc1 Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/Makefile.inc1 Thu Feb 5 07:24:17 2015 (r278235) @@ -1634,7 +1634,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_lib_libcapsicum} \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ - lib/libradius lib/libsbuf lib/libtacplus \ + ${_lib_libradius} lib/libsbuf lib/libtacplus \ lib/libgeom \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ ${_cddl_lib_libuutil} \ @@ -1657,6 +1657,10 @@ lib/libgeom__L: lib/libexpat__L _lib_libthr= lib/libthr .endif +.if ${MK_RADIUS_SUPPORT} != "no" +_lib_libradius= lib/libradius +.endif + .if ${MK_OFED} != "no" _ofed_lib= contrib/ofed/usr.lib/ .endif Modified: user/dchagin/lemul/UPDATING ============================================================================== --- user/dchagin/lemul/UPDATING Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/UPDATING Thu Feb 5 07:24:17 2015 (r278235) @@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150131: + The powerpc64 kernel has been changed to a position-independent + executable. This can only be booted with a new version of loader(8), + so make sure to update both world and kernel before rebooting. + 20150118: Clang and llvm have been upgraded to 3.5.1 release. This is a bugfix only release, no new features have been added. Please see the 20141231 Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -31,7 +31,6 @@ if [ $# != 1 ]; then fi dtrace=$1 -CC=/usr/bin/gcc CFLAGS= doit() @@ -47,7 +46,7 @@ void main() {} EOF - if $CC $CFLAGS -o $cofile $cfile >/dev/null 2>&1; then + if cc $CFLAGS -o $cofile $cfile >/dev/null 2>&1; then $dtrace -xerrtags -C -s /dev/stdin \ >/dev/null 2>$errfile < @@ -67,11 +66,6 @@ EOF rm -f $cofile $cfile 2>/dev/null } -if [ ! -x $CC ]; then - echo "$0: bad compiler: $CC" >& 2 - exit 1 -fi - concurrency=`psrinfo | wc -l` let concurrency=concurrency*4 let i=0 Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe Thu Feb 5 07:24:17 2015 (r278235) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe Thu Feb 5 07:24:17 2015 (r278235) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe Thu Feb 5 07:24:17 2015 (r278235) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe Thu Feb 5 07:24:17 2015 (r278235) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe Thu Feb 5 07:24:17 2015 (r278235) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe Thu Feb 5 07:24:17 2015 (r278235) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe Thu Feb 5 07:24:17 2015 (r278235) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe Thu Feb 5 07:24:17 2015 (r278235) @@ -1,4 +1,4 @@ -#!/usr/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe Thu Feb 5 07:24:17 2015 (r278235) @@ -1,4 +1,4 @@ -#!/usr/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d Thu Feb 5 07:24:17 2015 (r278235) @@ -54,7 +54,7 @@ pid$1:a.out:go: exit(1); } -syscall::rexit:entry +syscall::exit:entry /pid == $1/ { exit(0); Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe ============================================================================== Binary file (source and/or target). No diff available. Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe ============================================================================== Binary file (source and/or target). No diff available. Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -37,7 +37,8 @@ script() $dtrace -s /dev/stdin <p_pid == $child && - args[1]->pr_psargs == "$longsleep" && args[2] == SIGHUP/ + xlate(args[1])->pr_psargs == "$longsleep" && + args[2] == SIGHUP/ { exit(0); } @@ -48,7 +49,7 @@ killer() { while true; do sleep 1 - /usr/bin/kill -HUP $child + kill -HUP $child done } @@ -58,7 +59,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -longsleep="/usr/bin/sleep 10000" +longsleep="/bin/sleep 10000" /usr/bin/nohup $longsleep & child=$! Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -48,7 +48,7 @@ sleeper() { while true; do $longsleep & - /usr/bin/sleep 1 + sleep 1 kill -9 $! done } @@ -59,7 +59,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -longsleep="/usr/bin/sleep 10000" +longsleep="/bin/sleep 10000" sleeper & child=$! @@ -67,9 +67,9 @@ child=$! script status=$? -pstop $child +kill -STOP $child pkill -P $child kill $child -prun $child +kill -CONT $child exit $status Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -37,7 +37,8 @@ script() $dtrace -s /dev/stdin <pr_ppid == $child && - args[1]->pr_psargs == "$longsleep" && args[2] == SIGUSR1/ + xlate(args[1])->pr_psargs == "$longsleep" && + args[2] == SIGUSR1/ { /* * This is guaranteed to not race with signal-handle. @@ -58,7 +59,7 @@ sleeper() while true; do $longsleep & sleep 1 - /usr/bin/kill -USR1 $! + kill -USR1 $! done } @@ -68,7 +69,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -longsleep="/usr/bin/sleep 10000" +longsleep="/bin/sleep 10000" sleeper & child=$! @@ -76,9 +77,9 @@ child=$! script status=$? -pstop $child +kill -STOP $child pkill -P $child kill $child -prun $child +kill -CONT $child exit $status Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`/bin/basename $0` +bname=`basename $0` dfilename=/var/tmp/$bname.$$.d ## Create .d file Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -42,7 +42,7 @@ fi dtrace=$1 -bname=`/usr/bin/basename $0` +bname=`basename $0` dfilename=/var/tmp/$bname.$$ Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -43,7 +43,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`/usr/bin/basename $0` +bname=`basename $0` dfilename=/var/tmp/$bname.$$.d ## Create .d file @@ -77,7 +77,7 @@ fi #Get the groupid of the calling process using ps -groupid=`ps -o pid,pgid | grep "$$ " | awk '{print $2}' 2>/dev/null` +groupid=`ps -x -o pid,egid | grep "$$ " | awk '{print $2}' 2>/dev/null` if [ $? -ne 0 ]; then print -u2 "unable to get uid of the current process with pid = $$" exit 1 @@ -93,5 +93,5 @@ fi #Cleanup leftovers -/bin/rm -f $dfilename +rm -f $dfilename exit 0 Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`/bin/basename $0` +bname=`basename $0` dfilename=/var/tmp/$bname.$$ ## Create .d file @@ -69,7 +69,7 @@ EOF chmod 555 $dfilename -userid=`ps -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null` +userid=`ps -x -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null` if [ $? -ne 0 ]; then print -u2 "unable to get uid of the current process with pid = $$" exit 1 @@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then exit 1 fi -#/bin/rm -f $dfilename +rm -f $dfilename exit 0 Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`/bin/basename $0` +bname=`basename $0` dfilename=/var/tmp/$bname.$$ ## Create .d file @@ -69,7 +69,7 @@ EOF chmod 555 $dfilename -groupid=`ps -o pid,gid | grep "$$ " | awk '{print $2}' 2>/dev/null` +groupid=`ps -x -o pid,gid | grep "$$ " | awk '{print $2}' 2>/dev/null` if [ $? -ne 0 ]; then print -u2 "unable to get uid of the current process with pid = $$" exit 1 @@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then exit 1 fi -#/bin/rm -f $dfilename +rm -f $dfilename exit 0 Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`/bin/basename $0` +bname=`basename $0` dfilename=/var/tmp/$bname.$$.d ## Create .d file @@ -75,12 +75,12 @@ fi #Pass current pid (I mean parent pid for .d script). -$dfilename $$ >/dev/null 2>&1 +$dfilename $$ #>/dev/null 2>&1 if [ $? -ne 0 ]; then print -u2 "Error in executing $dfilename" exit 1 fi -#/bin/rm -f $dfilename +rm -f $dfilename exit 0 Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`/bin/basename $0` +bname=`basename $0` dfilename=/var/tmp/$bname.$$ ## Create .d file @@ -69,7 +69,7 @@ EOF chmod 555 $dfilename -projectid=`ps -o pid,projid | grep "$$ " | awk '{print $2}' 2>/dev/null` +projectid=`ps -x -o pid,projid | grep "$$ " | awk '{print $2}' 2>/dev/null` if [ $? -ne 0 ]; then print -u2 "unable to get uid of the current process with pid = $$" exit 1 @@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then exit 1 fi -#/bin/rm -f $dfilename +rm -f $dfilename exit 0 Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`/bin/basename $0` +bname=`basename $0` dfilename=/var/tmp/$bname.$$ ## Create .d file @@ -69,7 +69,7 @@ EOF chmod 555 $dfilename -sessionid=`ps -o pid,sid | grep "$$ " | awk '{print $2}' 2>/dev/null` +sessionid=`ps -x -o pid,sid | grep "$$ " | awk '{print $2}' 2>/dev/null` if [ $? -ne 0 ]; then print -u2 "unable to get sid of the current process with pid = $$" exit 1 @@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then exit 1 fi -#/bin/rm -f $dfilename +rm -f $dfilename exit 0 Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`/bin/basename $0` +bname=`basename $0` dfilename=/var/tmp/$bname.$$.d ## Create .d file Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`/bin/basename $0` +bname=`basename $0` dfilename=/var/tmp/$bname.$$ ## Create .d file @@ -69,7 +69,7 @@ EOF chmod 555 $dfilename -taskidval=`ps -o pid,taskid | grep "$$ " | awk '{print $2}' 2>/dev/null` +taskidval=`ps -x -o pid,taskid | grep "$$ " | awk '{print $2}' 2>/dev/null` if [ $? -ne 0 ]; then print -u2 "unable to get uid of the current process with pid = $$" exit 1 @@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then exit 1 fi -#/bin/rm -f $dfilename +rm -f $dfilename exit 0 Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -41,7 +41,7 @@ if [ $# != 1 ]; then fi dtrace=$1 -bname=`/bin/basename $0` +bname=`basename $0` dfilename=/var/tmp/$bname.$$ ## Create .d file @@ -69,7 +69,7 @@ EOF chmod 555 $dfilename -userid=`ps -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null` +userid=`ps -x -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null` if [ $? -ne 0 ]; then print -u2 "unable to get uid of the current process with pid = $$" exit 1 @@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then exit 1 fi -#/bin/rm -f $dfilename +rm -f $dfilename exit 0 Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -48,7 +48,7 @@ fi dtrace="$1" startdir="$PWD" -dir=$(mktemp -td drtiXXXXXX) +dir=$(mktemp -d -t drtiXXXXXX) if (( $? != 0 )); then print -u2 'Could not create safe temporary directory' exit 2 Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -51,7 +51,7 @@ provider test_prov { }; EOF -gcc -c test.c +cc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -61,7 +61,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 fi -gcc -o test test.o prov.o +cc -o test test.o prov.o if [ $? -ne 0 ]; then print -u2 "failed to link final executable" exit 1 Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -51,7 +51,7 @@ provider test_prov { }; EOF -gcc -c test.c +cc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -61,7 +61,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 fi -gcc -o test test.o prov.o +cc -o test test.o prov.o if [ $? -ne 0 ]; then print -u2 "failed to link final executable" exit 1 Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Thu Feb 5 07:24:17 2015 (r278235) @@ -51,7 +51,7 @@ provider test_prov { }; EOF -gcc -c test.c +cc -c test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 @@ -61,7 +61,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 fi -gcc -o test test.o prov.o +cc -o test test.o prov.o if [ $? -ne 0 ]; then print -u2 "failed to link final executable" exit 1 Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Thu Feb 5 07:24:17 2015 (r278235) @@ -382,6 +382,9 @@ dt_stddev(uint64_t *data, uint64_t norma int64_t norm_avg; uint64_t diff[2]; + if (data[0] == 0) + return (0); + /* * The standard approximation for standard deviation is * sqrt(average(x**2) - average(x)**2), i.e. the square root Modified: user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.c ============================================================================== --- user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.c Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.c Thu Feb 5 07:24:17 2015 (r278235) @@ -25,6 +25,7 @@ along with this program; see the file COPYING. If not, write to the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#define __ARM_STATIC_INLINE #include "unwind.h" /* We add a prototype for abort here to avoid creating a dependency on @@ -1089,4 +1090,11 @@ _Unwind_GetIPInfo (struct _Unwind_Contex *ip_before_insn = 0; return _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1; } + +void +_Unwind_SetIP (struct _Unwind_Context *context, _Unwind_Ptr val) +{ + _Unwind_SetGR (context, 15, val | (_Unwind_GetGR (context, 15) & 1)); +} + #endif Modified: user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.h ============================================================================== --- user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.h Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.h Thu Feb 5 07:24:17 2015 (r278235) @@ -34,6 +34,10 @@ #define __ARM_EABI_UNWINDER__ 1 +#ifndef __ARM_STATIC_INLINE +#define __ARM_STATIC_INLINE static inline +#endif + #ifdef __cplusplus extern "C" { #endif @@ -245,7 +249,7 @@ extern "C" { return tmp; } - static inline _Unwind_Word + __ARM_STATIC_INLINE _Unwind_Word _Unwind_GetGR (_Unwind_Context *context, int regno) { _uw val; @@ -253,6 +257,12 @@ extern "C" { return val; } + __ARM_STATIC_INLINE void + _Unwind_SetGR (_Unwind_Context *context, int regno, _Unwind_Word val) + { + _Unwind_VRS_Set (context, _UVRSC_CORE, regno, _UVRSD_UINT32, &val); + } + #ifndef __FreeBSD__ /* Return the address of the instruction, not the actual IP value. */ #define _Unwind_GetIP(context) \ @@ -260,21 +270,16 @@ extern "C" { #define _Unwind_GetIPInfo(context, ip_before_insn) \ (*ip_before_insn = 0, _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1) -#else - _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *); - _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *); -#endif - - static inline void - _Unwind_SetGR (_Unwind_Context *context, int regno, _Unwind_Word val) - { - _Unwind_VRS_Set (context, _UVRSC_CORE, regno, _UVRSD_UINT32, &val); - } /* The dwarf unwinder doesn't understand arm/thumb state. We assume the landing pad uses the same instruction set as the call site. */ #define _Unwind_SetIP(context, val) \ _Unwind_SetGR (context, 15, val | (_Unwind_GetGR (context, 15) & 1)) +#else + _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *); + _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *); + void _Unwind_SetIP (struct _Unwind_Context *, _Unwind_Ptr); +#endif #ifdef __cplusplus } /* extern "C" */ Modified: user/dchagin/lemul/contrib/libcxxrt/exception.cc ============================================================================== --- user/dchagin/lemul/contrib/libcxxrt/exception.cc Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/contrib/libcxxrt/exception.cc Thu Feb 5 07:24:17 2015 (r278235) @@ -673,7 +673,7 @@ static _Unwind_Reason_Code trace(struct * If the failure happened by falling off the end of the stack without finding * a handler, prints a back trace before aborting. */ -#if __GNUC__ > 3 && __GNUC_MINOR__ > 2 +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) extern "C" void *__cxa_begin_catch(void *e) throw(); #else extern "C" void *__cxa_begin_catch(void *e); @@ -1191,7 +1191,7 @@ BEGIN_PERSONALITY_FUNCTION(__gxx_persona * pointer to the caught exception, which is either the adjusted pointer (for * C++ exceptions) of the unadjusted pointer (for foreign exceptions). */ -#if __GNUC__ > 3 && __GNUC_MINOR__ > 2 +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) extern "C" void *__cxa_begin_catch(void *e) throw() #else extern "C" void *__cxa_begin_catch(void *e) Modified: user/dchagin/lemul/contrib/libcxxrt/typeinfo.cc ============================================================================== --- user/dchagin/lemul/contrib/libcxxrt/typeinfo.cc Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/contrib/libcxxrt/typeinfo.cc Thu Feb 5 07:24:17 2015 (r278235) @@ -35,23 +35,15 @@ type_info::~type_info() {} bool type_info::operator==(const type_info &other) const { -#ifdef LIBCXXRT_MERGED_TYPEINFO return __type_name == other.__type_name; -#else - return __type_name == other.__type_name || strcmp(__type_name, other.__type_name) == 0; -#endif } bool type_info::operator!=(const type_info &other) const { - return !operator==(other); + return __type_name != other.__type_name; } bool type_info::before(const type_info &other) const { -#ifdef LIBCXXRT_MERGED_TYPEINFO return __type_name < other.__type_name; -#else - return strcmp(__type_name, other.__type_name) < 0; -#endif } const char* type_info::name() const { Copied: user/dchagin/lemul/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff (from r278234, head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/dchagin/lemul/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff Thu Feb 5 07:24:17 2015 (r278235, copy of r278234, head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff) @@ -0,0 +1,33 @@ +Allow clang to be built for mips/mips64 backend types by adding our mips +triple ids + +This only allows testing and does not change the defaults for mips/mips64. +They still build/use gcc by default. + +Differential Revision: https://reviews.freebsd.org/D1190 +Reviewed by: dim + +Introduced here: http://svnweb.freebsd.org/changeset/base/277423 + +Index: tools/clang/lib/Driver/Tools.cpp +=================================================================== +--- tools/clang/lib/Driver/Tools.cpp ++++ tools/clang/lib/Driver/Tools.cpp +@@ -6592,6 +6592,17 @@ void freebsd::Link::ConstructJob(Compilation &C, c + CmdArgs.push_back("elf32ppc_fbsd"); + } + ++ if (Arg *A = Args.getLastArg(options::OPT_G)) { ++ if (ToolChain.getArch() == llvm::Triple::mips || ++ ToolChain.getArch() == llvm::Triple::mipsel || ++ ToolChain.getArch() == llvm::Triple::mips64 || ++ ToolChain.getArch() == llvm::Triple::mips64el) { ++ StringRef v = A->getValue(); ++ CmdArgs.push_back(Args.MakeArgString("-G" + v)); ++ A->claim(); ++ } ++ } ++ + if (Output.isFilename()) { + CmdArgs.push_back("-o"); + CmdArgs.push_back(Output.getFilename()); Copied: user/dchagin/lemul/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff (from r278234, head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/dchagin/lemul/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff Thu Feb 5 07:24:17 2015 (r278235, copy of r278234, head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff) @@ -0,0 +1,83 @@ +Pull in r226664 from upstream llvm trunk (by Tim Northover): + + AArch64: add backend option to reserve x18 (platform register) + + AAPCS64 says that it's up to the platform to specify whether x18 is + reserved, and a first step on that way is to add a flag controlling + it. + + From: Andrew Turner + +Introduced here: http://svnweb.freebsd.org/changeset/base/277774 + +Index: lib/Target/AArch64/AArch64RegisterInfo.cpp +=================================================================== +--- lib/Target/AArch64/AArch64RegisterInfo.cpp ++++ lib/Target/AArch64/AArch64RegisterInfo.cpp +@@ -33,6 +33,10 @@ using namespace llvm; + #define GET_REGINFO_TARGET_DESC + #include "AArch64GenRegisterInfo.inc" + ++static cl::opt ++ReserveX18("aarch64-reserve-x18", cl::Hidden, ++ cl::desc("Reserve X18, making it unavailable as GPR")); ++ + AArch64RegisterInfo::AArch64RegisterInfo(const AArch64InstrInfo *tii, + const AArch64Subtarget *sti) + : AArch64GenRegisterInfo(AArch64::LR), TII(tii), STI(sti) {} +@@ -90,7 +94,7 @@ AArch64RegisterInfo::getReservedRegs(const Machine + Reserved.set(AArch64::W29); + } + +- if (STI->isTargetDarwin()) { ++ if (STI->isTargetDarwin() || ReserveX18) { + Reserved.set(AArch64::X18); // Platform register + Reserved.set(AArch64::W18); + } +@@ -117,7 +121,7 @@ bool AArch64RegisterInfo::isReservedReg(const Mach + return true; + case AArch64::X18: + case AArch64::W18: +- return STI->isTargetDarwin(); ++ return STI->isTargetDarwin() || ReserveX18; + case AArch64::FP: + case AArch64::W29: + return TFI->hasFP(MF) || STI->isTargetDarwin(); +@@ -379,7 +383,7 @@ unsigned AArch64RegisterInfo::getRegPressureLimit( + case AArch64::GPR64commonRegClassID: + return 32 - 1 // XZR/SP + - (TFI->hasFP(MF) || STI->isTargetDarwin()) // FP +- - STI->isTargetDarwin() // X18 reserved as platform register ++ - (STI->isTargetDarwin() || ReserveX18) // X18 reserved as platform register + - hasBasePointer(MF); // X19 + case AArch64::FPR8RegClassID: + case AArch64::FPR16RegClassID: +Index: test/CodeGen/AArch64/arm64-platform-reg.ll +=================================================================== +--- test/CodeGen/AArch64/arm64-platform-reg.ll ++++ test/CodeGen/AArch64/arm64-platform-reg.ll +@@ -1,4 +1,5 @@ +-; RUN: llc -mtriple=arm64-apple-ios -o - %s | FileCheck %s --check-prefix=CHECK-DARWIN ++; RUN: llc -mtriple=arm64-apple-ios -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE-X18 ++; RUN: llc -mtriple=arm64-freebsd-gnu -aarch64-reserve-x18 -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE-X18 + ; RUN: llc -mtriple=arm64-linux-gnu -o - %s | FileCheck %s + + ; x18 is reserved as a platform register on Darwin but not on other +@@ -16,11 +17,11 @@ define void @keep_live() { + ; CHECK: ldr x18 + ; CHECK: str x18 + +-; CHECK-DARWIN-NOT: ldr fp +-; CHECK-DARWIN-NOT: ldr x18 +-; CHECK-DARWIN: Spill +-; CHECK-DARWIN-NOT: ldr fp +-; CHECK-DARWIN-NOT: ldr x18 +-; CHECK-DARWIN: ret ++; CHECK-RESERVE-X18-NOT: ldr fp ++; CHECK-RESERVE-X18-NOT: ldr x18 ++; CHECK-RESERVE-X18: Spill ++; CHECK-RESERVE-X18-NOT: ldr fp ++; CHECK-RESERVE-X18-NOT: ldr x18 ++; CHECK-RESERVE-X18: ret + ret void + } Copied: user/dchagin/lemul/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff (from r278234, head/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/dchagin/lemul/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff Thu Feb 5 07:24:17 2015 (r278235, copy of r278234, head/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff) @@ -0,0 +1,54 @@ +Pull in r227062 from upstream clang trunk (by Renato Golin): + + Allows Clang to use LLVM's fixes-x18 option + + This patch allows clang to have llvm reserve the x18 + platform register on AArch64. FreeBSD will use this in the kernel for + per-cpu data but has no need to reserve this register in userland so + will need this flag to reserve it. + + This uses llvm r226664 to allow this register to be reserved. + + Patch by Andrew Turner. + +Introduced here: http://svnweb.freebsd.org/changeset/base/277775 + +Index: tools/clang/include/clang/Driver/Options.td +=================================================================== +--- tools/clang/include/clang/Driver/Options.td ++++ tools/clang/include/clang/Driver/Options.td +@@ -1141,6 +1141,9 @@ def mno_long_calls : Flag<["-"], "mno-long-calls"> + def mgeneral_regs_only : Flag<["-"], "mgeneral-regs-only">, Group, + HelpText<"Generate code which only uses the general purpose registers (AArch64 only)">; + ++def ffixed_x18 : Flag<["-"], "ffixed-x18">, Group, ++ HelpText<"Reserve the x18 register (AArch64 only)">; ++ + def mvsx : Flag<["-"], "mvsx">, Group; + def mno_vsx : Flag<["-"], "mno-vsx">, Group; + def mfprnd : Flag<["-"], "mfprnd">, Group; +Index: tools/clang/lib/Driver/Tools.cpp +=================================================================== +--- tools/clang/lib/Driver/Tools.cpp ++++ tools/clang/lib/Driver/Tools.cpp +@@ -887,6 +887,11 @@ void Clang::AddAArch64TargetArgs(const ArgList &Ar + if (A->getOption().matches(options::OPT_mno_global_merge)) + CmdArgs.push_back("-mno-global-merge"); + } ++ ++ if (Args.hasArg(options::OPT_ffixed_x18)) { ++ CmdArgs.push_back("-backend-option"); ++ CmdArgs.push_back("-aarch64-reserve-x18"); ++ } + } + + // Get CPU and ABI names. They are not independent +Index: tools/clang/test/Driver/aarch64-fixed-x18.c +=================================================================== +--- tools/clang/test/Driver/aarch64-fixed-x18.c ++++ tools/clang/test/Driver/aarch64-fixed-x18.c +@@ -0,0 +1,4 @@ ++// RUN: %clang -target aarch64-none-gnu -ffixed-x18 -### %s 2> %t ++// RUN: FileCheck --check-prefix=CHECK-FIXED-X18 < %t %s ++ ++// CHECK-FIXED-X18: "-backend-option" "-aarch64-reserve-x18" Modified: user/dchagin/lemul/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c ============================================================================== --- user/dchagin/lemul/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c Thu Feb 5 07:24:17 2015 (r278235) @@ -107,9 +107,6 @@ ATF_TC_BODY(ttyname_r_err, tc) ATF_REQUIRE(rv == ERANGE); } -#ifdef __FreeBSD__ - atf_tc_expect_fail("FreeBSD returns ENOTTY instead of EBADF; see bin/191936"); -#endif rv = ttyname_r(-1, buf, ttymax); ATF_REQUIRE(rv == EBADF); Modified: user/dchagin/lemul/etc/Makefile ============================================================================== --- user/dchagin/lemul/etc/Makefile Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/etc/Makefile Thu Feb 5 07:24:17 2015 (r278235) @@ -21,13 +21,11 @@ BIN1= crontab \ dhclient.conf \ disktab \ fbtab \ - ftpusers \ gettytab \ group \ hosts \ hosts.allow \ hosts.equiv \ - inetd.conf \ libalias.conf \ libmap.conf \ login.access \ @@ -101,6 +99,14 @@ BIN1+= snmpd.config BIN1+= freebsd-update.conf .endif +.if ${MK_FTP} != "no" +BIN1+= ftpusers +.endif + +.if ${MK_INETD} != "no" +BIN1+= inetd.conf +.endif + .if ${MK_LOCATE} != "no" BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc .endif Modified: user/dchagin/lemul/etc/rc.d/Makefile ============================================================================== --- user/dchagin/lemul/etc/rc.d/Makefile Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/etc/rc.d/Makefile Thu Feb 5 07:24:17 2015 (r278235) @@ -43,7 +43,6 @@ FILES= DAEMON \ growfs \ gssd \ ${_hcsecd} \ - hostapd \ hostid \ hostid_save \ hostname \ @@ -137,7 +136,6 @@ FILES= DAEMON \ var \ virecover \ watchdogd \ - wpa_supplicant \ ypbind \ yppasswdd \ ypserv \ Modified: user/dchagin/lemul/include/Makefile ============================================================================== --- user/dchagin/lemul/include/Makefile Thu Feb 5 07:19:30 2015 (r278234) +++ user/dchagin/lemul/include/Makefile Thu Feb 5 07:24:17 2015 (r278235) @@ -44,7 +44,7 @@ LSUBDIRS= cam/ata cam/scsi \ dev/hwpmc \ dev/ic dev/iicbus dev/io dev/lmc dev/mfi dev/nvme \ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \ - dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ + dev/speaker dev/utopia dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \ fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ @@ -58,12 +58,12 @@ LSUBDIRS= cam/ata cam/scsi \ LSUBSUBDIRS= dev/mpt/mpilib -.if ${MK_CUSE} != "no" -LSUBDIRS+= fs/cuse +.if ${MK_BLUETOOTH} != "no" +LSUBSUBDIRS+= netgraph/bluetooth/include .endif -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" -_dev_powermac_nvram= dev/powermac_nvram +.if ${MK_CUSE} != "no" +LSUBDIRS+= fs/cuse .endif .if ${MK_GSSAPI} != "no" @@ -75,15 +75,18 @@ INCS+= gssapi.h INCS+= hesiod.h .endif -.if ${MK_BLUETOOTH} != "no" -LSUBSUBDIRS+= netgraph/bluetooth/include -.endif - # Handle the #define aliases for libiconv .if ${MK_ICONV} == "yes" INCS+= iconv.h .endif - + +.if ${MK_USB} != "no" +LSUBDIRS+= dev/usb *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Thu Feb 5 17:21:43 2015 Return-Path: Delivered-To: svn-src-user@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 9A09FE5; Thu, 5 Feb 2015 17:21:43 +0000 (UTC) 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 8733CC51; Thu, 5 Feb 2015 17:21:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15HLh2n037418; Thu, 5 Feb 2015 17:21:43 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15HLhWr037417; Thu, 5 Feb 2015 17:21:43 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502051721.t15HLhWr037417@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Thu, 5 Feb 2015 17:21:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278270 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 17:21:43 -0000 Author: pho Date: Thu Feb 5 17:21:42 2015 New Revision: 278270 URL: https://svnweb.freebsd.org/changeset/base/278270 Log: Cleanup script and fix trailing whitespace. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/sendfile_shm.sh Modified: user/pho/stress2/misc/sendfile_shm.sh ============================================================================== --- user/pho/stress2/misc/sendfile_shm.sh Thu Feb 5 16:31:49 2015 (r278269) +++ user/pho/stress2/misc/sendfile_shm.sh Thu Feb 5 17:21:42 2015 (r278270) @@ -28,8 +28,6 @@ # $FreeBSD$ # -[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 - # Sendfile(2) over posix shmfd # Test scenario by kib@ @@ -43,7 +41,7 @@ cc -o sendfile_shm -Wall -Wextra -O2 sen rm -f sendfile_shm.c cd $here -daemon ../testcases/swap/swap -t 2m -i 20 > /dev/null 2>&1 +daemon ../testcases/swap/swap -t 2m -i 20 > /dev/null 2>&1 sleep 5 for i in `jot 10`; do /tmp/sendfile_shm /boot/kernel/kernel /tmp/sendfile_shm.$i > \ @@ -52,8 +50,7 @@ done for i in `jot 10`; do wait done -while ps aux | grep -v grep | grep -q swap; do - killall -9 swap +while pkill -9 swap; do sleep .5 done for i in `jot 10`; do @@ -198,6 +195,6 @@ main(int argc, char *argv[]) sleep(1); receivefd(s[1], outfd, st.st_size); } - + return (0); } From owner-svn-src-user@FreeBSD.ORG Sat Feb 7 13:18:33 2015 Return-Path: Delivered-To: svn-src-user@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 EA1FDB45; Sat, 7 Feb 2015 13:18:33 +0000 (UTC) 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 D68C680F; Sat, 7 Feb 2015 13:18:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17DIXqc089147; Sat, 7 Feb 2015 13:18:33 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17DIXGL089146; Sat, 7 Feb 2015 13:18:33 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502071318.t17DIXGL089146@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sat, 7 Feb 2015 13:18:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278353 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 13:18:34 -0000 Author: pho Date: Sat Feb 7 13:18:32 2015 New Revision: 278353 URL: https://svnweb.freebsd.org/changeset/base/278353 Log: Wait longer for gdb to start and improve error handling. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/signal.sh Modified: user/pho/stress2/misc/signal.sh ============================================================================== --- user/pho/stress2/misc/signal.sh Sat Feb 7 13:11:45 2015 (r278352) +++ user/pho/stress2/misc/signal.sh Sat Feb 7 13:18:32 2015 (r278353) @@ -180,7 +180,7 @@ int main(int argc, char *argv[]) { int sig; sscanf(argv[3], "%d", &sig); - + if( syscall(SYS_thr_kill2, pid, id, sig) ) { perror("syscall"); } @@ -200,25 +200,29 @@ sleep 300 > gdbfifo & # Keep the fifo op fifopid=$! gdb ./waitthread < gdbfifo > gdbout 2>&1 & +gdbpid=$! echo "set args 8" > gdbfifo echo "run" > gdbfifo -sleep .2 +sleep .5 pid=`ps | grep -v grep | grep "waitthread 8" | sed 's/^ *//;s/ .*//'` -[ -z "$pid" ] && echo "Could not find pid" && exit 1 -procstat -t $pid > pstat - -t1=`grep fifo pstat | awk '{print $2}'` -t2=`grep umtxn pstat | awk '{print $2}' | tail -1` +if [ -n "$pid" ]; then + procstat -t $pid > pstat -./tkill $pid $t1 5 # SIGTRAP -./tkill $pid $t2 2 # SIGINT + t1=`grep fifo pstat | awk '{print $2}'` + t2=`grep umtxn pstat | awk '{print $2}' | tail -1` -echo "c" > gdbfifo -echo "quit" > gdbfifo + ./tkill $pid $t1 5 # SIGTRAP + ./tkill $pid $t2 2 # SIGINT -kill $fifopid + echo "c" > gdbfifo + echo "quit" > gdbfifo + sleep 1 + grep -q "signal SIGINT" gdbout || echo FAIL +else + echo "Did not find pid for test program waitthread" +fi -grep -q "signal SIGINT" gdbout || echo FAIL +kill $fifopid $gdbpid > /dev/null 2>&1 rm -f gdbfifo gdbout pstat waitthread tkill /tmp/waitthread ps | grep -v grep | grep waitthread | awk '{print $1}' | xargs kill From owner-svn-src-user@FreeBSD.ORG Sat Feb 7 13:20:32 2015 Return-Path: Delivered-To: svn-src-user@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 68800D6C; Sat, 7 Feb 2015 13:20:32 +0000 (UTC) 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 5589581F; Sat, 7 Feb 2015 13:20:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17DKWph090007; Sat, 7 Feb 2015 13:20:32 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17DKWaY090005; Sat, 7 Feb 2015 13:20:32 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502071320.t17DKWaY090005@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sat, 7 Feb 2015 13:20:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278355 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 13:20:32 -0000 Author: pho Date: Sat Feb 7 13:20:31 2015 New Revision: 278355 URL: https://svnweb.freebsd.org/changeset/base/278355 Log: Add new findings. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/socketpair.sh Modified: user/pho/stress2/misc/socketpair.sh ============================================================================== --- user/pho/stress2/misc/socketpair.sh Sat Feb 7 13:19:04 2015 (r278354) +++ user/pho/stress2/misc/socketpair.sh Sat Feb 7 13:20:31 2015 (r278355) @@ -30,6 +30,9 @@ # Page fault due to recursion. Fixed in r216150. +# Looping in kernel: http://people.freebsd.org/~pho/stress/log/kostik737.txt +# Fixed in r274712 + . ../default.cfg here=`pwd` From owner-svn-src-user@FreeBSD.ORG Sat Feb 7 13:22:32 2015 Return-Path: Delivered-To: svn-src-user@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 4D4F0E5E; Sat, 7 Feb 2015 13:22:32 +0000 (UTC) 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 39EF58C1; Sat, 7 Feb 2015 13:22:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17DMWUT093216; Sat, 7 Feb 2015 13:22:32 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17DMWJl093215; Sat, 7 Feb 2015 13:22:32 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502071322.t17DMWJl093215@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sat, 7 Feb 2015 13:22:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278356 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 13:22:32 -0000 Author: pho Date: Sat Feb 7 13:22:31 2015 New Revision: 278356 URL: https://svnweb.freebsd.org/changeset/base/278356 Log: Fix trailing whitespace. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/statfs.sh Modified: user/pho/stress2/misc/statfs.sh ============================================================================== --- user/pho/stress2/misc/statfs.sh Sat Feb 7 13:20:31 2015 (r278355) +++ user/pho/stress2/misc/statfs.sh Sat Feb 7 13:22:31 2015 (r278356) @@ -30,7 +30,7 @@ # Regression test for statfs problems with deleting a large number of files -# $ ./statfs.sh +# $ ./statfs.sh # Filesystem 1K-blocks Used Avail Capacity iused ifree %iused Mounted on # /dev/ad0s1e 1982798 1782134 42042 98% 4965 254105 2% /tmp # Free inodes on /tmp: 254105 @@ -43,7 +43,6 @@ # Filesystem 1K-blocks Used Avail Capacity iused ifree %iused Mounted on # /dev/ad0s1e 1982798 1784528 39648 98% 4965 254105 2% /tmp - odir=`pwd` dir=/tmp @@ -122,7 +121,7 @@ main() sprintf(file,"p%06d.%05d", pid, i); if (unlink(file) == -1) err(3, "unlink(%s)", file); - + } printf("\n"); return (0); From owner-svn-src-user@FreeBSD.ORG Sat Feb 7 13:24:31 2015 Return-Path: Delivered-To: svn-src-user@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 60CA5F51; Sat, 7 Feb 2015 13:24:31 +0000 (UTC) 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 4DCB38CE; Sat, 7 Feb 2015 13:24:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17DOV9t093487; Sat, 7 Feb 2015 13:24:31 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17DOVjo093486; Sat, 7 Feb 2015 13:24:31 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502071324.t17DOVjo093486@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sat, 7 Feb 2015 13:24:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278357 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 13:24:31 -0000 Author: pho Date: Sat Feb 7 13:24:30 2015 New Revision: 278357 URL: https://svnweb.freebsd.org/changeset/base/278357 Log: Fix trailing whitespace and make test less verbose. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/suj6.sh Modified: user/pho/stress2/misc/suj6.sh ============================================================================== --- user/pho/stress2/misc/suj6.sh Sat Feb 7 13:22:31 2015 (r278356) +++ user/pho/stress2/misc/suj6.sh Sat Feb 7 13:24:30 2015 (r278357) @@ -50,7 +50,7 @@ newfs -j md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint -su $testuser -c "cd $mntpoint; /tmp/suj6" +su $testuser -c "cd $mntpoint; /tmp/suj6" > /dev/null while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 @@ -104,7 +104,7 @@ test(int size) sprintf(file,"p%05d", getpid()); - if ((fd = creat(file, 0660)) == -1) + if ((fd = creat(file, 0660)) == -1) err(1, "creat(%s)", file); to = sizeof(buf); From owner-svn-src-user@FreeBSD.ORG Sat Feb 7 13:26:14 2015 Return-Path: Delivered-To: svn-src-user@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 72799B2; Sat, 7 Feb 2015 13:26:14 +0000 (UTC) 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 5F9158DC; Sat, 7 Feb 2015 13:26:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17DQEGd093741; Sat, 7 Feb 2015 13:26:14 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17DQEiq093740; Sat, 7 Feb 2015 13:26:14 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502071326.t17DQEiq093740@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sat, 7 Feb 2015 13:26:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278358 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 13:26:14 -0000 Author: pho Date: Sat Feb 7 13:26:13 2015 New Revision: 278358 URL: https://svnweb.freebsd.org/changeset/base/278358 Log: Trailing whitespace fix. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/swap.sh Modified: user/pho/stress2/misc/swap.sh ============================================================================== --- user/pho/stress2/misc/swap.sh Sat Feb 7 13:24:30 2015 (r278357) +++ user/pho/stress2/misc/swap.sh Sat Feb 7 13:26:13 2015 (r278358) @@ -87,7 +87,7 @@ setup(void) printf("setup: pid %d. Total %luMb\n", getpid(), size / 1024 / 1024 * INCARNATIONS); #endif - + if (size == 0) errx(1, "Argument too small");