xnu-517.3.15.tar.gz

[apple/xnu.git] / bsd / kern / bsd_init.c

diff --git a/bsd/kern/bsd_init.c b/bsd/kern/bsd_init.c
index 1934f20f9923509504e83aae0ab0eaaf4c03f43f..cc54ea10b65b5eae6d4ecdac5e546d0306ef4b22 100644 (file)
--- a/bsd/kern/bsd_init.c
+++ b/bsd/kern/bsd_init.c
@@ -1,21 +1,24 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -66,13 +69,6 @@
  * All rights reserved.  The CMU software License Agreement specifies
  * the terms and conditions for use and redistribution.
  */
  * All rights reserved.  The CMU software License Agreement specifies
  * the terms and conditions for use and redistribution.
  */

-/*
- * HISTORY
- * 16-Apr-98  A. Ramesh at Apple
- *     Created for Apple Core from DR2 init_main.c.
- */
-
-#include <quota.h>

 
 #include <sys/param.h>
 #include <sys/filedesc.h>
 
 #include <sys/param.h>
 #include <sys/filedesc.h>


@@ -85,7 +81,10 @@
 #include <sys/buf.h>
 #include <sys/clist.h>
 #include <sys/user.h>
 #include <sys/buf.h>
 #include <sys/clist.h>
 #include <sys/user.h>

-#include <ufs/ufs/quota.h>
+#include <sys/time.h>
+#include <sys/systm.h>
+
+#include <sys/kern_audit.h>

 
 #include <sys/malloc.h>
 #include <sys/dkstat.h>
 
 #include <sys/malloc.h>
 #include <sys/dkstat.h>


@@ -100,11 +99,11 @@
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 

-#include <sys/ux_exception.h>
+#include <sys/ux_exception.h>  /* for ux_exception_port */

 
 #include <sys/reboot.h>
 #include <mach/exception_types.h>
 
 #include <sys/reboot.h>
 #include <mach/exception_types.h>

-#include <dev/busvar.h>
+#include <dev/busvar.h>                        /* for pseudo_inits */

 #include <sys/kdebug.h>
 
 #include <mach/mach_types.h>
 #include <sys/kdebug.h>
 
 #include <mach/mach_types.h>


@@ -114,10 +113,15 @@
 #include <kern/clock.h>
 #include <mach/kern_return.h>
 
 #include <kern/clock.h>
 #include <mach/kern_return.h>
 

-extern shared_region_mapping_t       system_shared_region;
+#include <mach/shared_memory_server.h>
+#include <vm/vm_shared_memory_server.h>
+
+extern int app_profile;                /* on/off switch for pre-heat cache */

 
 char    copyright[] =
 
 char    copyright[] =

-"Copyright (c) 1982, 1986, 1989, 1991, 1993\n\tThe Regents of the University of California.  All rights reserved.\n\n";
+"Copyright (c) 1982, 1986, 1989, 1991, 1993\n\t"
+"The Regents of the University of California. "
+"All rights reserved.\n\n";

 
 extern void    ux_handler();
 
 
 extern void    ux_handler();
 


@@ -132,18 +136,6 @@ struct     pstats pstats0;
 struct sigacts sigacts0;
 struct proc *kernproc, *initproc;
 
 struct sigacts sigacts0;
 struct proc *kernproc, *initproc;
 

-
-long cp_time[CPUSTATES];
-long dk_seek[DK_NDRIVE];
-long dk_time[DK_NDRIVE];
-long dk_wds[DK_NDRIVE];
-long dk_wpms[DK_NDRIVE];
-long dk_xfer[DK_NDRIVE];
-long dk_bps[DK_NDRIVE];
-
-int dk_busy;
-int dk_ndrive;
-

 long tk_cancc;
 long tk_nin;
 long tk_nout;
 long tk_cancc;
 long tk_nin;
 long tk_nout;


@@ -160,15 +152,15 @@ dev_t     dumpdev;                /* device to take dumps on */
 long   dumplo;                 /* offset into dumpdev */
 long   hostid;
 char   hostname[MAXHOSTNAMELEN];
 long   dumplo;                 /* offset into dumpdev */
 long   hostid;
 char   hostname[MAXHOSTNAMELEN];

