Libc-391.tar.gz

[apple/libc.git] / threads / lu_utils.c

diff --git a/threads/lu_utils.c b/threads/lu_utils.c
index 850835563f6bd22979770977cc79c2fb2023d7a8..ce686dc1bec7da3bf4d8ff2a07edb37586e38921 100644 (file)
--- a/threads/lu_utils.c
+++ b/threads/lu_utils.c
@@ -42,24 +42,21 @@ mach_port_t _lu_port = MACH_PORT_NULL;
 static name_t LOOKUP_NAME = "lookup daemon v2";
 
 mach_port_t _lookupd_port(mach_port_t port) {
 static name_t LOOKUP_NAME = "lookup daemon v2";
 
 mach_port_t _lookupd_port(mach_port_t port) {

+       kern_return_t ret;
+

        if (port != MACH_PORT_NULL) {
        if (port != MACH_PORT_NULL) {

-               kern_return_t ret;
-               mach_port_t bp;
-               ret = task_get_bootstrap_port(mach_task_self(), &bp);
-               if (ret != KERN_SUCCESS) {
-                       mach_error("task_get_bootstrap_port() failed", ret);
-                       abort();
-               }
-               if (bp == MACH_PORT_NULL) {
-                       mach_error("task_get_bootstrap_port() returned MACH_PORT_NULL!", 0);
-                       return MACH_PORT_NULL;
-               }
-               ret = bootstrap_register(bp, LOOKUP_NAME, port);
+               ret = bootstrap_register(bootstrap_port, LOOKUP_NAME, port);

                if (ret != BOOTSTRAP_SUCCESS) {
                        mach_error("bootstrap_register() failed", ret);
                        abort();
                }
                 return port;
                if (ret != BOOTSTRAP_SUCCESS) {
                        mach_error("bootstrap_register() failed", ret);
                        abort();
                }
                 return port;

+       } else if ((_lu_port == MACH_PORT_NULL) && (getpid() > 1)) {
+               ret = bootstrap_look_up(bootstrap_port, LOOKUP_NAME, &_lu_port);
+               if (ret != BOOTSTRAP_SUCCESS && ret != BOOTSTRAP_UNKNOWN_SERVICE) {
+                       mach_error("bootstrap_look_up() failed", ret);
+                       _lu_port = MACH_PORT_NULL;
+               }

        }
        return _lu_port;
 }
        }
        return _lu_port;
 }


@@ -68,27 +65,7 @@ mach_port_t _lookupd_port(mach_port_t port) {
 void
 _lu_fork_child()
 {
 void
 _lu_fork_child()
 {

-       mach_port_t bp;
-       kern_return_t ret;
-       int pid = getpid();
-

        _lu_port = MACH_PORT_NULL;
        _lu_port = MACH_PORT_NULL;

-       if (pid > 2) {
-               ret = task_get_bootstrap_port(mach_task_self(), &bp);
-               if (ret != KERN_SUCCESS) {
-                       mach_error("task_get_bootstrap_port() failed", ret);
-                       abort();
-               }
-               if (bp == MACH_PORT_NULL) {
-                       fprintf(stderr, "task_get_bootstrap_port() returned MACH_PORT_NULL!\n");
-                       return;
-               }
-               ret = bootstrap_look_up(bp, LOOKUP_NAME, &_lu_port);
-               if (ret != BOOTSTRAP_SUCCESS && ret != BOOTSTRAP_UNKNOWN_SERVICE) {
-                       mach_error("bootstrap_look_up() failed", ret);
-                       _lu_port = MACH_PORT_NULL;
-               }
-       }

 }
 
 void
 }
 
 void


@@ -100,35 +77,9 @@ _lu_setport(mach_port_t desired)
        _lu_port = desired;
 }
 
        _lu_port = desired;
 }
 

-static int
-port_valid(mach_port_t port)
-{
-       mach_port_type_t ptype;
-       kern_return_t ret;
-       
-       ret = mach_port_type(mach_task_self(), port, &ptype);
-       if (ret != KERN_SUCCESS) {
-               mach_error("mach_port_type() failed", ret);
-               return 0;
-       }
-       return 1;
-}
-

 int
 _lu_running(void)
 {
 int
 _lu_running(void)
 {

-       if (_lu_port == MACH_PORT_NULL) {
-               _lu_fork_child();
-       }
-       if (_lu_port != MACH_PORT_NULL) {
-               if (port_valid(_lu_port)) {
-                       return (1);
-               }
-               _lu_fork_child();
-               if (port_valid(_lu_port)) {
-                       return (1);
-               }
-       }
-       return 0;
+       return ((_lu_port != MACH_PORT_NULL) ||
+               (_lookupd_port(MACH_PORT_NULL) != MACH_PORT_NULL));

 }
 }

-