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

1 files changed, 8 insertions, 6 deletions

diff --git a/server/IptablesRestoreControllerTest.cpp b/server/IptablesRestoreControllerTest.cpp
index d01d7ced1..c9028df1a 100644
--- a/server/IptablesRestoreControllerTest.cpp
+++ b/server/IptablesRestoreControllerTest.cpp
@@ -14,14 +14,16 @@
  * limitations under the License.
  */
 
-#include <string>
 #include <fcntl.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include <sys/file.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include <cinttypes>
+#include <iostream>
+#include <string>
 
 #define LOG_TAG "IptablesRestoreControllerTest"
 #include <android-base/stringprintf.h>
@@ -269,9 +271,9 @@ TEST_F(IptablesRestoreControllerTest, TestUidRuleBenchmark) {
             EXPECT_EQ(0, con.execute(V4V6, IPTABLES_RESTORE_ADD, nullptr));
             EXPECT_EQ(0, con.execute(V4V6, IPTABLES_RESTORE_DEL, nullptr));
         }
-        float timeTaken = s.getTimeAndReset();
-        fprintf(stderr, "    Add/del %d UID rules via restore: %.1fms (%.2fms per operation)\n",
-                iterations, timeTaken, timeTaken / 2 / iterations);
+        int64_t timeTaken = s.getTimeAndResetUs();
+        std::cerr << "    Add/del " << iterations << " UID rules via restore: " << timeTaken
+                  << "us (" << (timeTaken / 2 / iterations) << "us per operation)" << std::endl;
     }
 }