-int    hostnamelen;
+int            hostnamelen;

 char   domainname[MAXDOMNAMELEN];
 char   domainname[MAXDOMNAMELEN];

-int    domainnamelen;
+int            domainnamelen;
+char   classichandler[32] = {0};  
+long   classichandler_fsid = -1L;
+long   classichandler_fileid = -1L;

 
 char rootdevice[16];   /* hfs device names have at least 9 chars */
 struct timeval boottime;               /* GRODY!  This has to go... */
 
 char rootdevice[16];   /* hfs device names have at least 9 chars */
 struct timeval boottime;               /* GRODY!  This has to go... */

-#if FIXME  /* [ */
-struct timeval time;
-#endif  /* FIXME ] */

 
 #ifdef  KMEMSTATS
 struct kmemstats kmemstats[M_LAST];
 
 #ifdef  KMEMSTATS
 struct kmemstats kmemstats[M_LAST];


@@ -178,7 +170,7 @@ int lbolt;                          /* awoken once a second */
 struct vnode *rootvp;
 int boothowto = RB_DEBUG;
 
 struct vnode *rootvp;
 int boothowto = RB_DEBUG;
 

-#define        BSD_PAGABLE_MAP_SIZE    (4 * 512 * 1024)
+#define        BSD_PAGABLE_MAP_SIZE    (16 * 512 * 1024)

 vm_map_t       bsd_pageable_map;
 vm_map_t       mb_map;
 semaphore_t execve_semaphore;
 vm_map_t       bsd_pageable_map;
 vm_map_t       mb_map;
 semaphore_t execve_semaphore;


@@ -187,11 +179,12 @@ int       cmask = CMASK;
 
 int parse_bsd_args(void);
 extern int bsd_hardclockinit;
 
 int parse_bsd_args(void);
 extern int bsd_hardclockinit;

-extern vm_address_t bsd_init_task;
+extern task_t bsd_init_task;

 extern char    init_task_failure_data[];
 extern char    init_task_failure_data[];

+extern void time_zone_slock_init(void);

 
 

-funnel_t * kernel_flock;
-funnel_t * network_flock;
+funnel_t *kernel_flock;
+funnel_t *network_flock;

 int disable_funnel = 0;                /* disables split funnel */
 int enable_funnel = 0;         /* disables split funnel */
 
 int disable_funnel = 0;                /* disables split funnel */
 int enable_funnel = 0;         /* disables split funnel */
 


@@ -201,13 +194,10 @@ int enable_funnel = 0;            /* disables split funnel */
  * soon as a stack and segmentation
  * have been established.
  * Functions:
  * soon as a stack and segmentation
  * have been established.
  * Functions:

- *     clear and free user core

  *     turn on clock
  *     hand craft 0th process
  *     call all initialization routines
  *     turn on clock
  *     hand craft 0th process
  *     call all initialization routines

- *     fork - process 0 to schedule
- *          - process 1 execute bootstrap
- *          - process 2 to page out
+ *  hand craft 1st user process

  */
 
 /*
  */
 
 /*


@@ -225,7 +215,6 @@ proc_name(s, p)
                        length + 1);
 }
 
                        length + 1);
 }
 

-

 /* To allow these values to be patched, they're globals here */
 #include <machine/vmparam.h>
 struct rlimit vm_initial_limit_stack = { DFLSSIZ, MAXSSIZ };
 /* To allow these values to be patched, they're globals here */
 #include <machine/vmparam.h>
 struct rlimit vm_initial_limit_stack = { DFLSSIZ, MAXSSIZ };


@@ -233,15 +222,13 @@ struct rlimit vm_initial_limit_data = { DFLDSIZ, MAXDSIZ };
 struct rlimit vm_initial_limit_core = { DFLCSIZ, MAXCSIZ };
 
 extern thread_t first_thread;
 struct rlimit vm_initial_limit_core = { DFLCSIZ, MAXCSIZ };
 
 extern thread_t first_thread;

