Improve support of large log file on 32-bit host (#308)

* Better support large log file when -D_FILE_OFFSET_BITS=64 on 32-bit host * Use off_t to define log file size uniformly Cherry-pick: 39e5c72
chenshuo · Jan 18, 2018 · 65e4dc4 · 65e4dc4
1 parent 6a29505
commit 65e4dc4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/muduo/base/AsyncLogging.cc b/muduo/base/AsyncLogging.cc
@@ -7,7 +7,7 @@
 using namespace muduo;
 
 AsyncLogging::AsyncLogging(const string& basename,
-                           size_t rollSize,
+                           off_t rollSize,
                            int flushInterval)
   : flushInterval_(flushInterval),
     running_(false),

diff --git a/muduo/base/AsyncLogging.h b/muduo/base/AsyncLogging.h
@@ -19,7 +19,7 @@ class AsyncLogging : noncopyable
  public:
 
   AsyncLogging(const string& basename,
-               size_t rollSize,
+               off_t rollSize,
                int flushInterval = 3);
 
   ~AsyncLogging()
@@ -57,7 +57,7 @@ class AsyncLogging : noncopyable
   const int flushInterval_;
   std::atomic<bool> running_;
   string basename_;
-  size_t rollSize_;
+  off_t rollSize_;
   muduo::Thread thread_;
   muduo::CountDownLatch latch_;
   muduo::MutexLock mutex_;

diff --git a/muduo/base/FileUtil.h b/muduo/base/FileUtil.h
@@ -73,15 +73,15 @@ class AppendFile : noncopyable
 
   void flush();
 
-  size_t writtenBytes() const { return writtenBytes_; }
+  off_t writtenBytes() const { return writtenBytes_; }
 
  private:
 
   size_t write(const char* logline, size_t len);
 
   FILE* fp_;
   char buffer_[64*1024];
-  size_t writtenBytes_;
+  off_t writtenBytes_;
 };
 }
 

diff --git a/muduo/base/LogFile.cc b/muduo/base/LogFile.cc
@@ -10,7 +10,7 @@
 using namespace muduo;
 
 LogFile::LogFile(const string& basename,
-                 size_t rollSize,
+                 off_t rollSize,
                  bool threadSafe,
                  int flushInterval,
                  int checkEveryN)

diff --git a/muduo/base/LogFile.h b/muduo/base/LogFile.h
@@ -18,7 +18,7 @@ class LogFile : noncopyable
 {
  public:
   LogFile(const string& basename,
-          size_t rollSize,
+          off_t rollSize,
           bool threadSafe = true,
           int flushInterval = 3,
           int checkEveryN = 1024);
@@ -34,7 +34,7 @@ class LogFile : noncopyable
   static string getLogFileName(const string& basename, time_t* now);
 
   const string basename_;
-  const size_t rollSize_;
+  const off_t rollSize_;
   const int flushInterval_;
   const int checkEveryN_;
 

diff --git a/muduo/base/tests/AsyncLogging_test.cc b/muduo/base/tests/AsyncLogging_test.cc
@@ -6,7 +6,7 @@
 #include <sys/resource.h>
 #include <unistd.h>
 
-int kRollSize = 500*1000*1000;
+off_t kRollSize = 500*1000*1000;
 
 muduo::AsyncLogging* g_asyncLog = NULL;