diff --git a/kernel/main.cc b/kernel/main.cc index 8dd9d1c..9173d71 100644 --- a/kernel/main.cc +++ b/kernel/main.cc @@ -93,7 +93,7 @@ extern "C" int main() { offset += 1+(appsize/4096); } - g.vault().scheduler.ready(new Thread(false, (void*)0x4001000, 1)); + g.vault().scheduler.ready(new Thread(false, (void*)0x4001000, 2)); //for(void* p=Multiboot::getModule(0)->getStartAddress(); pgetEndAddress(); p=(void*)((uintptr_t)p+4096)){ // DBG << "module at: " << hex << p << endl; // g.vault().scheduler.ready(new Thread(false, p)); diff --git a/user/app1/appl.cc b/user/app1/appl.cc index 10f08ac..93bc095 100644 --- a/user/app1/appl.cc +++ b/user/app1/appl.cc @@ -8,14 +8,21 @@ extern "C" void main() { //sys_test(1,2,3,4,5); unsigned id = sys_getpid(); - char text[] = "testX"; + char text[] = "app X"; text[4] = 0x30+id; - char buf= 32 ; + char buf = 32; + + write(1, text, sizeof(text), 0, (int)id); + + uint8_t cnt = 0; for (unsigned i = 1;; ++i) { - write(1, text, sizeof(text)); + char msg[5]; + msg[0] = 0x30+cnt; + msg[1] = 0; + cnt=(cnt+1)%10; + write(1, msg, sizeof(text), 6, (int)id); void* ptr= map(512); - //sprintf(&buf, "ptr address: %x \n" , ptr); //unmap(ptr, 512); diff --git a/user/app2/kappl.cc b/user/app2/kappl.cc index ed6e396..16c518f 100644 --- a/user/app2/kappl.cc +++ b/user/app2/kappl.cc @@ -8,16 +8,25 @@ extern "C" void main() { char cmd_buff[100]; uint8_t bufferpos = 0; + + uint8_t id = sys_getpid(); + uint8_t x = 0; + + char text[] = "kappl"; + write(1, text, sizeof(text), 0, (int)id); + while(1){ char msg[11]; int len; len = read(0, msg, 1); if(len){ - write(0, msg, len); + write(0, msg, len, 6+x, id); memcpy(&cmd_buff[bufferpos], msg, len); bufferpos+=len; for(uint8_t i=0; i