+extern thread_act_t    cloneproc(struct proc *, int);
+extern int     (*mountroot) __P((void));
+extern int     netboot_mountroot();    /* netboot.c */
+extern int     netboot_setup(struct proc * p);

 
 

-#define SPL_DEBUG      0
-#if    SPL_DEBUG
-#define        dprintf(x)      printf x
-#else  SPL_DEBUG
-#define dprintf(x)
-#endif /* SPL_DEBUG */
-
-extern thread_t        cloneproc(struct proc *, int);
+/* hook called after root is mounted XXX temporary hack */
+void (*mountroot_post_hook)(void);

 
 void
 bsd_init()
 
 void
 bsd_init()


@@ -251,46 +238,31 @@ bsd_init()
        register int i;
        int s;
        thread_t        th;
        register int i;
        int s;
        thread_t        th;

-       extern void     bsdinit_task();

        void            lightning_bolt(void );
        kern_return_t   ret;
        boolean_t funnel_state;
        extern void uthread_zone_init();
 
        void            lightning_bolt(void );
        kern_return_t   ret;
        boolean_t funnel_state;
        extern void uthread_zone_init();
 

-       extern int (*mountroot) __P((void));
-

 
 

-#if 1

        /* split funnel is enabled by default */
        PE_parse_boot_arg("dfnl", &disable_funnel);
        /* split funnel is enabled by default */
        PE_parse_boot_arg("dfnl", &disable_funnel);

-#else
-       /* split funnel is disabled befault */
-       disable_funnel = 1;
-       PE_parse_boot_arg("efnl", &enable_funnel);
-       if (enable_funnel)  {
-                       /* enable only if efnl is set in bootarg */
-                       disable_funnel = 0;
-       }
-#endif

 
        kernel_flock = funnel_alloc(KERNEL_FUNNEL);
        if (kernel_flock == (funnel_t *)0 ) {
 
        kernel_flock = funnel_alloc(KERNEL_FUNNEL);
        if (kernel_flock == (funnel_t *)0 ) {

-               panic("bsd_init: Fail to allocate kernel mutex lock");
+               panic("bsd_init: Failed to allocate kernel funnel");

        }
         
        }
         

-        

        funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
        if (!disable_funnel) {
                network_flock = funnel_alloc(NETWORK_FUNNEL);
                if (network_flock == (funnel_t *)0 ) {
        funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
        if (!disable_funnel) {
                network_flock = funnel_alloc(NETWORK_FUNNEL);
                if (network_flock == (funnel_t *)0 ) {

-                       panic("bds_init: Fail to allocate network mutex lock");
+                       panic("bsd_init: Failed to allocate network funnel");

                }
        } else {
                network_flock = kernel_flock;
        }
 
                }
        } else {
                network_flock = kernel_flock;
        }
 

-        

        printf(copyright);
 
        kmeminit();
        printf(copyright);
 
        kmeminit();


@@ -312,14 +284,15 @@ bsd_init()
        p = kernproc;
 
        /* kernel_task->proc = kernproc; */
        p = kernproc;
 
        /* kernel_task->proc = kernproc; */

-       set_bsdtask_info(kernel_task,(void *)kernproc);
+       set_bsdtask_info(kernel_task,(void *)p);

        p->p_pid = 0;
 
        /* give kernproc a name */
        proc_name("kernel_task", p);
 
        if (current_task() != kernel_task)
        p->p_pid = 0;
 
        /* give kernproc a name */
        proc_name("kernel_task", p);
 
        if (current_task() != kernel_task)

