Merge pull request #4978
938bcce
CAutoFile: make file private (Philip Kaufmann)0c35486
CBufferedFile: add explicit close function (Philip Kaufmann)c9fb27d
CBufferedFile: convert into a non-refcounted RAII wrapper (Philip Kaufmann)
This commit is contained in:
commit
0e64566a82
@ -3085,6 +3085,7 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp)
|
||||
|
||||
int nLoaded = 0;
|
||||
try {
|
||||
// This takes over fileIn and calls fclose() on it in the CBufferedFile destructor
|
||||
CBufferedFile blkdat(fileIn, 2*MAX_BLOCK_SIZE, MAX_BLOCK_SIZE+8, SER_DISK, CLIENT_VERSION);
|
||||
uint64_t nStartByte = 0;
|
||||
if (dbp) {
|
||||
@ -3141,7 +3142,6 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp)
|
||||
LogPrintf("%s : Deserialize or I/O error - %s", __func__, e.what());
|
||||
}
|
||||
}
|
||||
fclose(fileIn);
|
||||
} catch(std::runtime_error &e) {
|
||||
AbortNode(_("Error: system error: ") + e.what());
|
||||
}
|
||||
|
@ -1154,7 +1154,7 @@ public:
|
||||
|
||||
|
||||
|
||||
/** Non-refcounted RAII wrapper for FILE*.
|
||||
/** Non-refcounted RAII wrapper for FILE*
|
||||
*
|
||||
* Will automatically close the file when it goes out of scope if not null.
|
||||
* If you're returning the file pointer, return file.release().
|
||||
@ -1166,12 +1166,13 @@ private:
|
||||
// Disallow copies
|
||||
CAutoFile(const CAutoFile&);
|
||||
CAutoFile& operator=(const CAutoFile&);
|
||||
protected:
|
||||
FILE* file;
|
||||
public:
|
||||
|
||||
int nType;
|
||||
int nVersion;
|
||||
|
||||
FILE* file;
|
||||
|
||||
public:
|
||||
CAutoFile(FILE* filenew, int nTypeIn, int nVersionIn)
|
||||
{
|
||||
file = filenew;
|
||||
@ -1186,10 +1187,11 @@ public:
|
||||
|
||||
void fclose()
|
||||
{
|
||||
if (file != NULL && file != stdin && file != stdout && file != stderr)
|
||||
if (file) {
|
||||
::fclose(file);
|
||||
file = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
FILE* release() { FILE* ret = file; file = NULL; return ret; }
|
||||
operator FILE*() { return file; }
|
||||
@ -1256,12 +1258,22 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
/** Wrapper around a FILE* that implements a ring buffer to
|
||||
* deserialize from. It guarantees the ability to rewind
|
||||
* a given number of bytes. */
|
||||
/** Non-refcounted RAII wrapper around a FILE* that implements a ring buffer to
|
||||
* deserialize from. It guarantees the ability to rewind a given number of bytes.
|
||||
*
|
||||
* Will automatically close the file when it goes out of scope if not null.
|
||||
* If you need to close the file early, use file.fclose() instead of fclose(file).
|
||||
*/
|
||||
class CBufferedFile
|
||||
{
|
||||
private:
|
||||
// Disallow copies
|
||||
CBufferedFile(const CBufferedFile&);
|
||||
CBufferedFile& operator=(const CBufferedFile&);
|
||||
|
||||
int nType;
|
||||
int nVersion;
|
||||
|
||||
FILE *src; // source file
|
||||
uint64_t nSrcPos; // how many bytes have been read from source
|
||||
uint64_t nReadPos; // how many bytes have been read from this
|
||||
@ -1289,12 +1301,25 @@ protected:
|
||||
}
|
||||
|
||||
public:
|
||||
int nType;
|
||||
int nVersion;
|
||||
|
||||
CBufferedFile(FILE *fileIn, uint64_t nBufSize, uint64_t nRewindIn, int nTypeIn, int nVersionIn) :
|
||||
src(fileIn), nSrcPos(0), nReadPos(0), nReadLimit((uint64_t)(-1)), nRewind(nRewindIn), vchBuf(nBufSize, 0),
|
||||
nType(nTypeIn), nVersion(nVersionIn) {
|
||||
nSrcPos(0), nReadPos(0), nReadLimit((uint64_t)(-1)), nRewind(nRewindIn), vchBuf(nBufSize, 0)
|
||||
{
|
||||
src = fileIn;
|
||||
nType = nTypeIn;
|
||||
nVersion = nVersionIn;
|
||||
}
|
||||
|
||||
~CBufferedFile()
|
||||
{
|
||||
fclose();
|
||||
}
|
||||
|
||||
void fclose()
|
||||
{
|
||||
if (src) {
|
||||
::fclose(src);
|
||||
src = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
// check whether we're at the end of the source file
|
||||
|
Loading…
Reference in New Issue
Block a user