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

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

uspace/srv/loader/main.c

@@ -50 +50 @@
 #include <fcntl.h>
 #include <sys/types.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/loader.h>
@@ -95 +94 @@
 
 /** Used to limit number of connections to one. */
-static bool connected;
+static bool connected = false;
 
 static void ldr_get_taskid(ipc_callid_t rid, ipc_call_t *request)
@@ -106 +105 @@
         
         if (!async_data_read_receive(&callid, &len)) {
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return;
         }
@@ -115 +114 @@
         
         async_data_read_finalize(callid, &task_id, len);
-        ipc_answer_0(rid, EOK);
+        async_answer_0(rid, EOK);
 }
 
@@ -135 +134 @@
         }
         
-        ipc_answer_0(rid, rc);
+        async_answer_0(rid, rc);
 }
 
@@ -155 +154 @@
         }
         
-        ipc_answer_0(rid, rc);
+        async_answer_0(rid, rc);
 }
 
@@ -188 +187 @@
                 if (_argv == NULL) {
                         free(buf);
-                        ipc_answer_0(rid, ENOMEM);
+                        async_answer_0(rid, ENOMEM);
                         return;
                 }
@@ -220 +219 @@
         }
         
-        ipc_answer_0(rid, rc);
+        async_answer_0(rid, rc);
 }
 
@@ -244 +243 @@
                 if (_filv == NULL) {
                         free(buf);
-                        ipc_answer_0(rid, ENOMEM);
+                        async_answer_0(rid, ENOMEM);
                         return;
                 }
@@ -271 +270 @@
         }
         
-        ipc_answer_0(rid, EOK);
+        async_answer_0(rid, EOK);
 }
 
@@ -287 +286 @@
         if (rc != EE_OK) {
                 DPRINTF("Failed to load executable '%s'.\n", pathname);
-                ipc_answer_0(rid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return 1;
         }
@@ -304 +303 @@
                 /* Statically linked program */
                 is_dyn_linked = false;
-                ipc_answer_0(rid, EOK);
+                async_answer_0(rid, EOK);
                 return 0;
         }
@@ -312 +311 @@
                 DPRINTF("Failed to load interpreter '%s.'\n",
                     prog_info.interp);
-                ipc_answer_0(rid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return 1;
         }
         
         is_dyn_linked = true;
-        ipc_answer_0(rid, EOK);
+        async_answer_0(rid, EOK);
         
         return 0;
@@ -343 +342 @@
                 DPRINTF("Entry point: %p\n", interp_info.entry);
                 
-                ipc_answer_0(rid, EOK);
+                async_answer_0(rid, EOK);
                 elf_run(&interp_info, &pcb);
         } else {
                 /* Statically linked program */
-                ipc_answer_0(rid, EOK);
+                async_answer_0(rid, EOK);
                 elf_run(&prog_info, &pcb);
         }
@@ -367 +366 @@
         /* Already have a connection? */
         if (connected) {
-                ipc_answer_0(iid, ELIMIT);
+                async_answer_0(iid, ELIMIT);
                 return;
         }
@@ -374 +373 @@
         
         /* Accept the connection */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         /* Ignore parameters, the connection is already open */
@@ -408 +407 @@
                         /* Not reached */
                 default:
-                        retval = ENOENT;
+                        retval = EINVAL;
                         break;
                 }
-                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP) {
-                        DPRINTF("Responding EINVAL to method %d.\n",
-                            IPC_GET_IMETHOD(call));
-                        ipc_answer_0(callid, EINVAL);
-                }
+                
+                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP)
+                        async_answer_0(callid, retval);
         }
 }
@@ -423 +420 @@
 int main(int argc, char *argv[])
 {
-        sysarg_t phonead;
-        task_id_t id;
-        int rc;
-
-        connected = false;
-
+        /* Set a handler of incomming connections. */
+        async_set_client_connection(ldr_connection);
+        
         /* Introduce this task to the NS (give it our task ID). */
-        id = task_get_id();
-        rc = async_req_2_0(PHONE_NS, NS_ID_INTRO, LOWER32(id), UPPER32(id));
+        task_id_t id = task_get_id();
+        int rc = async_req_2_0(PHONE_NS, NS_ID_INTRO, LOWER32(id), UPPER32(id));
         if (rc != EOK)
                 return -1;
-
-        /* Set a handler of incomming connections. */
-        async_set_client_connection(ldr_connection);
         
         /* Register at naming service. */
-        if (ipc_connect_to_me(PHONE_NS, SERVICE_LOAD, 0, 0, &phonead) != 0) 
+        if (service_register(SERVICE_LOAD) != EOK)
                 return -2;
-
+        
         async_manager();