Changeset ff20afc in mainline for uspace/srv/sysman/repo.c

Timestamp:

2019-08-17T13:12:47Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

5a88d87

Parents:

d5cca04

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-12-04 13:56:42)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-17 13:12:47)

Message:

sysman: Synchronize access to unit repository from other fibrils

File:

• uspace/srv/sysman/repo.c (modified) (6 diffs)

uspace/srv/sysman/repo.c

@@ -42 +42 @@
 static hash_table_t units_by_name;
 static hash_table_t units_by_handle;
+/** Lock to protect units_by_name and units_by_handle, so that
+ * repo_find_unit_by_* can be called also from non-event loop fibrils.
+ */
+static FIBRIL_RWLOCK_INITIALIZE(repo_lock);
 
 /* Hash table functions */
@@ -137 +141 @@
         sysman_log(LVL_DEBUG2, "%s('%s')", __func__, unit_name(unit));
 
+        fibril_rwlock_write_lock(&repo_lock);
         if (hash_table_insert_unique(&units_by_name, &unit->units_by_name)) {
                 /* Pointers are same size as unit_handle_t both on 32b and 64b */
@@ -143 +148 @@
                 hash_table_insert(&units_by_handle, &unit->units_by_handle);
                 list_append(&unit->units, &units);
+                fibril_rwlock_write_unlock(&repo_lock);
                 return EOK;
         } else {
+                fibril_rwlock_write_unlock(&repo_lock);
                 return EEXISTS;
         }
@@ -268 +275 @@
 unit_t *repo_find_unit_by_name(const char *name)
 {
+        fibril_rwlock_read_lock(&repo_lock);
         ht_link_t *ht_link = hash_table_find(&units_by_name, (void *)name);
+        fibril_rwlock_read_unlock(&repo_lock);
+
         if (ht_link != NULL) {
                 return hash_table_get_inst(ht_link, unit_t, units_by_name);
@@ -278 +288 @@
 unit_t *repo_find_unit_by_handle(unit_handle_t handle)
 {
+        fibril_rwlock_read_lock(&repo_lock);
         ht_link_t *ht_link = hash_table_find(&units_by_handle, &handle);
+        fibril_rwlock_read_unlock(&repo_lock);
+
         if (ht_link != NULL) {
                 return hash_table_get_inst(ht_link, unit_t, units_by_handle);
@@ -286 +299 @@
 }
 
+void repo_rlock(void)
+{
+        fibril_rwlock_read_lock(&repo_lock);
+}
+
+void repo_runlock(void)
+{
+        fibril_rwlock_read_unlock(&repo_lock);
+}