-               printf("We are in for problem, current task in not kernel task\n");
+               printf("bsd_init: We have a problem, "
+                               "current task is not kernel task\n");

        
        /*
         * Create process 0.
        
        /*
         * Create process 0.


@@ -341,6 +314,7 @@ bsd_init()
        p->p_nice = NZERO;
        p->p_pptr = p;
        lockinit(&p->signal_lock, PVM, "signal", 0, 0);
        p->p_nice = NZERO;
        p->p_pptr = p;
        lockinit(&p->signal_lock, PVM, "signal", 0, 0);

+       TAILQ_INIT(&p->p_uthlist);

        p->sigwait = FALSE;
        p->sigwait_thread = THREAD_NULL;
        p->exit_thread = THREAD_NULL;
        p->sigwait = FALSE;
        p->sigwait_thread = THREAD_NULL;
        p->exit_thread = THREAD_NULL;


@@ -351,11 +325,23 @@ bsd_init()
        p->p_cred = &cred0;
        p->p_ucred = crget();
        p->p_ucred->cr_ngroups = 1;     /* group 0 */
        p->p_cred = &cred0;
        p->p_ucred = crget();
        p->p_ucred->cr_ngroups = 1;     /* group 0 */

+       
+       TAILQ_INIT(&p->aio_activeq);
+       TAILQ_INIT(&p->aio_doneq);
+       p->aio_active_count = 0;
+       p->aio_done_count = 0;
+
+       /* Set the audit info for this process */
+       audit_proc_init(p);

 
        /* Create the file descriptor table. */
        filedesc0.fd_refcnt = 1+1;      /* +1 so shutdown will not _FREE_ZONE */
        p->p_fd = &filedesc0;
        filedesc0.fd_cmask = cmask;
 
        /* Create the file descriptor table. */
        filedesc0.fd_refcnt = 1+1;      /* +1 so shutdown will not _FREE_ZONE */
        p->p_fd = &filedesc0;
        filedesc0.fd_cmask = cmask;

+       filedesc0.fd_knlistsize = -1;
+       filedesc0.fd_knlist = NULL;
+       filedesc0.fd_knhash = NULL;
+       filedesc0.fd_knhashmask = 0;

 
        /* Create the limits structures. */
        p->p_limit = &limit0;
 
        /* Create the limits structures. */
        p->p_limit = &limit0;


@@ -364,6 +350,7 @@ bsd_init()
                        limit0.pl_rlimit[i].rlim_max = RLIM_INFINITY;
        limit0.pl_rlimit[RLIMIT_NOFILE].rlim_cur = NOFILE;
        limit0.pl_rlimit[RLIMIT_NPROC].rlim_cur = MAXUPRC;
                        limit0.pl_rlimit[i].rlim_max = RLIM_INFINITY;
        limit0.pl_rlimit[RLIMIT_NOFILE].rlim_cur = NOFILE;
        limit0.pl_rlimit[RLIMIT_NPROC].rlim_cur = MAXUPRC;

+       limit0.pl_rlimit[RLIMIT_NPROC].rlim_max = maxproc;

        limit0.pl_rlimit[RLIMIT_STACK] = vm_initial_limit_stack;
        limit0.pl_rlimit[RLIMIT_DATA] = vm_initial_limit_data;
        limit0.pl_rlimit[RLIMIT_CORE] = vm_initial_limit_core;
        limit0.pl_rlimit[RLIMIT_STACK] = vm_initial_limit_stack;
        limit0.pl_rlimit[RLIMIT_DATA] = vm_initial_limit_data;
        limit0.pl_rlimit[RLIMIT_CORE] = vm_initial_limit_core;


@@ -377,7 +364,6 @@ bsd_init()
         */
        (void)chgproccnt(0, 1);
 
         */
        (void)chgproccnt(0, 1);
 

-       

        /*
         *      Allocate a kernel submap for pageable memory
         *      for temporary copying (execve()).
        /*
         *      Allocate a kernel submap for pageable memory
         *      for temporary copying (execve()).


@@ -391,22 +377,15 @@ bsd_init()
                                TRUE,
                                TRUE,
                                &bsd_pageable_map);
                                TRUE,
                                TRUE,
                                &bsd_pageable_map);

-       if (ret != KERN_SUCCESS) 
-               panic("bsd_init: Failed to allocare bsd pageable map");
+               if (ret != KERN_SUCCESS) 
+                       panic("bsd_init: Failed to allocate bsd pageable map");

        }
 
        /* Initialize the execve() semaphore */
        }
 
        /* Initialize the execve() semaphore */

