X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fiocache.c;h=743dabc49e78c73e0d1633cc27f5930733da0e65;hb=34dbc845a86903c0b531216b166a4d596255bc9a;hp=8ea6929a8a2401c97f108b91ad4eb6671f46bf19;hpb=75e87cf46a3899f76bae5c64e130cfc033562e9a;p=tpg%2Facess2.git

diff --git a/Kernel/drv/iocache.c b/Kernel/drv/iocache.c
index 8ea6929a..743dabc4 100644
--- a/Kernel/drv/iocache.c
+++ b/Kernel/drv/iocache.c
@@ -4,7 +4,8 @@
  * 
  * By thePowersGang (John Hodge)
  */
-#include <common.h>
+#define DEBUG	0
+#include <acess.h>
 #include <iocache.h>
 
 // === TYPES ===
@@ -24,7 +25,7 @@ struct sIOCache
 {
 	tIOCache	*Next;
 	 int	SectorSize;
-	 int	Lock;
+	tMutex	Lock;
 	 int	Mode;
 	Uint32	ID;
 	tIOCache_WriteCallback	Write;
@@ -34,7 +35,7 @@ struct sIOCache
 };
 
 // === GLOBALS ===
- int	glIOCache_Caches;
+tShortSpinlock	glIOCache_Caches;
 tIOCache	*gIOCache_Caches = NULL;
  int	giIOCache_NumCaches = 0;
 
@@ -60,10 +61,10 @@ tIOCache *IOCache_Create( tIOCache_WriteCallback Write, Uint32 ID, int SectorSiz
 	ret->Entries = 0;
 	
 	// Append to list
-	LOCK( &glIOCache_Caches );
+	SHORTLOCK( &glIOCache_Caches );
 	ret->Next = gIOCache_Caches;
 	gIOCache_Caches = ret;
-	RELEASE( &glIOCache_Caches );
+	SHORTREL( &glIOCache_Caches );
 	
 	// Return
 	return ret;
@@ -77,14 +78,19 @@ int IOCache_Read( tIOCache *Cache, Uint64 Sector, void *Buffer )
 {
 	tIOCache_Ent	*ent;
 	
+	ENTER("pCache XSector pBuffer", Cache, Sector, Buffer);
+	
 	// Sanity Check!
-	if(!Cache || !Buffer)
+	if(!Cache || !Buffer) {
+		LEAVE('i', -1);
 		return -1;
+	}
 	
 	// Lock
-	LOCK( &Cache->Lock );
+	Mutex_Acquire( &Cache->Lock );
 	if(Cache->CacheSize == 0) {
-		RELEASE( &Cache->Lock );
+		Mutex_Release( &Cache->Lock );
+		LEAVE('i', -1);
 		return -1;
 	}
 	
@@ -95,7 +101,8 @@ int IOCache_Read( tIOCache *Cache, Uint64 Sector, void *Buffer )
 		if( ent->Num == Sector ) {
 			memcpy(Buffer, ent->Data, Cache->SectorSize);
 			ent->LastAccess = now();
-			RELEASE( &Cache->Lock );
+			Mutex_Release( &Cache->Lock );
+			LEAVE('i', 1);
 			return 1;
 		}
 		// It's a sorted list, so as soon as we go past `Sector` we know
@@ -103,7 +110,8 @@ int IOCache_Read( tIOCache *Cache, Uint64 Sector, void *Buffer )
 		if(ent->Num > Sector)	break;
 	}
 	
-	RELEASE( &Cache->Lock );
+	Mutex_Release( &Cache->Lock );
+	LEAVE('i', 0);
 	return 0;
 }
 
@@ -122,9 +130,9 @@ int IOCache_Add( tIOCache *Cache, Uint64 Sector, void *Buffer )
 		return -1;
 	
 	// Lock
-	LOCK( &Cache->Lock );
+	Mutex_Acquire( &Cache->Lock );
 	if(Cache->CacheSize == 0) {
-		RELEASE( &Cache->Lock );
+		Mutex_Release( &Cache->Lock );
 		return -1;
 	}
 	
