commit 196f1b8a0f3d64b02a37069c37b35f32d358939a
author Bernie Innocenti <codewiz@google.com> Mon May 20 16:34:16 2019 +0900
committer Bernie Innocenti <codewiz@google.com> Wed May 29 15:10:48 2019 +0900
tree 5b81c54dc25d45856a8f40b98708a7354a174e2f
parent e48bf0b636f9e0e0330f69ea5798f5bec48ec67e

Remove floating-point time functions from StopWatch

Converting time units between floating-point milliseconds to integral
micros and floating-point seconds is error prone and leads to subtle
rounding bugs. Thus, consolidate all callers on microseconds and delete
the older methods.

Test: cd system/netd && atest .
Change-Id: Ief6ad4dbd21f442bfd65e78d49548677f3172a53

server/SockDiag.cpp

diff --git a/server/SockDiag.cpp b/server/SockDiag.cpp
index 33c523a..b3ffc87 100644
--- a/server/SockDiag.cpp
+++ b/server/SockDiag.cpp
@@ -14,19 +14,22 @@
  * limitations under the License.
  */
 
+#define LOG_TAG "Netd"
+
+#include "SockDiag.h"
+
 #include <errno.h>
+#include <linux/inet_diag.h>
+#include <linux/netlink.h>
+#include <linux/sock_diag.h>
 #include <netdb.h>
-#include <string.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
+#include <string.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 
-#include <linux/netlink.h>
-#include <linux/sock_diag.h>
-#include <linux/inet_diag.h>
-
-#define LOG_TAG "Netd"
+#include <cinttypes>
 
 #include <android-base/strings.h>
 #include <log/log.h>
@@ -34,7 +37,6 @@
 
 #include "NetdConstants.h"
 #include "Permission.h"
-#include "SockDiag.h"
 
 #ifndef SOCK_DESTROY
 #define SOCK_DESTROY 21
@@ -323,7 +325,8 @@
     }
 
     if (mSocketsDestroyed > 0) {
-        ALOGI("Destroyed %d sockets on %s in %.1f ms", mSocketsDestroyed, addrstr, s.timeTaken());
+        ALOGI("Destroyed %d sockets on %s in %" PRId64 "us", mSocketsDestroyed, addrstr,
+              s.timeTakenUs());
     }
 
     return mSocketsDestroyed;
@@ -397,7 +400,7 @@
     }
 
     if (mSocketsDestroyed > 0) {
-        ALOGI("Destroyed %d sockets for UID in %.1f ms", mSocketsDestroyed, s.timeTaken());
+        ALOGI("Destroyed %d sockets for UID in %" PRId64 "us", mSocketsDestroyed, s.timeTakenUs());
     }
 
     return 0;
@@ -424,9 +427,9 @@
     }
 
     if (mSocketsDestroyed > 0) {
-        ALOGI("Destroyed %d sockets for %s skip={%s} in %.1f ms",
-              mSocketsDestroyed, uidRanges.toString().c_str(),
-              android::base::Join(skipUids, " ").c_str(), s.timeTaken());
+        ALOGI("Destroyed %d sockets for %s skip={%s} in %" PRId64 "us", mSocketsDestroyed,
+              uidRanges.toString().c_str(), android::base::Join(skipUids, " ").c_str(),
+              s.timeTakenUs());
     }
 
     return 0;
@@ -517,8 +520,8 @@
     }
 
     if (mSocketsDestroyed > 0) {
-        ALOGI("Destroyed %d sockets for netId %d permission=%d in %.1f ms",
-              mSocketsDestroyed, netId, permission, s.timeTaken());
+        ALOGI("Destroyed %d sockets for netId %d permission=%d in %" PRId64 "us", mSocketsDestroyed,
+              netId, permission, s.timeTakenUs());
     }
 
     return 0;