-       {
-               kern_return_t kret;
-               int value;
-
-               value = BSD_PAGABLE_MAP_SIZE / NCARGS;
-
-               kret = semaphore_create(kernel_task, &execve_semaphore,
-                               SYNC_POLICY_FIFO, value);
-               if (kret != KERN_SUCCESS)
-                       panic("bsd_init: Failed to create execve semaphore");
-       }
+       ret = semaphore_create(kernel_task, &execve_semaphore,
+                       SYNC_POLICY_FIFO, (BSD_PAGABLE_MAP_SIZE / NCARGS));
+       if (ret != KERN_SUCCESS)
+               panic("bsd_init: Failed to create execve semaphore");

 
        /*
         * Initialize the calendar.
 
        /*
         * Initialize the calendar.


@@ -424,33 +403,38 @@ bsd_init()
        /* Initialize syslog */
        log_init();
 
        /* Initialize syslog */
        log_init();
 

-       /* Initialize SysV shm */
-       shminit();
+       /*
+        * Initializes security event auditing.
+        * XXX: Should/could this occur later?
+        */
+       audit_init();  
+
+       /* Initialize kqueues */
+       knote_init();
+
+       /* Initialize for async IO */
+       aio_init();
+
+       /* POSIX Shm and Sem */
+       pshm_cache_init();
+       psem_cache_init();
+       time_zone_slock_init();

 
 

-        /* POSIX Shm and Sem */
-        pshm_cache_init();
-        psem_cache_init();
-        

        /*
         * Initialize protocols.  Block reception of incoming packets
         * until everything is ready.
         */
        s = splimp();
        sysctl_register_fixed(); 
        /*
         * Initialize protocols.  Block reception of incoming packets
         * until everything is ready.
         */
        s = splimp();
        sysctl_register_fixed(); 

+       sysctl_mib_init();

        dlil_init();
        socketinit();
        domaininit();
        splx(s);
 
        dlil_init();
        socketinit();
        domaininit();
        splx(s);
 

-       /*
-        *      Create kernel idle cpu processes.  This must be done
-        *      before a context switch can occur (and hence I/O can
-        *      happen in the binit() call).
-        */

        p->p_fd->fd_cdir = NULL;
        p->p_fd->fd_rdir = NULL;
 
        p->p_fd->fd_cdir = NULL;
        p->p_fd->fd_rdir = NULL;
 

-

 #ifdef GPROF
        /* Initialize kernel profiling. */
        kmstartup();
 #ifdef GPROF
        /* Initialize kernel profiling. */
        kmstartup();


@@ -458,7 +442,7 @@ bsd_init()
 
        /* kick off timeout driven events by calling first time */
        thread_wakeup(&lbolt);
 
        /* kick off timeout driven events by calling first time */
        thread_wakeup(&lbolt);

-       timeout(lightning_bolt,0,hz);
+       timeout((void (*)(void *))lightning_bolt, 0, hz);

 
        bsd_autoconf();
 
 
        bsd_autoconf();
 


@@ -471,6 +455,9 @@ bsd_init()
 #if NLOOP > 0
        loopattach();                   /* XXX */
 #endif
 #if NLOOP > 0
        loopattach();                   /* XXX */
 #endif

+        
+        /* Register the built-in dlil ethernet interface family */
+       ether_family_init();

 
        vnode_pager_bootstrap();
 
 
        vnode_pager_bootstrap();
 


@@ -483,10 +470,18 @@ bsd_init()
                 * read the time after clock_initialize_calendar()
                 * and before nfs mount
                 */
                 * read the time after clock_initialize_calendar()
                 * and before nfs mount
                 */

-               microtime(&time);
+               microtime((struct timeval  *)&time);
+
+               bsd_hardclockinit = -1; /* start ticking */

 
                if (0 == (err = vfs_mountroot()))
                        break;
 
                if (0 == (err = vfs_mountroot()))
                        break;

+               if (mountroot == netboot_mountroot) {
+                       printf("cannot mount network root, errno = %d\n", err);
+                       mountroot = NULL;
+                       if (0 == (err = vfs_mountroot()))
+                               break;
+               }

                printf("cannot mount root, errno = %d\n", err);
                boothowto |= RB_ASKNAME;
        }
                printf("cannot mount root, errno = %d\n", err);
                boothowto |= RB_ASKNAME;
        }


