From 88382234bb540544a3550d1ddfb84e0d17eec971 Mon Sep 17 00:00:00 2001 From: Richard Braun Date: Sat, 17 Dec 2011 21:43:48 +0000 Subject: Remove arbitrary limits used by the zone system The zone allocator could limit the size of its zones to an arbitrary value set at zinit() time. There is no such parameter with the slab module. As a result of removing those limits, the kern/mach_param.h header becomes empty, and is simply removed altogether. * Makefrag.am (libkernel_a_SOURCES): Remove kern/mach_param.h. * i386/i386/fpu.c: Remove #include . * i386/i386/machine_task.c: Likewise. * i386/i386/pcb.c: Likewise. * ipc/ipc_init.c: Likewise. (ipc_space_max): Remove variable. (ipc_tree_entry_max): Likewise. (ipc_port_max): Likewise. (ipc_pset_max): Likewise. * ipc/ipc_init.h (IPC_ZONE_TYPE): Remove macro. (ipc_space_max): Remove extern declaration. (ipc_tree_entry_max): Likewise. (ipc_port_max): Likewise. (ipc_pset_max): Likewise. * ipc/ipc_hash.c (ipc_hash_init): Don't use ipc_tree_entry_max to compute ipc_hash_global_size. * ipc/ipc_marequest.c: Remove #include . (ipc_marequest_max): Remove variable. (ipc_marequest_init): Don't use ipc_marequest_max to compute ipc_marequest_size. (ipc_marequest_info): Return (unsigned int)-1 in maxp. * kern/act.c: Remove #include . * kern/mach_clock.c: Likewise. * kern/priority.c: Likewise. * kern/task.c: Likewise. * kern/thread.c: Likewise. * vm/memory_object_proxy.c: Likewise. * vm/vm_fault.c: Likewise. --- kern/act.c | 1 - kern/mach_clock.c | 1 - kern/mach_param.h | 67 ------------------------------------------------------- kern/priority.c | 1 - kern/task.c | 1 - kern/thread.c | 1 - 6 files changed, 72 deletions(-) delete mode 100644 kern/mach_param.h (limited to 'kern') diff --git a/kern/act.c b/kern/act.c index f4f1e31..36fa79c 100644 --- a/kern/act.c +++ b/kern/act.c @@ -30,7 +30,6 @@ #include #include -#include /* XXX INCALL_... */ #include #include #include diff --git a/kern/mach_clock.c b/kern/mach_clock.c index 050f088..edf87f0 100644 --- a/kern/mach_clock.c +++ b/kern/mach_clock.c @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include diff --git a/kern/mach_param.h b/kern/mach_param.h deleted file mode 100644 index 10376d8..0000000 --- a/kern/mach_param.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Mach Operating System - * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University. - * Copyright (c) 1993,1994 The University of Utah and - * the Computer Systems Laboratory (CSL). - * 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, THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF - * THIS SOFTWARE IN ITS "AS IS" CONDITION, AND DISCLAIM 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. - */ -/* - * File: kern/mach_param.h - * Author: Avadis Tevanian, Jr., Michael Wayne Young - * Date: 1986 - * - * Mach system sizing parameters - * - */ - -#ifndef _KERN_MACH_PARAM_H_ -#define _KERN_MACH_PARAM_H_ - -#define THREAD_MAX 1024 /* Max number of threads */ -#define THREAD_CHUNK 64 /* Allocation chunk */ - -#define TASK_MAX 1024 /* Max number of tasks */ -#define TASK_CHUNK 64 /* Allocation chunk */ - -#define ACT_MAX 1024 /* Max number of acts */ -#define ACT_CHUNK 64 /* Allocation chunk */ - -#define ACTPOOL_MAX 1024 -#define ACTPOOL_CHUNK 64 - -#define PORT_MAX ((TASK_MAX * 3 + THREAD_MAX) /* kernel */ \ - + (THREAD_MAX * 2) /* user */ \ - + 40000) /* slop for objects */ - /* Number of ports, system-wide */ - -#define SET_MAX (TASK_MAX + THREAD_MAX + 200) - /* Max number of port sets */ - -#define ITE_MAX (1 << 16) /* Max number of splay tree entries */ - -#define SPACE_MAX (TASK_MAX + 5) /* Max number of IPC spaces */ - -#define IMAR_MAX (1 << 10) /* Max number of msg-accepted reqs */ - -#endif /* _KERN_MACH_PARAM_H_ */ diff --git a/kern/priority.c b/kern/priority.c index feddd8e..17541b8 100644 --- a/kern/priority.c +++ b/kern/priority.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include diff --git a/kern/task.c b/kern/task.c index b1381ed..2624dd9 100644 --- a/kern/task.c +++ b/kern/task.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/kern/thread.c b/kern/thread.c index 0a59f07..74e1c4b 100644 --- a/kern/thread.c +++ b/kern/thread.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include -- cgit v1.2.3