X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fiocache.c;h=8f735419f1d9f65d4a823d8a316ec0a8c9402917;hb=b719f4869750496484938a93f279cb28c6a6e37a;hp=271fc8402680234a7e68054d5e7873eb6ce417c0;hpb=9143c184873d0b55444dc1c1084f3e9f3f2614bf;p=tpg%2Facess2.git

diff --git a/Kernel/drv/iocache.c b/Kernel/drv/iocache.c
index 271fc840..8f735419 100644
--- a/Kernel/drv/iocache.c
+++ b/Kernel/drv/iocache.c
@@ -3,6 +3,8 @@
  * - IO Cache
  * 
  * By thePowersGang (John Hodge)
+ * 
+ * TODO: Convert to use spare physical pages instead
  */
 #define DEBUG	0
 #include <acess.h>
@@ -10,6 +12,7 @@
 
 // === TYPES ===
 typedef struct sIOCache_Ent	tIOCache_Ent;
+typedef struct sIOCache_PageInfo	tIOCache_PageInfo;
 
 // === STRUCTURES ===
 struct sIOCache_Ent
@@ -21,6 +24,15 @@ struct sIOCache_Ent
 	Uint8	Data[];
 };
 
+struct sIOCache_PageInfo
+{
+	tIOCache_PageInfo	*GlobalNext;
+	tIOCache_PageInfo	*CacheNext;
+	tIOCache	*Owner;
+	tPAddr	BasePhys;
+	Uint64	BaseOffset;
+};
+
 struct sIOCache
 {
 	tIOCache	*Next;
@@ -38,6 +50,7 @@ struct sIOCache
 tShortSpinlock	glIOCache_Caches;
 tIOCache	*gIOCache_Caches = NULL;
  int	giIOCache_NumCaches = 0;
+tIOCache_PageInfo	*gIOCache_GlobalPages;
 
 // === CODE ===
 /**
@@ -74,7 +87,6 @@ tIOCache *IOCache_Create( tIOCache_WriteCallback Write, Uint32 ID, int SectorSiz
  */
 int IOCache_Read( tIOCache *Cache, Uint64 Sector, void *Buffer )
 {
-	tIOCache_Ent	*ent;
 	
 	ENTER("pCache XSector pBuffer", Cache, Sector, Buffer);
 	
@@ -91,7 +103,22 @@ int IOCache_Read( tIOCache *Cache, Uint64 Sector, void *Buffer )
 		LEAVE('i', -1);
 		return -1;
 	}
-	
+
+	#if IOCACHE_USE_PAGES
+	tIOCache_PageInfo	*page;
+	size_t	offset = (Sector*Cache->SectorSize) % PAGE_SIZE;
+	Uint64	wanted_base = (Sector*Cache->SectorSize) & ~(PAGE_SIZE-1);
+	for( page = Cache->Pages; page; page = page->CacheNext )
+	{
+		void	*tmp;
+		if(page->BaseOffset < WantedBase)	continue;
+		if(page->BaseOffset > WantedBase)	break;
+		tmp = MM_MapTemp( page->BasePhys );
+		memcpy( Buffer, tmp + offset, Cache->SectorSize ); 
+		MM_FreeTemp( tmp );
+	}
+	#else	
+	tIOCache_Ent	*ent;
 	// Search the list
 	for( ent = Cache->Entries; ent; ent = ent->Next )
 	{
@@ -107,6 +134,7 @@ int IOCache_Read( tIOCache *Cache, Uint64 Sector, void *Buffer )
 		// it's not there
 		if(ent->Num > Sector)	break;
 	}
+	#endif
 	
 	Mutex_Release( &Cache->Lock );
 	LEAVE('i', 0);
@@ -177,6 +205,10 @@ int IOCache_Add( tIOCache *Cache, Uint64 Sector, void *Buffer )
 				oldestPrev = prev;
 			}
 		}
+		if( !oldest ) {
+			Log_Error("IOCache", "Cache full, but also empty");
+			return -1;
+		}
 		// Remove from list, write back and free
 		oldestPrev->Next = oldest->Next;
 		if(oldest->LastWrite && Cache->Mode != IOCACHE_VIRTUAL)
@@ -305,14 +337,14 @@ void IOCache_Destroy( tIOCache *Cache )
 	// Remove from list
 	SHORTLOCK( &glIOCache_Caches );
 	{
-		tIOCache	*ent;
-		tIOCache	*prev = (tIOCache*)&gIOCache_Caches;
-		for(ent = gIOCache_Caches;
-			ent;
-			prev = ent, ent = ent->Next )
+		tIOCache	*cache;
+		tIOCache	*prev_cache = (tIOCache*)&gIOCache_Caches;
+		for(cache = gIOCache_Caches;
+			cache;
+			prev_cache = cache, cache = cache->Next )
 		{
-			if(ent == Cache) {
-				prev->Next = ent->Next;
+			if(cache == Cache) {
+				prev_cache->Next = cache->Next;
 				break;
 			}
 		}