trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jpe...@apache.org
Subject [1/2] git commit: TS-2556: fix ink_hrtime_diff_msec
Date Fri, 07 Feb 2014 04:49:05 GMT
Updated Branches:
  refs/heads/master bd070c693 -> 704f0a85a


TS-2556: fix ink_hrtime_diff_msec


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0c3691e3
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0c3691e3
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0c3691e3

Branch: refs/heads/master
Commit: 0c3691e350344ae4b717f72876623ee7953ed125
Parents: bd070c6
Author: James Peach <jpeach@apache.org>
Authored: Thu Feb 6 16:04:39 2014 -0800
Committer: James Peach <jpeach@apache.org>
Committed: Thu Feb 6 20:48:24 2014 -0800

----------------------------------------------------------------------
 CHANGES             | 2 ++
 lib/ts/ink_hrtime.h | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c3691e3/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 493fe74..770f95a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.0.0
 
+  *) [TS-2556] Fix ink_hrtime_diff_msec.
+
   *) [TS-2553] Fix a segfault in the Metalink plugin reported by Faysal Banna
    and preserve the Content-Length header
    Author: Jack Bates <jack@nottheoilrig.com>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c3691e3/lib/ts/ink_hrtime.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_hrtime.h b/lib/ts/ink_hrtime.h
index f7f6050..2f7dc45 100644
--- a/lib/ts/ink_hrtime.h
+++ b/lib/ts/ink_hrtime.h
@@ -298,7 +298,7 @@ ink_time()
 static inline int
 ink_hrtime_diff_msec(ink_hrtime t1, ink_hrtime t2)
 {
-  return (int) ((t1 - t2) / 1000);
+  return (int) ink_hrtime_to_msec(t1 - t2);
 }
 
 static inline ink_hrtime


Mime
View raw message