Changeset b2fa1204 in mainline for kernel/generic/src
- Timestamp:
- 2014-01-05T21:12:26Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- ca05e9b
- Parents:
- bd6ff94
- Location:
- kernel/generic/src
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/console/cmd.c
rbd6ff94 rb2fa1204 45 45 #include <console/kconsole.h> 46 46 #include <print.h> 47 #include <log.h> 47 48 #include <panic.h> 48 49 #include <typedefs.h> … … 639 640 for (i = 0; basic_commands[i]; i++) { 640 641 if (!cmd_register(basic_commands[i])) { 641 printf("Cannot register command %s\n", 642 log(LF_OTHER, LVL_ERROR, 643 "Cannot register command %s", 642 644 basic_commands[i]->name); 643 645 } … … 665 667 unsigned int _len = (unsigned int) len; 666 668 if ((_len != len) || (((int) _len) < 0)) { 667 printf("Command length overflow\n");669 log(LF_OTHER, LVL_ERROR, "Command length overflow"); 668 670 return 1; 669 671 } -
kernel/generic/src/lib/func.c
rbd6ff94 rb2fa1204 37 37 38 38 #include <func.h> 39 #include < print.h>39 #include <log.h> 40 40 #include <cpu.h> 41 41 #include <arch/asm.h> … … 72 72 73 73 if (CPU) 74 printf("cpu%u: halted\n", CPU->id);74 log(LF_OTHER, LVL_NOTE, "cpu%u: halted", CPU->id); 75 75 else 76 printf("cpu: halted\n");76 log(LF_OTHER, LVL_NOTE, "cpu: halted"); 77 77 78 78 cpu_halt(); -
kernel/generic/src/lib/rd.c
rbd6ff94 rb2fa1204 38 38 */ 39 39 40 #include < print.h>40 #include <log.h> 41 41 #include <lib/rd.h> 42 42 #include <mm/frame.h> … … 68 68 sysinfo_set_item_val("rd.address.physical", NULL, (sysarg_t) base); 69 69 70 printf("RAM disk at %p (size %zu bytes)\n", (void *) base, size); 70 log(LF_OTHER, LVL_NOTE, "RAM disk at %p (size %zu bytes)", (void *) base, 71 size); 71 72 } 72 73 -
kernel/generic/src/main/kinit.c
rbd6ff94 rb2fa1204 59 59 #include <mm/km.h> 60 60 #include <print.h> 61 #include <log.h> 61 62 #include <memstr.h> 62 63 #include <console/console.h> … … 140 141 thread_ready(thread); 141 142 } else 142 printf("Unable to create kcpulb thread for cpu%u\n", i); 143 log(LF_OTHER, LVL_ERROR, 144 "Unable to create kcpulb thread for cpu%u", i); 143 145 } 144 146 } … … 156 158 thread_ready(thread); 157 159 else 158 printf("Unable to create kload thread\n");160 log(LF_OTHER, LVL_ERROR, "Unable to create kload thread"); 159 161 160 162 #ifdef CONFIG_KCONSOLE … … 168 170 thread_ready(thread); 169 171 else 170 printf("Unable to create kconsole thread\n"); 172 log(LF_OTHER, LVL_ERROR, 173 "Unable to create kconsole thread"); 171 174 } 172 175 #endif /* CONFIG_KCONSOLE */ … … 210 213 for (i = 0; i < init.cnt; i++) { 211 214 if (init.tasks[i].paddr % FRAME_SIZE) { 212 printf("init[%zu]: Address is not frame aligned\n", i); 215 log(LF_OTHER, LVL_ERROR, 216 "init[%zu]: Address is not frame aligned", i); 213 217 programs[i].task = NULL; 214 218 continue; … … 273 277 init_rd((void *) init.tasks[i].paddr, init.tasks[i].size); 274 278 } else 275 printf("init[%zu]: Init binary load failed " 276 "(error %d, loader status %u)\n", i, rc, 279 log(LF_OTHER, LVL_ERROR, 280 "init[%zu]: Init binary load failed " 281 "(error %d, loader status %u)", i, rc, 277 282 programs[i].loader_status); 278 283 } -
kernel/generic/src/main/shutdown.c
rbd6ff94 rb2fa1204 39 39 #include <func.h> 40 40 #include <print.h> 41 #include <log.h> 41 42 42 43 void reboot(void) … … 45 46 46 47 #ifdef CONFIG_DEBUG 47 printf("Rebooting the system\n");48 log(LF_OTHER, LVL_DEBUG, "Rebooting the system"); 48 49 #endif 49 50 -
kernel/generic/src/mm/frame.c
rbd6ff94 rb2fa1204 54 54 #include <arch.h> 55 55 #include <print.h> 56 #include <log.h> 56 57 #include <align.h> 57 58 #include <mm/slab.h> … … 121 122 { 122 123 if (zones.count + 1 == ZONES_MAX) { 123 printf("Maximum zone count %u exceeded!\n", ZONES_MAX); 124 log(LF_OTHER, LVL_ERROR, "Maximum zone count %u exceeded!", 125 ZONES_MAX); 124 126 return (size_t) -1; 125 127 } … … 141 143 (!iswithin(zones.info[i].base, zones.info[i].count, 142 144 base, count))) { 143 printf("Zone (%p, %p) overlaps " 144 "with previous zone (%p %p)!\n", 145 log(LF_OTHER, LVL_WARN, 146 "Zone (%p, %p) overlaps " 147 "with previous zone (%p %p)!", 145 148 (void *) PFN2ADDR(base), (void *) PFN2ADDR(count), 146 149 (void *) PFN2ADDR(zones.info[i].base), … … 913 916 914 917 #ifdef CONFIG_DEBUG 915 printf("Thread %" PRIu64 " waiting for %zu frames " 916 "(%zu available).\n", THREAD->tid, count, avail); 918 log(LF_OTHER, LVL_DEBUG, 919 "Thread %" PRIu64 " waiting for %zu frames " 920 "%zu available.", THREAD->tid, count, avail); 917 921 #endif 918 922 … … 938 942 939 943 #ifdef CONFIG_DEBUG 940 printf("Thread %" PRIu64 " woken up.\n", THREAD->tid); 944 log(LF_OTHER, LVL_DEBUG, "Thread %" PRIu64 " woken up.", 945 THREAD->tid); 941 946 #endif 942 947 -
kernel/generic/src/proc/program.c
rbd6ff94 rb2fa1204 49 49 #include <lib/elf_load.h> 50 50 #include <errno.h> 51 #include < print.h>51 #include <log.h> 52 52 #include <syscall/copy.h> 53 53 #include <proc/program.h> … … 155 155 156 156 program_loader = image_addr; 157 printf("Program loader at %p\n", (void *) image_addr);157 log(LF_OTHER, LVL_NOTE, "Program loader at %p", (void *) image_addr); 158 158 159 159 return EOK; … … 181 181 if (!loader) { 182 182 as_destroy(as); 183 printf("Cannot spawn loader as none was registered\n"); 183 log(LF_OTHER, LVL_ERROR, 184 "Cannot spawn loader as none was registered"); 184 185 return ENOENT; 185 186 } … … 189 190 if (prg->loader_status != EE_OK) { 190 191 as_destroy(as); 191 printf("Cannot spawn loader (%s)\n",192 log(LF_OTHER, LVL_ERROR, "Cannot spawn loader (%s)", 192 193 elf_error(prg->loader_status)); 193 194 return ENOENT; -
kernel/generic/src/proc/scheduler.c
rbd6ff94 rb2fa1204 61 61 #include <cpu.h> 62 62 #include <print.h> 63 #include <log.h> 63 64 #include <debug.h> 64 65 #include <stacktrace.h> … … 517 518 518 519 #ifdef SCHEDULER_VERBOSE 519 printf("cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64 520 ", nrdy=%" PRIua ")\n", CPU->id, THREAD->tid, THREAD->priority, 520 log(LF_OTHER, LVL_DEBUG, 521 "cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64 522 ", nrdy=%" PRIua ")", CPU->id, THREAD->tid, THREAD->priority, 521 523 THREAD->ticks, atomic_get(&CPU->nrdy)); 522 524 #endif … … 663 665 664 666 #ifdef KCPULB_VERBOSE 665 printf("kcpulb%u: TID %" PRIu64 " -> cpu%u, " 666 "nrdy=%ld, avg=%ld\n", CPU->id, t->tid, 667 log(LF_OTHER, LVL_DEBUG, 668 "kcpulb%u: TID %" PRIu64 " -> cpu%u, " 669 "nrdy=%ld, avg=%ld", CPU->id, t->tid, 667 670 CPU->id, atomic_get(&CPU->nrdy), 668 671 atomic_get(&nrdy) / config.cpu_active); -
kernel/generic/src/syscall/syscall.c
rbd6ff94 rb2fa1204 87 87 rc = syscall_table[id](a1, a2, a3, a4, a5, a6); 88 88 } else { 89 printf("Task %" PRIu64": Unknown syscall %#" PRIxn, TASK->taskid, id); 89 log(LF_OTHER, LVL_ERROR, 90 "Task %" PRIu64": Unknown syscall %#" PRIxn, TASK->taskid, id); 90 91 task_kill_self(true); 91 92 }
Note:
See TracChangeset
for help on using the changeset viewer.