@@ -496,9 +491,17 @@ bsd_init()
        /* Get the vnode for '/'.  Set fdp->fd_fd.fd_cdir to reference it. */
        if (VFS_ROOT(mountlist.cqh_first, &rootvnode))
                panic("bsd_init: cannot find root vnode");
        /* Get the vnode for '/'.  Set fdp->fd_fd.fd_cdir to reference it. */
        if (VFS_ROOT(mountlist.cqh_first, &rootvnode))
                panic("bsd_init: cannot find root vnode");

-       filedesc0.fd_cdir = rootvnode;

        VREF(rootvnode);
        VREF(rootvnode);

+       filedesc0.fd_cdir = rootvnode;

        VOP_UNLOCK(rootvnode, 0, p);
        VOP_UNLOCK(rootvnode, 0, p);

+
+       if (mountroot == netboot_mountroot) {
+               int err;
+               /* post mount setup */
+               if (err = netboot_setup(p)) {
+                       panic("bsd_init: NetBoot could not find root, %d", err);
+               }
+       }

        
 
        /*
        
 
        /*


@@ -509,63 +512,39 @@ bsd_init()
        p->p_stats->p_start = boottime = time;
        p->p_rtime.tv_sec = p->p_rtime.tv_usec = 0;
 
        p->p_stats->p_start = boottime = time;
        p->p_rtime.tv_sec = p->p_rtime.tv_usec = 0;
 

-#ifdef DEVFS
+#if DEVFS

        {
            extern void devfs_kernel_mount(char * str);
            
            devfs_kernel_mount("/dev");
        }
        {
            extern void devfs_kernel_mount(char * str);
            
            devfs_kernel_mount("/dev");
        }

-#endif DEVFS
+#endif /* DEVFS */

        
        /* Initialize signal state for process 0. */
        siginit(p);
 
        
        /* Initialize signal state for process 0. */
        siginit(p);
 

-       /* printf("Launching user process\n"); */
-

        bsd_utaskbootstrap();
 
        bsd_utaskbootstrap();
 

-       (void) thread_funnel_set(kernel_flock, FALSE);
+       /* invoke post-root-mount hook */
+       if (mountroot_post_hook != NULL)
+               mountroot_post_hook();
+       
+       (void) thread_funnel_set(kernel_flock, funnel_state);

 }
 
 }
 

+/* Called with kernel funnel held */

 void
 void

