Changes in uspace/srv/loader/main.c [27b76ca:8a1fb09] in mainline

File:

• uspace/srv/loader/main.c (modified) (10 diffs)

uspace/srv/loader/main.c

@@ -52 +52 @@
 #include <ipc/services.h>
 #include <ipc/loader.h>
-#include <ns.h>
+#include <ipc/ns.h>
+#include <macros.h>
 #include <loader/pcb.h>
 #include <entry_point.h>
@@ -59 +60 @@
 #include <str.h>
 #include <as.h>
-#include <elf/elf.h>
-#include <elf/elf_load.h>
-#include <vfs/vfs.h>
+
+#include <elf.h>
+#include <elf_load.h>
 
 #ifdef CONFIG_RTLD
@@ -90 +91 @@
 
 /** Number of preset files */
-static unsigned int filc = 0;
+static int filc = 0;
+/** Preset files vector */
+static fdi_node_t **filv = NULL;
+/** Buffer holding all preset files */
+static fdi_node_t *fil_buf = NULL;
 
 static elf_info_t prog_info;
@@ -236 +241 @@
 static void ldr_set_files(ipc_callid_t rid, ipc_call_t *request)
 {
-        size_t count = IPC_GET_ARG1(*request);
-
-        async_exch_t *vfs_exch = vfs_exchange_begin();
-
-        for (filc = 0; filc < count; filc++) {
-                ipc_callid_t callid;
-                int fd;
-
-                if (!async_state_change_receive(&callid, NULL, NULL, NULL)) {
-                        async_answer_0(callid, EINVAL);
-                        break;
+        fdi_node_t *buf;
+        size_t buf_size;
+        int rc = async_data_write_accept((void **) &buf, false, 0, 0,
+            sizeof(fdi_node_t), &buf_size);
+        
+        if (rc == EOK) {
+                int count = buf_size / sizeof(fdi_node_t);
+                
+                /*
+                 * Allocate new filv
+                 */
+                fdi_node_t **_filv = (fdi_node_t **) calloc(count + 1, sizeof(fdi_node_t *));
+                if (_filv == NULL) {
+                        free(buf);
+                        async_answer_0(rid, ENOMEM);
+                        return;
                 }
-                async_state_change_finalize(callid, vfs_exch);
-                fd = fd_wait();
-                assert(fd == (int) filc);
-        }
-
-        vfs_exchange_end(vfs_exch);
-
+                
+                /*
+                 * Fill the new filv with argument pointers
+                 */
+                int i;
+                for (i = 0; i < count; i++)
+                        _filv[i] = &buf[i];
+                
+                _filv[count] = NULL;
+                
+                /*
+                 * Copy temporary data to global variables
+                 */
+                if (fil_buf != NULL)
+                        free(fil_buf);
+                
+                if (filv != NULL)
+                        free(filv);
+                
+                filc = count;
+                fil_buf = buf;
+                filv = _filv;
+        }
+        
         async_answer_0(rid, EOK);
 }
@@ -283 +310 @@
         
         pcb.filc = filc;
+        pcb.filv = filv;
         
         if (prog_info.interp == NULL) {
@@ -322 +350 @@
 
         /* Initialize list of loaded modules */
-        list_initialize(&runtime_env->modules);
-        list_append(&prog_mod.modules_link, &runtime_env->modules);
+        list_initialize(&runtime_env->modules_head);
+        list_append(&prog_mod.modules_link, &runtime_env->modules_head);
 
         /* Pointer to program module. Used as root of the module graph. */
@@ -384 +412 @@
  * to execute the loaded program).
  */
-static void ldr_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
-{
+static void ldr_connection(ipc_callid_t iid, ipc_call_t *icall)
+{
+        ipc_callid_t callid;
+        ipc_call_t call;
+        int retval;
+        
         /* Already have a connection? */
         if (connected) {
@@ -398 +430 @@
         
         /* Ignore parameters, the connection is already open */
+        (void) iid;
         (void) icall;
         
-        while (true) {
-                int retval;
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-                
-                if (!IPC_GET_IMETHOD(call))
+        while (1) {
+                callid = async_get_call(&call);
+                
+                switch (IPC_GET_IMETHOD(call)) {
+                case IPC_M_PHONE_HUNGUP:
                         exit(0);
-                
-                switch (IPC_GET_IMETHOD(call)) {
                 case LOADER_GET_TASKID:
                         ldr_get_taskid(callid, &call);
@@ -435 +465 @@
                 }
                 
-                async_answer_0(callid, retval);
+                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP)
+                        async_answer_0(callid, retval);
         }
 }
@@ -448 +479 @@
         /* Introduce this task to the NS (give it our task ID). */
         task_id_t id = task_get_id();
-        int rc = ns_intro(id);
+        int rc = async_req_2_0(PHONE_NS, NS_ID_INTRO, LOWER32(id), UPPER32(id));
         if (rc != EOK)
                 return -1;