From 59e69ae1c7ccda74a8cbf8c9b2ae37bc74cbf612 Mon Sep 17 00:00:00 2001

From: Ravishankar N <ravishankar@redhat.com>

Date: Fri, 4 Jun 2021 10:55:37 +0530

Subject: [PATCH 575/584] libglusterfs: add functions to calculate time

 difference

Add gf_tvdiff() and gf_tsdiff() to calculate the difference

between 'struct timeval' and 'struct timespec' values, use

them where appropriate.

Upstream patch details:

> https://github.com/gluster/glusterfs/commit/ba7f24b1cedf2549394c21b3f0df1661227cefae

> Change-Id: I172be06ee84e99a1da76847c15e5ea3fbc059338

> Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>

> Updates: #1002

BUG: 1928676

Change-Id: I723ab9555b0f8caef108742acc2cb63d6a32eb96

Signed-off-by: Ravishankar N <ravishankar@redhat.com>

Reviewed-on: https://code.engineering.redhat.com/gerrit/c/rhs-glusterfs/+/245294

Tested-by: RHGS Build Bot <nigelb@redhat.com>

Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>

---

 glusterfsd/src/glusterfsd-mgmt.c          |  4 ++--

 libglusterfs/src/glusterfs/common-utils.h | 32 +++++++++++++++++++++++++++++++

 libglusterfs/src/latency.c                |  3 +--

 xlators/cluster/dht/src/dht-rebalance.c   |  6 ++----

 xlators/debug/io-stats/src/io-stats.c     |  8 ++------

 5 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c

index 61d1b21..a51dd9e 100644

--- a/glusterfsd/src/glusterfsd-mgmt.c

+++ b/glusterfsd/src/glusterfsd-mgmt.c

@@ -534,7 +534,7 @@ glusterfs_volume_top_write_perf(uint32_t blk_size, uint32_t blk_count,

     }

     gettimeofday(&end, NULL);

-    *time = (end.tv_sec - begin.tv_sec) * 1e6 + (end.tv_usec - begin.tv_usec);

+    *time = gf_tvdiff(&begin, &end;;

     *throughput = total_blks / *time;

     gf_log("glusterd", GF_LOG_INFO,

            "Throughput %.2f Mbps time %.2f secs "

@@ -653,7 +653,7 @@ glusterfs_volume_top_read_perf(uint32_t blk_size, uint32_t blk_count,

     }

     gettimeofday(&end, NULL);

-    *time = (end.tv_sec - begin.tv_sec) * 1e6 + (end.tv_usec - begin.tv_usec);

+    *time = gf_tvdiff(&begin, &end;;

     *throughput = total_blks / *time;

     gf_log("glusterd", GF_LOG_INFO,

            "Throughput %.2f Mbps time %.2f secs "

diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h

index 604afd0..bd48b6f 100644

--- a/libglusterfs/src/glusterfs/common-utils.h

+++ b/libglusterfs/src/glusterfs/common-utils.h

@@ -1090,4 +1090,36 @@ find_xlator_option_in_cmd_args_t(const char *option_name, cmd_args_t *args);

 int

 gf_d_type_from_ia_type(ia_type_t type);

+/* Return delta value in microseconds. */

+

+static inline double

+gf_tvdiff(struct timeval *start, struct timeval *end)

+{

+    struct timeval t;

+

+    if (start->tv_usec > end->tv_usec)

+        t.tv_sec = end->tv_sec - 1, t.tv_usec = end->tv_usec + 1000000;

+    else

+        t.tv_sec = end->tv_sec, t.tv_usec = end->tv_usec;

+

+    return (double)(t.tv_sec - start->tv_sec) * 1e6 +

+           (double)(t.tv_usec - start->tv_usec);

+}

+

+/* Return delta value in nanoseconds. */

+

+static inline double

+gf_tsdiff(struct timespec *start, struct timespec *end)

+{

+    struct timespec t;

+

+    if (start->tv_nsec > end->tv_nsec)

+        t.tv_sec = end->tv_sec - 1, t.tv_nsec = end->tv_nsec + 1000000000;

+    else

+        t.tv_sec = end->tv_sec, t.tv_nsec = end->tv_nsec;

+

+    return (double)(t.tv_sec - start->tv_sec) * 1e9 +

+           (double)(t.tv_nsec - start->tv_nsec);

+}

+

 #endif /* _COMMON_UTILS_H */

diff --git a/libglusterfs/src/latency.c b/libglusterfs/src/latency.c

index e1e6de7..ce61399 100644

--- a/libglusterfs/src/latency.c

+++ b/libglusterfs/src/latency.c

@@ -33,8 +33,7 @@ gf_update_latency(call_frame_t *frame)

     if (!(begin->tv_sec && end->tv_sec))

         goto out;

-    elapsed = (end->tv_sec - begin->tv_sec) * 1e9 +

-              (end->tv_nsec - begin->tv_nsec);

+    elapsed = gf_tsdiff(begin, end);

     if (frame->op < 0 || frame->op >= GF_FOP_MAXVALUE) {

         gf_log("[core]", GF_LOG_WARNING, "Invalid frame op value: %d",

diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c

index eab7558..e07dec0 100644

--- a/xlators/cluster/dht/src/dht-rebalance.c

+++ b/xlators/cluster/dht/src/dht-rebalance.c

@@ -2927,8 +2927,7 @@ gf_defrag_migrate_single_file(void *opaque)

     if (defrag->stats == _gf_true) {

         gettimeofday(&end, NULL);

-        elapsed = (end.tv_sec - start.tv_sec) * 1e6 +

-                  (end.tv_usec - start.tv_usec);

+        elapsed = gf_tvdiff(&start, &end;;

         gf_log(this->name, GF_LOG_INFO,

                "Migration of "

                "file:%s size:%" PRIu64

@@ -3529,8 +3528,7 @@ gf_defrag_process_dir(xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc,

     }

     gettimeofday(&end, NULL);

-    elapsed = (end.tv_sec - dir_start.tv_sec) * 1e6 +

-              (end.tv_usec - dir_start.tv_usec);

+    elapsed = gf_tvdiff(&dir_start, &end;;

     gf_log(this->name, GF_LOG_INFO,

            "Migration operation on dir %s took "

            "%.2f secs",

diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c

index 9b34895..8ad96fb 100644

--- a/xlators/debug/io-stats/src/io-stats.c

+++ b/xlators/debug/io-stats/src/io-stats.c

@@ -281,9 +281,7 @@ is_fop_latency_started(call_frame_t *frame)

         begin = &frame->begin;                                                 \

         end = &frame->end;                                                     \

                                                                                \

-        elapsed = ((end->tv_sec - begin->tv_sec) * 1e9 +                       \

-                   (end->tv_nsec - begin->tv_nsec)) /                          \

-                  1000;                                                        \

+        elapsed = gf_tsdiff(begin, end) / 1000.0;                              \

         throughput = op_ret / elapsed;                                         \

                                                                                \

         conf = this->private;                                                  \

@@ -1774,9 +1772,7 @@ update_ios_latency(struct ios_conf *conf, call_frame_t *frame,

     begin = &frame->begin;

     end = &frame->end;

-    elapsed = ((end->tv_sec - begin->tv_sec) * 1e9 +

-               (end->tv_nsec - begin->tv_nsec)) /

-              1000;

+    elapsed = gf_tsdiff(begin, end) / 1000.0;

     update_ios_latency_stats(&conf->cumulative, elapsed, op);

     update_ios_latency_stats(&conf->incremental, elapsed, op);

-- 

1.8.3.1