Changeset fc10e1b in mainline for kernel/generic/src/mm

Timestamp:

2018-09-07T16:34:11Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

d2c91ab

Parents:

508b0df1 (diff), e90cfa6 (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 branch 'atomic'

Use more of <stdatomic.h> in kernel. Increment/decrement macros kept because
the are handy. atomic_t currently kept because I'm way too lazy to go through
all uses and think about the most appropriate replacement.

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (4 diffs)
• slab.c (modified) (2 diffs)

kernel/generic/src/mm/as.c

@@ -163 +163 @@
                 as->asid = ASID_INVALID;
 
-        atomic_set(&as->refcount, 0);
+        refcount_init(&as->refcount);
         as->cpu_refcount = 0;
 
@@ -190 +190 @@
 
         assert(as != AS);
-        assert(atomic_get(&as->refcount) == 0);
+        assert(refcount_unique(&as->refcount));
 
         /*
@@ -267 +267 @@
 NO_TRACE void as_hold(as_t *as)
 {
-        atomic_inc(&as->refcount);
+        refcount_up(&as->refcount);
 }
 
@@ -275 +275 @@
  * destroys the address space.
  *
- * @param asAddress space to be released.
+ * @param as Address space to be released.
  *
  */
 NO_TRACE void as_release(as_t *as)
 {
-        if (atomic_predec(&as->refcount) == 0)
+        if (refcount_down(&as->refcount))
                 as_destroy(as);
 }

kernel/generic/src/mm/slab.c

@@ -690 +690 @@
          * endless loop
          */
-        atomic_count_t magcount = atomic_get(&cache->magazine_counter);
+        size_t magcount = atomic_load(&cache->magazine_counter);
 
         slab_magazine_t *mag;
@@ -876 +876 @@
                 size_t size = cache->size;
                 size_t objects = cache->objects;
-                long allocated_slabs = atomic_get(&cache->allocated_slabs);
-                long cached_objs = atomic_get(&cache->cached_objs);
-                long allocated_objs = atomic_get(&cache->allocated_objs);
+                long allocated_slabs = atomic_load(&cache->allocated_slabs);
+                long cached_objs = atomic_load(&cache->cached_objs);
+                long allocated_objs = atomic_load(&cache->allocated_objs);
                 unsigned int flags = cache->flags;