Changeset bfd1546 in mainline for uspace/lib/libc

Timestamp:

2009-02-15T00:01:06Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

08b777e

Parents:

4cac212c

Message:

More elegant way of invoking the loader - as a 'cloneable' service. Task names functionality lost for the time being.

Location:

uspace/lib/libc

Files:

• generic/loader.c (modified) (3 diffs)
• generic/task.c (modified) (2 diffs)
• include/ipc/services.h (modified) (1 diff)
• include/loader/loader.h (modified) (1 diff)

uspace/lib/libc/generic/loader.c

@@ -35 +35 @@
 #include <ipc/ipc.h>
 #include <ipc/loader.h>
+#include <ipc/services.h>
 #include <libc.h>
 #include <task.h>
@@ -51 +52 @@
  *              de-allocated using free() after use).
  */
-loader_t *loader_spawn(const char *name)
-{
-        int phone_id, rc;
+int loader_spawn(const char *name)
+{
+        return __SYSCALL2(SYS_PROGRAM_SPAWN_LOADER,
+            (sysarg_t) name, strlen(name));
+}
+
+loader_t *loader_connect(void)
+{
         loader_t *ldr;
-
-        /*
-         * Ask kernel to spawn a new loader task.
-         */
-        rc = __SYSCALL3(SYS_PROGRAM_SPAWN_LOADER, (sysarg_t) &phone_id,
-                (sysarg_t) name, strlen(name));
-        if (rc != 0)
-                return NULL;
-
-        /*
-         * Say hello so that the loader knows the incoming connection's
-         * phone hash.
-         */
-        rc = async_req_0_0(phone_id, LOADER_HELLO);
-        if (rc != EOK)
+        int phone_id;
+
+        phone_id = ipc_connect_me_to(PHONE_NS, SERVICE_LOAD, 0, 0);
+        if (phone_id < 0)
                 return NULL;
 
@@ -77 +72 @@
 
         ldr->phone_id = phone_id;
-        return ldr;
+        return ldr;     
 }
 

uspace/lib/libc/generic/task.c

@@ -64 +64 @@
         int rc;
 
-        /* Spawn a program loader. */   
-        ldr = loader_spawn(path);
+        /* Connect to a program loader. */
+        ldr = loader_connect();
         if (ldr == NULL)
                 return 0;
@@ -90 +90 @@
 
         /* Run it. */
-        /* Load the program. */
         rc = loader_run(ldr);
         if (rc != EOK)

uspace/lib/libc/include/ipc/services.h

@@ -39 +39 @@
 
 typedef enum {
-        SERVICE_PCI = 1,
+        SERVICE_LOAD = 1,
+        SERVICE_PCI,
         SERVICE_KEYBOARD,
         SERVICE_VIDEO,

uspace/lib/libc/include/loader/loader.h

@@ -45 +45 @@
 } loader_t;
 
-extern loader_t *loader_spawn(const char *name);
+extern int loader_spawn(const char *);
+extern loader_t *loader_connect(void);
 extern int loader_get_task_id(loader_t *, task_id_t *);
 extern int loader_set_pathname(loader_t *, const char *);