X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fvfs%2Fio.c;h=35c1ebf88bec10504cd8fc974da690c3e75f5e4c;hb=13078002b01ee4f63eb2001d2ef479a2a006ea32;hp=dc55fe2ac856fed44df6579804383140fba70aaf;hpb=bf62604f78c2d8bc88cac3664e15ed02c6e6d581;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/vfs/io.c b/KernelLand/Kernel/vfs/io.c
index dc55fe2a..35c1ebf8 100644
--- a/KernelLand/Kernel/vfs/io.c
+++ b/KernelLand/Kernel/vfs/io.c
@@ -1,6 +1,11 @@
 /*
- * AcessMicro VFS
- * - File IO Passthru's
+ * Acess2 Kernel
+ * - By John Hodge (thePowersGang)
+ *
+ * vfs/io.c
+ * - VFS IO Handling (Read/Write)
+ *
+ * TODO: VFS-level caching to support non-blocking IO?
  */
 #define DEBUG	0
 #include <acess.h>
@@ -18,39 +23,40 @@ size_t VFS_Read(int FD, size_t Length, void *Buffer)
 	tVFS_Handle	*h;
 	size_t	ret;
 	
-	ENTER("iFD XLength pBuffer", FD, Length, Buffer);
-	
 	h = VFS_GetHandle(FD);
 	if(!h) {
-		LOG("Bad Handle");
-		LEAVE_RET('i', -1);
+		LOG("FD%i is a bad Handle", FD);
+		return -1;
 	}
 	
 	if( !(h->Mode & VFS_OPENFLAG_READ) ) {
-		LOG("Bad mode");
-		LEAVE_RET('i', -1);
+		LOG("FD%i not open for reading", FD);
+		return -1;
 	}
 	if( (h->Node->Flags & VFS_FFLAG_DIRECTORY) ) {
-		LOG("Reading directory");
-		LEAVE_RET('i', -1);
+		LOG("FD%i is a directory", FD);
+		return -1;
 	}
 
 	if(!h->Node->Type || !h->Node->Type->Read) {
-		LOG("No read method");
-		LEAVE_RET('i', -1);
+		LOG("FD%i has no read method", FD);
+		return -1;
 	}
 
 	if( !MM_GetPhysAddr(h->Node->Type->Read) ) {
-		Log_Error("VFS", "Node type %p(%s) read method is junk %p", h->Node->Type, h->Node, h->Node->Type->TypeName,
+		Log_Error("VFS", "Node type %p(%s) read method is junk %p",
+			h->Node->Type, h->Node, h->Node->Type->TypeName,
 			h->Node->Type->Read);
-		LEAVE_RET('i', -1);
+		return -1;
 	}
 	
-	ret = h->Node->Type->Read(h->Node, h->Position, Length, Buffer);
-	if(ret == (size_t)-1)	LEAVE_RET('i', -1);
+	Uint	flags = 0;
+	flags |= (h->Mode & VFS_OPENFLAG_NONBLOCK) ? VFS_IOFLAG_NOBLOCK : 0;
+	ret = h->Node->Type->Read(h->Node, h->Position, Length, Buffer, flags);
+	if(ret != Length)	LOG("%i/%i read", ret, Length);
+	if(ret == (size_t)-1)	return -1;
 	
 	h->Position += ret;
-	LEAVE('X', ret);
 	return ret;
 }
 
@@ -75,12 +81,15 @@ size_t VFS_ReadAt(int FD, Uint64 Offset, size_t Length, void *Buffer)
 	}
 
 	if( !MM_GetPhysAddr(h->Node->Type->Read) ) {
-		Log_Error("VFS", "Node type %p(%s) read method is junk %p", h->Node->Type, h->Node, h->Node->Type->TypeName,
+		Log_Error("VFS", "Node type %p(%s) read method is junk %p",
+			h->Node->Type, h->Node->Type->TypeName,
 			h->Node->Type->Read);
-		LEAVE_RET('i', -1);
 	}
 	
-	ret = h->Node->Type->Read(h->Node, Offset, Length, Buffer);
+	Uint	flags = 0;
+	flags |= (h->Mode & VFS_OPENFLAG_NONBLOCK) ? VFS_IOFLAG_NOBLOCK : 0;
+	ret = h->Node->Type->Read(h->Node, Offset, Length, Buffer, flags);
+	if(ret != Length)	LOG("%i/%i read", ret, Length);
 	if(ret == (size_t)-1)	return -1;
 	return ret;
 }
