X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Ffifo.c;h=4d3595b767b6d8afc0cb3540c2cc5669d6870434;hb=ceae45d80582dcb433cd26dcd6aad1c17229779d;hp=df71823b98ba09ea7bc435fab8e2acb4f62a9f0b;hpb=b71ce3a65f255d487f1f869ba88c6924b11ad7e5;p=tpg%2Facess2.git

diff --git a/Kernel/drv/fifo.c b/Kernel/drv/fifo.c
index df71823b..4d3595b7 100644
--- a/Kernel/drv/fifo.c
+++ b/Kernel/drv/fifo.c
@@ -1,9 +1,10 @@
 /* AcessOS
  * FIFO Pipe Driver
  */
-#include <common.h>
+#include <acess.h>
 #include <modules.h>
 #include <fs_devfs.h>
+#include <semaphore.h>
 
 // === CONSTANTS ===
 #define DEFAULT_RING_SIZE	2048
@@ -25,27 +26,38 @@ typedef struct sPipe {
  int	FIFO_Install(char **Arguments);
  int	FIFO_IOCtl(tVFS_Node *Node, int Id, void *Data);
 char	*FIFO_ReadDir(tVFS_Node *Node, int Id);
-tVFS_Node	*FIFO_FindDir(tVFS_Node *Node, char *Filename);
- int	FIFO_MkNod(tVFS_Node *Node, char *Name, Uint Flags);
+tVFS_Node	*FIFO_FindDir(tVFS_Node *Node, const char *Filename);
+ int	FIFO_MkNod(tVFS_Node *Node, const char *Name, Uint Flags);
 void	FIFO_Close(tVFS_Node *Node);
- int	FIFO_Relink(tVFS_Node *Node, char *OldName, char *NewName);
+ int	FIFO_Relink(tVFS_Node *Node, const char *OldName, const char *NewName);
 Uint64	FIFO_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
-Uint64	FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
-tPipe	*FIFO_Int_NewPipe(int Size, char *Name);
+Uint64	FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, const void *Buffer);
+tPipe	*FIFO_Int_NewPipe(int Size, const char *Name);
 
 // === GLOBALS ===
 MODULE_DEFINE(0, 0x0032, FIFO, FIFO_Install, NULL, NULL);
