Changeset bb9ec2d in mainline for uspace/srv/loader/main.c

Timestamp:

2017-03-07T20:47:35Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a737667e

Parents:

e796dc8

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-07 20:47:35)

git-committer:

Jakub Jermar <jakub@…> (2017-03-07 20:47:35)

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5/ revision 1941-1944

Original commit messages:

1944: Jiri Zarevucky 2013-08-06 Replace legacy file descriptor presetting with inbox.
1943: Jiri Zarevucky 2013-08-06 Do not preserve open state when passing file descriptor to another task. Allow receiver to specify, whether the descriptor is low or high.
1942: Jiri Zarevucky 2013-08-06 C style.
1941: Jiri Zarevucky 2013-08-06 Make loader accept file reference instead of a pathname.

Modifications:

• Keep version of elf_load_file() that accepts file name
• Changes required for loading dynamically linked executables
• Update to newer list_foreach

File:

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

uspace/srv/loader/main.c

@@ -62 +62 @@
 #include <elf/elf_load.h>
 #include <vfs/vfs.h>
+#include <vfs/inbox.h>
 
 #define DPRINTF(...)
 
-/** Pathname of the file that will be loaded */
-static char *pathname = NULL;
+/** File that will be loaded */
+static char *progname = NULL;
+static int program_fd = -1;
 
 /** The Program control block */
@@ -81 +83 @@
 static char *arg_buf = NULL;
 
-/** Number of preset files */
-static unsigned int filc = 0;
+/** Inbox entries. */
+static struct pcb_inbox_entry inbox[INBOX_MAX_ENTRIES];
+static int inbox_entries = 0;
 
 static elf_info_t prog_info;
@@ -130 +133 @@
 }
 
-/** Receive a call setting pathname of the program to execute.
- *
- * @param rid
- * @param request
- */
-static void ldr_set_pathname(ipc_callid_t rid, ipc_call_t *request)
-{
-        char *buf;
-        int rc = async_data_write_accept((void **) &buf, true, 0, 0, 0, NULL);
-        
-        if (rc == EOK) {
-                if (pathname != NULL)
-                        free(pathname);
-                
-                pathname = buf;
-        }
-        
-        async_answer_0(rid, rc);
+/** Receive a call setting the program to execute.
+ *
+ * @param rid
+ * @param request
+ */
+static void ldr_set_program(ipc_callid_t rid, ipc_call_t *request)
+{
+        ipc_callid_t writeid;
+        size_t namesize;
+        if (!async_data_write_receive(&writeid, &namesize)) {
+                async_answer_0(rid, EINVAL);
+                return;
+        }
+
+        char* name = malloc(namesize);
+        int rc = async_data_write_finalize(writeid, name, namesize);
+        if (rc != EOK) {
+                async_answer_0(rid, EINVAL);
+                return;
+        }
+
+        int file = vfs_receive_handle(true);
+        if (file < 0) {
+                async_answer_0(rid, EINVAL);
+                return;
+        }
+        
+        progname = name;
+        program_fd = file;
+        async_answer_0(rid, EOK);
 }
 
@@ -215 +230 @@
 }
 
-/** Receive a call setting preset files of the program to execute.
- *
- * @param rid
- * @param request
- */
-static void ldr_set_files(ipc_callid_t rid, ipc_call_t *request)
-{
-        size_t count = IPC_GET_ARG1(*request);
-
-        for (filc = 0; filc < count; filc++) {
-                int fd = vfs_receive_handle();
-                if (fd < 0) {
-                        break;
-                }
-                assert(fd == (int) filc);
-        }
-
+/** Receive a call setting inbox files of the program to execute.
+ *
+ * @param rid
+ * @param request
+ */
+static void ldr_add_inbox(ipc_callid_t rid, ipc_call_t *request)
+{
+        if (inbox_entries == INBOX_MAX_ENTRIES) {
+                async_answer_0(rid, ERANGE);
+        }
+
+        ipc_callid_t writeid;
+        size_t namesize;
+        if (!async_data_write_receive(&writeid, &namesize)) {
+                async_answer_0(rid, EINVAL);
+                return;
+        }
+
+        char* name = malloc(namesize);
+        int rc = async_data_write_finalize(writeid, name, namesize);
+        if (rc != EOK) {
+                async_answer_0(rid, EINVAL);
+                return;
+        }
+
+        int file = vfs_receive_handle(true);
+        if (file < 0) {
+                async_answer_0(rid, EINVAL);
+                return;
+        }
+
+        inbox[inbox_entries].name = name;
+        inbox[inbox_entries].file = file;
+        inbox_entries++;
         async_answer_0(rid, EOK);
 }
@@ -243 +275 @@
 static int ldr_load(ipc_callid_t rid, ipc_call_t *request)
 {
-        int rc;
-        
-        rc = elf_load(pathname, &prog_info);
+        int rc = elf_load(program_fd, &prog_info);
         if (rc != EE_OK) {
-                DPRINTF("Failed to load executable '%s'.\n", pathname);
+                DPRINTF("Failed to load executable for '%s'.\n", progname);
                 async_answer_0(rid, EINVAL);
                 return 1;
@@ -259 +289 @@
         pcb.argv = argv;
         
-        pcb.filc = filc;
+        pcb.inbox = inbox;
+        pcb.inbox_entries = inbox_entries;
         
         async_answer_0(rid, rc);
@@ -273 +304 @@
 static void ldr_run(ipc_callid_t rid, ipc_call_t *request)
 {
-        const char *cp;
-        
         DPRINTF("Set task name\n");
 
         /* Set the task name. */
-        cp = str_rchr(pathname, '/');
-        cp = (cp == NULL) ? pathname : (cp + 1);
-        task_set_name(cp);
+        task_set_name(progname);
         
         /* Run program */
@@ -327 +354 @@
                         ldr_set_cwd(callid, &call);
                         continue;
-                case LOADER_SET_PATHNAME:
-                        ldr_set_pathname(callid, &call);
+                case LOADER_SET_PROGRAM:
+                        ldr_set_program(callid, &call);
                         continue;
                 case LOADER_SET_ARGS:
                         ldr_set_args(callid, &call);
                         continue;
-                case LOADER_SET_FILES:
-                        ldr_set_files(callid, &call);
+                case LOADER_ADD_INBOX:
+                        ldr_add_inbox(callid, &call);
                         continue;
                 case LOADER_LOAD: