Changeset 3cfe2b8 in mainline

Timestamp:

2018-09-07T16:01:50Z (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:

c53e813

Parents:

5f1d850

Message:

Convert atomic_t to atomic_size_t (6): Replace atomic_count_t with size_t

Location:

kernel

Files:

• generic/include/atomic.h (modified) (1 diff)
• generic/src/adt/cht.c (modified) (3 diffs)
• generic/src/mm/slab.c (modified) (1 diff)
• generic/src/proc/scheduler.c (modified) (2 diffs)
• generic/src/sysinfo/stats.c (modified) (2 diffs)
• test/synch/rcu1.c (modified) (3 diffs)
• test/synch/semaphore1.c (modified) (1 diff)
• test/thread/thread1.c (modified) (1 diff)

kernel/generic/include/atomic.h

@@ -40 +40 @@
 #include <stdatomic.h>
 
-typedef size_t atomic_count_t;
 typedef atomic_size_t atomic_t;
 

kernel/generic/src/adt/cht.c

@@ -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) {
@@ -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);
                 }

kernel/generic/src/mm/slab.c

@@ -690 +690 @@
          * endless loop
          */
-        atomic_count_t magcount = atomic_load(&cache->magazine_counter);
+        size_t magcount = atomic_load(&cache->magazine_counter);
 
         slab_magazine_t *mag;

kernel/generic/src/proc/scheduler.c

@@ -566 +566 @@
 void kcpulb(void *arg)
 {
-        atomic_count_t average;
-        atomic_count_t rdy;
+        size_t average;
+        size_t rdy;
 
         /*
@@ -593 +593 @@
                 goto satisfied;
 
-        atomic_count_t count = average - rdy;
+        size_t count = average - rdy;
 
         /*

kernel/generic/src/sysinfo/stats.c

@@ -764 +764 @@
  *
  */
-static inline load_t load_calc(load_t load, load_t exp, atomic_count_t ready)
+static inline load_t load_calc(load_t load, load_t exp, size_t ready)
 {
         load *= exp;
@@ -784 +784 @@
 
         while (true) {
-                atomic_count_t ready = atomic_load(&nrdy);
+                size_t ready = atomic_load(&nrdy);
 
                 /* Mutually exclude with get_stats_load() */

kernel/test/synch/rcu1.c

@@ -361 +361 @@
 typedef struct {
         rcu_item_t rcu;
-        atomic_count_t start_time;
+        size_t start_time;
 } seq_item_t;
 
@@ -368 +368 @@
 
 static atomic_t cur_time = { 1 };
-static atomic_count_t max_upd_done_time = { 0 };
+static size_t max_upd_done_time = { 0 };
 
 static void seq_cb(rcu_item_t *rcu_item)
@@ -399 +399 @@
                 for (size_t i = 0; i < work->read_cnt; ++i) {
                         rcu_read_lock();
-                        atomic_count_t start_time = atomic_postinc(&cur_time);
+                        size_t start_time = atomic_postinc(&cur_time);
 
                         for (volatile size_t d = 0; d < 10 * i; ++d) {

kernel/test/synch/semaphore1.c

@@ -73 +73 @@
 {
         int i, j, k;
-        atomic_count_t consumers;
-        atomic_count_t producers;
+        size_t consumers;
+        size_t producers;
 
         waitq_initialize(&can_start);

kernel/test/thread/thread1.c

@@ -56 +56 @@
 {
         unsigned int i;
-        atomic_count_t total = 0;
+        size_t total = 0;
 
         atomic_store(&finish, 1);