+tVFS_NodeType	gFIFO_DirNodeType = {
+	.TypeName = "FIFO Dir Node",
+	.ReadDir = FIFO_ReadDir,
+	.FindDir = FIFO_FindDir,
+	.MkNod = FIFO_MkNod,
+	.Relink = FIFO_Relink,
+	.IOCtl = FIFO_IOCtl
+};
+tVFS_NodeType	gFIFO_PipeNodeType = {
+	.TypeName = "FIFO Pipe Node",
+	.Read = FIFO_Read,
+	.Write = FIFO_Write,
+	.Close = FIFO_Close
+};
 tDevFS_Driver	gFIFO_DriverInfo = {
 	NULL, "fifo",
 	{
+	.Size = 1,
 	.NumACLs = 1,
 	.ACLs = &gVFS_ACL_EveryoneRW,
 	.Flags = VFS_FFLAG_DIRECTORY,
-	.ReadDir = FIFO_ReadDir,
-	.FindDir = FIFO_FindDir,
-	.MkNod = FIFO_MkNod,
-	.Relink = FIFO_Relink,
-	.IOCtl = FIFO_IOCtl
+	.Type = &gFIFO_DirNodeType
 	}
 };
 tVFS_Node	gFIFO_AnonNode = {
@@ -62,7 +74,7 @@ tPipe	*gFIFO_NamedPipes = NULL;
 int FIFO_Install(char **Options)
 {
 	DevFS_AddDevice( &gFIFO_DriverInfo );
-	return MODULE_INIT_SUCCESS;
+	return MODULE_ERR_OK;
 }
 
 /**
@@ -80,6 +92,7 @@ int FIFO_IOCtl(tVFS_Node *Node, int Id, void *Data)
 char *FIFO_ReadDir(tVFS_Node *Node, int Id)
 {
 	tPipe	*tmp = gFIFO_NamedPipes;
+	
 	// Entry 0 is Anon Pipes
 	if(Id == 0)	return strdup("anon");
 	
@@ -92,11 +105,11 @@ char *FIFO_ReadDir(tVFS_Node *Node, int Id)
 }
 
 /**
- * \fn tVFS_Node *FIFO_FindDir(tVFS_Node *Node, char *Filename)
+ * \fn tVFS_Node *FIFO_FindDir(tVFS_Node *Node, const char *Filename)
  * \brief Find a file in the FIFO root
  * \note Creates an anon pipe if anon is requested
  */
-tVFS_Node *FIFO_FindDir(tVFS_Node *Node, char *Filename)
+tVFS_Node *FIFO_FindDir(tVFS_Node *Node, const char *Filename)
 {
 	tPipe	*tmp;
 	if(!Filename)	return NULL;
@@ -124,15 +137,16 @@ tVFS_Node *FIFO_FindDir(tVFS_Node *Node, char *Filename)
 }
 
 /**
- * \fn int FIFO_MkNod(tVFS_Node *Node, char *Name, Uint Flags)
+ * \fn int FIFO_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
  */
-int FIFO_MkNod(tVFS_Node *Node, char *Name, Uint Flags)
+int FIFO_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
 {
 	return 0;
 }
 
 /**
- * \fn void FIFO_Close(vfs_node *Node)
+ * \fn void FIFO_Close(tVFS_Node *Node)
+ * \brief Close a FIFO end
  */
 void FIFO_Close(tVFS_Node *Node)
 {
@@ -153,10 +167,10 @@ void FIFO_Close(tVFS_Node *Node)
 }
 
 /**
- * \fn int FIFO_Relink(tVFS_Node *Node, char *OldName, char *NewName)
+ * \fn int FIFO_Relink(tVFS_Node *Node, const char *OldName, const char *NewName)
  * \brief Relink a file (Deletes named pipes)
  */
-int FIFO_Relink(tVFS_Node *Node, char *OldName, char *NewName)
+int FIFO_Relink(tVFS_Node *Node, const char *OldName, const char *NewName)
 {
 	tPipe	*pipe, *tmp;
 	
@@ -216,24 +230,36 @@ Uint64 FIFO_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 	{
 		// Wait for buffer to fill
 		if(pipe->Flags & PF_BLOCKING)
-			while(pipe->ReadPos == pipe->WritePos)
-				Threads_Yield();
+		{
+			#if 0
+			len = Semaphore_Wait( &pipe->Semaphore, remaining );
+			#else
+			VFS_SelectNode(Node, VFS_SELECT_READ, NULL, "FIFO_Read");
+			// Read buffer
+			// TODO: Rethink this, it might not work on buffer overflow
+			if(pipe->WritePos - pipe->ReadPos < remaining)
+				len = pipe->WritePos - pipe->ReadPos;
+			else
+				len = remaining;
+			#endif
+		}
 		else
+		{
 			if(pipe->ReadPos == pipe->WritePos)
 				return 0;
-		
-		// Read buffer
-		if(pipe->WritePos - pipe->ReadPos < remaining)
-			len = pipe->WritePos - pipe->ReadPos;
-		else
-			len = remaining;
+			// Read buffer
+			if(pipe->WritePos - pipe->ReadPos < remaining)
+				len = pipe->WritePos - pipe->ReadPos;
+			else
+				len = remaining;
+		}
 		
 		// Check if read overflows buffer
 		if(len > pipe->BufSize - pipe->ReadPos)
 		{
 			int ofs = pipe->BufSize - pipe->ReadPos;
 			memcpy(Buffer, &pipe->Buffer[pipe->ReadPos], ofs);
-			memcpy(Buffer + ofs, &pipe->Buffer, len-ofs);
+			memcpy((Uint8*)Buffer + ofs, &pipe->Buffer, len-ofs);
 		}
 		else
 		{
@@ -244,10 +270,16 @@ Uint64 FIFO_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 		pipe->ReadPos += len;
 		pipe->ReadPos %= pipe->BufSize;
 		
+		// Mark some flags
+		if( pipe->ReadPos == pipe->WritePos ) {
+			VFS_MarkAvaliable(Node, 0);
+		}
+		VFS_MarkFull(Node, 0);	// Buffer can't still be full
+		
 		// Decrement Remaining Bytes
 		remaining -= len;
 		// Increment Buffer address
-		Buffer += len;
+		Buffer = (Uint8*)Buffer + len;
 	}
 
 	return Length;
@@ -258,7 +290,7 @@ Uint64 FIFO_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
  * \fn Uint64 FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
  * \brief Write to a fifo pipe
  */
-Uint64 FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
+Uint64 FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, const void *Buffer)
 {
 	tPipe	*pipe = Node->ImplPtr;
 	Uint	len;
@@ -269,25 +301,34 @@ Uint64 FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 	while(remaining)
 	{
 		// Wait for buffer to empty
-		if(pipe->Flags & PF_BLOCKING)
-			while(pipe->ReadPos == (pipe->WritePos+1)%pipe->BufSize)
-				Threads_Yield();
+		if(pipe->Flags & PF_BLOCKING) {
+			#if 0
+			len = Semaphore_Signal( &pipe->Semaphore, remaining );
+			#else
+			VFS_SelectNode(Node, VFS_SELECT_WRITE, NULL, "FIFO_Write");
+			if(pipe->ReadPos - pipe->WritePos < remaining)
+				len = pipe->ReadPos - pipe->WritePos;
+			else
+				len = remaining;
+			#endif
+		}
 		else
+		{
 			if(pipe->ReadPos == (pipe->WritePos+1)%pipe->BufSize)
 				return 0;
-		
-		// Write buffer
-		if(pipe->ReadPos - pipe->WritePos < remaining)
-			len = pipe->ReadPos - pipe->WritePos;
-		else
-			len = remaining;
+			// Write buffer
+			if(pipe->ReadPos - pipe->WritePos < remaining)
+				len = pipe->ReadPos - pipe->WritePos;
+			else
+				len = remaining;
+		}
 		
 		// Check if write overflows buffer
 		if(len > pipe->BufSize - pipe->WritePos)
 		{
 			int ofs = pipe->BufSize - pipe->WritePos;
 			memcpy(&pipe->Buffer[pipe->WritePos], Buffer, ofs);
-			memcpy(&pipe->Buffer, Buffer + ofs, len-ofs);
+			memcpy(&pipe->Buffer, (Uint8*)Buffer + ofs, len-ofs);
 		}
 		else
 		{
@@ -298,10 +339,16 @@ Uint64 FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 		pipe->WritePos += len;
 		pipe->WritePos %= pipe->BufSize;
 		
+		// Mark some flags
+		if( pipe->ReadPos == pipe->WritePos ) {
+			VFS_MarkFull(Node, 1);	// Buffer full
+		}
+		VFS_MarkAvaliable(Node, 1);
+		
 		// Decrement Remaining Bytes
 		remaining -= len;
 		// Increment Buffer address
-		Buffer += len;
+		Buffer = (Uint8*)Buffer + len;
 	}
 
 	return Length;
@@ -309,29 +356,31 @@ Uint64 FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 
 // --- HELPERS ---
 /**
- * \fn tPipe *FIFO_Int_NewPipe(int Size, char *Name)
+ * \fn tPipe *FIFO_Int_NewPipe(int Size, const char *Name)
  * \brief Create a new pipe
  */
-tPipe *FIFO_Int_NewPipe(int Size, char *Name)
+tPipe *FIFO_Int_NewPipe(int Size, const char *Name)
 {
 	tPipe	*ret;
-	 int	allocsize = sizeof(tPipe) + sizeof(tVFS_ACL) + Size;
+	 int	namelen = strlen(Name) + 1;
+	 int	allocsize = sizeof(tPipe) + sizeof(tVFS_ACL) + Size + namelen;
 	
 	ret = malloc(allocsize);
 	if(!ret)	return NULL;
 	
 	// Clear Return
 	memset(ret, 0, allocsize);
-	
-	ret->Name = Name;
+	ret->Flags = PF_BLOCKING;
 	
 	// Allocate Buffer
 	ret->BufSize = Size;
 	ret->Buffer = (void*)( (Uint)ret + sizeof(tPipe) + sizeof(tVFS_ACL) );
-	if(!ret->Buffer) {
-		free(ret);
-		return NULL;
-	}
+	
+	// Set name (and FIFO name)
+	ret->Name = ret->Buffer + Size;
+	strcpy(ret->Name, Name);
+	// - Start empty, max of `Size`
+	//Semaphore_Init( &ret->Semaphore, 0, Size, "FIFO", ret->Name );
 	
 	// Set Node
 	ret->Node.Size = 0;
@@ -347,9 +396,7 @@ tPipe *FIFO_Int_NewPipe(int Size, char *Name)
 	ret->Node.CTime
 		= ret->Node.MTime
 		= ret->Node.ATime = now();
-	ret->Node.Read = FIFO_Read;
-	ret->Node.Write = FIFO_Write;
-	ret->Node.Close = FIFO_Close;
+	ret->Node.Type = &gFIFO_PipeNodeType;
 	
 	return ret;
 }