Changeset 11b285d in mainline for kernel/test/synch/rcu1.c

Timestamp:

2018-05-13T15:19:32Z (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:

ad896eb

Parents:

13db2044

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-05-13 14:59:01)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-05-13 15:19:32)

Message:

Use standard signature for malloc() in kernel.

The remaining instances of blocking allocation are replaced with
a new separate function named nfmalloc (short for non-failing malloc).

File:

• kernel/test/synch/rcu1.c (modified) (8 diffs)

kernel/test/synch/rcu1.c

@@ -251 +251 @@
 {
         for (int i = 0; i < nop_updater_iters; i += 2) {
-                rcu_item_t *a = malloc(sizeof(rcu_item_t), FRAME_ATOMIC);
-                rcu_item_t *b = malloc(sizeof(rcu_item_t), FRAME_ATOMIC);
+                rcu_item_t *a = malloc(sizeof(rcu_item_t));
+                rcu_item_t *b = malloc(sizeof(rcu_item_t));
 
                 if (a && b) {
@@ -315 +315 @@
         rcu_read_lock();
 
-        item_w_cookie_t *item = malloc(sizeof(item_w_cookie_t), FRAME_ATOMIC);
+        item_w_cookie_t *item = malloc(sizeof(item_w_cookie_t));
 
         if (item) {
@@ -420 +420 @@
                 /* Updater */
                 for (size_t i = 0; i < work->update_cnt; ++i) {
-                        seq_item_t *a = malloc(sizeof(seq_item_t), FRAME_ATOMIC);
-                        seq_item_t *b = malloc(sizeof(seq_item_t), FRAME_ATOMIC);
+                        seq_item_t *a = malloc(sizeof(seq_item_t));
+                        seq_item_t *b = malloc(sizeof(seq_item_t));
 
                         if (a && b) {
@@ -523 +523 @@
         TPRINTF("\nReader exits thread with rcu_lock\n");
 
-        exited_t *p = malloc(sizeof(exited_t), FRAME_ATOMIC);
+        exited_t *p = malloc(sizeof(exited_t));
         if (!p) {
                 TPRINTF("[out-of-mem]\n");
@@ -686 +686 @@
 static bool do_one_reader_preempt(void (*f)(void *), const char *err)
 {
-        preempt_t *p = malloc(sizeof(preempt_t), FRAME_ATOMIC);
+        preempt_t *p = malloc(sizeof(preempt_t));
         if (!p) {
                 TPRINTF("[out-of-mem]\n");
@@ -777 +777 @@
         TPRINTF("\nSynchronize with long reader\n");
 
-        synch_t *synch = malloc(sizeof(synch_t), FRAME_ATOMIC);
+        synch_t *synch = malloc(sizeof(synch_t));
 
         if (!synch) {
@@ -828 +828 @@
         TPRINTF("\nrcu_barrier: Wait for outstanding rcu callbacks to complete\n");
 
-        barrier_t *barrier = malloc(sizeof(barrier_t), FRAME_ATOMIC);
+        barrier_t *barrier = malloc(sizeof(barrier_t));
 
         if (!barrier) {
@@ -886 +886 @@
 
         for (size_t i = 0; i < s->iters; ++i) {
-                rcu_item_t *item = malloc(sizeof(rcu_item_t), FRAME_ATOMIC);
+                rcu_item_t *item = malloc(sizeof(rcu_item_t));
 
                 if (item) {