Changeset 4470e26 in mainline for uspace/lib/libc

Timestamp:

2008-09-24T10:57:21Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

0993087

Parents:

45454e9b

Message:

Separate load and run commands for loader. Update tracer - no events get missed on startup anymore.

Location:

uspace/lib/libc

Files:

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

uspace/lib/libc/generic/loader.c

@@ -206 +206 @@
 }
 
+/** Instruct loader to load the program.
+ *
+ * If this function succeeds, the program has been successfully loaded
+ * and is ready to be executed.
+ *
+ * @param ldr           Loader connection structure.
+ * @return              Zero on success or negative error code.
+ */
+int loader_load_program(loader_t *ldr)
+{
+        int rc;
+
+        rc = async_req_0_0(ldr->phone_id, LOADER_LOAD);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
 /** Instruct loader to execute the program.
+ *
+ * Note that this function blocks until the loader actually replies
+ * so you cannot expect this function to return if you are debugging
+ * the task and its thread is stopped.
  *
  * After using this function, no further operations must be performed
@@ -214 +237 @@
  * @return              Zero on success or negative error code.
  */
-int loader_start_program(loader_t *ldr)
+int loader_run(loader_t *ldr)
 {
         int rc;
@@ -222 +245 @@
                 return rc;
 
-        ipc_hangup(ldr->phone_id);
         return EOK;
 }

uspace/lib/libc/generic/task.c

@@ -64 +64 @@
         int rc;
 
-        /* Spawn a program loader */    
+        /* Spawn a program loader. */   
         ldr = loader_spawn();
         if (ldr == NULL)
@@ -74 +74 @@
                 goto error;
 
-        /* Send program pathname */
+        /* Send program pathname. */
         rc = loader_set_pathname(ldr, path);
         if (rc != EOK)
                 goto error;
 
-        /* Send arguments */
+        /* Send arguments. */
         rc = loader_set_args(ldr, argv);
         if (rc != EOK)
                 goto error;
 
-        /* Request loader to start the program */       
-        rc = loader_start_program(ldr);
+        /* Load the program. */
+        rc = loader_load_program(ldr);
+        if (rc != EOK)
+                goto error;
+
+        /* Run it. */
+        /* Load the program. */
+        rc = loader_run(ldr);
         if (rc != EOK)
                 goto error;
 
         /* Success */
+
+        free(ldr);
         return task_id;
 
@@ -95 +103 @@
 error:
         loader_abort(ldr);
+        free(ldr);
+
         return 0;
 }

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

@@ -43 +43 @@
         LOADER_SET_PATHNAME,
         LOADER_SET_ARGS,
+        LOADER_LOAD,
         LOADER_RUN
 } fb_request_t;

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

@@ -47 +47 @@
 extern int loader_set_pathname(loader_t *, const char *);
 extern int loader_set_args(loader_t *, char *const []);
-extern int loader_start_program(loader_t *);
+extern int loader_load_program(loader_t *);
+extern int loader_run(loader_t *);
 extern void loader_abort(loader_t *);