Mercurial > hg > Members > kono > Cerium
diff TaskManager/kernel/schedule/Scheduler.cc @ 736:31d0a5baafdf
cut printf
author | hiroki@localhost.localdomain |
---|---|
date | Sun, 27 Dec 2009 20:39:33 +0900 |
parents | dcaa40ec963d |
children | 4c2e6493b008 |
line wrap: on
line diff
--- a/TaskManager/kernel/schedule/Scheduler.cc Fri Dec 25 20:20:40 2009 +0900 +++ b/TaskManager/kernel/schedule/Scheduler.cc Sun Dec 27 20:39:33 2009 +0900 @@ -1,6 +1,8 @@ #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include "Scheduler.h" +#include "SchedTask.h" #include "SchedNop.h" #include "error.h" #include <assert.h> @@ -21,7 +23,7 @@ static int null_run(SchedTask* smanager, void* r, void *w) { - printf("Calling Undefined Task\n"); + smanager->printf("Calling Undefined Task\n"); return 0; } @@ -211,7 +213,7 @@ task_list[task_id].end-task_list[task_id].location); task_list[task_id].segment = s; #if 0 - fprintf(stderr,"loadng task id %d at 0x%x entry 0x%x\n",task_id, + m->printf("loadng task id %d at 0x%x entry 0x%x\n",task_id, (unsigned int)(task_list[task_id].segment->data ), (unsigned int)( (char*)task_list[task_id].segment->data + @@ -230,9 +232,9 @@ #if 0 MemorySegment *s = task_list[task_id].segment; if (s) - fprintf(stderr,"wait load task id %d 0x%x\n",task_id,(int)s->data); + m->printf("wait load task id %d 0x%x\n",task_id,(int)s->data); else - fprintf(stderr,"wait load task id %d 000000\n",task_id); + m->printf("wait load task id %d 000000\n",task_id); #endif // wait for code segment load m->wait_segment(task_list[task_id].segment); @@ -243,7 +245,7 @@ task_list[task_id].entry_offset); task_list[task_id].run = run; #if 0 - fprintf(stderr,"wait load task id %d done. creator = 0x%x entry_offset = 0x%x\n",task_id, + m->printf("wait load task id %d done. creator = 0x%x entry_offset = 0x%x\n",task_id, (unsigned int)run, task_list[task_id].entry_offset); #endif @@ -275,11 +277,11 @@ task_list[cmd].load = load_task; task_list[cmd].wait = wait_load; #if 0 -fprintf(stderr,"cmd = %d\n",cmd); -fprintf(stderr,"locatation = 0x%x\n",start); -fprintf(stderr,"end = 0x%x\n",start+size); -fprintf(stderr,"size = 0x%x\n",size); -fprintf(stderr,"entry = 0x%x\n",entry_offset); +this->printf("cmd = %d\n",cmd); +this->printf("locatation = 0x%x\n",start); +this->printf("end = 0x%x\n",start+size); +this->printf("size = 0x%x\n",size); +this->printf("entry = 0x%x\n",entry_offset); #endif } @@ -342,7 +344,7 @@ MemorySegment *s = hash->get(addr); if (s) { /* 既に load されている */ -// fprintf(stderr,"get_segement loaded %llx 0x%x size 0x%d\n",addr,s->data,size); +// this->printf("get_segement loaded %llx 0x%x size 0x%d\n",addr,s->data,size); m->moveToFirst(s); return s; } @@ -361,7 +363,7 @@ s->address = addr; hash->put(s->address, s); -// fprintf(stderr,"get_segement %llx 0x%x size 0x%d\n",addr, s->data,size); +// this->printf("get_segement %llx 0x%x size 0x%d\n",addr, s->data,size); return s; } @@ -432,4 +434,31 @@ } +int +Scheduler::printf(const char * format, ...) +{ +#if !defined(__SPU__) + va_list ap; + va_start(ap,format); + int ret= vprintf(format, ap); + va_end(ap); + return ret; +#else + return 0; +#endif +} + + +int +Scheduler::vprintf(const char * format, va_list ap) +{ +#if !defined(__SPU__) + int ret= vprintf(format, ap); + return ret; +#else + return 0; +#endif +} + + /* end */