[vcpkg] Deduplicate all timer classes.

2 files changed, 4 insertions, 41 deletions

diff --git a/toolsrc/include/vcpkg_Chrono.h b/toolsrc/include/vcpkg_Chrono.h
index e4ae121b3..a9d1bbbed 100644
--- a/toolsrc/include/vcpkg_Chrono.h
+++ b/toolsrc/include/vcpkg_Chrono.h
@@ -10,7 +10,7 @@ namespace vcpkg
     public:
         static ElapsedTime createStarted();
 
-        constexpr ElapsedTime() :m_startTick() {}
+        constexpr ElapsedTime() : m_startTick() {}
 
         template <class TimeUnit>
         TimeUnit elapsed() const
@@ -18,42 +18,14 @@ namespace vcpkg
             return std::chrono::duration_cast<TimeUnit>(std::chrono::high_resolution_clock::now() - this->m_startTick);
         }
 
-        std::string toString() const;
-
-    private:
-        std::chrono::steady_clock::time_point m_startTick;
-    };
-
-    class Stopwatch
-    {
-    public:
-        static Stopwatch createUnstarted();
-
-        static Stopwatch createStarted();
-
-        bool isRunning() const;
-
-        const Stopwatch& start();
-
-        const Stopwatch& stop();
-
-        Stopwatch& reset();
-
-        template <class TimeUnit>
-        TimeUnit elapsed() const
+        double microseconds() const
         {
-            return std::chrono::duration_cast<TimeUnit>(elapsedNanos());
+            return elapsed<std::chrono::duration<double, std::micro>>().count();
         }
 
         std::string toString() const;
 
     private:
-        Stopwatch();
-
-        std::chrono::nanoseconds elapsedNanos() const;
-
-        bool m_isRunning;
-        std::chrono::nanoseconds m_elapsedNanos;
-        std::chrono::steady_clock::time_point m_startTick;
+        std::chrono::high_resolution_clock::time_point m_startTick;
     };
 }
diff --git a/toolsrc/include/vcpkg_System.h b/toolsrc/include/vcpkg_System.h
index 7634034ab..a414ba0d4 100644
--- a/toolsrc/include/vcpkg_System.h
+++ b/toolsrc/include/vcpkg_System.h
@@ -84,15 +84,6 @@ namespace vcpkg::System
         return println(c, Strings::format(messageTemplate, messageArgs...).c_str());
     }
 
-    struct Stopwatch2
-    {
-        int64_t start_time, end_time, freq;
-
-        void start();
-        void stop();
-        double microseconds() const;
-    };
-
     optional<std::wstring> get_environmental_variable(const wchar_t* varname) noexcept;
 
     void set_environmental_variable(const wchar_t* varname, const wchar_t* varvalue) noexcept;