Changeset 11b285d in mainline for kernel/generic/src/adt

Timestamp:

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

Location:

kernel/generic/src/adt

Files:

• cht.c (modified) (1 diff)
• hash_table.c (modified) (1 diff)

kernel/generic/src/adt/cht.c

@@ -573 +573 @@
         size_t bytes =
             sizeof(cht_buckets_t) + (bucket_cnt - 1) * sizeof(marked_ptr_t);
-        cht_buckets_t *b = malloc(bytes, can_block ? 0 : FRAME_ATOMIC);
+        cht_buckets_t *b = can_block ? nfmalloc(bytes) : malloc(bytes);
 
         if (!b)

kernel/generic/src/adt/hash_table.c

@@ -401 +401 @@
         assert(pbuckets && HT_MIN_BUCKETS <= bucket_cnt);
 
-        list_t *buckets = malloc(bucket_cnt * sizeof(list_t), FRAME_ATOMIC);
+        list_t *buckets = malloc(bucket_cnt * sizeof(list_t));
         if (!buckets)
                 return false;