Changeset 7473807 in mainline for kernel/generic/src/console

Timestamp:

2018-05-11T20:22:42Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d2c5159

Parents:

ae89656

Message:

Use atomic malloc allocations

We can safely use atomic allocations in places that use the non-failing
version of malloc(), but test the return value anyway. And also in some
places that can afford to return failure but did not because of comfort.

Location:

kernel/generic/src/console

Files:

• cmd.c (modified) (1 diff)
• console.c (modified) (1 diff)
• kconsole.c (modified) (1 diff)

kernel/generic/src/console/cmd.c

@@ -1465 +1465 @@
                 return true;
 
-        uint64_t *data = (uint64_t *) malloc(sizeof(uint64_t) * cnt, 0);
+        uint64_t *data = (uint64_t *) malloc(sizeof(uint64_t) * cnt,
+            FRAME_ATOMIC);
         if (data == NULL) {
                 printf("Error allocating memory for statistics\n");

kernel/generic/src/console/console.c

@@ -411 +411 @@
 
         if (size > 0) {
-                data = (char *) malloc(size + 1, 0);
+                data = (char *) malloc(size + 1, FRAME_ATOMIC);
                 if (!data)
                         return (sys_errno_t) ENOMEM;

kernel/generic/src/console/kconsole.c

@@ -298 +298 @@
                 end++;
 
-        tmp = malloc(STR_BOUNDS(end - start + 1), 0);
+        tmp = malloc(STR_BOUNDS(end - start + 1), FRAME_ATOMIC);
+        if (!tmp)
+                return NULL;
 
         wstr_to_str(tmp, end - start + 1, &cmdline[start]);