Changeset 482c86f in mainline

Timestamp:

2009-04-05T21:09:59Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

a78d001

Parents:

0175246

Message:

NS was forgetting to hangup phones. One phone was leaked for every load attempt and when all 16 phones were exhausted, NS would lock up.

Location:

uspace

Files:

• lib/libc/generic/loader.c (modified) (1 diff)
• srv/loader/main.c (modified) (3 diffs)
• srv/ns/ns.c (modified) (2 diffs)

uspace/lib/libc/generic/loader.c

@@ -243 +243 @@
                 return rc;
 
+        ipc_hangup(ldr->phone_id);
+        ldr->phone_id = 0;
         return EOK;
 }

uspace/srv/loader/main.c

@@ -179 +179 @@
         
         ipc_data_write_finalize(callid, arg_buf, buf_len);
-        ipc_answer_0(rid, EOK);
         
         arg_buf[buf_len] = '\0';
@@ -199 +198 @@
         if (argv == NULL) {
                 free(arg_buf);
-                ipc_answer_0(callid, ENOMEM);
                 ipc_answer_0(rid, ENOMEM);
                 return;
         }
-        
+
         /*
          * Fill argv with argument pointers
@@ -219 +217 @@
         argc = n;
         argv[n] = NULL;
+
+        ipc_answer_0(rid, EOK);
 }
 

uspace/srv/ns/ns.c

@@ -325 +325 @@
         retval = ipc_forward_fast(callid, hs->phone, IPC_GET_ARG2(*call),
             IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
-        
 out:
         if (!(callid & IPC_CALLID_NOTIFICATION))
@@ -358 +357 @@
         int rc = ipc_forward_fast(csr->callid, phone, IPC_GET_ARG2(csr->call),
                 IPC_GET_ARG3(csr->call), 0, IPC_FF_NONE);
-        
+
         free(csr);
+        ipc_hangup(phone);
 }