performance/io-cache: simplify and cleanup internal time management

Since this xlator measures time intervals in seconds, gettimeofday()
may be replaced with simpler gf_time(). Simplify and convert to
static ioc_inode_need_revalidate() as well.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Change-Id: Iaf13ecbf527589286ab3331c37429dd04bf6fa2c
Updates: #1002

3 files changed, 18 insertions, 38 deletions

diff --git a/xlators/performance/io-cache/src/io-cache.c b/xlators/performance/io-cache/src/io-cache.c
index 2fefaef8de8..9375d29c17f 100644
--- a/xlators/performance/io-cache/src/io-cache.c
+++ b/xlators/performance/io-cache/src/io-cache.c
@@ -133,23 +133,17 @@ ioc_update_pages(call_frame_t *frame, ioc_inode_t *ioc_inode,
     return 0;
 }
 
-int32_t
+static gf_boolean_t
 ioc_inode_need_revalidate(ioc_inode_t *ioc_inode)
 {
-    int8_t need_revalidate = 0;
-    struct timeval tv = {
-        0,
-    };
     ioc_table_t *table = NULL;
 
+    GF_ASSERT(ioc_inode);
     table = ioc_inode->table;
+    GF_ASSERT(table);
 
-    gettimeofday(&tv, NULL);
-
-    if (time_elapsed(&tv, &ioc_inode->cache.tv) >= table->cache_timeout)
-        need_revalidate = 1;
-
-    return need_revalidate;
+    return (gf_time() - ioc_inode->cache.last_revalidate >=
+            table->cache_timeout);
 }
 
 /*
@@ -411,9 +405,6 @@ ioc_cache_validate_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
     ioc_inode_t *ioc_inode = NULL;
     size_t destroy_size = 0;
     struct iatt *local_stbuf = NULL;
-    struct timeval tv = {
-        0,
-    };
 
     local = frame->local;
     ioc_inode = local->inode;
@@ -451,10 +442,9 @@ ioc_cache_validate_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
     if (op_ret < 0)
         local_stbuf = NULL;
 
-    gettimeofday(&tv, NULL);
     ioc_inode_lock(ioc_inode);
     {
-        memcpy(&ioc_inode->cache.tv, &tv, sizeof(struct timeval));
+        ioc_inode->cache.last_revalidate = gf_time();
     }
     ioc_inode_unlock(ioc_inode);
 
@@ -1405,9 +1395,6 @@ ioc_lk(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd,
 {
     ioc_inode_t *ioc_inode = NULL;
     uint64_t tmp_inode = 0;
-    struct timeval tv = {
-        0,
-    };
 
     inode_ctx_get(fd->inode, this, &tmp_inode);
     ioc_inode = (ioc_inode_t *)(long)tmp_inode;
@@ -1418,10 +1405,9 @@ ioc_lk(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd,
         return 0;
     }
 
-    gettimeofday(&tv, NULL);
     ioc_inode_lock(ioc_inode);
     {
-        memcpy(&ioc_inode->cache.tv, &tv, sizeof(struct timeval));
+        ioc_inode->cache.last_revalidate = gf_time();
     }
     ioc_inode_unlock(ioc_inode);
 
@@ -1955,9 +1941,9 @@ __ioc_cache_dump(ioc_inode_t *ioc_inode, char *prefix)
 
     table = ioc_inode->table;
 
-    if (ioc_inode->cache.tv.tv_sec) {
-        gf_time_fmt_tv(timestr, sizeof timestr, &ioc_inode->cache.tv,
-                       gf_timefmt_FT);
+    if (ioc_inode->cache.last_revalidate) {
+        gf_time_fmt(timestr, sizeof timestr, ioc_inode->cache.last_revalidate,
+                    gf_timefmt_FT);
 
         gf_proc_dump_write("last-cache-validation-time", "%s", timestr);
     }
diff --git a/xlators/performance/io-cache/src/io-cache.h b/xlators/performance/io-cache/src/io-cache.h
index 4303c2fae13..7ba7f3a3a28 100644
--- a/xlators/performance/io-cache/src/io-cache.h
+++ b/xlators/performance/io-cache/src/io-cache.h
@@ -117,15 +117,13 @@ struct ioc_page {
 struct ioc_cache {
     rbthash_table_t *page_table;
     struct list_head page_lru;
-    time_t mtime;      /*
-                        * seconds component of file mtime
-                        */
-    time_t mtime_nsec; /*
-                        * nanosecond component of file mtime
-                        */
-    struct timeval tv; /*
-                        * time-stamp at last re-validate
-                        */
+    time_t mtime;           /*
+                             * seconds component of file mtime
+                             */
+    time_t mtime_nsec;      /*
+                             * nanosecond component of file mtime
+                             */
+    time_t last_revalidate; /* timestamp at last re-validate */
 };
 
 struct ioc_inode {
diff --git a/xlators/performance/io-cache/src/page.c b/xlators/performance/io-cache/src/page.c
index a8edbde23f2..84b1ae6cb20 100644
--- a/xlators/performance/io-cache/src/page.c
+++ b/xlators/performance/io-cache/src/page.c
@@ -413,9 +413,6 @@ ioc_fault_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret,
     ioc_waitq_t *waitq = NULL;
     size_t iobref_page_size = 0;
     char zero_filled = 0;
-    struct timeval tv = {
-        0,
-    };
 
     GF_ASSERT(frame);
 
@@ -431,7 +428,6 @@ ioc_fault_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret,
 
     zero_filled = ((op_ret >= 0) && (stbuf->ia_mtime == 0));
 
-    gettimeofday(&tv, NULL);
     ioc_inode_lock(ioc_inode);
     {
         if (op_ret == -1 ||
@@ -448,7 +444,7 @@ ioc_fault_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret,
             ioc_inode->cache.mtime_nsec = stbuf->ia_mtime_nsec;
         }
 
-        memcpy(&ioc_inode->cache.tv, &tv, sizeof(struct timeval));
+        ioc_inode->cache.last_revalidate = gf_time();
 
         if (op_ret < 0) {
             /* error, readv returned -1 */