DATADIR = datadir;
CACHEID = cacheid;
+ if ( cacheid.find("_") != -1 ) {
+ if(log) *log << "CCACHE: Invalid cacheid \"" << cacheid << "\" given. Cacheids must not contain underscores!" << endl << flush;
+ exit(1);
+ }
+
configMem = (char*)malloc(configMemSize);
tmpConfig = (char*)malloc(configMemSize);
refetchDataFiles = false;
}
-string configcache::getFileId(const bool& shortid)
+string configcache::getFileId(int actnequi, const bool& shortid)
{
stringstream fileid;
- if(!shortid) fileid << CACHEID << "_" << NEQUI << "_" << NSKIP;
+ if(!shortid) fileid << CACHEID << "_" << actnequi << "_" << NSKIP;
for(int ipara=0; ipara<Paras.size(); ipara++)
fileid << "_" << Paras[ipara].id << Paras[ipara].val;
filedesc->filename = infile;
filedesc->doVirtualEquilibration = false;
+ filedesc->firstUsedConfig = true;
if( infile.size() < 4 ) return false;
inchar = new char [infile.size()+1];
strcpy (inchar, infile.c_str());
-
+
inParts = strtok( inchar, "_" );
for(int iPart=0; inParts!=NULL; iPart++)
{
switch(iPart)
{
- case 1: if(inParts != CACHEID) return false; break;
- case 2:
- if (atoi(inParts) > NEQUI)
- return false;
- else if (atoi(inParts) < NEQUI)
+ case 1: if(inParts != CACHEID)
+ return false;
+ break;
+ case 2:
+ if (atoi(inParts) < NEQUI)
filedesc->doVirtualEquilibration = true;
filedesc->nequi = atoi(inParts);
break;
delete[] inchar;
- if( truncIn.find( getFileId(true) + "_" ) == string::npos ) return false;
+ if( truncIn.find( getFileId(NEQUI, true) + "_" ) == string::npos ) return false;
return true;
}
return NULL;
}
-/* returns number of equilibration-steps left */
-int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
+/* 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)
{
- int nequileft = NEQUI;
+ readnewconfig = false;
- if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return nequileft;
+ if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return;
if(refetchDataFiles){
refetchDataFiles = false;
while(true)
{
- if( (!inFile.is_open()) && inFiles.size() == 0 ) return nequileft;
+ vector<infiledesc>::iterator inFileIt = getNextInfile(excludeFileHashes);
+ int iDidVirtualSkips;
- while( (!inFile.is_open()) && inFiles.size() > 0 ) {
- bool excludethisfile=false;
+ if( (!inFile.is_open()) && inFileIt == inFiles.end() ) {
+ cout << "RETURNING..." << endl;
+ nequileft = nequileft_internal;
+ return;
+ }
- openFileDesc = inFiles.back();
+ while( (!inFile.is_open()) && inFiles.size() > 0 ) {
+ openFileDesc = *inFileIt;
- if (excludeFileHashes != NULL)
- for (vector<unsigned long>::iterator exit = excludeFileHashes->begin(); exit != excludeFileHashes->end(); ++exit)
- if ( *exit == hash(inFiles.back().filename) ) {
- excludethisfile = true;
- break;
- }
-
- if ( ! excludethisfile ) {
- if(log) *log << "CCACHE: Opening dat-file: " << inFiles.back().filename << endl << flush;
- inFile.open( (DATADIR + "/" + inFiles.back().filename).c_str(), std::ios::binary );
- }
- else
- if(log) *log << "CCACHE: Excluded dat-file: " << inFiles.back().filename << endl << flush;
+ if(log) *log << "CCACHE: Opening dat-file: " << inFileIt->filename << endl << flush;
+ inFile.open( (DATADIR + "/" + inFileIt->filename).c_str(), std::ios::binary );
- inFiles.pop_back();
+ inFiles.erase(inFileIt);
if( !inFile.is_open() ) continue;
if (openFileDesc.doVirtualEquilibration) {
if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush;
openFileDesc.doVirtualEquilibration = false;
- for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
+ for (iDidVirtualSkips=0; iDidVirtualSkips < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iDidVirtualSkips++) {
if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
break;
- else if ( (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip < nequileft ) {
+ else if ( (NEQUI-openFileDesc.nequi) - (iDidVirtualSkips+1)*openFileDesc.nskip < nequileft_internal ) {
memcpy(configMem, tmpConfig, configSize);
- nequileft = (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip;
+ nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;
+ cout << "blabla:" << nequileft_internal << endl;
+ readnewconfig = true;
+ openFileDesc.firstUsedConfig = false;
}
}
}
if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
{
memcpy(configMem, tmpConfig, configSize);
- return -1;
+ readnewconfig = true;
+ if (openFileDesc.firstUsedConfig) {
+ openFileDesc.firstUsedConfig = false;
+ if (NEQUI < openFileDesc.nequi)
+ nequileft_internal = NEQUI - openFileDesc.nequi - iDidVirtualSkips*openFileDesc.nskip;
+ else
+ nequileft_internal = NEQUI - openFileDesc.nequi;
+ }
+ nequileft_internal -= openFileDesc.nskip;
+ cout << "sadasd:" << nequileft_internal << endl;
+ nequileft = nequileft_internal;
+ return;
}
else {
if(log) *log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;
}
}
-void configcache::openOutFile()
+void configcache::openOutFile(int actnequi)
{
time_t secstamp = time(NULL);
outFileName.str("");
- outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.edat.tmp";
+ outFileName << DATADIR << "/" << secstamp << "_" << getFileId(actnequi) << "_.edat.tmp";
outFile.open( outFileName.str().c_str(), std::ios::binary );
outBuffer->push(outFile);
}
-void configcache::writeHeader(const string& headerid, const char *header, long unsigned int size) {
+void configcache::writeHeader(const string& headerid, const char *header, long unsigned int size, int actnequi) {
unsigned long headeridhash;
if( DATADIR == "" || MODE < 2 ) return;
if(!outFile.is_open())
- openOutFile();
+ openOutFile(actnequi);
headeridhash = hash(headerid);
boost::iostreams::write(*outBuffer, header, size);
}
-void configcache::writeConfig()
+void configcache::writeConfig(int actnequi)
{
long unsigned int zeroheader=0;
if ( DATADIR == "" || MODE < 2 ) return;
if ( ! outFile.is_open() )
- openOutFile();
+ openOutFile(actnequi);
boost::iostreams::write(*outBuffer, (char*)&zeroheader, sizeof(long unsigned int));
headerStore.pop_back();
}
}
+
+vector<infiledesc>::iterator configcache::getNextInfile(vector<unsigned long> *excludeFileHashes) {
+ for (vector<infiledesc>::iterator init = inFiles.begin(); init != inFiles.end(); ++init) {
+ if (excludeFileHashes != NULL) {
+ bool excludethisfile = false;
+
+ for (vector<unsigned long>::iterator exit = excludeFileHashes->begin(); exit != excludeFileHashes->end(); ++exit)
+ if ( *exit == hash(init->filename) ) {
+ excludethisfile = true;
+ break;
+ }
+
+ if (excludethisfile)
+ continue;
+ }
+ return init;
+ }
+ return inFiles.end();
+}
projects / phys / latlib.git / blobdiff