X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fdrv%2Ffifo.c;h=de3192ab004aae0f4945c73f1aa193522fec9c1e;hb=015f48988e0ff398409d71dfc692005ab439490a;hp=f957d2851145295930a102f3c6ea9eede82182ad;hpb=6dbb27af1a9f92781ae5eb898f83b78fe3a0e004;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/drv/fifo.c b/KernelLand/Kernel/drv/fifo.c
index f957d285..de3192ab 100644
--- a/KernelLand/Kernel/drv/fifo.c
+++ b/KernelLand/Kernel/drv/fifo.c
@@ -31,13 +31,13 @@ typedef struct sPipe {
  int	FIFO_Install(char **Arguments);
  int	FIFO_IOCtl(tVFS_Node *Node, int Id, void *Data);
  int	FIFO_ReadDir(tVFS_Node *Node, int Id, char Dest[FILENAME_MAX]);
-tVFS_Node	*FIFO_FindDir(tVFS_Node *Node, const char *Filename);
+tVFS_Node	*FIFO_FindDir(tVFS_Node *Node, const char *Filename, Uint Flags);
 tVFS_Node	*FIFO_MkNod(tVFS_Node *Node, const char *Name, Uint Flags);
 void	FIFO_Reference(tVFS_Node *Node);
 void	FIFO_Close(tVFS_Node *Node);
  int	FIFO_Unlink(tVFS_Node *Node, const char *OldName);
-size_t	FIFO_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer);
-size_t	FIFO_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer);
+size_t	FIFO_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer, Uint Flags);
+size_t	FIFO_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer, Uint Flags);
 tPipe	*FIFO_Int_NewPipe(int Size, const char *Name);
 
 // === GLOBALS ===
@@ -121,7 +121,7 @@ int FIFO_ReadDir(tVFS_Node *Node, int Id, char Dest[FILENAME_MAX])
  * \brief Find a file in the FIFO root
  * \note Creates an anon pipe if anon is requested
  */
-tVFS_Node *FIFO_FindDir(tVFS_Node *Node, const char *Filename)
+tVFS_Node *FIFO_FindDir(tVFS_Node *Node, const char *Filename, Uint Flags)
 {
 	tPipe	*tmp;
 	if(!Filename)	return NULL;
@@ -132,6 +132,9 @@ tVFS_Node *FIFO_FindDir(tVFS_Node *Node, const char *Filename)
 	// Anon Pipe
 	if( strcmp(Filename, "anon") == 0 )
 	{
+		if( Flags & VFS_FDIRFLAG_STAT ) {
+			//return &gFIFI_TemplateAnonNode;
+		}
 		tmp = FIFO_Int_NewPipe(DEFAULT_RING_SIZE, "anon");
 		return &tmp->Node;
 	}
@@ -219,7 +222,7 @@ int FIFO_Unlink(tVFS_Node *Node, const char *OldName)
 /**
  * \brief Read from a fifo pipe
  */
-size_t FIFO_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer)
+size_t FIFO_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer, Uint Flags)
 {
 	tPipe	*pipe = Node->ImplPtr;
 	Uint	len;
@@ -232,7 +235,7 @@ size_t FIFO_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer)
 	while(remaining)
 	{
 		// Wait for buffer to fill
-		if(pipe->Flags & PF_BLOCKING)
+		if( (pipe->Flags & PF_BLOCKING) && !(Flags & VFS_IOFLAG_NOBLOCK) )
 		{
 			if( pipe->ReadPos == pipe->WritePos )
 				VFS_SelectNode(Node, VFS_SELECT_READ, NULL, "FIFO_Read");
@@ -280,6 +283,7 @@ size_t FIFO_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer)
 		
 		// Mark some flags
 		if( pipe->ReadPos == pipe->WritePos ) {
+			LOG("%i == %i, marking none to read", pipe->ReadPos, pipe->WritePos);
 			VFS_MarkAvaliable(Node, 0);
 		}
 		VFS_MarkFull(Node, 0);	// Buffer can't still be full
@@ -302,7 +306,7 @@ size_t FIFO_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer)
 /**
  * \brief Write to a fifo pipe
  */
