Changeset 10a5479d in mainline

Timestamp:

2012-01-22T14:18:38Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

49ec568, fcae007

Parents:

eb2efc7

Message:

Prevent callbacks from racing. This was probably the culprit which was
causing sometimes the mouse, sometimes the network adapter not to be
discovered.

Location:

uspace/srv

Files:

• hid/input/generic/input.c (modified) (3 diffs)
• net/net/net.c (modified) (5 diffs)

uspace/srv/hid/input/generic/input.c

@@ -39 +39 @@
 #include <adt/list.h>
 #include <bool.h>
+#include <fibril_synch.h>
 #include <ipc/services.h>
 #include <ipc/input.h>
@@ -83 +84 @@
 async_sess_t *irc_sess = NULL;
 
+static FIBRIL_MUTEX_INITIALIZE(discovery_lock);
+
 void kbd_push_data(kbd_dev_t *kdev, sysarg_t data)
 {
@@ -593 +596 @@
         int rc;
         
+        fibril_mutex_lock(&discovery_lock);
+        
         rc = dev_check_new_kbdevs();
-        if (rc != EOK)
+        if (rc != EOK) {
+                fibril_mutex_unlock(&discovery_lock);
                 return rc;
+        }
         
         rc = dev_check_new_mousedevs();
-        if (rc != EOK)
+        if (rc != EOK) {
+                fibril_mutex_unlock(&discovery_lock);
                 return rc;
-
+        }
+        
+        fibril_mutex_unlock(&discovery_lock);
+        
         return EOK;
 }

uspace/srv/net/net/net.c

@@ -56 +56 @@
 #include <adt/measured_strings.h>
 #include <adt/module_map.h>
+#include <fibril_synch.h>
 #include <loc.h>
 #include <nic.h>
@@ -76 +77 @@
 DEVICE_MAP_IMPLEMENT(netifs, netif_t);
 LIST_INITIALIZE(netif_list);
+
+static FIBRIL_MUTEX_INITIALIZE(discovery_lock);
 
 /** Add the configured setting to the configuration map.
@@ -294 +297 @@
         printf("%s: Initializing device '%s'\n", NAME, netif->name);
         
-        link_initialize(&netif->netif_list);
-        
         netif->sid = sid;
         netif->sess = loc_service_connect(EXCHANGE_SERIALIZE, netif->sid,
@@ -535 +536 @@
         int rc;
 
+        fibril_mutex_lock(&discovery_lock);
+
         rc = loc_category_get_id(DEVICE_CATEGORY_NIC, &nic_cat, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
@@ -569 +572 @@
 
         free(svcs);
+        fibril_mutex_unlock(&discovery_lock);
         return EOK;
 }