-bsdinit_task()
+bsdinit_task(void)

 {
        struct proc *p = current_proc();
        struct uthread *ut;
        kern_return_t   kr;
        thread_act_t th_act;
 {
        struct proc *p = current_proc();
        struct uthread *ut;
        kern_return_t   kr;
        thread_act_t th_act;

-       boolean_t funnel_state;
+       shared_region_mapping_t system_region;

 
 

-       funnel_state = thread_funnel_set(kernel_flock, TRUE);
-
-#if FIXME  /* [ */
-
-       ipc_port_t      master_bootstrap_port;
-       task_t          bootstrap_task;
-       thread_act_t    bootstrap_thr_act;
-       ipc_port_t      root_device_port;
-
-       master_bootstrap_port = ipc_port_alloc_kernel();
-       if (master_bootstrap_port == IP_NULL)
-               panic("can't allocate master bootstrap port");
-       printf("setting bootstrap port \n");
-       task_set_special_port(bootstrap_task,
-                             TASK_BOOTSTRAP_PORT,
-                             ipc_port_make_send(master_bootstrap_port));
-       
-       printf("Setting exception port for the init task\n");
-       (void) task_set_exception_ports(get_threadtask(th),
-                                       EXC_MASK_ALL &
-                                       ~(EXC_MASK_SYSCALL |
-                         EXC_MASK_MACH_SYSCALL | EXC_MASK_RPC_ALERT),
-                                       ux_exception_port,
-                                       EXCEPTION_DEFAULT, 0);
-
-#endif /* FIXME  ] */

        proc_name("init", p);
 
        ux_handler_init();
        proc_name("init", p);
 
        ux_handler_init();

-       /* port_reference(ux_exception_port);*/

 
        th_act = current_act();
        (void) host_set_exception_ports(host_priv_self(),
 
        th_act = current_act();
        (void) host_set_exception_ports(host_priv_self(),


@@ -591,11 +570,17 @@ bsdinit_task()
        bsd_hardclockinit = 1;  /* Start bsd hardclock */
        bsd_init_task = get_threadtask(th_act);
        init_task_failure_data[0] = 0;
        bsd_hardclockinit = 1;  /* Start bsd hardclock */
        bsd_init_task = get_threadtask(th_act);
        init_task_failure_data[0] = 0;

-       vm_set_shared_region(get_threadtask(th_act), system_shared_region);
+       system_region = lookup_default_shared_region(ENV_DEFAULT_ROOT,
+                               machine_slot[cpu_number()].cpu_type);
+        if (system_region == NULL) {
+               shared_file_boot_time_init(ENV_DEFAULT_ROOT,
+                               machine_slot[cpu_number()].cpu_type);
+       } else {
+               vm_set_shared_region(get_threadtask(th_act), system_region);
+       }

        load_init_program(p);
        load_init_program(p);

-
-       (void) thread_funnel_set(kernel_flock, FALSE);
-       
+       /* turn on app-profiling i.e. pre-heating */
+       app_profile = 1;

 }
 
 void
 }
 
 void


@@ -613,8 +598,9 @@ lightning_bolt()
        (void) thread_funnel_set(kernel_flock, FALSE);
 }
 
        (void) thread_funnel_set(kernel_flock, FALSE);
 }
 

-bsd_autoconf(){
-        extern kern_return_t IOKitBSDInit( void );
+bsd_autoconf()
+{
+       extern kern_return_t IOKitBSDInit( void );

 
        kminit();
 
 
        kminit();
 


@@ -628,20 +614,16 @@ bsd_autoconf(){
                (*pi->ps_func) (pi->ps_count);
        }
 
                (*pi->ps_func) (pi->ps_count);
        }
 

-        return( IOKitBSDInit());
+       return( IOKitBSDInit());

 }
 
 
 }
 
 

-#include <sys/disklabel.h>  // for MAXPARTITIONS
+#include <sys/disklabel.h>  /* for MAXPARTITIONS */

 
 setconf()
 {      
        extern kern_return_t IOFindBSDRoot( char * rootName,
                                dev_t * root, u_int32_t * flags );
 
 setconf()
 {      
        extern kern_return_t IOFindBSDRoot( char * rootName,
                                dev_t * root, u_int32_t * flags );

-
-       extern int      (*mountroot) __P((void));
-       extern int      nfs_mountroot();        /* nfs_vfsops.c */
-

        u_int32_t       flags;
        kern_return_t   err;
 
        u_int32_t       flags;
        kern_return_t   err;
 


@@ -661,10 +643,9 @@ setconf()
                flags = 0;
        }
 
                flags = 0;
        }
 

-       /* if network device then force nfs root */

        if( flags & 1 ) {
        if( flags & 1 ) {

-               printf("mounting nfs root\n");
-               mountroot = nfs_mountroot;
+               /* network device */
+               mountroot = netboot_mountroot;

        } else {
                /* otherwise have vfs determine root filesystem */
                mountroot = NULL;
        } else {
                /* otherwise have vfs determine root filesystem */
                mountroot = NULL;


@@ -675,14 +656,16 @@ setconf()
 bsd_utaskbootstrap()
 {
        thread_act_t th_act;
 bsd_utaskbootstrap()
 {
        thread_act_t th_act;

+       struct uthread *ut;

 
 

-       th_act = (thread_act_t)cloneproc(kernproc, 0);
+       th_act = cloneproc(kernproc, 0);

        initproc = pfind(1);                            
        initproc = pfind(1);                            

-       thread_hold(th_act);
-       (void) thread_stop_wait(getshuttle_thread(th_act));
-       thread_ast_set(th_act,AST_BSD_INIT);
-       thread_release(th_act);
-       thread_unstop(getshuttle_thread(th_act));
+       /* Set the launch time for init */
+       initproc->p_stats->p_start = time;
+
+       ut = (struct uthread *)get_bsdthread_info(th_act);
+       ut->uu_sigmask = 0;
+       act_set_astbsd(th_act);

        (void) thread_resume(th_act);
 }
 
        (void) thread_resume(th_act);
 }
 


@@ -704,6 +687,7 @@ parse_bsd_args()
                else
                        strcat(init_args,"-s");
        }
                else
                        strcat(init_args,"-s");
        }

