Merge pull request #10 from HuolalaTech/fix/close-fd

fix(c++): close fd while flushing in incremental mode

Author: mricefox

Core/Glog.cpp

@@ -419,6 +419,7 @@ bool Glog::appendLogFile(uint8_t &maxRecursionDepth, time_t epochSeconds) {
             if (--maxRecursionDepth <= 0) {
                 InternalError("appendLogFile() reach recursion upper limit");
                 m_cacheFile->closeFile();
+                closeFile(fd, filepath.c_str());
                 return false;
             }
             return appendLogFile(maxRecursionDepth, epochSeconds);
@@ -450,13 +451,15 @@ bool Glog::appendLogFile(uint8_t &maxRecursionDepth, time_t epochSeconds) {
         InternalError("fail to truncate [%s] to size %zu, %s", filepath.c_str(), mmapOffset + mmapSize,
                       ::strerror(errno));
         m_cacheFile->closeFile();
+        closeFile(fd, filepath.c_str());
         return false;
     }
 
     if (!GlogFile::zeroFillFile(fd, fileSize, copySize)) {
         InternalError("fail to zeroFile [%s] to size %zu, %s", filepath.c_str(), mmapOffset + mmapSize,
                       strerror(errno));
         m_cacheFile->closeFile();
+        closeFile(fd, filepath.c_str());
         return false;
     }
 
@@ -465,6 +468,7 @@ bool Glog::appendLogFile(uint8_t &maxRecursionDepth, time_t epochSeconds) {
     if (mmapPtr == MAP_FAILED) {
         InternalError("fail to mmap [%s], %s", filepath.c_str(), strerror(errno));
         m_cacheFile->closeFile();
+        closeFile(fd, filepath.c_str());
         return false;
     }
 
@@ -473,6 +477,7 @@ bool Glog::appendLogFile(uint8_t &maxRecursionDepth, time_t epochSeconds) {
     if (src == nullptr || src == MAP_FAILED) {
         InternalError("fail to get cache file [%s] mmap ptr", filepath.c_str());
         m_cacheFile->closeFile();
+        closeFile(fd, filepath.c_str());
         return false;
     }
     memcpy((uint8_t *) mmapPtr + dstOffset, src + headerSize, copySize);
@@ -493,6 +498,7 @@ bool Glog::appendLogFile(uint8_t &maxRecursionDepth, time_t epochSeconds) {
         InternalError("fail to truncate [%s] to size %zu, %s", filepath.c_str(), fileSize + copySize,
                       ::strerror(errno));
         m_cacheFile->closeFile();
+        closeFile(fd, filepath.c_str());
         return false;
     }
 
@@ -502,8 +508,11 @@ bool Glog::appendLogFile(uint8_t &maxRecursionDepth, time_t epochSeconds) {
     //    m_cacheFile->resetInternalState();
 
     m_cacheFile->closeFile();
+    closeFile(fd, filepath.c_str());
     if (::remove(m_cacheFile->getPath().c_str()) < 0) {
         InternalError("fail to remove file [%s] %s", m_cacheFile->getPath().c_str(), ::strerror(errno));
+        m_cacheFile->closeFile();
+        closeFile(fd, filepath.c_str());
         return false;
     } else {
         InternalDebug("remove file [%s]", m_cacheFile->getPath().c_str());

Core/utilities.cpp

@@ -232,4 +232,15 @@ int readSpecifySize(int fd, void *buf, size_t size) {
     return static_cast<int>(bytes);
 }
 
+bool closeFile(int fd, const char *filepath) {
+    if (fd < 0) {
+        return false;
+    }
+    if (::close(fd) != 0) {
+        InternalError("fail to close [%s], %s", filepath ? filepath : "Unknown", strerror(errno));
+        return false;
+    }
+    return true;
+}
+
 } // namespace glog

Core/utilities.h

@@ -76,5 +76,7 @@ int char2int(char input);
 bool str2Hex(const string &s, uint8_t *data);
 
 int readSpecifySize(int fd, void *buf, size_t size);
+
+bool closeFile(int fd, const char *filepath = nullptr);
 } // namespace glog
 #endif //CORE__UTILITIES_H_