Libc-391.5.22.tar.gz

[apple/libc.git] / mach / mach_init_ports.c

diff --git a/mach/mach_init_ports.c b/mach/mach_init_ports.c
index b178e576595ec747f39148174eb3d1205520d167..71e52cbb00e3d4ea6cf4140b786a682eefc48c15 100644 (file)
--- a/mach/mach_init_ports.c
+++ b/mach/mach_init_ports.c
@@ -1,3 +1,25 @@
+/*
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * 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,
+ * 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@
+ */
 /*
  * @OSF_COPYRIGHT@
  */
@@ -29,12 +51,14 @@
  */
 
 #include <mach/mach.h>
+#include <stdlib.h>
 #include "externs.h"
 
 mach_port_t    bootstrap_port = MACH_PORT_NULL;
 mach_port_t    name_server_port = MACH_PORT_NULL;
 mach_port_t    environment_port = MACH_PORT_NULL;
 mach_port_t    service_port = MACH_PORT_NULL;
+semaphore_t    clock_sem = MACH_PORT_NULL;
 mach_port_t    clock_port = MACH_PORT_NULL;
 mach_port_t thread_recycle_port = MACH_PORT_NULL;
 
@@ -55,25 +79,13 @@ mach_init_ports(void)
        if (kr != KERN_SUCCESS)
            return;
 
-       kr = mach_ports_lookup(mach_task_self(), &ports,
-                              &ports_count);
-       if ((kr != KERN_SUCCESS) ||
-           (ports_count < MACH_PORTS_SLOTS_USED))
-           return;
-
-       name_server_port = ports[NAME_SERVER_SLOT];
-       environment_port = ports[ENVIRONMENT_SLOT];
-       service_port     = ports[SERVICE_SLOT];
-
-       /* get rid of out-of-line data so brk has a chance of working */
-
-       (void) vm_deallocate(mach_task_self(),
-                            (vm_offset_t) ports,
-                            (vm_size_t) (ports_count * sizeof *ports));
-
         /* Get the clock service port for nanosleep */
        host = mach_host_self();
         kr = host_get_clock_service(host, SYSTEM_CLOCK, &clock_port);
+        if (kr != KERN_SUCCESS) {
+            abort();
+       }
+        kr = semaphore_create(mach_task_self(), &clock_sem, SYNC_POLICY_FIFO, 0);
         if (kr != KERN_SUCCESS) {
             abort();
         }
@@ -82,6 +94,25 @@ mach_init_ports(void)
         if (kr != KERN_SUCCESS) {
             abort();
         }
+
+       /*
+        *      Find the options service ports.
+        *      XXX - Don't need these on Darwin, should go away.
+        */
+       kr = mach_ports_lookup(mach_task_self(), &ports,
+                              &ports_count);
+       if (kr == KERN_SUCCESS) {
+               if (ports_count >= MACH_PORTS_SLOTS_USED) {
+                       name_server_port = ports[NAME_SERVER_SLOT];
+                       environment_port = ports[ENVIRONMENT_SLOT];
+                       service_port     = ports[SERVICE_SLOT];
+               }
+
+               /* get rid of out-of-line data */
+               (void) vm_deallocate(mach_task_self(),
+                            (vm_offset_t) ports,
+                            (vm_size_t) (ports_count * sizeof *ports));
+       }
 }
 
 #ifdef notdef