Changeset 2a7ba5e in mainline for uspace/lib/c/generic/async.c

Timestamp:

2016-05-24T21:03:32Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

609f8d9c

Parents:

0a981e3 (diff), c170438 (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 async framework changes

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.
  *
@@ -998 +987 @@
 }
 
-/** 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;
+/** 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)
+{
         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(msg->call));
+            &IPC_GET_IMETHOD(*call));
         if (link) {
                 notification_t *notification =
@@ -1031 +1013 @@
         
         if (handler)
-                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;
+                handler(callid, call, data);
 }
 
@@ -1375 +1314 @@
         /* 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;
         }
@@ -1550 +1508 @@
 void async_create_manager(void)
 {
-        fid_t fid = fibril_create(async_manager_fibril, NULL);
+        fid_t fid = fibril_create_generic(async_manager_fibril, NULL, PAGE_SIZE);
         if (fid != 0)
                 fibril_add_manager(fid);
@@ -1674 +1632 @@
         
         ipc_call_async_4(exch->phone, imethod, arg1, arg2, arg3, arg4, msg,
-            reply_received, true);
+            reply_received);
         
         return (aid_t) msg;
@@ -1712 +1670 @@
         
         ipc_call_async_5(exch->phone, imethod, arg1, arg2, arg3, arg4, arg5,
-            msg, reply_received, true);
+            msg, reply_received);
         
         return (aid_t) msg;
@@ -2001 +1959 @@
 {
         if (exch != NULL)
-                ipc_call_async_0(exch->phone, imethod, NULL, NULL, true);
+                ipc_call_async_0(exch->phone, imethod, NULL, NULL);
 }
 
@@ -2007 +1965 @@
 {
         if (exch != NULL)
-                ipc_call_async_1(exch->phone, imethod, arg1, NULL, NULL, true);
+                ipc_call_async_1(exch->phone, imethod, arg1, NULL, NULL);
 }
 
@@ -2014 +1972 @@
 {
         if (exch != NULL)
-                ipc_call_async_2(exch->phone, imethod, arg1, arg2, NULL, NULL,
-                    true);
+                ipc_call_async_2(exch->phone, imethod, arg1, arg2, NULL, NULL);
 }
 
@@ -2023 +1980 @@
         if (exch != NULL)
                 ipc_call_async_3(exch->phone, imethod, arg1, arg2, arg3, NULL,
-                    NULL, true);
+                    NULL);
 }
 
@@ -2031 +1988 @@
         if (exch != NULL)
                 ipc_call_async_4(exch->phone, imethod, arg1, arg2, arg3, arg4,
-                    NULL, NULL, true);
+                    NULL, NULL);
 }
 
@@ -2039 +1996 @@
         if (exch != NULL)
                 ipc_call_async_5(exch->phone, imethod, arg1, arg2, arg3, arg4,
-                    arg5, NULL, NULL, true);
+                    arg5, NULL, NULL);
 }
 
@@ -2162 +2119 @@
         
         ipc_call_async_0(exch->phone, IPC_M_CLONE_ESTABLISH, msg,
-            reply_received, true);
+            reply_received);
         
         sysarg_t rc;
@@ -2211 +2168 @@
         
         ipc_call_async_4(phone, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3, arg4,
-            msg, reply_received, true);
+            msg, reply_received);
         
         sysarg_t rc;