-size_t FIFO_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer)
+size_t FIFO_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer, Uint Flags)
 {
 	tPipe	*pipe = Node->ImplPtr;
 	Uint	len;
@@ -315,9 +319,12 @@ size_t FIFO_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buff
 	while(remaining)
 	{
 		// Wait for buffer to empty
-		if(pipe->Flags & PF_BLOCKING) {
-			if( pipe->ReadPos == (pipe->WritePos+1)%pipe->BufSize )
+		if( (pipe->Flags & PF_BLOCKING) && !(Flags & VFS_IOFLAG_NOBLOCK) )
+		{
+			if( pipe->ReadPos == (pipe->WritePos+1)%pipe->BufSize ) {
+				LOG("Blocking write on FIFO");
 				VFS_SelectNode(Node, VFS_SELECT_WRITE, NULL, "FIFO_Write");
+			}
 
 			len = remaining;
 			if( pipe->ReadPos > pipe->WritePos )
@@ -349,11 +356,14 @@ size_t FIFO_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buff
 		if(len > pipe->BufSize - pipe->WritePos)
 		{
 			int ofs = pipe->BufSize - pipe->WritePos;
+			LOG("pipe->Buffer = %p, pipe->WritePos = %i, ofs=%i, len=%i",
+				pipe->Buffer, pipe->WritePos, ofs, len);
 			memcpy(&pipe->Buffer[pipe->WritePos], Buffer, ofs);
-			memcpy(&pipe->Buffer, (Uint8*)Buffer + ofs, len-ofs);
+			memcpy(&pipe->Buffer[0], (Uint8*)Buffer + ofs, len-ofs);
 		}
 		else
 		{
+			LOG("pipe->Buffer = %p, pipe->WritePos = %i", pipe->Buffer, pipe->WritePos);
 			memcpy(&pipe->Buffer[pipe->WritePos], Buffer, len);
 		}
 		
@@ -363,6 +373,7 @@ size_t FIFO_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buff
 		
 		// Mark some flags
 		if( pipe->ReadPos == pipe->WritePos ) {
+			LOG("Buffer is full");
 			VFS_MarkFull(Node, 1);	// Buffer full
 		}
 		VFS_MarkAvaliable(Node, 1);
@@ -377,7 +388,7 @@ size_t FIFO_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buff
 	return Length;
 }
 
-// --- HELPERS ---
+// --- HeLPERS ---
 /**
  * \fn tPipe *FIFO_Int_NewPipe(int Size, const char *Name)
  * \brief Create a new pipe
@@ -393,7 +404,7 @@ tPipe *FIFO_Int_NewPipe(int Size, const char *Name)
 	ret = calloc(1, allocsize);
 	if(!ret)	LEAVE_RET('n', NULL);
 	
-	// Clear Return
+	// Set default flags
 	ret->Flags = PF_BLOCKING;
 	
 	// Allocate Buffer
@@ -414,10 +425,10 @@ tPipe *FIFO_Int_NewPipe(int Size, const char *Name)
 	ret->Node.GID = Threads_GetGID();
 	ret->Node.NumACLs = 1;
 	ret->Node.ACLs = (void*)( (Uint)ret + sizeof(tPipe) );
-		ret->Node.ACLs->Group = 0;
-		ret->Node.ACLs->ID = ret->Node.UID;
-		ret->Node.ACLs->Inv = 0;
-		ret->Node.ACLs->Perms = -1;
+		ret->Node.ACLs->Ent.Group = 0;
+		ret->Node.ACLs->Ent.ID = ret->Node.UID;
+		ret->Node.ACLs->Perm.Inv = 0;
+		ret->Node.ACLs->Perm.Perms = -1;
 	ret->Node.CTime
 		= ret->Node.MTime
 		= ret->Node.ATime = now();