Changes in uspace/lib/c/generic/async.c [c170438:9ef495f] in mainline

File:

• uspace/lib/c/generic/async.c (modified) (15 diffs)

uspace/lib/c/generic/async.c

@@ -493 +493 @@
 }
 
+static size_t notification_handler_stksz = FIBRIL_DFLT_STK_SIZE;
+
+/** Set the stack size for the notification handler notification fibrils.
+ *
+ * @param size Stack size in bytes.
+ */
+void async_set_notification_handler_stack_size(size_t size)
+{
+        notification_handler_stksz = size;
+}
+
 /** Mutex protecting inactive_exch_list and avail_phone_cv.
  *
@@ -987 +998 @@
 }
 
-/** Process notification.
- *
- * @param callid Hash of the incoming call.
- * @param call   Data of the incoming call.
- */
-static void process_notification(ipc_callid_t callid, ipc_call_t *call)
-{
+/** Notification fibril.
+ *
+ * When a notification arrives, a fibril with this implementing function is
+ * created. It calls the corresponding notification handler and does the final
+ * cleanup.
+ *
+ * @param arg Message structure pointer.
+ *
+ * @return Always zero.
+ *
+ */
+static int notification_fibril(void *arg)
+{
+        assert(arg);
+        
+        msg_t *msg = (msg_t *) arg;
         async_notification_handler_t handler = NULL;
         void *data = NULL;
-
-        assert(call);
         
         futex_down(&async_futex);
         
         ht_link_t *link = hash_table_find(&notification_hash_table,
-            &IPC_GET_IMETHOD(*call));
+            &IPC_GET_IMETHOD(msg->call));
         if (link) {
                 notification_t *notification =
@@ -1013 +1031 @@
         
         if (handler)
-                handler(callid, call, data);
+                handler(msg->callid, &msg->call, data);
+        
+        free(msg);
+        return 0;
+}
+
+/** Process notification.
+ *
+ * A new fibril is created which would process the notification.
+ *
+ * @param callid Hash of the incoming call.
+ * @param call   Data of the incoming call.
+ *
+ * @return False if an error occured.
+ *         True if the call was passed to the notification fibril.
+ *
+ */
+static bool process_notification(ipc_callid_t callid, ipc_call_t *call)
+{
+        assert(call);
+        
+        futex_down(&async_futex);
+        
+        msg_t *msg = malloc(sizeof(*msg));
+        if (!msg) {
+                futex_up(&async_futex);
+                return false;
+        }
+        
+        msg->callid = callid;
+        msg->call = *call;
+        
+        fid_t fid = fibril_create_generic(notification_fibril, msg,
+            notification_handler_stksz);
+        if (fid == 0) {
+                free(msg);
+                futex_up(&async_futex);
+                return false;
+        }
+        
+        fibril_add_ready(fid);
+        
+        futex_up(&async_futex);
+        return true;
 }
 
@@ -1314 +1375 @@
         /* Kernel notification */
         if ((callid & IPC_CALLID_NOTIFICATION)) {
-                fibril_t *fibril = (fibril_t *) __tcb_get()->fibril_data;
-                unsigned oldsw = fibril->switches;
-
                 process_notification(callid, call);
-
-                if (oldsw != fibril->switches) {
-                        /*
-                         * The notification handler did not execute atomically
-                         * and so the current manager fibril assumed the role of
-                         * a notification fibril. While waiting for its
-                         * resources, it switched to another manager fibril that
-                         * had already existed or it created a new one. We
-                         * therefore know there is at least yet another
-                         * manager fibril that can take over. We now kill the
-                         * current 'notification' fibril to prevent fibril
-                         * population explosion.
-                         */
-                        futex_down(&async_futex);
-                        fibril_switch(FIBRIL_FROM_DEAD);
-                }
                 return;
         }
@@ -1508 +1550 @@
 void async_create_manager(void)
 {
-        fid_t fid = fibril_create_generic(async_manager_fibril, NULL, PAGE_SIZE);
+        fid_t fid = fibril_create(async_manager_fibril, NULL);
         if (fid != 0)
                 fibril_add_manager(fid);
@@ -1632 +1674 @@
         
         ipc_call_async_4(exch->phone, imethod, arg1, arg2, arg3, arg4, msg,
-            reply_received);
+            reply_received, true);
         
         return (aid_t) msg;
@@ -1670 +1712 @@
         
         ipc_call_async_5(exch->phone, imethod, arg1, arg2, arg3, arg4, arg5,
-            msg, reply_received);
+            msg, reply_received, true);
         
         return (aid_t) msg;
@@ -1959 +2001 @@
 {
         if (exch != NULL)
-                ipc_call_async_0(exch->phone, imethod, NULL, NULL);
+                ipc_call_async_0(exch->phone, imethod, NULL, NULL, true);
 }
 
@@ -1965 +2007 @@
 {
         if (exch != NULL)
-                ipc_call_async_1(exch->phone, imethod, arg1, NULL, NULL);
+                ipc_call_async_1(exch->phone, imethod, arg1, NULL, NULL, true);
 }
 
@@ -1972 +2014 @@
 {
         if (exch != NULL)
-                ipc_call_async_2(exch->phone, imethod, arg1, arg2, NULL, NULL);
+                ipc_call_async_2(exch->phone, imethod, arg1, arg2, NULL, NULL,
+                    true);
 }
 
@@ -1980 +2023 @@
         if (exch != NULL)
                 ipc_call_async_3(exch->phone, imethod, arg1, arg2, arg3, NULL,
-                    NULL);
+                    NULL, true);
 }
 
@@ -1988 +2031 @@
         if (exch != NULL)
                 ipc_call_async_4(exch->phone, imethod, arg1, arg2, arg3, arg4,
-                    NULL, NULL);
+                    NULL, NULL, true);
 }
 
@@ -1996 +2039 @@
         if (exch != NULL)
                 ipc_call_async_5(exch->phone, imethod, arg1, arg2, arg3, arg4,
-                    arg5, NULL, NULL);
+                    arg5, NULL, NULL, true);
 }
 
@@ -2119 +2162 @@
         
         ipc_call_async_0(exch->phone, IPC_M_CLONE_ESTABLISH, msg,
-            reply_received);
+            reply_received, true);
         
         sysarg_t rc;
@@ -2168 +2211 @@
         
         ipc_call_async_4(phone, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3, arg4,
-            msg, reply_received);
+            msg, reply_received, true);
         
         sysarg_t rc;