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

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/console

Files:

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

kernel/generic/src/console/cmd.c

@@ -1465 +1465 @@
                 return true;
 
-        uint64_t *data = (uint64_t *) malloc(sizeof(uint64_t) * cnt,
-            FRAME_ATOMIC);
+        uint64_t *data = (uint64_t *) malloc(sizeof(uint64_t) * cnt);
         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, FRAME_ATOMIC);
+                data = (char *) malloc(size + 1);
                 if (!data)
                         return (sys_errno_t) ENOMEM;

kernel/generic/src/console/kconsole.c

@@ -219 +219 @@
         const char *hint;
         const char *help;
-        char *output = malloc(MAX_CMDLINE, 0);
+        char *output = nfmalloc(MAX_CMDLINE);
         size_t hints_to_show = MAX_TAB_HINTS - 1;
         size_t total_hints_shown = 0;
@@ -298 +298 @@
                 end++;
 
-        tmp = malloc(STR_BOUNDS(end - start + 1), FRAME_ATOMIC);
+        tmp = malloc(STR_BOUNDS(end - start + 1));
         if (!tmp)
                 return NULL;
@@ -332 +332 @@
         wchar_t *current = history[history_pos];
         current[0] = 0;
-        char *tmp = malloc(STR_BOUNDS(MAX_CMDLINE), 0);
+        char *tmp = nfmalloc(STR_BOUNDS(MAX_CMDLINE));
 
         while (true) {
@@ -810 +810 @@
                 printf("Type \"exit\" to leave the console.\n");
 
-        char *cmdline = malloc(STR_BOUNDS(MAX_CMDLINE), 0);
+        char *cmdline = nfmalloc(STR_BOUNDS(MAX_CMDLINE));
         while (true) {
                 wchar_t *tmp = clever_readline((char *) prompt, stdin);