+

        if (PE_parse_boot_arg("-b", namep)) {
                boothowto |= RB_NOBOOTRC;
                len = strlen(init_args);
        if (PE_parse_boot_arg("-b", namep)) {
                boothowto |= RB_NOBOOTRC;
                len = strlen(init_args);


@@ -737,6 +721,14 @@ parse_bsd_args()
                        strcat(init_args,"-x");
        }
 
                        strcat(init_args,"-x");
        }
 

+       if (PE_parse_boot_arg("-d", namep)) {
+               len = strlen(init_args);
+               if(len != 0)
+                       strcat(init_args," -d");
+               else
+                       strcat(init_args,"-d");
+       }
+

        PE_parse_boot_arg("srv", &srv);
        PE_parse_boot_arg("ncl", &ncl);
        PE_parse_boot_arg("nbuf", &nbuf);
        PE_parse_boot_arg("srv", &srv);
        PE_parse_boot_arg("ncl", &ncl);
        PE_parse_boot_arg("nbuf", &nbuf);


@@ -749,7 +741,6 @@ thread_funnel_switch(
         int    oldfnl,
        int     newfnl)
 {
         int    oldfnl,
        int     newfnl)
 {

-       thread_t        cur_thread;

        boolean_t       funnel_state_prev;
        int curfnl;
        funnel_t * curflock;
        boolean_t       funnel_state_prev;
        int curfnl;
        funnel_t * curflock;


@@ -766,26 +757,22 @@ thread_funnel_switch(
             panic("thread_funnel_switch: can't switch to same funnel");
         }
         
             panic("thread_funnel_switch: can't switch to same funnel");
         }
         

-        if ((oldfnl != NETWORK_FUNNEL) && (oldfnl != KERNEL_FUNNEL))
-        {
+        if ((oldfnl != NETWORK_FUNNEL) && (oldfnl != KERNEL_FUNNEL)) {

             panic("thread_funnel_switch: invalid oldfunnel");
         }
             panic("thread_funnel_switch: invalid oldfunnel");
         }

-        if ((newfnl != NETWORK_FUNNEL) && (newfnl != KERNEL_FUNNEL))
-        {
-            panic("thread_funnel_switch: invalid oldfunnel");
+        if ((newfnl != NETWORK_FUNNEL) && (newfnl != KERNEL_FUNNEL)) {
+            panic("thread_funnel_switch: invalid newfunnel");

         }
         
        if((curflock = thread_funnel_get()) == THR_FUNNEL_NULL) {
             panic("thread_funnel_switch: no funnel held");
        }
         
         }
         
        if((curflock = thread_funnel_get()) == THR_FUNNEL_NULL) {
             panic("thread_funnel_switch: no funnel held");
        }
         

-       cur_thread = current_thread();
-        

         if ((oldfnl == NETWORK_FUNNEL) && (curflock != network_flock))
             panic("thread_funnel_switch: network funnel not held");
             
         if ((oldfnl == KERNEL_FUNNEL) && (curflock != kernel_flock))
         if ((oldfnl == NETWORK_FUNNEL) && (curflock != network_flock))
             panic("thread_funnel_switch: network funnel not held");
             
         if ((oldfnl == KERNEL_FUNNEL) && (curflock != kernel_flock))

-            panic("thread_funnel_switch: network funnel not held");
+            panic("thread_funnel_switch: kernel funnel not held");

 
         if(oldfnl == NETWORK_FUNNEL) {
             oldflock = network_flock;
 
         if(oldfnl == NETWORK_FUNNEL) {
             oldflock = network_flock;