Changes in uspace/lib/c/generic/loader.c [0fe52ef:6e84dc3] in mainline

File:

• uspace/lib/c/generic/loader.c (modified) (13 diffs)

uspace/lib/c/generic/loader.c

@@ -35 +35 @@
 #include <ipc/loader.h>
 #include <ipc/services.h>
-#include <ns.h>
+#include <ipc/ns.h>
 #include <libc.h>
 #include <task.h>
@@ -44 +44 @@
 #include <vfs/vfs.h>
 #include <loader/loader.h>
-#include "private/loader.h"
 
 /** Connect to a new program loader.
@@ -64 +63 @@
 loader_t *loader_connect(void)
 {
+        int phone_id = service_connect_blocking(SERVICE_LOAD, 0, 0);
+        if (phone_id < 0)
+                return NULL;
+        
         loader_t *ldr = malloc(sizeof(loader_t));
         if (ldr == NULL)
                 return NULL;
         
-        async_sess_t *sess =
-            service_connect_blocking(EXCHANGE_SERIALIZE, SERVICE_LOAD, 0, 0);
-        if (sess == NULL) {
-                free(ldr);
-                return NULL;
-        }
-        
-        ldr->sess = sess;
+        ldr->phone_id = phone_id;
         return ldr;
 }
@@ -92 +88 @@
 {
         /* Get task ID. */
-        async_exch_t *exch = async_exchange_begin(ldr->sess);
-        
-        ipc_call_t answer;
-        aid_t req = async_send_0(exch, LOADER_GET_TASKID, &answer);
-        sysarg_t rc = async_data_read_start(exch, task_id, sizeof(task_id_t));
-        
-        async_exchange_end(exch);
-        
-        if (rc != EOK) {
-                async_wait_for(req, NULL);
-                return (int) rc;
-        }
-        
-        async_wait_for(req, &rc);
-        return (int) rc;
+        ipc_call_t answer;
+        aid_t req = async_send_0(ldr->phone_id, LOADER_GET_TASKID, &answer);
+        int rc = async_data_read_start(ldr->phone_id, task_id, sizeof(task_id_t));
+        if (rc != EOK) {
+                async_wait_for(req, NULL);
+                return rc;
+        }
+        
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+        return (int) retval;
 }
 
@@ -120 +112 @@
 int loader_set_cwd(loader_t *ldr)
 {
-        char *cwd = (char *) malloc(MAX_PATH_LEN + 1);
+        char *cwd;
+        size_t len;
+
+        cwd = (char *) malloc(MAX_PATH_LEN + 1);
         if (!cwd)
                 return ENOMEM;
-        
         if (!getcwd(cwd, MAX_PATH_LEN + 1))
-                str_cpy(cwd, MAX_PATH_LEN + 1, "/");
-        
-        size_t len = str_length(cwd);
-        
-        async_exch_t *exch = async_exchange_begin(ldr->sess);
-        
-        ipc_call_t answer;
-        aid_t req = async_send_0(exch, LOADER_SET_CWD, &answer);
-        sysarg_t rc = async_data_write_start(exch, cwd, len);
-        
-        async_exchange_end(exch);
+                str_cpy(cwd, MAX_PATH_LEN + 1, "/"); 
+        len = str_length(cwd);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_0(ldr->phone_id, LOADER_SET_CWD, &answer);
+        int rc = async_data_write_start(ldr->phone_id, cwd, len);
         free(cwd);
-        
-        if (rc != EOK) {
-                async_wait_for(req, NULL);
-                return (int) rc;
-        }
-        
-        async_wait_for(req, &rc);
-        return (int) rc;
+        if (rc != EOK) {
+                async_wait_for(req, NULL);
+                return rc;
+        }
+        
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+        return (int) retval;
 }
 
@@ -164 +153 @@
         char *pa = absolutize(path, &pa_len);
         if (!pa)
-                return ENOMEM;
+                return 0;
         
         /* Send program pathname */
-        async_exch_t *exch = async_exchange_begin(ldr->sess);
-        
-        ipc_call_t answer;
-        aid_t req = async_send_0(exch, LOADER_SET_PATHNAME, &answer);
-        sysarg_t rc = async_data_write_start(exch, (void *) pa, pa_len);
-        
-        async_exchange_end(exch);
+        ipc_call_t answer;
+        aid_t req = async_send_0(ldr->phone_id, LOADER_SET_PATHNAME, &answer);
+        int rc = async_data_write_start(ldr->phone_id, (void *) pa, pa_len);
+        if (rc != EOK) {
+                free(pa);
+                async_wait_for(req, NULL);
+                return rc;
+        }
+        
         free(pa);
         
-        if (rc != EOK) {
-                async_wait_for(req, NULL);
-                return (int) rc;
-        }
-        
-        async_wait_for(req, &rc);
-        return (int) rc;
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+        return (int) retval;
 }
 
@@ -225 +212 @@
         
         /* Send serialized arguments to the loader */