@@ -91,27 +100,18 @@ size_t VFS_ReadAt(int FD, Uint64 Offset, size_t Length, void *Buffer)
  */
 size_t VFS_Write(int FD, size_t Length, const void *Buffer)
 {
-	tVFS_Handle	*h;
-	size_t	ret;
-	
-	h = VFS_GetHandle(FD);
-	if(!h)	return -1;
-	
-	if( !(h->Mode & VFS_OPENFLAG_WRITE) )	return -1;
-	if( h->Node->Flags & VFS_FFLAG_DIRECTORY )	return -1;
-
-	if( !h->Node->Type || !h->Node->Type->Write )	return 0;
-
-	if( !MM_GetPhysAddr(h->Node->Type->Write) ) {
-		Log_Error("VFS", "Node type %p(%s) write method is junk %p", h->Node->Type, h->Node, h->Node->Type->TypeName,
-			h->Node->Type->Write);
+	tVFS_Handle	*h = VFS_GetHandle(FD);
+	if(!h) {
+		LOG("FD%i is not open", FD);
+		errno = EBADF;
 		return -1;
 	}
 	
-	ret = h->Node->Type->Write(h->Node, h->Position, Length, Buffer);
+	size_t ret = VFS_WriteAt(FD, h->Position, Length, Buffer);
 	if(ret == (size_t)-1)	return -1;
 
-	h->Position += ret;
+	if( !(h->Node->Type->Flags & VFS_NODETYPEFLAG_STREAM) )
+		h->Position += ret;
 	return ret;
 }
 
@@ -121,24 +121,79 @@ size_t VFS_Write(int FD, size_t Length, const void *Buffer)
  */
 size_t VFS_WriteAt(int FD, Uint64 Offset, size_t Length, const void *Buffer)
 {
-	tVFS_Handle	*h;
-	size_t	ret;
-	
-	h = VFS_GetHandle(FD);
+	LOG("FD=%i,Offset=%lli,Length=%i,Buffer=%p",
+		FD, Offset, Length, Buffer);
+	tVFS_Handle	*h = VFS_GetHandle(FD);
 	if(!h)	return -1;
 	
-	if( !(h->Mode & VFS_OPENFLAG_WRITE) )	return -1;
-	if( h->Node->Flags & VFS_FFLAG_DIRECTORY )	return -1;
-
-	if(!h->Node->Type || !h->Node->Type->Write)	return 0;
+	if( !(h->Mode & VFS_OPENFLAG_WRITE) ) {
+		LOG("FD%i not opened for writing", FD);
+		errno = EBADF;
+		return -1;
+	}
+	if( h->Node->Flags & VFS_FFLAG_DIRECTORY ) {
+		LOG("FD%i is a directory", FD);
+		errno = EISDIR;
+		return -1;
+	}
 
-	if( !MM_GetPhysAddr(h->Node->Type->Write) ) {
-		Log_Error("VFS", "Node type %p(%s) write method is junk %p", h->Node->Type, h->Node, h->Node->Type->TypeName,
-			h->Node->Type->Write);
+	const tVFS_NodeType*	nodetype = h->Node->Type;
+	if(!nodetype || !nodetype->Write) {
+		LOG("FD%i has no write method", FD);
+		errno = EINTERNAL;
+		return 0;
+	}
+	
+	if( !MM_GetPhysAddr(nodetype->Write) ) {
+		Log_Error("VFS", "Node type %p(%s) write method is junk %p",
+			nodetype, nodetype->TypeName, nodetype->Write);
+		errno = EINTERNAL;
 		return -1;
 	}
-	ret = h->Node->Type->Write(h->Node, Offset, Length, Buffer);
+	
+	// Bounds checks
+	if( h->Node->Size != (Uint64)-1 && Offset > h->Node->Size ) {
+		Log_Notice("VFS", "Write starting past EOF of FD%x (%lli > %lli)",
+			FD, Offset, h->Node->Size);
+		//errno = ESPIPE;
+		return 0;
+	}
+	if( Offset + Length > h->Node->Size )
+	{
+		// Going OOB
+		if( !nodetype->Truncate )
+		{
+			LOG("No .Truncate method, emiting write past EOF");
+		}
+		else if( nodetype->Flags & VFS_NODETYPEFLAG_NOAUTOEXPAND )
+		{
+			LOG("NOAUTOEXPAND set, truncating length from %i to %i",
+				Length, h->Node->Size - Offset);
+			Length = h->Node->Size - Offset;
+		}
+		else if( nodetype->Truncate(h->Node, Offset + Length) != Offset + Length )
+		{
+			// oh... fail? Truncate to current size
+			LOG(".Truncate failed, truncating length from %i to %i",
+				Length, h->Node->Size - Offset);
+			Length = h->Node->Size - Offset;
+		}
+		else
+		{
+			// Expansion, node size should now fit
+			LOG("Expanded file");
+		}
+	}
+	
+	// Create flag set
+	Uint flags = 0;
+	flags |= (h->Mode & VFS_OPENFLAG_NONBLOCK) ? VFS_IOFLAG_NOBLOCK : 0;
+	
+	// Dispatch the read!
+	size_t ret = nodetype->Write(h->Node, Offset, Length, Buffer, flags);
 	if(ret == (size_t)-1)	return -1;
+	if(ret != Length)	LOG("%i/%i written", ret, Length);
+
 	return ret;
 }
 
@@ -165,16 +220,17 @@ Uint64 VFS_Tell(int FD)
  */
 int VFS_Seek(int FD, Sint64 Offset, int Whence)
 {
-	tVFS_Handle	*h;
-	
-	h = VFS_GetHandle(FD);
+	tVFS_Handle	*h = VFS_GetHandle(FD);
 	if(!h)	return -1;
 	
-	//Log_Debug("VFS", "VFS_Seek: (fd=0x%x, Offset=0x%llx, Whence=%i)",
-	//	FD, Offset, Whence);
+	if( (h->Node->Type->Flags & VFS_NODETYPEFLAG_STREAM) ) {
+		LOG("Seeking in stream");
+		return -1;
+	}
 	
 	// Set relative to current position
 	if(Whence == 0) {
+		LOG("(FD%x)->Position += %lli", FD, Offset);
 		h->Position += Offset;
 		return 0;
 	}
@@ -183,27 +239,56 @@ int VFS_Seek(int FD, Sint64 Offset, int Whence)
 	if(Whence < 0) {
 		if( h->Node->Size == (Uint64)-1 )	return -1;
 
+		LOG("(FD%x)->Position = %llx - %llx", FD, h->Node->Size, Offset);
 		h->Position = h->Node->Size - Offset;
 		return 0;
 	}
 	
 	// Set relative to start of file
+	LOG("(FD%x)->Position = %llx", FD, Offset);
 	h->Position = Offset;
 	return 0;
 }
 
+/*
+ * Truncate/Expand a file's allocation
+ */
+off_t VFS_Truncate(int FD, off_t Size)
+{
+	tVFS_Handle	*h = VFS_GetHandle(FD);
+	if(!h) {
+		errno = EBADF;
+		return -1;
+	}
+	
+	if( !h->Node->Type->Truncate)
+	{
+		Log_Notice("VFS", "Nodetype '%s' doesn't have a Truncate method", h->Node->Type->TypeName);
+		errno = ENOTIMPL;
+		return -1;	
+	}
+	
+	return h->Node->Type->Truncate(h->Node, Size);
+}
+
 /**
  * \fn int VFS_IOCtl(int FD, int ID, void *Buffer)
  * \brief Call an IO Control on a file
  */
 int VFS_IOCtl(int FD, int ID, void *Buffer)
 {
-	tVFS_Handle	*h;
-	
-	h = VFS_GetHandle(FD);
-	if(!h)	return -1;
+	tVFS_Handle	*h = VFS_GetHandle(FD);
+	if(!h) {
+		LOG("FD%i is invalid", FD);
+		errno = EINVAL;
+		return -1;
+	}
 
-	if(!h->Node->Type || !h->Node->Type->IOCtl)	return -1;
+	if(!h->Node->Type || !h->Node->Type->IOCtl) {
+		LOG("FD%i does not have an IOCtl method");
+		errno = EINVAL;
+		return -1;
+	}
 	return h->Node->Type->IOCtl(h->Node, ID, Buffer);
 }