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

Timestamp:

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

Files:

• gsort.c (modified) (1 diff)
• ra.c (modified) (3 diffs)
• str.c (modified) (2 diffs)

kernel/generic/src/lib/gsort.c

@@ -111 +111 @@
 
         if (elem_size > IBUF_SIZE) {
-                slot = (void *) malloc(elem_size, FRAME_ATOMIC);
+                slot = (void *) malloc(elem_size);
                 if (!slot)
                         return false;

kernel/generic/src/lib/ra.c

@@ -124 +124 @@
         unsigned int i;
 
-        span = (ra_span_t *) malloc(sizeof(ra_span_t), FRAME_ATOMIC);
+        span = (ra_span_t *) malloc(sizeof(ra_span_t));
         if (!span)
                 return NULL;
@@ -132 +132 @@
         span->size = size;
 
-        span->free = (list_t *) malloc((span->max_order + 1) * sizeof(list_t),
-            FRAME_ATOMIC);
+        span->free = (list_t *) malloc((span->max_order + 1) * sizeof(list_t));
         if (!span->free) {
                 free(span);
@@ -205 +204 @@
         ra_arena_t *arena;
 
-        arena = (ra_arena_t *) malloc(sizeof(ra_arena_t), FRAME_ATOMIC);
+        arena = (ra_arena_t *) malloc(sizeof(ra_arena_t));
         if (!arena)
                 return NULL;

kernel/generic/src/lib/str.c

@@ -634 +634 @@
 {
         size_t size = str_size(src) + 1;
-        char *dest = malloc(size, 0);
+        char *dest = nfmalloc(size);
         assert(dest);
 
@@ -667 +667 @@
                 size = n;
 
-        char *dest = malloc(size + 1, 0);
+        char *dest = nfmalloc(size + 1);
         assert(dest);