-        async_exch_t *exch = async_exchange_begin(ldr->sess);
-        
-        ipc_call_t answer;
-        aid_t req = async_send_0(exch, LOADER_SET_ARGS, &answer);
-        sysarg_t rc = async_data_write_start(exch, (void *) arg_buf,
-            buffer_size);
-        
-        async_exchange_end(exch);
+        ipc_call_t answer;
+        aid_t req = async_send_0(ldr->phone_id, LOADER_SET_ARGS, &answer);
+        sysarg_t rc = async_data_write_start(ldr->phone_id, (void *) arg_buf, buffer_size);
+        if (rc != EOK) {
+                async_wait_for(req, NULL);
+                return rc;
+        }
+        
+        async_wait_for(req, &rc);
+        if (rc != EOK)
+                return rc;
+        
+        /* Free temporary buffer */
         free(arg_buf);
         
-        if (rc != EOK) {
-                async_wait_for(req, NULL);
-                return (int) rc;
-        }
-        
-        async_wait_for(req, &rc);
-        return (int) rc;
+        return EOK;
 }
 
@@ -256 +242 @@
  *
  */
-int loader_set_files(loader_t *ldr, int * const files[])
-{
+int loader_set_files(loader_t *ldr, fdi_node_t *const files[])
+{
+        /*
+         * Serialize the arguments into a single array. First
+         * compute size of the buffer needed.
+         */
+        fdi_node_t *const *ap = files;
+        size_t count = 0;
+        while (*ap != NULL) {
+                count++;
+                ap++;
+        }
+        
+        fdi_node_t *files_buf;
+        files_buf = (fdi_node_t *) malloc(count * sizeof(fdi_node_t));
+        if (files_buf == NULL)
+                return ENOMEM;
+        
+        /* Fill the buffer */
+        size_t i;
+        for (i = 0; i < count; i++)
+                files_buf[i] = *files[i];
+        
         /* Send serialized files to the loader */
-        async_exch_t *exch = async_exchange_begin(ldr->sess);
-        async_exch_t *vfs_exch = vfs_exchange_begin();
-        
-        int i;
-        for (i = 0; files[i]; i++);
-
-        ipc_call_t answer;
-        aid_t req = async_send_1(exch, LOADER_SET_FILES, i, &answer);
-
-        sysarg_t rc = EOK;
-        
-        for (i = 0; files[i]; i++) {
-                rc = async_state_change_start(exch, VFS_PASS_HANDLE, *files[i],
-                    0, vfs_exch); 
-                if (rc != EOK)
-                        break;
-        }
-        
-        vfs_exchange_end(vfs_exch);
-        async_exchange_end(exch);
-
-        if (rc != EOK) {
-                async_wait_for(req, NULL);
-                return (int) rc;
+        ipc_call_t answer;
+        aid_t req = async_send_0(ldr->phone_id, LOADER_SET_FILES, &answer);
+        sysarg_t rc = async_data_write_start(ldr->phone_id, (void *) files_buf,
+            count * sizeof(fdi_node_t));
+        if (rc != EOK) {
+                async_wait_for(req, NULL);
+                return rc;
         }
         
         async_wait_for(req, &rc);
-        return (int) rc;
+        if (rc != EOK)
+                return rc;
+        
+        /* Free temporary buffer */
+        free(files_buf);
+        
+        return EOK;
 }
 
@@ -301 +297 @@
 int loader_load_program(loader_t *ldr)
 {
-        async_exch_t *exch = async_exchange_begin(ldr->sess);
-        int rc = async_req_0_0(exch, LOADER_LOAD);
-        async_exchange_end(exch);
-        
-        return rc;
+        return (int) async_req_0_0(ldr->phone_id, LOADER_LOAD);
 }
 
@@ -314 +306 @@
  * the task and its thread is stopped.
  *
- * After using this function, no further operations can be performed
- * on the loader structure and it is deallocated.
+ * After using this function, no further operations must be performed
+ * on the loader structure. It should be de-allocated using free().
  *
  * @param ldr Loader connection structure.
@@ -324 +316 @@
 int loader_run(loader_t *ldr)
 {
-        async_exch_t *exch = async_exchange_begin(ldr->sess);
-        int rc = async_req_0_0(exch, LOADER_RUN);
-        async_exchange_end(exch);
-        
+        int rc = async_req_0_0(ldr->phone_id, LOADER_RUN);
         if (rc != EOK)
                 return rc;
         
-        async_hangup(ldr->sess);
-        free(ldr);
-        
+        async_hangup(ldr->phone_id);
+        ldr->phone_id = 0;
         return EOK;
 }
@@ -339 +327 @@
 /** Cancel the loader session.
  *
- * Tell the loader not to load any program and terminate.
- * After using this function, no further operations can be performed
- * on the loader structure and it is deallocated.
+ * Tells the loader not to load any program and terminate.
+ * After using this function, no further operations must be performed
+ * on the loader structure. It should be de-allocated using free().
  *
  * @param ldr Loader connection structure.
@@ -350 +338 @@
 void loader_abort(loader_t *ldr)
 {
-        async_hangup(ldr->sess);
-        free(ldr);
+        async_hangup(ldr->phone_id);
+        ldr->phone_id = 0;
 }