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/Controllers.cpp

diff --git a/server/Controllers.cpp b/server/Controllers.cpp
index 01eae77..c072400 100644
--- a/server/Controllers.cpp
+++ b/server/Controllers.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <cinttypes>
 #include <regex>
 #include <set>
 #include <string>
@@ -238,39 +239,39 @@
 void Controllers::initIptablesRules() {
     Stopwatch s;
     initChildChains();
-    gLog.info("Creating child chains: %.1fms", s.getTimeAndReset());
+    gLog.info("Creating child chains: %" PRId64 "us", s.getTimeAndResetUs());
 
     // Let each module setup their child chains
     setupOemIptablesHook();
-    gLog.info("Setting up OEM hooks: %.1fms", s.getTimeAndReset());
+    gLog.info("Setting up OEM hooks: %" PRId64 "us", s.getTimeAndResetUs());
 
     /* When enabled, DROPs all packets except those matching rules. */
     firewallCtrl.setupIptablesHooks();
-    gLog.info("Setting up FirewallController hooks: %.1fms", s.getTimeAndReset());
+    gLog.info("Setting up FirewallController hooks: %" PRId64 "us", s.getTimeAndResetUs());
 
     /* Does DROPs in FORWARD by default */
     tetherCtrl.setupIptablesHooks();
-    gLog.info("Setting up TetherController hooks: %.1fms", s.getTimeAndReset());
+    gLog.info("Setting up TetherController hooks: %" PRId64 "us", s.getTimeAndResetUs());
 
     /*
      * Does REJECT in INPUT, OUTPUT. Does counting also.
      * No DROP/REJECT allowed later in netfilter-flow hook order.
      */
     bandwidthCtrl.setupIptablesHooks();
-    gLog.info("Setting up BandwidthController hooks: %.1fms", s.getTimeAndReset());
+    gLog.info("Setting up BandwidthController hooks: %" PRId64 "us", s.getTimeAndResetUs());
 
     /*
      * Counts in nat: PREROUTING, POSTROUTING.
      * No DROP/REJECT allowed later in netfilter-flow hook order.
      */
     idletimerCtrl.setupIptablesHooks();
-    gLog.info("Setting up IdletimerController hooks: %.1fms", s.getTimeAndReset());
+    gLog.info("Setting up IdletimerController hooks: %" PRId64 "us", s.getTimeAndResetUs());
 
     /*
      * Add rules for detecting IPv6/IPv4 TCP/UDP connections with TLS/DTLS header
      */
     strictCtrl.setupIptablesHooks();
-    gLog.info("Setting up StrictController hooks: %.1fms", s.getTimeAndReset());
+    gLog.info("Setting up StrictController hooks: %" PRId64 "us", s.getTimeAndResetUs());
 }
 
 void Controllers::init() {
@@ -278,28 +279,28 @@
     Stopwatch s;
 
     clatdCtrl.init();
-    gLog.info("Initializing ClatdController: %.1fms", s.getTimeAndReset());
+    gLog.info("Initializing ClatdController: %" PRId64 "us", s.getTimeAndResetUs());
 
     netdutils::Status tcStatus = trafficCtrl.start();
     if (!isOk(tcStatus)) {
         gLog.error("Failed to start trafficcontroller: (%s)", toString(tcStatus).c_str());
     }
-    gLog.info("Initializing traffic control: %.1fms", s.getTimeAndReset());
+    gLog.info("Initializing traffic control: %" PRId64 "us", s.getTimeAndResetUs());
 
     bandwidthCtrl.setBpfEnabled(trafficCtrl.getBpfLevel() != android::bpf::BpfLevel::NONE);
     bandwidthCtrl.enableBandwidthControl();
-    gLog.info("Enabling bandwidth control: %.1fms", s.getTimeAndReset());
+    gLog.info("Enabling bandwidth control: %" PRId64 "us", s.getTimeAndResetUs());
 
     if (int ret = RouteController::Init(NetworkController::LOCAL_NET_ID)) {
         gLog.error("Failed to initialize RouteController (%s)", strerror(-ret));
     }
-    gLog.info("Initializing RouteController: %.1fms", s.getTimeAndReset());
+    gLog.info("Initializing RouteController: %" PRId64 "us", s.getTimeAndResetUs());
 
     netdutils::Status xStatus = XfrmController::Init();
     if (!isOk(xStatus)) {
         gLog.error("Failed to initialize XfrmController (%s)", netdutils::toString(xStatus).c_str());
     };
-    gLog.info("Initializing XfrmController: %.1fms", s.getTimeAndReset());
+    gLog.info("Initializing XfrmController: %" PRId64 "us", s.getTimeAndResetUs());
 }
 
 Controllers* gCtls = nullptr;