backup before pull

include/buffer.h

@@ -3,15 +3,23 @@
 #include <types.h>
 // General Purpose buffer
 
+int InitBuffer(Buffer* Buf, void* Store, int size);
+
 // returns 1 if buffer is ready(not null, has memory)
 int BufferReady(Buffer* Buf);
 
 // insert at the last
 int FeedBuffer(Buffer* Buf,void* Word);
 
+// insert a byte at the last
+int FeedBufferByte(Buffer* Buf, void* Byte);
+
 // Get from the start, does not change size
 int BufferFIFO(Buffer* Buf, void* Dest);
 
+// Get a single byte from the start, does not change size
+int BufferFIFOByte(BUffer* Buf,void* Dest);
+
 int BufferPopHead(Buffer* Buf);
 
 // Get from the Last, does not change size

include/types.h

@@ -50,7 +50,8 @@
 #define TIMER3_INTERRUPT 51
 #define IRQ_MAGIC 100
 
-
+// I/O buffer things
+#define BUFF_SIZE 256
 typedef struct heapnode {
 	int DelayedTick;
 	int TaskID;
@@ -136,6 +137,18 @@ typedef struct hash_table{
 	int size;
 }HT;
 
+typedef enum IOServerMessageType{
+  IN,
+  OUT,
+  NIN, // notifier input
+  NOUT, // notifier output
+} IOType;
+
+typedef struct IOServerRequest{
+  IOType Type;
+  char Byte;
+} IOReq;
+
 typedef struct NameServerMessage {
 	char Msg[NS_MESSAGE_MAX_LENGTH + 1];
 } NSMsg;

lib/buffer.c

@@ -3,6 +3,17 @@
 #include <error.h>
 #include <types.h>
 
+int InitBuffer(BUffer* Buf,void* Store,int size){
+  if(BUfferReady(Buf)){
+    Buf->Storage = Store;
+    Buf->Size = size;
+    Buf->Length = 0;
+    Buf->Head = 0;
+    Buf->Tail = 0;
+    return 0;
+  }else return BUFF_NOTREADY;
+}
+
 int BufferReady(Buffer* Buf){
   int ready = ((Buf!=NULL) &&(Buf->Size >0))? 1:0;
   return ready;
@@ -21,6 +32,18 @@ int FeedBuffer(Buffer* Buf,void* Word)
   }else return BUFF_NOTREADY;
 }
 
+int FeedBufferByte(Buffer* Buf, void *Byte)
+{
+  if(BufferReady(Buf)){
+    if(Buf->Length == Buf->Size) return BUFF_FULL;
+    char *Store = (char *)(Buf->Storage);
+    Store[Buf->Tail] = (char)Byte;
+    Buf->Tail = (Buf->Tail + 1)%(Buf->Size);
+    Buf->Length = Buf->Length + 1;
+    return 0;
+  }else return BUFF_NOTREADY;
+}
+
 int BufferFIFO(Buffer* Buf,void* Dest)
 {
   if(BufferReady(Buf)){
@@ -30,6 +53,17 @@ int BufferFIFO(Buffer* Buf,void* Dest)
     return 0;
   }else return BUFF_NOTREADY;
 }
+
+int BufferFIFOByte(Buffer* Buf,void *Dest)
+{
+  if(BufferReady(Buf)){
+    if(Buf->Length == 0)return BUFF_EMPTY;
+    char* Store = (char *)(Buf->Storage);
+    *(int *)Dest = Store[Buf->Head];
+    return 0;
+  }else return BUFF_NOTREADY;
+}
+
 int BufferPopHead(Buffer* Buf)
 {
   //bwprintf(COM2,"BufferPopHead: Buf is %d\n\r",Buf);

lib/ioserver.c

+#include <buffer.h>
+#include <nameserver.h>
+#include <syscall.h>
+#include <td-shared.h>
+#include <types.h>
+
+void IOServer(char IO, IOType Producer, IOType Consumer){
+  int Result;
+  char ServerName[] = "IServer";
+  ServerName[0] = IO;
+  Result = RegisterAs(Result);
+  
+  // set up send q
+  int MyID = MyTid();
+  int MyIndex = GetMemoryIndexINT(MyID);
+  Buffer** AllSendQ = GetAllSendQ();
+
+  //bwprintf(COM2,"NS Index %d\n\r",MyIndex);
+  // bwprintf(COM2,"NS AllSendQ add%d\n\r",AllSendQ);
+  Buffer SendQ;
+  Buffer WaitList;
+  Buffer Buff;
+  int QStorage[MAX_NUM_TD];
+  int WLStorage[MAX_NUM_TD];
+  int BStorage[BUFF_SIZE];
+  // need to check errors
+  Result = InitBuffer(&SendQ,(void *)QStorage,MAX_NUM_TD);
+  Result = InitBuffer(&WaitList,(void *)WLStorage,MAX_NUM_TD);
+  Result = InitBuffer(&Buff,(void *)BStorage,BUFF_SIZE);
+  AllSendQ[MyIndex] = &SendQ;
+
+  // some sort of while loop to receive and reply
+  int TaskToReceive;
+  IOReq ReceiveSlot;
+  int WLResult;
+
+  char bIsWLTask;
+  char bPushToWL;
+  char bEmpty = 1;
+  char bReceived = 0;
+  char Byte;
+  FOREVER{
+    TaskToReceive = NULL;
+    // if didn't wake up from block, first try to get one from wait list
+    if(bReceived == 0 && bEmpty){
+      WLResult = BufferFIFO(&WaitList,(void *)&TaskToReceive);
+    }
+    // if successfully get one from wait list, set config
+    if(WLResult == 0){
+      bReceived = 1;
+      bPushToWL = 0;
+      bIsWLTask = 1;
+    }else{
+      Result = BufferFIFO(&SendQ,(void *)(&TaskToReceive));
+      BufferPopHead(&SendQ);
+    }
+    if(TaskToReceive != NULL){
+      if(bReceived == 0){
+	Result = Receive(TaskToReceive,(void*) &ReceiveSlot, sizeof(NSReq));
+	bPushToWL = 1;
+      }
+      bReceived = 0;
+      // if sender is getc or we got one from wait list, we do receive procedure
+      if(ReceiveSlot.Type == Consumer || bIsWLTask){
+	// reset flag
+	bIsWLTask = 0;
+	// if IBuffer is empty,get the notifier input word
+	if(Buffer.Length == 0){
+	  bEmpty = 1;
+	  if(bPushToWL)FeedBuffer(&WaitList,(void*) TaskToReceive);
+	  continue;
+	}
+	BufferFIFOByte(&Buff, &Byte);
+	BufferPopHead(&Buff);
+	Reply(TaskToReceive,(void *)Byte, sizeof(char));
+      }else if(ReceiveSlot.Type == Producer){
+	bEmpty = 0;
+	FeedBuffer(&Buffer, (void *)(ReceiveSlot.Byte));
+	Result = 0;
+	Reply(TaskToReceive,(void *)(&Result), sizeof(int));
+      }
+    }else{
+      bReceived = 1;
+      Receive(TaskToReceive,(void*) &ReceiveSlot, sizeof(NSReq));
+    }
+  }
+}
+
+void IServer(){
+  IOServer('I',IN,NIN);
+}
+
+void OServer(){
+  IOServer('O',OUT,NOUT);
+}