.

praffulr · Mar 11, 2020 · 7e49940 · 7e49940
1 parent fc60696
commit 7e49940
Show file tree

Hide file tree

Showing 17 changed files with 4,566 additions and 5,264 deletions.
diff --git a/Makefile b/Makefile
@@ -17,6 +17,7 @@ SOURCES     = \
               $I/labs/shell.cc  \
               $I/labs/coroutine.cc  \
               $I/labs/fiber.cc  \
+              $I/labs/fiber_scheduler.cc  \
 
 ISO_SOURCES = \
               $O/iso/boot/$(NAME).exe   \

diff --git a/_tmp/hoh.065a8ab7026754e9d5f752582e61b81f.exe b/_tmp/hoh.065a8ab7026754e9d5f752582e61b81f.exe
diff --git a/_tmp/hoh.iso b/_tmp/hoh.iso
diff --git a/_tmp/iso/boot/hoh.exe b/_tmp/iso/boot/hoh.exe
diff --git a/_tmp/labs/shell.065a8ab7026754e9d5f752582e61b81f.o b/_tmp/labs/shell.065a8ab7026754e9d5f752582e61b81f.o
diff --git a/_tmp/x86/main.065a8ab7026754e9d5f752582e61b81f.o b/_tmp/x86/main.065a8ab7026754e9d5f752582e61b81f.o
diff --git a/_tmp/x86/main.cc.065a8ab7026754e9d5f752582e61b81f.dep b/_tmp/x86/main.cc.065a8ab7026754e9d5f752582e61b81f.dep
@@ -46,7 +46,7 @@ _tmp/x86/main.cc.065a8ab7026754e9d5f752582e61b81f.dep  ./_tmp/x86/main.065a8ab70
  /usr/include/boost/detail/workaround.hpp \
  /usr/include/boost/config/workaround.hpp labs/keyboard.h \
  generated/lpc_kbd.dev.h labs/shell.h labs/coroutine.h util/coroutine.h \
- labs/fiber.h util/fiber.h
+ labs/fiber.h util/fiber.h labs/fiber_scheduler.h
 
 labs/vgatext.h:
 
@@ -217,3 +217,5 @@ util/coroutine.h:
 labs/fiber.h:
 
 util/fiber.h:
+
+labs/fiber_scheduler.h:
diff --git a/fiber.cc b/fiber.cc
diff --git a/fiber.h b/fiber.h
diff --git a/labs/coroutine.cc b/labs/coroutine.cc
@@ -1,3 +1,5 @@
+// FIXME: check few fix set of assignments are done inside error block
+
 #include "labs/coroutine.h"
 
 bool equal_to1(char* str1, char* str2, int len)
@@ -84,8 +86,6 @@ void int_to_string_write1(char* arr, int n)
 
 void shell_step_coroutine(shellstate_t& shellstate, coroutine_t& f_coro, f_t& f_locals){
 
-    //insert your code here
-
     //copying local data
     int& i = f_locals.i;
     int& n = f_locals.n;
@@ -103,16 +103,16 @@ void shell_step_coroutine(shellstate_t& shellstate, coroutine_t& f_coro, f_t& f_
         // user didn't provided any input
 
 
-        if(num_arguments != 1)
-        {
-          hoh_debug(num_arguments);
-          hoh_debug("Primes arguments");
-          shellstate.output[0] = 'E';
-          shellstate.output[1] = 'R';
-          shellstate.output[2] = 'R';
-          shellstate.output[3] = 'O';
-          shellstate.output[4] = 'R';
-          shellstate.output[5] = '\0';
+	if(num_arguments != 1)
+	{
+		hoh_debug(num_arguments);
+		hoh_debug("Primes arguments");
+		shellstate.output[0] = 'E';
+		shellstate.output[1] = 'R';
+		shellstate.output[2] = 'R';
+		shellstate.output[3] = 'O';
+		shellstate.output[4] = 'R';
+		shellstate.output[5] = '\0';
         }
         else
         {