Move the Stopwatch class to NetdConstants.

Also implement TimedOperation by subclassing Stopwatch, since
it essentially does the same thing.

Change-Id: I68febcf1caa8a00b548790f9e3ccc10836877639

diff --git a/server/NetdConstants.h b/server/NetdConstants.h
index 1d8ae34..e3f533a 100644 (file)
--- a/server/NetdConstants.h
+++ b/server/NetdConstants.h
@@ -20,6 +20,9 @@
 #include <string>
 #include <list>
 #include <stdarg.h>
+
+#include <chrono>
+
 #include <private/android_filesystem_config.h>
 
 #include "utils/RWLock.h"
@@ -55,6 +58,21 @@ int parsePrefix(const char *prefix, uint8_t *family, void *address, int size, ui
 
 const uid_t INVALID_UID = static_cast<uid_t>(-1);
 
+class Stopwatch {
+public:
+    Stopwatch() : mStart(std::chrono::steady_clock::now()) {}
+    virtual ~Stopwatch() {};
+
+    float timeTaken() const {
+        using ms = std::chrono::duration<float, std::ratio<1, 1000>>;
+        return (std::chrono::duration_cast<ms>(
+                std::chrono::steady_clock::now() - mStart)).count();
+    }
+
+private:
+    std::chrono::time_point<std::chrono::steady_clock> mStart;
+};
+
 namespace android {
 namespace net {
 

diff --git a/server/SockDiag.cpp b/server/SockDiag.cpp
index 6a39997..48b8eae 100644 (file)
--- a/server/SockDiag.cpp
+++ b/server/SockDiag.cpp
@@ -48,20 +48,6 @@ struct AddrinfoDeleter {
 
 typedef std::unique_ptr<addrinfo, AddrinfoDeleter> ScopedAddrinfo;
 
-class Stopwatch {
-public:
-    Stopwatch(): mStart(std::chrono::steady_clock::now()) {}
-    float timeTaken() {
-        using ms = std::chrono::duration<float, std::ratio<1, 1000>>;
-        return (std::chrono::duration_cast<ms>(
-                std::chrono::steady_clock::now() - mStart)).count();
-    }
-
-private:
-    std::chrono::time_point<std::chrono::steady_clock> mStart;
-    std::string mName;
-};
-
 int checkError(int fd) {
     struct {
         nlmsghdr h;

diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index defe875..bc9cf88 100644 (file)
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -55,17 +55,14 @@ protected:
 };
 
 
-class TimedOperation {
+class TimedOperation : public Stopwatch {
 public:
-    TimedOperation(std::string name): mStart(std::chrono::steady_clock::now()), mName(name) {}
+    TimedOperation(std::string name): mName(name) {}
     virtual ~TimedOperation() {
-        using ms = std::chrono::duration<float, std::ratio<1, 1000>>;
-        fprintf(stderr, "    %s: %6.1f ms\n", mName.c_str(),
-                std::chrono::duration_cast<ms>(std::chrono::steady_clock::now() - mStart).count());
+        fprintf(stderr, "    %s: %6.1f ms\n", mName.c_str(), timeTaken());
     }
 
 private:
-    std::chrono::time_point<std::chrono::steady_clock> mStart;
     std::string mName;
 };