Changeset 0594c7ea in mainline

Timestamp:

2012-07-12T18:31:10Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

057e77f

Parents:

e25eb9e3

Message:

rcu: Changed mallocs in test rcu1 to use nonblocking ATOMIC_FRAME flag.

File:

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

kernel/test/synch/rcu1.c

@@ -250 +250 @@
 {
         for (int i = 0; i < nop_updater_iters; i += 2){
-                rcu_item_t *a = malloc(sizeof(rcu_item_t), 0);
-                rcu_item_t *b = malloc(sizeof(rcu_item_t), 0);
+                rcu_item_t *a = malloc(sizeof(rcu_item_t), FRAME_ATOMIC);
+                rcu_item_t *b = malloc(sizeof(rcu_item_t), FRAME_ATOMIC);
                 
                 if (a && b) {
@@ -257 +257 @@
                         rcu_call(b, count_cb);
                 } else {
+                        TPRINTF("[out-of-mem]\n");
                         free(a);
                         free(b);
+                        return;
                 }
         }
@@ -312 +314 @@
         rcu_read_lock();
         
-        item_w_cookie_t *item = malloc(sizeof(item_w_cookie_t), 0);
+        item_w_cookie_t *item = malloc(sizeof(item_w_cookie_t), FRAME_ATOMIC);
         
         if (item) {
@@ -412 +414 @@
                 /* Updater */
                 for (size_t i = 0; i < work->update_cnt; ++i) {
-                        seq_item_t *a = malloc(sizeof(seq_item_t), 0);
-                        seq_item_t *b = malloc(sizeof(seq_item_t), 0);
+                        seq_item_t *a = malloc(sizeof(seq_item_t), FRAME_ATOMIC);
+                        seq_item_t *b = malloc(sizeof(seq_item_t), FRAME_ATOMIC);
                         
                         if (a && b) {
@@ -512 +514 @@
         TPRINTF("\nReader exits thread with rcu_lock\n");
         
-        exited_t *p = malloc(sizeof(exited_t), 0);
+        exited_t *p = malloc(sizeof(exited_t), FRAME_ATOMIC);
+        if (!p) {
+                TPRINTF("[out-of-mem]\n");
+                return false;
+        }
+                
         p->exited = false;
         
@@ -670 +677 @@
 static bool do_one_reader_preempt(void (*f)(void*), const char *err)
 {
-        preempt_t *p = malloc(sizeof(preempt_t), 0);
-        ASSERT(p);
+        preempt_t *p = malloc(sizeof(preempt_t), FRAME_ATOMIC);
+        if (!p) {
+                TPRINTF("[out-of-mem]\n");
+                return false;
+        }
+        
         p->e.exited = false;
         p->result = EOK;
@@ -756 +767 @@
         TPRINTF("\nSynchronize with long reader\n");
         
-        synch_t *synch = malloc(sizeof(synch_t), 0);
+        synch_t *synch = malloc(sizeof(synch_t), FRAME_ATOMIC);
         
         if (!synch) {
+                TPRINTF("[out-of-mem]\n");
                 return false;
         }
@@ -826 +838 @@
         
         for (size_t i = 0; i < s->iters; ++i) {
-                rcu_item_t *item = malloc(sizeof(rcu_item_t), 0);
-                
-                if (item)
+                rcu_item_t *item = malloc(sizeof(rcu_item_t), FRAME_ATOMIC);
+                
+                if (item) {
                         rcu_call(item, stress_cb);
+                } else {
+                        TPRINTF("[out-of-mem]\n");
+                        return;
+                }
                 
                 /* Print a dot if we make progress of 1% */