@@ -134,7 +142,7 @@ int IOCache_Add( tIOCache *Cache, Uint64 Sector, void *Buffer )
 	{
 		// Is it already here?
 		if( ent->Num == Sector ) {
-			RELEASE( &Cache->Lock );
+			Mutex_Release( &Cache->Lock );
 			return 0;
 		}
 		
@@ -189,7 +197,7 @@ int IOCache_Add( tIOCache *Cache, Uint64 Sector, void *Buffer )
 	Cache->CacheUsed ++;
 	
 	// Release Spinlock
-	RELEASE( &Cache->Lock );
+	Mutex_Release( &Cache->Lock );
 	
 	// Return success
 	return 1;
@@ -207,9 +215,9 @@ int IOCache_Write( tIOCache *Cache, Uint64 Sector, void *Buffer )
 	if(!Cache || !Buffer)
 		return -1;
 	// Lock
-	LOCK( &Cache->Lock );
+	Mutex_Acquire( &Cache->Lock );
 	if(Cache->CacheSize == 0) {
-		RELEASE( &Cache->Lock );
+		Mutex_Release( &Cache->Lock );
 		return -1;
 	}
 	
@@ -226,7 +234,7 @@ int IOCache_Write( tIOCache *Cache, Uint64 Sector, void *Buffer )
 				ent->LastWrite = 0;
 			}
 			
-			RELEASE( &Cache->Lock );
+			Mutex_Release( &Cache->Lock );
 			return 1;
 		}
 		// It's a sorted list, so as soon as we go past `Sector` we know
@@ -234,7 +242,7 @@ int IOCache_Write( tIOCache *Cache, Uint64 Sector, void *Buffer )
 		if(ent->Num > Sector)	break;
 	}
 	
-	RELEASE( &Cache->Lock );
+	Mutex_Release( &Cache->Lock );
 	return 0;
 }
 
@@ -249,9 +257,9 @@ void IOCache_Flush( tIOCache *Cache )
 	if( Cache->Mode == IOCACHE_VIRTUAL )	return;
 	
 	// Lock
-	LOCK( &Cache->Lock );
+	Mutex_Acquire( &Cache->Lock );
 	if(Cache->CacheSize == 0) {
-		RELEASE( &Cache->Lock );
+		Mutex_Release( &Cache->Lock );
 		return;
 	}
 	
@@ -262,7 +270,7 @@ void IOCache_Flush( tIOCache *Cache )
 		ent->LastWrite = 0;
 	}
 	
-	RELEASE( &Cache->Lock );
+	Mutex_Release( &Cache->Lock );
 }
 
 /**
@@ -274,9 +282,9 @@ void IOCache_Destroy( tIOCache *Cache )
 	tIOCache_Ent	*ent, *prev = NULL;
 	
 	// Lock
-	LOCK( &Cache->Lock );
+	Mutex_Acquire( &Cache->Lock );
 	if(Cache->CacheSize == 0) {
-		RELEASE( &Cache->Lock );
+		Mutex_Release( &Cache->Lock );
 		return;
 	}
 	
@@ -294,10 +302,10 @@ void IOCache_Destroy( tIOCache *Cache )
 	
 	Cache->CacheSize = 0;
 	
-	RELEASE( &Cache->Lock );
+	Mutex_Release( &Cache->Lock );
 	
 	// Remove from list
-	LOCK( &glIOCache_Caches );
+	SHORTLOCK( &glIOCache_Caches );
 	{
 		tIOCache	*ent;
 		tIOCache	*prev = (tIOCache*)&gIOCache_Caches;
@@ -311,7 +319,7 @@ void IOCache_Destroy( tIOCache *Cache )
 			}
 		}
 	}
-	RELEASE( &glIOCache_Caches );
+	SHORTREL( &glIOCache_Caches );
 	
 	free(Cache);
 }