Avoid unnecessary calls to time(3)

[redis.git] / src / aof.c

diff --git a/src/aof.c b/src/aof.c
index b43f99f5e8e5f47cd7ec0e9454c8233606ff6a60..a83149bddb47f0cdf8bcd7483aa66da8bd83ce97 100644 (file)
--- a/src/aof.c
+++ b/src/aof.c
@@ -60,7 +60,6 @@ int startAppendOnly(void) {
  * buffer and write it on disk using this function just before entering
  * the event loop again. */
 void flushAppendOnlyFile(void) {
  * buffer and write it on disk using this function just before entering
  * the event loop again. */
 void flushAppendOnlyFile(void) {

-    time_t now;

     ssize_t nwritten;
 
     if (sdslen(server.aofbuf) == 0) return;
     ssize_t nwritten;
 
     if (sdslen(server.aofbuf) == 0) return;


@@ -86,21 +85,21 @@ void flushAppendOnlyFile(void) {
     server.aofbuf = sdsempty();
     server.appendonly_current_size += nwritten;
 
     server.aofbuf = sdsempty();
     server.appendonly_current_size += nwritten;
 

-    /* Don't Fsync if no-appendfsync-on-rewrite is set to yes and we have
-     * childs performing heavy I/O on disk. */
+    /* Don't fsync if no-appendfsync-on-rewrite is set to yes and there are
+     * children doing I/O in the background. */

     if (server.no_appendfsync_on_rewrite &&
         (server.bgrewritechildpid != -1 || server.bgsavechildpid != -1))
             return;
     if (server.no_appendfsync_on_rewrite &&
         (server.bgrewritechildpid != -1 || server.bgsavechildpid != -1))
             return;

-    /* Fsync if needed */
-    now = time(NULL);
+
+    /* Perform the fsync if needed. */

     if (server.appendfsync == APPENDFSYNC_ALWAYS ||
         (server.appendfsync == APPENDFSYNC_EVERYSEC &&
     if (server.appendfsync == APPENDFSYNC_ALWAYS ||
         (server.appendfsync == APPENDFSYNC_EVERYSEC &&

-         now-server.lastfsync > 1))
+         server.unixtime > server.lastfsync))

     {
         /* aof_fsync is defined as fdatasync() for Linux in order to avoid
          * flushing metadata. */
         aof_fsync(server.appendfd); /* Let's try to get this data on the disk */
     {
         /* aof_fsync is defined as fdatasync() for Linux in order to avoid
          * flushing metadata. */
         aof_fsync(server.appendfd); /* Let's try to get this data on the disk */

-        server.lastfsync = now;
+        server.lastfsync = server.unixtime;

     }
 }
 
     }
 }