Changeset fc10e1b in mainline for kernel/generic/src/adt/cht.c

Timestamp:

2018-09-07T16:34:11Z (6 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.

File:

• kernel/generic/src/adt/cht.c (modified) (8 diffs)

kernel/generic/src/adt/cht.c

@@ -537 +537 @@
         h->new_b = NULL;
         h->op = op;
-        atomic_set(&h->item_cnt, 0);
-        atomic_set(&h->resize_reqs, 0);
+        atomic_store(&h->item_cnt, 0);
+        atomic_store(&h->resize_reqs, 0);
 
         if (NULL == op->remove_callback) {
@@ -618 +618 @@
 
         /* You must clear the table of items. Otherwise cht_destroy will leak. */
-        assert(atomic_get(&h->item_cnt) == 0);
+        assert(atomic_load(&h->item_cnt) == 0);
 }
 
@@ -625 +625 @@
 {
         /* Wait for resize to complete. */
-        while (0 < atomic_get(&h->resize_reqs)) {
+        while (0 < atomic_load(&h->resize_reqs)) {
                 rcu_barrier();
         }
@@ -2122 +2122 @@
 
         if ((need_shrink || missed_shrink) && h->b->order > h->min_order) {
-                atomic_count_t resize_reqs = atomic_preinc(&h->resize_reqs);
+                size_t resize_reqs = atomic_preinc(&h->resize_reqs);
                 /* The first resize request. Start the resizer. */
                 if (1 == resize_reqs) {
@@ -2143 +2143 @@
 
         if ((need_grow || missed_grow) && h->b->order < CHT_MAX_ORDER) {
-                atomic_count_t resize_reqs = atomic_preinc(&h->resize_reqs);
+                size_t resize_reqs = atomic_preinc(&h->resize_reqs);
                 /* The first resize request. Start the resizer. */
                 if (1 == resize_reqs) {
@@ -2160 +2160 @@
         /* Make resize_reqs visible. */
         read_barrier();
-        assert(0 < atomic_get(&h->resize_reqs));
+        assert(0 < atomic_load(&h->resize_reqs));
 #endif
 
@@ -2168 +2168 @@
                 /* Load the most recent h->item_cnt. */
                 read_barrier();
-                size_t cur_items = (size_t) atomic_get(&h->item_cnt);
+                size_t cur_items = (size_t) atomic_load(&h->item_cnt);
                 size_t bucket_cnt = (1 << h->b->order);
                 size_t max_items = h->max_load * bucket_cnt;
@@ -2178 +2178 @@
                 } else {
                         /* Table is just the right size. */
-                        atomic_count_t reqs = atomic_predec(&h->resize_reqs);
+                        size_t reqs = atomic_predec(&h->resize_reqs);
                         done = (reqs == 0);
                 }