From 4bc88d46fa9859615521f436511d4f102f20eb67 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 18 Jul 2012 14:11:28 +0000
Subject: databases are still static, but are controlled via classes

git-svn-id: http://svn.miranda-ng.org/main/trunk@1014 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Db3x/src/dbcache.cpp | 92 ++++++++++++++++++++++----------------------
 1 file changed, 45 insertions(+), 47 deletions(-)

(limited to 'plugins/Db3x/src/dbcache.cpp')

diff --git a/plugins/Db3x/src/dbcache.cpp b/plugins/Db3x/src/dbcache.cpp
index 10d34e1ec3..c68db53a0a 100644
--- a/plugins/Db3x/src/dbcache.cpp
+++ b/plugins/Db3x/src/dbcache.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define CACHESECTIONSIZE   4096
 #define CACHESECTIONCOUNT  32
 
-static BOOL safetyMode=TRUE;
+static BOOL safetyMode = TRUE;
 static PBYTE pDbCache;
 static DWORD lastUseCounter;
 struct DBCacheSectionInfo {
@@ -37,23 +37,23 @@ struct DBCacheSectionInfo {
 static __inline int FindSectionForOffset(const DWORD ofs)
 {
 	int i;
-	for(i=0;i<CACHESECTIONCOUNT;i++)
-		if(ofs>=cacheSectionInfo[i].ofsBase && ofs<cacheSectionInfo[i].ofsBase+CACHESECTIONSIZE)
+	for(i = 0;i<CACHESECTIONCOUNT;i++)
+		if (ofs >= cacheSectionInfo[i].ofsBase && ofs<cacheSectionInfo[i].ofsBase+CACHESECTIONSIZE)
 			return i;
 	return -1;
 }
 
 static __inline int FindLRUSection(void)
 {
-	int i,lru=0;
-	DWORD lowestLastUse=cacheSectionInfo[0].lastUsed;
-	for(i=1;i<CACHESECTIONCOUNT;i++) if(cacheSectionInfo[i].lastUsed<lowestLastUse) {lru=i; lowestLastUse=cacheSectionInfo[i].lastUsed;}
+	int i,lru = 0;
+	DWORD lowestLastUse = cacheSectionInfo[0].lastUsed;
+	for(i = 1;i<CACHESECTIONCOUNT;i++) if (cacheSectionInfo[i].lastUsed<lowestLastUse) {lru = i; lowestLastUse = cacheSectionInfo[i].lastUsed;}
 	return lru;
 }
 
 static __inline void LoadSection(const int i,DWORD ofs)
 {
-	cacheSectionInfo[i].ofsBase=ofs-ofs%CACHESECTIONSIZE;
+	cacheSectionInfo[i].ofsBase = ofs-ofs%CACHESECTIONSIZE;
 	log1("readsect %08x",ofs);
 	SetFilePointer(hDbFile,cacheSectionInfo[i].ofsBase,NULL,FILE_BEGIN);
 	ReadFile(hDbFile,pDbCache+i*CACHESECTIONSIZE,CACHESECTIONSIZE,&ofs,NULL);
@@ -62,8 +62,8 @@ static __inline void LoadSection(const int i,DWORD ofs)
 static __inline void MoveSection(int *sectId,int dest)
 {
 	CopyMemory(pDbCache+dest*CACHESECTIONSIZE,pDbCache+(*sectId)*CACHESECTIONSIZE,CACHESECTIONSIZE);
-	cacheSectionInfo[dest].ofsBase=cacheSectionInfo[*sectId].ofsBase;
-	*sectId=dest;
+	cacheSectionInfo[dest].ofsBase = cacheSectionInfo[*sectId].ofsBase;
+	*sectId = dest;
 }
 
 
@@ -79,25 +79,25 @@ PBYTE DBRead(DWORD ofs,int bytesRequired,int *bytesAvail)
 	part1sect = FindSectionForOffset(ofs);
 	if (ofs%CACHESECTIONSIZE+bytesRequired<CACHESECTIONSIZE) {
 		//only one section required
-		if(part1sect==-1) {
-			part1sect=FindLRUSection();
+		if (part1sect == -1) {
+			part1sect = FindLRUSection();
 			LoadSection(part1sect,ofs);
 		}
-		cacheSectionInfo[part1sect].lastUsed=++lastUseCounter;
-		if(bytesAvail!=NULL) *bytesAvail=cacheSectionInfo[part1sect].ofsBase+CACHESECTIONSIZE-ofs;
+		cacheSectionInfo[part1sect].lastUsed = ++lastUseCounter;
+		if (bytesAvail!= NULL) *bytesAvail = cacheSectionInfo[part1sect].ofsBase+CACHESECTIONSIZE-ofs;
 		return pDbCache+part1sect*CACHESECTIONSIZE+(ofs-cacheSectionInfo[part1sect].ofsBase);
 	}
 	//two sections are required
-	part2sect=FindSectionForOffset(ofs+CACHESECTIONSIZE);
-	if(part1sect!=-1) {
-		if(part2sect==-1) {  //first part in cache, but not second part
-			if(part1sect==CACHESECTIONCOUNT-1) MoveSection(&part1sect,0);
+	part2sect = FindSectionForOffset(ofs+CACHESECTIONSIZE);
+	if (part1sect!= -1) {
+		if (part2sect == -1) {  //first part in cache, but not second part
+			if (part1sect == CACHESECTIONCOUNT-1) MoveSection(&part1sect,0);
 			LoadSection(part1sect+1,ofs+CACHESECTIONSIZE);
 		}
-		else if(part2sect!=part1sect+1) {   //both parts are in cache, but not already consecutive
-			if(part1sect==CACHESECTIONCOUNT-1) {
+		else if (part2sect!= part1sect+1) {   //both parts are in cache, but not already consecutive
+			if (part1sect == CACHESECTIONCOUNT-1) {
 				//first part is at end, move to before second part
-				if(part2sect==0) //second part is at start: need to move both
+				if (part2sect == 0) //second part is at start: need to move both
 					MoveSection(&part2sect,1);
 				MoveSection(&part1sect,part2sect-1);
 			}
@@ -106,20 +106,20 @@ PBYTE DBRead(DWORD ofs,int bytesRequired,int *bytesAvail)
 		}
 	}
 	else {
-		if(part2sect==-1) {  //neither section is in cache
-			part1sect=0; part2sect=1;
+		if (part2sect == -1) {  //neither section is in cache
+			part1sect = 0; part2sect = 1;
 			LoadSection(part1sect,ofs); LoadSection(part2sect,ofs+CACHESECTIONSIZE);
 		}
 		else {    //part 2 is in cache, but not part 1
-			if(part2sect==0) MoveSection(&part2sect,1);
-			part1sect=part2sect-1;
+			if (part2sect == 0) MoveSection(&part2sect,1);
+			part1sect = part2sect-1;
 			LoadSection(part1sect,ofs);
 		}
 	}
 	//both sections are now consecutive, starting at part1sect
-	cacheSectionInfo[part1sect].lastUsed=++lastUseCounter;
-	cacheSectionInfo[part1sect+1].lastUsed=++lastUseCounter;
-	if(bytesAvail!=NULL) *bytesAvail=cacheSectionInfo[part1sect+1].ofsBase+CACHESECTIONSIZE-ofs;
+	cacheSectionInfo[part1sect].lastUsed = ++lastUseCounter;
+	cacheSectionInfo[part1sect+1].lastUsed = ++lastUseCounter;
+	if (bytesAvail!= NULL) *bytesAvail = cacheSectionInfo[part1sect+1].ofsBase+CACHESECTIONSIZE-ofs;
 	return pDbCache+part1sect*CACHESECTIONSIZE+(ofs-cacheSectionInfo[part1sect].ofsBase);
 }
 
@@ -134,21 +134,21 @@ void DBWrite(DWORD ofs,PVOID pData,int bytes)
 
 	log2("write %d@%08x",bytes,ofs);
 	SetFilePointer(hDbFile,ofs,NULL,FILE_BEGIN);
-	if (WriteFile(hDbFile,pData,bytes,&bytesWritten,NULL)==0)
+	if (WriteFile(hDbFile,pData,bytes,&bytesWritten,NULL) == 0)
 	{
 		DatabaseCorruption();
 	}
 	logg();
 	//check if any of the cache sections contain this bit
-	for(i=0;i<CACHESECTIONCOUNT;i++) {
-		if(ofs+bytes>=cacheSectionInfo[i].ofsBase && ofs<cacheSectionInfo[i].ofsBase+CACHESECTIONSIZE) {
-			if(ofs<cacheSectionInfo[i].ofsBase) {  //don't start at beginning
-				if(ofs+bytes>=cacheSectionInfo[i].ofsBase+CACHESECTIONSIZE)   //don't finish at end
+	for(i = 0;i<CACHESECTIONCOUNT;i++) {
+		if (ofs+bytes >= cacheSectionInfo[i].ofsBase && ofs<cacheSectionInfo[i].ofsBase+CACHESECTIONSIZE) {
+			if (ofs<cacheSectionInfo[i].ofsBase) {  //don't start at beginning
+				if (ofs+bytes >= cacheSectionInfo[i].ofsBase+CACHESECTIONSIZE)   //don't finish at end
 					CopyMemory(pDbCache+i*CACHESECTIONSIZE,(PBYTE)pData+cacheSectionInfo[i].ofsBase-ofs,CACHESECTIONSIZE);
 				else CopyMemory(pDbCache+i*CACHESECTIONSIZE,(PBYTE)pData+cacheSectionInfo[i].ofsBase-ofs,bytes-(cacheSectionInfo[i].ofsBase-ofs));
 			}
 			else {	  //start at beginning
-				if(ofs+bytes>=cacheSectionInfo[i].ofsBase+CACHESECTIONSIZE)   //don't finish at end
+				if (ofs+bytes >= cacheSectionInfo[i].ofsBase+CACHESECTIONSIZE)   //don't finish at end
 					CopyMemory(pDbCache+i*CACHESECTIONSIZE+ofs-cacheSectionInfo[i].ofsBase,pData,cacheSectionInfo[i].ofsBase+CACHESECTIONSIZE-ofs);
 				else CopyMemory(pDbCache+i*CACHESECTIONSIZE+ofs-cacheSectionInfo[i].ofsBase,pData,bytes);
 			}
@@ -162,7 +162,7 @@ void DBMoveChunk(DWORD ofsDest,DWORD ofsSource,int bytes)
 	PBYTE buf;
 
 	log3("move %d %08x->%08x",bytes,ofsSource,ofsDest);
-	buf=(PBYTE)mir_alloc(bytes);
+	buf = (PBYTE)mir_alloc(bytes);
 	SetFilePointer(hDbFile,ofsSource,NULL,FILE_BEGIN);
 	ReadFile(hDbFile,buf,bytes,&bytesRead,NULL);
 	DBWrite(ofsDest,buf,bytes);
@@ -183,35 +183,33 @@ void DBFlush(int setting)
 {
 	if (!setting) {
 		log0("nflush1");
-		if(safetyMode) FlushFileBuffers(hDbFile);
+		if (safetyMode) FlushFileBuffers(hDbFile);
 		log0("nflush2");
 		return;
 	}
 	KillTimer(NULL,flushBuffersTimerId);
-	flushBuffersTimerId=SetTimer(NULL,flushBuffersTimerId,50,DoBufferFlushTimerProc);
+	flushBuffersTimerId = SetTimer(NULL,flushBuffersTimerId,50,DoBufferFlushTimerProc);
 }
 
 static INT_PTR CacheSetSafetyMode(WPARAM wParam,LPARAM lParam)
 {
 	EnterCriticalSection(&csDbAccess);
-	safetyMode=wParam;
+	safetyMode = wParam;
 	LeaveCriticalSection(&csDbAccess);
-	if(safetyMode) FlushFileBuffers(hDbFile);
+	if (safetyMode) FlushFileBuffers(hDbFile);
 	return 0;
 }
 
 int InitCache(void)
 {
-	int i;
-	DWORD bytesRead;
-	
-	CreateServiceFunction(MS_DB_SETSAFETYMODE,CacheSetSafetyMode);
-	pDbCache=(PBYTE)mir_alloc(CACHESECTIONSIZE*CACHESECTIONCOUNT);
-	lastUseCounter=CACHESECTIONCOUNT;
-	for(i=0;i<CACHESECTIONCOUNT;i++) {
-		cacheSectionInfo[i].ofsBase=0;
-		cacheSectionInfo[i].lastUsed=i;
+	pDbCache = (PBYTE)mir_alloc(CACHESECTIONSIZE*CACHESECTIONCOUNT);
+	lastUseCounter = CACHESECTIONCOUNT;
+	for(int i = 0; i < CACHESECTIONCOUNT; i++) {
+		cacheSectionInfo[i].ofsBase = 0;
+		cacheSectionInfo[i].lastUsed = i;
 		SetFilePointer(hDbFile,cacheSectionInfo[i].ofsBase,NULL,FILE_BEGIN);
+
+		DWORD bytesRead;
 		ReadFile(hDbFile,pDbCache+i*CACHESECTIONSIZE,CACHESECTIONSIZE,&bytesRead,NULL);
 	}
 	return 0;
-- 
cgit v1.2.3