From owner-svn-src-user@FreeBSD.ORG Thu Apr 16 08:41:21 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 924A36F; Thu, 16 Apr 2015 08:41:21 +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 7E09F5FB; Thu, 16 Apr 2015 08:41:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G8fLhJ023968; Thu, 16 Apr 2015 08:41:21 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G8fK4r023964; Thu, 16 Apr 2015 08:41:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504160841.t3G8fK4r023964@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 16 Apr 2015 08:41:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281595 - user/ngie/more-tests/tools/regression/p1003_1b 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.20 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, 16 Apr 2015 08:41:21 -0000 Author: ngie Date: Thu Apr 16 08:41:19 2015 New Revision: 281595 URL: https://svnweb.freebsd.org/changeset/base/281595 Log: - Fix compilation (MAP_INHERIT's dead) - Fix warnings - Use mkstemp instead of tmpnam Modified: user/ngie/more-tests/tools/regression/p1003_1b/Makefile user/ngie/more-tests/tools/regression/p1003_1b/fifo.c user/ngie/more-tests/tools/regression/p1003_1b/sched.c user/ngie/more-tests/tools/regression/p1003_1b/yield.c Modified: user/ngie/more-tests/tools/regression/p1003_1b/Makefile ============================================================================== --- user/ngie/more-tests/tools/regression/p1003_1b/Makefile Thu Apr 16 08:05:56 2015 (r281594) +++ user/ngie/more-tests/tools/regression/p1003_1b/Makefile Thu Apr 16 08:41:19 2015 (r281595) @@ -14,4 +14,5 @@ SRCS=\ MAN= CFLAGS+=-DNO_MEMLOCK + .include Modified: user/ngie/more-tests/tools/regression/p1003_1b/fifo.c ============================================================================== --- user/ngie/more-tests/tools/regression/p1003_1b/fifo.c Thu Apr 16 08:05:56 2015 (r281594) +++ user/ngie/more-tests/tools/regression/p1003_1b/fifo.c Thu Apr 16 08:41:19 2015 (r281595) @@ -31,17 +31,17 @@ * * $FreeBSD$ */ -#include -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include #include #include +#include +#include +#include volatile int ticked; #define CAN_USE_ALARMS @@ -109,7 +109,7 @@ int fifo(int argc, char *argv[]) fifo_param.sched_priority = 1; p = (long *)mmap(0, sizeof(*p), - PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED|MAP_INHERIT, -1, 0); + PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, -1, 0); if (p == (long *)-1) err(errno, "mmap"); Modified: user/ngie/more-tests/tools/regression/p1003_1b/sched.c ============================================================================== --- user/ngie/more-tests/tools/regression/p1003_1b/sched.c Thu Apr 16 08:05:56 2015 (r281594) +++ user/ngie/more-tests/tools/regression/p1003_1b/sched.c Thu Apr 16 08:41:19 2015 (r281595) @@ -41,16 +41,17 @@ #define _POSIX_SOURCE #define _POSIX_C_SOURCE 199309L -#include -#include - -#include -#include +#include #include #include -#include - +#include #include +#include +#define __XSI_VISIBLE 1 +#include +#undef __XSI_VISIBLE +#include +#include #include "prutil.h" @@ -209,17 +210,14 @@ int sched(int ac, char *av[]) { -#define NAM "P1003_1b_schedXXXX" - char nam[L_tmpnam]; + char nam[] = "P1003_1b_schedXXXXXX"; int fd; pid_t p; pid_t *lastrun; - strcpy(nam, NAM); - if (tmpnam(nam) != nam) - q(__LINE__, errno, "tmpnam " NAM); - q(__LINE__, (fd = open(nam, O_RDWR|O_CREAT, 0666)), - "open " NAM); + fd = mkstemp(nam); + if (fd == -1) + q(__LINE__, errno, "mkstemp failed"); (void)unlink(nam); Modified: user/ngie/more-tests/tools/regression/p1003_1b/yield.c ============================================================================== --- user/ngie/more-tests/tools/regression/p1003_1b/yield.c Thu Apr 16 08:05:56 2015 (r281594) +++ user/ngie/more-tests/tools/regression/p1003_1b/yield.c Thu Apr 16 08:41:19 2015 (r281595) @@ -89,7 +89,7 @@ int yield(int argc, char *argv[]) n = nslaves = atoi(argv[1]); p = (int *)mmap(0, sizeof(int), - PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED|MAP_INHERIT, -1, 0); + PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, -1, 0); if (p == (int *)-1) err(errno, "mmap");