diff options
| -rw-r--r-- | libthreads/cthreads.h | 9 | ||||
| -rw-r--r-- | libthreads/options.h | 44 |
2 files changed, 36 insertions, 17 deletions
diff --git a/libthreads/cthreads.h b/libthreads/cthreads.h index 979b43ca..d3b6c290 100644 --- a/libthreads/cthreads.h +++ b/libthreads/cthreads.h @@ -34,6 +34,13 @@ * macros. They take one argument: a name string. * * $Log: cthreads.h,v $ + * Revision 1.19 2002/05/28 23:55:58 roland + * 2002-05-28 Roland McGrath <roland@frob.com> + * + * * cthreads.h (hurd_condition_wait, condition_implies, + * condition_unimplies): Restore decls lost in merge. + * (mutex_clear): Define as mutex_init instead of bogon (lost in merge). + * * Revision 1.18 2002/05/27 02:50:10 roland * 2002-05-26 Roland McGrath <roland@frob.com> * @@ -230,8 +237,6 @@ #ifndef _CTHREADS_ #define _CTHREADS_ 1 -#define WAIT_DEBUG /* XXX should be defined somewhere else */ - #if 0 /* This is CMU's machine-dependent file. In GNU all of the machine dependencies are dealt with in libc. */ diff --git a/libthreads/options.h b/libthreads/options.h index 952720de..b8074693 100644 --- a/libthreads/options.h +++ b/libthreads/options.h @@ -1,57 +1,71 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ /* * HISTORY - * $Log: options.h,v $ + * $Log: options.h,v $ + * Revision 1.2 2002/05/27 02:50:10 roland + * 2002-05-26 Roland McGrath <roland@frob.com> + * + * Changes merged from CMU MK83a version: + * * cthreads.h, options.h: Various cleanups. + * * call.c, cthread_data.c, sync.c, mig_support.c: Likewise. + * * i386/cthreads.h, i386/thread.c, i386/lock.s: Likewise. + * * cthread_internals.h: Add decls for internal functions. + * (struct cproc): Use vm_offset_t for stack_base and stack_size members. + * Use natural_t for context member. + * * cprocs.c: Use prototypes for all defns. + * * cthreads.c: Likewise. + * (cthread_exit): Cast any_t to integer_t before int. + * * Revision 2.8 91/05/14 17:58:35 mrt * Correcting copyright - * + * * Revision 2.7 91/02/14 14:21:03 mrt * Added new Mach copyright * [91/02/13 12:41:31 mrt] - * + * * Revision 2.6 90/09/09 14:35:04 rpd * Remove special option , debug_mutex and thread_calls. * [90/08/24 rwd] - * + * * Revision 2.5 90/06/02 15:14:14 rpd * Removed RCS Source, Header lines. * [90/05/03 00:07:27 rpd] - * + * * Revision 2.4 90/03/14 21:12:15 rwd * Added new option: * WAIT_DEBUG: keep track of who a blocked thread is * waiting for. * [90/03/01 rwd] - * + * * Revision 2.3 90/01/19 14:37:25 rwd * New option: * THREAD_CALLS: cthread_* version of thread_* calls. * [90/01/03 rwd] - * + * * Revision 2.2 89/12/08 19:54:09 rwd * Added code: * MUTEX_SPECIAL: Have extra kernel threads available for @@ -77,7 +91,7 @@ * [89/11/13 rwd] * Added copyright. Removed all options. * [89/10/23 rwd] - * + * */ /* * options.h @@ -87,4 +101,4 @@ #define SPIN_RESCHED /*#define CHECK_STATUS*/ /*#define RED_ZONE*/ -#define WAIT_DEBUG +/*#define WAIT_DEBUG*/ |