X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/6ad2fe3a6550b77888c46b17f81d8ab74406649d..681f1e885b0f95d7278ad2e7e0f2d157c0048390:/configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index b6edc17..62519a4 100644
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -174,11 +174,9 @@ void * configcache::getHeader(const string& headerid) {
   return NULL;
 }
 
-/* returns number of equilibration-steps left with new read configuration 
-   or zero if no new configuration was read */
-void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigned long> *excludeFileHashes)
+void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigned long> *excludeFileHashes)
 {
-  readnewconfig = false;
+  *readnewconfig = false;
 
   if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return;
 
@@ -193,8 +191,8 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
       int iDidVirtualSkips;
 
       if( (!inFile.is_open()) && inFileIt == inFiles.end() ) {
-	cout << "RETURNING..." << endl;
-	nequileft = nequileft_internal;
+	if (*readnewconfig)
+	  *nequileft = nequileft_internal;
 	return;
       }
 
@@ -223,8 +221,6 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
       if( inFile.is_open() ) 
 	{
 	  if (doVirtualEquilibration) {
-	    cout << nequileft_internal << endl;
-
 	    if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush;
 	    doVirtualEquilibration = false;
 	    for (iDidVirtualSkips=0; iDidVirtualSkips < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iDidVirtualSkips++) {
@@ -233,8 +229,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
 	      else if ( (NEQUI-openFileDesc.nequi) - (iDidVirtualSkips+1)*openFileDesc.nskip < nequileft_internal ) {
 		memcpy(configMem, tmpConfig, configSize);
 		nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;
-		cout << "blabla:" << nequileft_internal << endl;
-		readnewconfig = true;
+		*readnewconfig = true;
 		firstUsedConfig = false;
 	      }
 	    }
@@ -243,7 +238,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
 	  if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
 	    {
 	      memcpy(configMem, tmpConfig, configSize);
-	      readnewconfig = true;
+	      *readnewconfig = true;
 	      if (firstUsedConfig) {
 		firstUsedConfig = false;
 		if (openFileDesc.nequi < NEQUI)
@@ -252,8 +247,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
 		  nequileft_internal = NEQUI - openFileDesc.nequi;
 	      }
 	      nequileft_internal -= openFileDesc.nskip;
-	      cout << "sadasd:" << nequileft_internal << endl;
-	      nequileft = nequileft_internal;
+	      *nequileft = nequileft_internal;
 	      return;
 	    }
 	  else {