From owner-freebsd-standards@FreeBSD.ORG Sun Nov 5 08:18:54 2006 Return-Path: X-Original-To: freebsd-standards@freebsd.org Delivered-To: freebsd-standards@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B5F316A859 for ; Sun, 5 Nov 2006 08:18:54 +0000 (UTC) (envelope-from izumtiih@cargolink.com) Received: from cargolink.com (62-43-83-194.user.ono.com [62.43.83.194]) by mx1.FreeBSD.org (Postfix) with SMTP id 1A6D643D5D for ; Sun, 5 Nov 2006 08:18:52 +0000 (GMT) (envelope-from izumtiih@cargolink.com) Message-ID: <03dd01c70086$3eff94d0$2312e5f0@urepublicanu> From: "Beatrice Rutledge" To: Date: Sun, 05 Nov 2006 09:18:42 +0100 MIME-Version: 1.0 X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2900.2869 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2962 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Subject: OTC Platinum Stock Report j X-BeenThere: freebsd-standards@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Beatrice Rutledge List-Id: Standards compliance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 08:18:54 -0000 THE PR CAMPAIGN IS ON GET IN FIRST THING IN THE MORNING This advisory is based on exclusive insiders/agents information. (AVLN.OB) Avalon Energy Corporation has an undivided 85% working interest in the Shotgun Draw Prospect in the prolific natural gas producing Uinta Basin , located in the US Rockies, Utah . The lease comprises 13,189 acres with a potential 4 TCF recoverable gas and is overpressured by a 0.55 . 0.85 gradient. ON MONDAY NOV 6th: at 11 cents its a STEAL - Volume: 389,001 - Volume: + 50% - Price: +5.77% The key to any tade is buying low and selling high, WELL the energy market has bottomed out and time to get in is now. We specialise in calling market bottom and when it comes to energy THIS IS THE BOTTOM, SO GET IN FOLKS SEE WHAT ITS LIKE TO DOUBLE WITH 1 TRADE SEE WHAT ITS LIKE TO DOUBLE WITH 1 TRADE President Bush, working a southwest Missouri campaign crowd like a yell leader, blasted Democrats on Friday, saying they have no plan to keep Americans safe from terrorists. President Bush, working a southwest Missouri campaign crowd like a yell leader, blasted Democrats on Friday, saying they have no plan to keep Americans safe from terrorists. "If they say they want to win the war on terror, but call for America to pull out of what al Qaeda says is the central front in this war, ask them this question: 'What's your plan?' " Bush said at a rally for Missouri Sen. Jim Talent, who is seeking re-election in one of the tightest races in the nation. (Watch how Bush is picking his election battles -- 1:36 ) "Nine days ago, one of the worst tragedies in the 100-year history of the Forest Service took the lives of five heroes," U.S. Forest Service Chaplain Steve Seltzner said as the service began. "It has shaken this agency and the men and women of the San Benardino National Forest to its very core and shocked the entire world." From owner-freebsd-standards@FreeBSD.ORG Mon Nov 6 11:08:14 2006 Return-Path: X-Original-To: freebsd-standards@FreeBSD.org Delivered-To: freebsd-standards@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DBEC216A5E2 for ; Mon, 6 Nov 2006 11:08:13 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C26A43D45 for ; Mon, 6 Nov 2006 11:08:13 +0000 (GMT) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (linimon@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kA6B8Drm014056 for ; Mon, 6 Nov 2006 11:08:13 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from linimon@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kA6B8CiO014052 for freebsd-standards@FreeBSD.org; Mon, 6 Nov 2006 11:08:12 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 6 Nov 2006 11:08:12 GMT Message-Id: <200611061108.kA6B8CiO014052@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: linimon set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: freebsd-standards@FreeBSD.org Cc: Subject: Current problem reports assigned to you X-BeenThere: freebsd-standards@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Standards compliance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 11:08:14 -0000 Current FreeBSD problem reports Critical problems Serious problems S Tracker Resp. Description -------------------------------------------------------------------------------- o bin/25542 standards /bin/sh: null char in quoted string o kern/46239 standards posix semaphore implementation errors o stand/54410 standards one-true-awk not POSIX compliant (no extended REs) o stand/82654 standards C99 long double math functions are missing o stand/94729 standards fcntl() throws undocumented ENOTTY o stand/104422 standards TCP-MD5 key length limits 6 problems total. Non-critical problems S Tracker Resp. Description -------------------------------------------------------------------------------- o bin/21519 standards sys/dir.h should be deprecated some more o bin/24390 standards Replacing old dir-symlinks when using /bin/ln s stand/24590 standards timezone function not compatible witn Single Unix Spec s kern/28260 standards UIO_MAXIOV needs to be made public s stand/36076 standards Implementation of POSIX fuser command o stand/39256 standards snprintf/vsnprintf aren't POSIX-conformant for strings p stand/41576 standards POSIX compliance of ln(1) o stand/44425 standards getcwd() succeeds even if current dir has perm 000. o stand/46119 standards Priority problems for SCHED_OTHER using pthreads o stand/54833 standards [pcvt] more pcvt deficits o stand/54839 standards [pcvt] pcvt deficits p stand/55112 standards glob.h, glob_t's gl_pathc should be "size_t", not "int o stand/56476 standards cd9660 unicode support simple hack o stand/58676 standards grantpt(3) alters storage used by ptsname(3) s stand/62858 standards malloc(0) not C99 compliant s kern/64875 standards [libc] [patch] [feature request] add a system call: fd o stand/66357 standards make POSIX conformance problem ('sh -e' & '+' command- o stand/66531 standards _gettemp uses a far smaller set of filenames than docu o stand/70813 standards [PATCH] ls(1) not Posix compliant o stand/72006 standards floating point formating in non-C locales o stand/79056 standards regex(3) regression tests a stand/80293 standards sysconf() does not support well-defined unistd values o stand/81287 standards [PATCH]: fingerd(8) might send a line not ending in CR o stand/83845 standards [libm] [patch] add log2() and log2f() support for libm o stand/85080 standards output of long double subnormals (with printf) is wron o stand/92360 standards [headers] [patch] Missing TAB3 in kernel headers o stand/92362 standards [headers] [patch] Missing SIGPOLL in kernel headers o kern/93705 standards [headers] [patch] ENODATA and EGREGIOUS (for glibc com o stand/96016 standards clock_getres et al should be in o stand/96236 standards [PATCH] [POSIX] sed.1 incorrectly describes a function o stand/99517 standards Missing SIGRTMIN and SIGRTMAX signals o stand/99960 standards [Patch] [make] Add -p flag o stand/100017 standards [Patch] Add fuser(1) functionality to fstat(1) o stand/104743 standards Wrong values for _POSIX_ minimal limits o stand/104841 standards C99 long double square root. 35 problems total. From owner-freebsd-standards@FreeBSD.ORG Tue Nov 7 14:11:43 2006 Return-Path: X-Original-To: standards@FreeBSD.org Delivered-To: freebsd-standards@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA90716A403; Tue, 7 Nov 2006 14:11:42 +0000 (UTC) (envelope-from trhodes@FreeBSD.org) Received: from pittgoth.com (ns1.pittgoth.com [216.38.206.188]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9C6243D88; Tue, 7 Nov 2006 14:11:40 +0000 (GMT) (envelope-from trhodes@FreeBSD.org) Received: from localhost (ip70-177-190-239.dc.dc.cox.net [70.177.190.239]) (authenticated bits=0) by pittgoth.com (8.13.6/8.13.6) with ESMTP id kA7EBcgm069394 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 7 Nov 2006 09:11:39 -0500 (EST) (envelope-from trhodes@FreeBSD.org) Date: Tue, 7 Nov 2006 09:11:28 -0500 From: Tom Rhodes To: standards@FreeBSD.org Message-Id: <20061107091128.063d0ae5.trhodes@FreeBSD.org> Organization: The FreeBSD Project X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i386-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: arch@FreeBSD.org Subject: cvs rm sys/posix4 && enable sem X-BeenThere: freebsd-standards@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Standards compliance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 14:11:43 -0000 Hi, I spent some time this morning working over the P1003_1B_SEMAPHORES option and figured I might as well play with the task of merging posix4/ into regular sys. In light of of this, I also enabled and tested on all architectures, the sem module disabled by Alfred for some unknown (later learned via old email) reason. Does anyone object to the following: 1: Repocopy posix4/* files to sys/sys and sys/kern; 2: patch CURRENT for the change; 3: remove posix4/*; 4: enable sem module; 5: add P1003_1B_SEMAPHORES to GENERIC; 6: (eventually and maybe) merge psched.h and sched.h (I renamed posix4/sched.h to sys/psched.h in this patch). This one is completely optional. The included patch is pretty vanilla and does *most* of this, not counting the repo-copy and added P1003_1B_SEMAPHORES to GENERIC. It also passes my universe build. This also has the side effect of differentiating between the two sched.h files we have in the tree. Thanks, -- Tom Rhodes Index: include/Makefile =================================================================== RCS file: /home/ncvs/src/include/Makefile,v retrieving revision 1.265 diff -u -r1.265 Makefile --- include/Makefile 31 Oct 2006 22:22:29 -0000 1.265 +++ include/Makefile 7 Nov 2006 13:48:11 -0000 @@ -28,7 +28,7 @@ MHDRS= float.h floatingpoint.h stdarg.h -PHDRS= sched.h semaphore.h _semaphore.h +PHDRS= psched.h semaphore.h _semaphore.h LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \ termios.h ucontext.h @@ -36,7 +36,7 @@ LDIRS= bsm cam geom net net80211 netatalk netatm netgraph netinet netinet6 \ netipsec ${_netipx} netkey netnatm ${_netncp} netsmb \ nfs nfsclient nfsserver \ - pccard posix4 sys vm + pccard sys vm LSUBDIRS= cam/scsi \ dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ @@ -111,7 +111,7 @@ INCSLINKS+= machine/$i ${INCLUDEDIR}/$i .endfor .for i in ${PHDRS} -INCSLINKS+= posix4/$i ${INCLUDEDIR}/$i +INCSLINKS+= sys/$i ${INCLUDEDIR}/$i .endfor .if ${MACHINE} != ${MACHINE_ARCH} Index: include/pthread.h =================================================================== RCS file: /home/ncvs/src/include/pthread.h,v retrieving revision 1.40 diff -u -r1.40 pthread.h --- include/pthread.h 24 Oct 2005 05:53:54 -0000 1.40 +++ include/pthread.h 7 Nov 2006 13:48:11 -0000 @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include /* Index: lib/libc/stdlib/malloc.c =================================================================== RCS file: /home/ncvs/src/lib/libc/stdlib/malloc.c,v retrieving revision 1.137 diff -u -r1.137 malloc.c --- lib/libc/stdlib/malloc.c 8 Sep 2006 17:52:15 -0000 1.137 +++ lib/libc/stdlib/malloc.c 7 Nov 2006 13:48:13 -0000 @@ -210,7 +210,7 @@ #include #include #include -#include +#include #include #include #include Index: lib/libc/sys/sched_get_priority_max.2 =================================================================== RCS file: /home/ncvs/src/lib/libc/sys/sched_get_priority_max.2,v retrieving revision 1.19 diff -u -r1.19 sched_get_priority_max.2 --- lib/libc/sys/sched_get_priority_max.2 2 Jul 2004 23:52:13 -0000 1.19 +++ lib/libc/sys/sched_get_priority_max.2 7 Nov 2006 13:48:13 -0000 @@ -35,7 +35,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sched.h +.In psched.h .Ft int .Fn sched_get_priority_max "int policy" .Ft int @@ -67,7 +67,7 @@ The value of .Fa policy should be one of the scheduling policy values defined in -.Fa : +.Fa : .Bl -tag -width [SCHED_OTHER] .It Bq Er SCHED_FIFO First-in-first-out fixed priority scheduling with no round robin scheduling; Index: lib/libc/sys/sched_setparam.2 =================================================================== RCS file: /home/ncvs/src/lib/libc/sys/sched_setparam.2,v retrieving revision 1.17 diff -u -r1.17 sched_setparam.2 --- lib/libc/sys/sched_setparam.2 4 Jul 2004 20:55:48 -0000 1.17 +++ lib/libc/sys/sched_setparam.2 7 Nov 2006 13:48:13 -0000 @@ -33,7 +33,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sched.h +.In psched.h .Ft int .Fn sched_setparam "pid_t pid" "const struct sched_param *param" .Ft int Index: lib/libc/sys/sched_setscheduler.2 =================================================================== RCS file: /home/ncvs/src/lib/libc/sys/sched_setscheduler.2,v retrieving revision 1.17 diff -u -r1.17 sched_setscheduler.2 --- lib/libc/sys/sched_setscheduler.2 2 Jul 2004 23:52:13 -0000 1.17 +++ lib/libc/sys/sched_setscheduler.2 7 Nov 2006 13:48:13 -0000 @@ -33,7 +33,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sched.h +.In psched.h .Ft int .Fn sched_setscheduler "pid_t pid" "int policy" "const struct sched_param *param" .Ft int @@ -81,7 +81,7 @@ as a write-style operation. .Pp The scheduling policies are in -.Fa : +.Fa : .Bl -tag -width [SCHED_OTHER] .It Bq Er SCHED_FIFO First-in-first-out fixed priority scheduling with no round robin scheduling; @@ -94,7 +94,7 @@ The .Vt sched_param structure is defined in -.Fa : +.Fa : .Pp .Bd -literal -offset indent struct sched_param { Index: lib/libc/sys/sched_yield.2 =================================================================== RCS file: /home/ncvs/src/lib/libc/sys/sched_yield.2,v retrieving revision 1.13 diff -u -r1.13 sched_yield.2 --- lib/libc/sys/sched_yield.2 2 Jul 2004 23:52:13 -0000 1.13 +++ lib/libc/sys/sched_yield.2 7 Nov 2006 13:48:13 -0000 @@ -32,7 +32,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sched.h +.In psched.h .Ft int .Fn sched_yield void .Sh DESCRIPTION Index: lib/libc_r/test/mutex_d.c =================================================================== RCS file: /home/ncvs/src/lib/libc_r/test/mutex_d.c,v retrieving revision 1.4 diff -u -r1.4 mutex_d.c --- lib/libc_r/test/mutex_d.c 4 Jun 2003 20:38:54 -0000 1.4 +++ lib/libc_r/test/mutex_d.c 7 Nov 2006 13:48:13 -0000 @@ -39,7 +39,7 @@ #include #include #include "pthread.h" -#include +#include #include #include #include Index: lib/libc_r/uthread/pthread_private.h =================================================================== RCS file: /home/ncvs/src/lib/libc_r/uthread/pthread_private.h,v retrieving revision 1.87 diff -u -r1.87 pthread_private.h --- lib/libc_r/uthread/pthread_private.h 31 May 2005 19:57:23 -0000 1.87 +++ lib/libc_r/uthread/pthread_private.h 7 Nov 2006 13:48:13 -0000 @@ -57,7 +57,7 @@ #include #include #include -#include +#include #include #include #include Index: lib/libc_r/uthread/uthread_spinlock.c =================================================================== RCS file: /home/ncvs/src/lib/libc_r/uthread/uthread_spinlock.c,v retrieving revision 1.12 diff -u -r1.12 uthread_spinlock.c --- lib/libc_r/uthread/uthread_spinlock.c 26 Mar 2003 04:02:24 -0000 1.12 +++ lib/libc_r/uthread/uthread_spinlock.c 7 Nov 2006 13:48:13 -0000 @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include Index: lib/libpthread/test/mutex_d.c =================================================================== RCS file: /home/ncvs/src/lib/libpthread/test/mutex_d.c,v retrieving revision 1.5 diff -u -r1.5 mutex_d.c --- lib/libpthread/test/mutex_d.c 19 Nov 2005 04:47:06 -0000 1.5 +++ lib/libpthread/test/mutex_d.c 7 Nov 2006 13:48:15 -0000 @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include Index: lib/libpthread/thread/thr_private.h =================================================================== RCS file: /home/ncvs/src/lib/libpthread/thread/thr_private.h,v retrieving revision 1.127 diff -u -r1.127 thr_private.h --- lib/libpthread/thread/thr_private.h 9 Jun 2006 14:23:40 -0000 1.127 +++ lib/libpthread/thread/thr_private.h 7 Nov 2006 13:48:15 -0000 @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include @@ -1257,7 +1257,7 @@ int __sys_ioctl(int, unsigned long, ...); #endif -/* #inclde */ +/* #inclde */ #ifdef _SCHED_H_ int __sys_sched_yield(void); #endif Index: lib/libthr/thread/thr_yield.c =================================================================== RCS file: /home/ncvs/src/lib/libthr/thread/thr_yield.c,v retrieving revision 1.2 diff -u -r1.2 thr_yield.c --- lib/libthr/thread/thr_yield.c 4 Apr 2006 02:57:49 -0000 1.2 +++ lib/libthr/thread/thr_yield.c 7 Nov 2006 13:48:40 -0000 @@ -34,7 +34,7 @@ #include "namespace.h" #include -#include +#include #include "un-namespace.h" __weak_reference(_pthread_yield, pthread_yield); Index: share/man/man4/sem.4 =================================================================== RCS file: /home/ncvs/src/share/man/man4/sem.4,v retrieving revision 1.2 diff -u -r1.2 sem.4 --- share/man/man4/sem.4 2 Jun 2003 11:19:23 -0000 1.2 +++ share/man/man4/sem.4 7 Nov 2006 13:48:49 -0000 @@ -24,19 +24,26 @@ .\" .\" $FreeBSD: src/share/man/man4/sem.4,v 1.2 2003/06/02 11:19:23 ru Exp $ .\" -.Dd January 14, 2003 +.Dd November 6, 2006 .Dt SEM 4 .Os .Sh NAME .Nm sem .Nd POSIX semaphores .Sh SYNOPSIS -To link into the kernel: +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: .Bd -ragged -offset indent .Cd "options P1003_1B_SEMAPHORES" .Ed .Pp -To load as a kernel loadable module: +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +sem_load="YES" +.Ed .Pp .Dl "kldload sem" .Sh DESCRIPTION @@ -47,6 +54,10 @@ to implement .Tn POSIX semaphores. +This facility offers support for such functions as +.Fn sem_init +and +.Fn sem_wait . It is available both as a kernel option for static inclusion and as a dynamic kernel module. .Sh SEE ALSO @@ -68,3 +79,4 @@ .Nm kernel module appeared in .Fx 5.0 . +.\" XXX: This manual page is weak with details and info. Index: sys/Makefile =================================================================== RCS file: /home/ncvs/src/sys/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- sys/Makefile 10 Aug 2006 06:29:43 -0000 1.38 +++ sys/Makefile 7 Nov 2006 13:48:49 -0000 @@ -11,7 +11,7 @@ CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ isofs kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ - netsmb nfs nfsclient nfs4client rpc pccard pci posix4 sys \ + netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} Index: sys/amd64/linux32/linux32_proto.h =================================================================== RCS file: /home/ncvs/src/sys/amd64/linux32/linux32_proto.h,v retrieving revision 1.25 diff -u -r1.25 linux32_proto.h --- sys/amd64/linux32/linux32_proto.h 29 Oct 2006 14:12:44 -0000 1.25 +++ sys/amd64/linux32/linux32_proto.h 7 Nov 2006 13:48:50 -0000 @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include Index: sys/compat/freebsd32/freebsd32_proto.h =================================================================== RCS file: /home/ncvs/src/sys/compat/freebsd32/freebsd32_proto.h,v retrieving revision 1.74 diff -u -r1.74 freebsd32_proto.h --- sys/compat/freebsd32/freebsd32_proto.h 3 Nov 2006 21:23:33 -0000 1.74 +++ sys/compat/freebsd32/freebsd32_proto.h 7 Nov 2006 13:48:51 -0000 @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include Index: sys/compat/linux/linux_misc.c =================================================================== RCS file: /home/ncvs/src/sys/compat/linux/linux_misc.c,v retrieving revision 1.191 diff -u -r1.191 linux_misc.c --- sys/compat/linux/linux_misc.c 28 Oct 2006 16:47:38 -0000 1.191 +++ sys/compat/linux/linux_misc.c 7 Nov 2006 13:48:51 -0000 @@ -72,7 +72,7 @@ #include #include -#include +#include #include #include Index: sys/compat/svr4/svr4_proto.h =================================================================== RCS file: /home/ncvs/src/sys/compat/svr4/svr4_proto.h,v retrieving revision 1.27 diff -u -r1.27 svr4_proto.h --- sys/compat/svr4/svr4_proto.h 15 Aug 2006 17:36:59 -0000 1.27 +++ sys/compat/svr4/svr4_proto.h 7 Nov 2006 13:48:51 -0000 @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include Index: sys/conf/files =================================================================== RCS file: /home/ncvs/src/sys/conf/files,v retrieving revision 1.1159 diff -u -r1.1159 files --- sys/conf/files 3 Nov 2006 21:09:03 -0000 1.1159 +++ sys/conf/files 7 Nov 2006 13:48:52 -0000 @@ -1315,6 +1315,7 @@ kern/inflate.c optional gzip kern/init_main.c standard kern/init_sysent.c standard +kern/ksched.c optional _kposix_priority_scheduling kern/kern_acct.c standard kern/kern_acl.c standard kern/kern_alq.c optional alq @@ -1374,6 +1375,8 @@ kern/linker_if.m standard kern/md4c.c optional netsmb kern/md5c.c standard +kern/p1003_1b.c standard +kern/posix4_mib.c standard kern/sched_4bsd.c optional sched_4bsd kern/sched_core.c optional sched_core kern/sched_ule.c optional sched_ule @@ -1918,9 +1921,6 @@ pci/nfsmb.c optional nfsmb pci pci/viapm.c optional viapm pci pci/xrpu.c optional xrpu pci -posix4/ksched.c optional _kposix_priority_scheduling -posix4/p1003_1b.c standard -posix4/posix4_mib.c standard rpc/rpcclnt.c optional nfsclient security/audit/audit.c optional audit security/audit/audit_arg.c optional audit Index: sys/i386/ibcs2/ibcs2_proto.h =================================================================== RCS file: /home/ncvs/src/sys/i386/ibcs2/ibcs2_proto.h,v retrieving revision 1.30 diff -u -r1.30 ibcs2_proto.h --- sys/i386/ibcs2/ibcs2_proto.h 15 Aug 2006 17:37:00 -0000 1.30 +++ sys/i386/ibcs2/ibcs2_proto.h 7 Nov 2006 13:49:01 -0000 @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include Index: sys/i386/ibcs2/ibcs2_xenix.h =================================================================== RCS file: /home/ncvs/src/sys/i386/ibcs2/ibcs2_xenix.h,v retrieving revision 1.21 diff -u -r1.21 ibcs2_xenix.h --- sys/i386/ibcs2/ibcs2_xenix.h 15 Aug 2006 17:37:00 -0000 1.21 +++ sys/i386/ibcs2/ibcs2_xenix.h 7 Nov 2006 13:49:01 -0000 @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include Index: sys/i386/linux/linux_proto.h =================================================================== RCS file: /home/ncvs/src/sys/i386/linux/linux_proto.h,v retrieving revision 1.86 diff -u -r1.86 linux_proto.h --- sys/i386/linux/linux_proto.h 29 Oct 2006 14:12:44 -0000 1.86 +++ sys/i386/linux/linux_proto.h 7 Nov 2006 13:49:01 -0000 @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include Index: sys/kern/Make.tags.inc =================================================================== RCS file: /home/ncvs/src/sys/kern/Make.tags.inc,v retrieving revision 1.15 diff -u -r1.15 Make.tags.inc --- sys/kern/Make.tags.inc 5 Mar 2003 19:24:21 -0000 1.15 +++ sys/kern/Make.tags.inc 7 Nov 2006 13:49:01 -0000 @@ -47,7 +47,6 @@ ${SYS}/netnatm/*.[ch] \ ${SYS}/nfs/*.[ch] \ ${SYS}/pci/*.[ch] \ - ${SYS}/posix4/*.[ch] \ ${SYS}/ufs/ffs/*.[ch] \ ${SYS}/ufs/ufs/*.[ch] \ ${SYS}/vm/*.[ch] \ @@ -64,7 +63,6 @@ ${SYS}/netnatm \ ${SYS}/nfs \ ${SYS}/pci \ - ${SYS}/posix4 \ ${SYS}/vm \ ${SYS}/sys Index: sys/kern/kern_sig.c =================================================================== RCS file: /home/ncvs/src/sys/kern/kern_sig.c,v retrieving revision 1.335 diff -u -r1.335 kern_sig.c --- sys/kern/kern_sig.c 26 Oct 2006 21:42:19 -0000 1.335 +++ sys/kern/kern_sig.c 7 Nov 2006 13:49:01 -0000 @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -76,7 +77,6 @@ #include #include -#include #include #include Index: sys/kern/kern_thr.c =================================================================== RCS file: /home/ncvs/src/sys/kern/kern_thr.c,v retrieving revision 1.54 diff -u -r1.54 kern_thr.c --- sys/kern/kern_thr.c 26 Oct 2006 21:42:20 -0000 1.54 +++ sys/kern/kern_thr.c 7 Nov 2006 13:49:01 -0000 @@ -33,7 +33,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -45,8 +47,6 @@ #include #include #include -#include -#include #include #include Index: sys/kern/kern_time.c =================================================================== RCS file: /home/ncvs/src/sys/kern/kern_time.c,v retrieving revision 1.134 diff -u -r1.134 kern_time.c --- sys/kern/kern_time.c 22 Oct 2006 11:52:13 -0000 1.134 +++ sys/kern/kern_time.c 7 Nov 2006 13:49:01 -0000 @@ -48,14 +48,13 @@ #include #include #include +#include #include #include #include #include #include -#include - #include #include Index: sys/kern/makesyscalls.sh =================================================================== RCS file: /home/ncvs/src/sys/kern/makesyscalls.sh,v retrieving revision 1.66 diff -u -r1.66 makesyscalls.sh --- sys/kern/makesyscalls.sh 15 Aug 2006 17:09:32 -0000 1.66 +++ sys/kern/makesyscalls.sh 7 Nov 2006 13:49:01 -0000 @@ -125,7 +125,7 @@ printf "#define\t%s\n\n", sysproto_h > sysarg printf "#include \n" > sysarg printf "#include \n" > sysarg - printf "#include \n" > sysarg + printf "#include \n" > sysarg printf "#include \n\n" > sysarg printf "#include \n\n" > sysarg printf "struct proc;\n\n" > sysarg Index: sys/kern/uipc_mqueue.c =================================================================== RCS file: /home/ncvs/src/sys/kern/uipc_mqueue.c,v retrieving revision 1.16 diff -u -r1.16 uipc_mqueue.c --- sys/kern/uipc_mqueue.c 26 Sep 2006 04:12:47 -0000 1.16 +++ sys/kern/uipc_mqueue.c 7 Nov 2006 13:49:01 -0000 @@ -65,6 +65,7 @@ #include #include #include +#include #include #include #include @@ -78,7 +79,6 @@ #include #include #include -#include /* * Limits and constants Index: sys/kern/uipc_sem.c =================================================================== RCS file: /home/ncvs/src/sys/kern/uipc_sem.c,v retrieving revision 1.25 diff -u -r1.25 uipc_sem.c --- sys/kern/uipc_sem.c 22 Oct 2006 11:52:13 -0000 1.25 +++ sys/kern/uipc_sem.c 7 Nov 2006 13:49:01 -0000 @@ -42,6 +42,8 @@ #include #include #include +#include +#include #include #include #include @@ -49,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -56,11 +59,7 @@ #include #include #include - -#include -#include -#include -#include +#include #include Index: sys/kern/vfs_aio.c =================================================================== RCS file: /home/ncvs/src/sys/kern/vfs_aio.c,v retrieving revision 1.228 diff -u -r1.228 vfs_aio.c --- sys/kern/vfs_aio.c 15 Oct 2006 14:22:13 -0000 1.228 +++ sys/kern/vfs_aio.c 7 Nov 2006 13:49:12 -0000 @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -57,7 +58,6 @@ #include -#include #include #include #include Index: sys/modules/Makefile =================================================================== RCS file: /home/ncvs/src/sys/modules/Makefile,v retrieving revision 1.510 diff -u -r1.510 Makefile --- sys/modules/Makefile 9 Sep 2006 16:58:22 -0000 1.510 +++ sys/modules/Makefile 7 Nov 2006 13:49:12 -0000 @@ -219,6 +219,7 @@ scc \ scd \ ${_scsi_low} \ + sem \ sf \ ${_sio} \ sis \ Index: sys/security/mac/mac_posix_sem.c =================================================================== RCS file: /home/ncvs/src/sys/security/mac/mac_posix_sem.c,v retrieving revision 1.3 diff -u -r1.3 mac_posix_sem.c --- sys/security/mac/mac_posix_sem.c 22 Oct 2006 11:52:18 -0000 1.3 +++ sys/security/mac/mac_posix_sem.c 7 Nov 2006 13:49:21 -0000 @@ -37,14 +37,13 @@ #include #include +#include #include #include #include #include #include -#include - #include #include Index: sys/security/mac_biba/mac_biba.c =================================================================== RCS file: /home/ncvs/src/sys/security/mac_biba/mac_biba.c,v retrieving revision 1.94 diff -u -r1.94 mac_biba.c --- sys/security/mac_biba/mac_biba.c 12 Sep 2006 04:25:12 -0000 1.94 +++ sys/security/mac_biba/mac_biba.c 7 Nov 2006 13:49:21 -0000 @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -66,8 +67,6 @@ #include #include -#include - #include #include Index: sys/security/mac_mls/mac_mls.c =================================================================== RCS file: /home/ncvs/src/sys/security/mac_mls/mac_mls.c,v retrieving revision 1.77 diff -u -r1.77 mac_mls.c --- sys/security/mac_mls/mac_mls.c 12 Sep 2006 04:25:12 -0000 1.77 +++ sys/security/mac_mls/mac_mls.c 7 Nov 2006 13:49:21 -0000 @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -66,8 +67,6 @@ #include #include -#include - #include #include Index: sys/security/mac_stub/mac_stub.c =================================================================== RCS file: /home/ncvs/src/sys/security/mac_stub/mac_stub.c,v retrieving revision 1.56 diff -u -r1.56 mac_stub.c --- sys/security/mac_stub/mac_stub.c 19 Sep 2005 18:52:51 -0000 1.56 +++ sys/security/mac_stub/mac_stub.c 7 Nov 2006 13:49:21 -0000 @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -68,8 +69,6 @@ #include #include -#include - #include #include Index: sys/security/mac_test/mac_test.c =================================================================== RCS file: /home/ncvs/src/sys/security/mac_test/mac_test.c,v retrieving revision 1.63 diff -u -r1.63 mac_test.c --- sys/security/mac_test/mac_test.c 19 Sep 2005 18:52:51 -0000 1.63 +++ sys/security/mac_test/mac_test.c 7 Nov 2006 13:49:21 -0000 @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -63,8 +64,6 @@ #include #include -#include - #include #include Index: sys/sys/sysproto.h =================================================================== RCS file: /home/ncvs/src/sys/sys/sysproto.h,v retrieving revision 1.211 diff -u -r1.211 sysproto.h --- sys/sys/sysproto.h 3 Nov 2006 18:57:49 -0000 1.211 +++ sys/sys/sysproto.h 7 Nov 2006 13:49:31 -0000 @@ -11,8 +11,8 @@ #include #include -#include #include +#include #include Index: sys/sys/thr.h =================================================================== RCS file: /home/ncvs/src/sys/sys/thr.h,v retrieving revision 1.11 diff -u -r1.11 thr.h --- sys/sys/thr.h 22 Sep 2006 15:04:28 -0000 1.11 +++ sys/sys/thr.h 7 Nov 2006 13:49:31 -0000 @@ -30,7 +30,7 @@ #ifndef _SYS_THR_H_ #define _SYS_THR_H_ -#include +#include /* Create the thread in the suspended state. */ #define THR_SUSPENDED 0x0001 Index: usr.bin/kdump/mksubr =================================================================== RCS file: /home/ncvs/src/usr.bin/kdump/mksubr,v retrieving revision 1.4 diff -u -r1.4 mksubr --- usr.bin/kdump/mksubr 18 Sep 2006 13:49:57 -0000 1.4 +++ usr.bin/kdump/mksubr 7 Nov 2006 13:49:46 -0000 @@ -112,7 +112,7 @@ #include #include #include -#include +#include #include #define _KERNEL #include @@ -295,7 +295,7 @@ auto_switch_type "prioname" "PRIO_[A-Z]+[[:space:]]+[0-9]" "sys/resource.h" auto_switch_type "madvisebehavname" "_?MADV_[A-Z]+[[:space:]]+[0-9]+" "sys/mman.h" auto_switch_type "msyncflagsname" "MS_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h" -auto_switch_type "schedpolicyname" "SCHED_[A-Z]+[[:space:]]+[0-9]+" "sched.h" +auto_switch_type "schedpolicyname" "SCHED_[A-Z]+[[:space:]]+[0-9]+" "psched.h" auto_switch_type "kldunloadfflagsname" "LINKER_UNLOAD_[A-Z]+[[:space:]]+[0-9]+" "sys/linker.h" auto_switch_type "ksethrcmdname" "KSE_INTR_[A-Z]+[[:space:]]+[0-9]+" "sys/kse.h" auto_switch_type "extattrctlname" "EXTATTR_NAMESPACE_[A-Z]+[[:space:]]+0x[0-9]+" "sys/extattr.h" From owner-freebsd-standards@FreeBSD.ORG Tue Nov 7 15:16:35 2006 Return-Path: X-Original-To: standards@freebsd.org Delivered-To: freebsd-standards@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4323C16A4D1; Tue, 7 Nov 2006 15:16:35 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE12043DC9; Tue, 7 Nov 2006 15:15:33 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from zion.baldwin.cx (zion.baldwin.cx [192.168.0.7]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id kA7FFVGe058066; Tue, 7 Nov 2006 10:15:31 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: freebsd-arch@freebsd.org Date: Tue, 7 Nov 2006 09:55:16 -0500 User-Agent: KMail/1.9.1 References: <20061107091128.063d0ae5.trhodes@FreeBSD.org> In-Reply-To: <20061107091128.063d0ae5.trhodes@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200611070955.17274.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [192.168.0.1]); Tue, 07 Nov 2006 10:15:31 -0500 (EST) X-Virus-Scanned: ClamAV 0.88.3/2172/Tue Nov 7 09:04:48 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Tom Rhodes , standards@freebsd.org Subject: Re: cvs rm sys/posix4 && enable sem X-BeenThere: freebsd-standards@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Standards compliance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 15:16:35 -0000 On Tuesday 07 November 2006 09:11, Tom Rhodes wrote: > Hi, > > I spent some time this morning working over the P1003_1B_SEMAPHORES > option and figured I might as well play with the task of merging > posix4/ into regular sys. In light of of this, I also enabled and > tested on all architectures, the sem module disabled by Alfred > for some unknown (later learned via old email) reason. > > Does anyone object to the following: > > 1: Repocopy posix4/* files to sys/sys and sys/kern; > 2: patch CURRENT for the change; > 3: remove posix4/*; > 4: enable sem module; > 5: add P1003_1B_SEMAPHORES to GENERIC; > 6: (eventually and maybe) merge psched.h and sched.h (I renamed > posix4/sched.h to sys/psched.h in this patch). This one is > completely optional. > > The included patch is pretty vanilla and does *most* of this, > not counting the repo-copy and added P1003_1B_SEMAPHORES to > GENERIC. It also passes my universe build. This also has the > side effect of differentiating between the two sched.h files we > have in the tree. Thanks, I think the psched.h rename needs more thought. I think POSIX says that you include sched.h (not psched.h) for various APIs such as sched_yield(), sched_setscheduler(), etc. -- John Baldwin From owner-freebsd-standards@FreeBSD.ORG Tue Nov 7 15:27:29 2006 Return-Path: X-Original-To: standards@FreeBSD.org Delivered-To: freebsd-standards@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB0FC16A47B; Tue, 7 Nov 2006 15:27:29 +0000 (UTC) (envelope-from trhodes@FreeBSD.org) Received: from pittgoth.com (ns1.pittgoth.com [216.38.206.188]) by mx1.FreeBSD.org (Postfix) with ESMTP id 362A943D6D; Tue, 7 Nov 2006 15:27:28 +0000 (GMT) (envelope-from trhodes@FreeBSD.org) Received: from localhost (ip70-177-190-239.dc.dc.cox.net [70.177.190.239]) (authenticated bits=0) by pittgoth.com (8.13.6/8.13.6) with ESMTP id kA7FRL5i070025 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 7 Nov 2006 10:27:22 -0500 (EST) (envelope-from trhodes@FreeBSD.org) Date: Tue, 7 Nov 2006 10:27:08 -0500 From: Tom Rhodes To: John Baldwin Message-Id: <20061107102708.213d53ca.trhodes@FreeBSD.org> In-Reply-To: <200611070955.17274.jhb@freebsd.org> References: <20061107091128.063d0ae5.trhodes@FreeBSD.org> <200611070955.17274.jhb@freebsd.org> Organization: The FreeBSD Project X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i386-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: trhodes@FreeBSD.org, standards@FreeBSD.org, freebsd-arch@FreeBSD.org Subject: Re: cvs rm sys/posix4 && enable sem X-BeenThere: freebsd-standards@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Standards compliance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 15:27:29 -0000 On Tue, 7 Nov 2006 09:55:16 -0500 John Baldwin wrote: > On Tuesday 07 November 2006 09:11, Tom Rhodes wrote: > > Hi, > > > > I spent some time this morning working over the P1003_1B_SEMAPHORES > > option and figured I might as well play with the task of merging > > posix4/ into regular sys. In light of of this, I also enabled and > > tested on all architectures, the sem module disabled by Alfred > > for some unknown (later learned via old email) reason. > > > > Does anyone object to the following: > > > > 1: Repocopy posix4/* files to sys/sys and sys/kern; > > 2: patch CURRENT for the change; > > 3: remove posix4/*; > > 4: enable sem module; > > 5: add P1003_1B_SEMAPHORES to GENERIC; > > 6: (eventually and maybe) merge psched.h and sched.h (I renamed > > posix4/sched.h to sys/psched.h in this patch). This one is > > completely optional. > > > > The included patch is pretty vanilla and does *most* of this, > > not counting the repo-copy and added P1003_1B_SEMAPHORES to > > GENERIC. It also passes my universe build. This also has the > > side effect of differentiating between the two sched.h files we > > have in the tree. Thanks, > > I think the psched.h rename needs more thought. I think POSIX says that > you include sched.h (not psched.h) for various APIs such as sched_yield(), > sched_setscheduler(), etc. I'd like to merge them and will gladly go that route if people support it. ;) -- Tom Rhodes From owner-freebsd-standards@FreeBSD.ORG Fri Nov 10 03:04:41 2006 Return-Path: X-Original-To: standards@FreeBSD.org Delivered-To: freebsd-standards@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC96B16A403; Fri, 10 Nov 2006 03:04:41 +0000 (UTC) (envelope-from trhodes@FreeBSD.org) Received: from pittgoth.com (ns1.pittgoth.com [216.38.206.188]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2889043D46; Fri, 10 Nov 2006 03:04:41 +0000 (GMT) (envelope-from trhodes@FreeBSD.org) Received: from localhost (net-ix.gw.ai.net [205.134.160.6] (may be forged)) (authenticated bits=0) by pittgoth.com (8.13.6/8.13.6) with ESMTP id kAA34d1Y090497 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 9 Nov 2006 22:04:40 -0500 (EST) (envelope-from trhodes@FreeBSD.org) Date: Thu, 9 Nov 2006 22:04:29 -0500 From: Tom Rhodes To: standards@FreeBSD.org Message-Id: <20061109220429.14b933dd.trhodes@FreeBSD.org> In-Reply-To: <20061107091128.063d0ae5.trhodes@FreeBSD.org> References: <20061107091128.063d0ae5.trhodes@FreeBSD.org> Organization: The FreeBSD Project X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i386-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: arch@FreeBSD.org Subject: New Patch [was: Re: cvs rm sys/posix4 && enable sem] X-BeenThere: freebsd-standards@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Standards compliance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 03:04:41 -0000 On Tue, 7 Nov 2006 09:11:28 -0500 Tom Rhodes wrote: Following up to myself, > Hi, > > I spent some time this morning working over the P1003_1B_SEMAPHORES > option and figured I might as well play with the task of merging > posix4/ into regular sys. In light of of this, I also enabled and > tested on all architectures, the sem module disabled by Alfred > for some unknown (later learned via old email) reason. > > Does anyone object to the following: > > 1: Repocopy posix4/* files to sys/sys and sys/kern; > 2: patch CURRENT for the change; > 3: remove posix4/*; > 4: enable sem module; > 5: add P1003_1B_SEMAPHORES to GENERIC; > 6: (eventually and maybe) merge psched.h and sched.h (I renamed > posix4/sched.h to sys/psched.h in this patch). This one is > completely optional. > > The included patch is pretty vanilla and does *most* of this, > not counting the repo-copy and added P1003_1B_SEMAPHORES to > GENERIC. It also passes my universe build. This also has the > side effect of differentiating between the two sched.h files we > have in the tree. Thanks, > New patch which merges posix4/sched.h and sys/sched.h into the same file. This will add an extra step to my above list of "steps" as, in place of a repo-copy, I'll commit the diff to sys/sched.h with a note. And, because I'm not a lawyer, I also included the posix4/sched.h copyright; I'd prefer to be safe than sorry. I'm sorry for the wait on this new patch; but I wanted to give others a chance to chime in before making major changes. If there are no problems, I would hope to get this in the tree this weekend or perhaps Monday. Yes, it survived another make universe. Thanks, -- Tom Rhodes ? posix.diff ? sys/kern/ksched.c ? sys/kern/p1003_1b.c ? sys/kern/posix4_mib.c ? sys/sys/_semaphore.h ? sys/sys/ksem.h ? sys/sys/posix4.h ? sys/sys/semaphore.h Index: include/Makefile =================================================================== RCS file: /home/ncvs/src/include/Makefile,v retrieving revision 1.265 diff -u -r1.265 Makefile --- include/Makefile 31 Oct 2006 22:22:29 -0000 1.265 +++ include/Makefile 9 Nov 2006 11:06:09 -0000 @@ -36,7 +36,7 @@ LDIRS= bsm cam geom net net80211 netatalk netatm netgraph netinet netinet6 \ netipsec ${_netipx} netkey netnatm ${_netncp} netsmb \ nfs nfsclient nfsserver \ - pccard posix4 sys vm + pccard sys vm LSUBDIRS= cam/scsi \ dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ @@ -111,7 +111,7 @@ INCSLINKS+= machine/$i ${INCLUDEDIR}/$i .endfor .for i in ${PHDRS} -INCSLINKS+= posix4/$i ${INCLUDEDIR}/$i +INCSLINKS+= sys/$i ${INCLUDEDIR}/$i .endfor .if ${MACHINE} != ${MACHINE_ARCH} Index: share/man/man4/sem.4 =================================================================== RCS file: /home/ncvs/src/share/man/man4/sem.4,v retrieving revision 1.2 diff -u -r1.2 sem.4 --- share/man/man4/sem.4 2 Jun 2003 11:19:23 -0000 1.2 +++ share/man/man4/sem.4 9 Nov 2006 11:06:44 -0000 @@ -24,19 +24,26 @@ .\" .\" $FreeBSD: src/share/man/man4/sem.4,v 1.2 2003/06/02 11:19:23 ru Exp $ .\" -.Dd January 14, 2003 +.Dd November 6, 2006 .Dt SEM 4 .Os .Sh NAME .Nm sem .Nd POSIX semaphores .Sh SYNOPSIS -To link into the kernel: +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: .Bd -ragged -offset indent .Cd "options P1003_1B_SEMAPHORES" .Ed .Pp -To load as a kernel loadable module: +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +sem_load="YES" +.Ed .Pp .Dl "kldload sem" .Sh DESCRIPTION @@ -47,6 +54,10 @@ to implement .Tn POSIX semaphores. +This facility offers support for such functions as +.Fn sem_init +and +.Fn sem_wait . It is available both as a kernel option for static inclusion and as a dynamic kernel module. .Sh SEE ALSO @@ -68,3 +79,4 @@ .Nm kernel module appeared in .Fx 5.0 . +.\" XXX: This manual page is weak with details and info. Index: sys/Makefile =================================================================== RCS file: /home/ncvs/src/sys/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- sys/Makefile 10 Aug 2006 06:29:43 -0000 1.38 +++ sys/Makefile 9 Nov 2006 11:06:45 -0000 @@ -11,7 +11,7 @@ CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ isofs kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ - netsmb nfs nfsclient nfs4client rpc pccard pci posix4 sys \ + netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} Index: sys/compat/linux/linux_misc.c =================================================================== RCS file: /home/ncvs/src/sys/compat/linux/linux_misc.c,v retrieving revision 1.192 diff -u -r1.192 linux_misc.c --- sys/compat/linux/linux_misc.c 6 Nov 2006 13:41:49 -0000 1.192 +++ sys/compat/linux/linux_misc.c 9 Nov 2006 11:06:46 -0000 @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -73,8 +74,6 @@ #include #include -#include - #include #include #include Index: sys/conf/files =================================================================== RCS file: /home/ncvs/src/sys/conf/files,v retrieving revision 1.1160 diff -u -r1.1160 files --- sys/conf/files 6 Nov 2006 13:37:18 -0000 1.1160 +++ sys/conf/files 9 Nov 2006 11:06:53 -0000 @@ -1315,6 +1315,7 @@ kern/inflate.c optional gzip kern/init_main.c standard kern/init_sysent.c standard +kern/ksched.c optional _kposix_priority_scheduling kern/kern_acct.c standard kern/kern_acl.c standard kern/kern_alq.c optional alq @@ -1375,6 +1376,8 @@ kern/linker_if.m standard kern/md4c.c optional netsmb kern/md5c.c standard +kern/p1003_1b.c standard +kern/posix4_mib.c standard kern/sched_4bsd.c optional sched_4bsd kern/sched_core.c optional sched_core kern/sched_ule.c optional sched_ule @@ -1919,9 +1922,6 @@ pci/nfsmb.c optional nfsmb pci pci/viapm.c optional viapm pci pci/xrpu.c optional xrpu pci -posix4/ksched.c optional _kposix_priority_scheduling -posix4/p1003_1b.c standard -posix4/posix4_mib.c standard rpc/rpcclnt.c optional nfsclient security/audit/audit.c optional audit security/audit/audit_arg.c optional audit Index: sys/i386/ibcs2/ibcs2_proto.h =================================================================== RCS file: /home/ncvs/src/sys/i386/ibcs2/ibcs2_proto.h,v retrieving revision 1.30 diff -u -r1.30 ibcs2_proto.h --- sys/i386/ibcs2/ibcs2_proto.h 15 Aug 2006 17:37:00 -0000 1.30 +++ sys/i386/ibcs2/ibcs2_proto.h 9 Nov 2006 11:07:02 -0000 @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include Index: sys/i386/ibcs2/ibcs2_xenix.h =================================================================== RCS file: /home/ncvs/src/sys/i386/ibcs2/ibcs2_xenix.h,v retrieving revision 1.21 diff -u -r1.21 ibcs2_xenix.h --- sys/i386/ibcs2/ibcs2_xenix.h 15 Aug 2006 17:37:00 -0000 1.21 +++ sys/i386/ibcs2/ibcs2_xenix.h 9 Nov 2006 11:07:02 -0000 @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include Index: sys/i386/linux/linux_proto.h =================================================================== RCS file: /home/ncvs/src/sys/i386/linux/linux_proto.h,v retrieving revision 1.86 diff -u -r1.86 linux_proto.h --- sys/i386/linux/linux_proto.h 29 Oct 2006 14:12:44 -0000 1.86 +++ sys/i386/linux/linux_proto.h 9 Nov 2006 11:07:02 -0000 @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include Index: sys/kern/Make.tags.inc =================================================================== RCS file: /home/ncvs/src/sys/kern/Make.tags.inc,v retrieving revision 1.15 diff -u -r1.15 Make.tags.inc --- sys/kern/Make.tags.inc 5 Mar 2003 19:24:21 -0000 1.15 +++ sys/kern/Make.tags.inc 9 Nov 2006 11:07:03 -0000 @@ -47,7 +47,6 @@ ${SYS}/netnatm/*.[ch] \ ${SYS}/nfs/*.[ch] \ ${SYS}/pci/*.[ch] \ - ${SYS}/posix4/*.[ch] \ ${SYS}/ufs/ffs/*.[ch] \ ${SYS}/ufs/ufs/*.[ch] \ ${SYS}/vm/*.[ch] \ @@ -64,7 +63,6 @@ ${SYS}/netnatm \ ${SYS}/nfs \ ${SYS}/pci \ - ${SYS}/posix4 \ ${SYS}/vm \ ${SYS}/sys Index: sys/kern/kern_time.c =================================================================== RCS file: /home/ncvs/src/sys/kern/kern_time.c,v retrieving revision 1.135 diff -u -r1.135 kern_time.c --- sys/kern/kern_time.c 6 Nov 2006 13:42:01 -0000 1.135 +++ sys/kern/kern_time.c 9 Nov 2006 11:07:03 -0000 @@ -50,13 +50,12 @@ #include #include #include +#include #include #include #include #include -#include - #include #include Index: sys/kern/makesyscalls.sh =================================================================== RCS file: /home/ncvs/src/sys/kern/makesyscalls.sh,v retrieving revision 1.66 diff -u -r1.66 makesyscalls.sh --- sys/kern/makesyscalls.sh 15 Aug 2006 17:09:32 -0000 1.66 +++ sys/kern/makesyscalls.sh 9 Nov 2006 11:07:03 -0000 @@ -125,7 +125,7 @@ printf "#define\t%s\n\n", sysproto_h > sysarg printf "#include \n" > sysarg printf "#include \n" > sysarg - printf "#include \n" > sysarg + printf "#include \n" > sysarg printf "#include \n\n" > sysarg printf "#include \n\n" > sysarg printf "struct proc;\n\n" > sysarg Index: sys/kern/uipc_mqueue.c =================================================================== RCS file: /home/ncvs/src/sys/kern/uipc_mqueue.c,v retrieving revision 1.17 diff -u -r1.17 uipc_mqueue.c --- sys/kern/uipc_mqueue.c 6 Nov 2006 13:42:01 -0000 1.17 +++ sys/kern/uipc_mqueue.c 9 Nov 2006 11:07:03 -0000 @@ -64,6 +64,7 @@ #include #include #include +#include #include #include #include @@ -79,7 +80,6 @@ #include #include #include -#include /* * Limits and constants Index: sys/kern/uipc_sem.c =================================================================== RCS file: /home/ncvs/src/sys/kern/uipc_sem.c,v retrieving revision 1.26 diff -u -r1.26 uipc_sem.c --- sys/kern/uipc_sem.c 6 Nov 2006 13:42:01 -0000 1.26 +++ sys/kern/uipc_sem.c 9 Nov 2006 11:07:40 -0000 @@ -42,14 +42,17 @@ #include #include #include +#include #include #include +#include #include #include #include #include #include #include +#include #include #include #include @@ -57,11 +60,7 @@ #include #include #include - -#include -#include -#include -#include +#include #include Index: sys/kern/vfs_aio.c =================================================================== RCS file: /home/ncvs/src/sys/kern/vfs_aio.c,v retrieving revision 1.228 diff -u -r1.228 vfs_aio.c --- sys/kern/vfs_aio.c 15 Oct 2006 14:22:13 -0000 1.228 +++ sys/kern/vfs_aio.c 9 Nov 2006 11:07:40 -0000 @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -57,7 +58,6 @@ #include -#include #include #include #include Index: sys/modules/Makefile =================================================================== RCS file: /home/ncvs/src/sys/modules/Makefile,v retrieving revision 1.510 diff -u -r1.510 Makefile --- sys/modules/Makefile 9 Sep 2006 16:58:22 -0000 1.510 +++ sys/modules/Makefile 9 Nov 2006 11:07:41 -0000 @@ -219,6 +219,7 @@ scc \ scd \ ${_scsi_low} \ + sem \ sf \ ${_sio} \ sis \ Index: sys/security/mac/mac_posix_sem.c =================================================================== RCS file: /home/ncvs/src/sys/security/mac/mac_posix_sem.c,v retrieving revision 1.3 diff -u -r1.3 mac_posix_sem.c --- sys/security/mac/mac_posix_sem.c 22 Oct 2006 11:52:18 -0000 1.3 +++ sys/security/mac/mac_posix_sem.c 9 Nov 2006 11:07:49 -0000 @@ -37,14 +37,13 @@ #include #include +#include #include #include #include #include #include -#include - #include #include Index: sys/security/mac_biba/mac_biba.c =================================================================== RCS file: /home/ncvs/src/sys/security/mac_biba/mac_biba.c,v retrieving revision 1.94 diff -u -r1.94 mac_biba.c --- sys/security/mac_biba/mac_biba.c 12 Sep 2006 04:25:12 -0000 1.94 +++ sys/security/mac_biba/mac_biba.c 9 Nov 2006 11:07:49 -0000 @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -66,8 +67,6 @@ #include #include -#include - #include #include Index: sys/security/mac_mls/mac_mls.c =================================================================== RCS file: /home/ncvs/src/sys/security/mac_mls/mac_mls.c,v retrieving revision 1.77 diff -u -r1.77 mac_mls.c --- sys/security/mac_mls/mac_mls.c 12 Sep 2006 04:25:12 -0000 1.77 +++ sys/security/mac_mls/mac_mls.c 9 Nov 2006 11:07:49 -0000 @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -66,8 +67,6 @@ #include #include -#include - #include #include Index: sys/security/mac_stub/mac_stub.c =================================================================== RCS file: /home/ncvs/src/sys/security/mac_stub/mac_stub.c,v retrieving revision 1.57 diff -u -r1.57 mac_stub.c --- sys/security/mac_stub/mac_stub.c 6 Nov 2006 13:45:45 -0000 1.57 +++ sys/security/mac_stub/mac_stub.c 9 Nov 2006 11:07:49 -0000 @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -68,8 +69,6 @@ #include #include -#include - #include #include Index: sys/security/mac_test/mac_test.c =================================================================== RCS file: /home/ncvs/src/sys/security/mac_test/mac_test.c,v retrieving revision 1.63 diff -u -r1.63 mac_test.c --- sys/security/mac_test/mac_test.c 19 Sep 2005 18:52:51 -0000 1.63 +++ sys/security/mac_test/mac_test.c 9 Nov 2006 11:07:49 -0000 @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -63,8 +64,6 @@ #include #include -#include - #include #include Index: sys/sys/sysproto.h =================================================================== RCS file: /home/ncvs/src/sys/sys/sysproto.h,v retrieving revision 1.211 diff -u -r1.211 sysproto.h --- sys/sys/sysproto.h 3 Nov 2006 18:57:49 -0000 1.211 +++ sys/sys/sysproto.h 9 Nov 2006 11:08:05 -0000 @@ -11,8 +11,8 @@ #include #include -#include #include +#include #include Index: sys/sys/thr.h =================================================================== RCS file: /home/ncvs/src/sys/sys/thr.h,v retrieving revision 1.11 diff -u -r1.11 thr.h --- sys/sys/thr.h 22 Sep 2006 15:04:28 -0000 1.11 +++ sys/sys/thr.h 9 Nov 2006 11:08:05 -0000 @@ -30,7 +30,7 @@ #ifndef _SYS_THR_H_ #define _SYS_THR_H_ -#include +#include /* Create the thread in the suspended state. */ #define THR_SUSPENDED 0x0001 Index: sys/sys/sched.h =================================================================== RCS file: /home/ncvs/src/sys/sys/sched.h,v retrieving revision 1.28 diff -u -r1.28 sched.h --- sys/sys/sched.h 26 Oct 2006 21:42:22 -0000 1.28 +++ sys/sys/sched.h 9 Nov 2006 11:38:13 -0000 @@ -1,4 +1,37 @@ /*- + * Copyright (c) 1996, 1997 + * HD Associates, Inc. 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by HD Associates, Inc + * and Jukka Antero Ukkonen. + * 4. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY HD ASSOCIATES 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 HD ASSOCIATES 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. + */ + +/*- * Copyright (c) 2002, Jeffrey Roberson * All rights reserved. * @@ -26,9 +59,10 @@ * $FreeBSD: src/sys/sys/sched.h,v 1.28 2006/10/26 21:42:22 jb Exp $ */ -#ifndef _SYS_SCHED_H_ -#define _SYS_SCHED_H_ +#ifndef _SCHED_H_ +#define _SCHED_H_ +#ifdef _KERNEL /* * General scheduling info. * @@ -138,5 +172,45 @@ void sched_thread_exit(struct thread *td); #endif void sched_newthread(struct thread *td); +#endif /* _KERNEL */ + +/* POSIX 1003.1b Process Scheduling */ -#endif /* !_SYS_SCHED_H_ */ +/* + * POSIX scheduling policies + */ +#define SCHED_FIFO 1 +#define SCHED_OTHER 2 +#define SCHED_RR 3 + +struct sched_param { + int sched_priority; +}; + +/* + * POSIX scheduling declarations for userland. + */ +#ifndef _KERNEL +#include +#include + +#ifndef _PID_T_DECLARED +typedef __pid_t pid_t; +#define _PID_T_DECLARED +#endif + +struct timespec; + +__BEGIN_DECLS +int sched_get_priority_max(int); +int sched_get_priority_min(int); +int sched_getparam(pid_t, struct sched_param *); +int sched_getscheduler(pid_t); +int sched_rr_get_interval(pid_t, struct timespec *); +int sched_setparam(pid_t, const struct sched_param *); +int sched_setscheduler(pid_t, int, const struct sched_param *); +int sched_yield(void); +__END_DECLS + +#endif +#endif /* !_SCHED_H_ */ Index: sys/kern/kern_sig.c =================================================================== RCS file: /home/ncvs/src/sys/kern/kern_sig.c,v retrieving revision 1.335 diff -u -r1.335 kern_sig.c --- sys/kern/kern_sig.c 26 Oct 2006 21:42:19 -0000 1.335 +++ sys/kern/kern_sig.c 9 Nov 2006 11:42:43 -0000 @@ -57,9 +57,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -76,7 +76,6 @@ #include #include -#include #include #include