Refactor logging code

1 files changed, 7 insertions, 15 deletions

diff --git a/platform/default/default_file_source.cpp b/platform/default/default_file_source.cpp
index 125d4df370..00559c4e49 100644
--- a/platform/default/default_file_source.cpp
+++ b/platform/default/default_file_source.cpp
@@ -11,10 +11,9 @@
 #include <mbgl/util/url.hpp>
 #include <mbgl/util/thread.hpp>
 #include <mbgl/util/work_request.hpp>
-#include <mbgl/util/logging.hpp>
+#include <mbgl/util/stopwatch.hpp>
 
 #include <cassert>
-#include <chrono>
 
 namespace mbgl {
 
@@ -153,23 +152,16 @@ public:
 
             // Get from the online file source
             if (resource.hasLoadingMethod(Resource::LoadingMethod::Network)) {
-#if MBGL_TILE_TIMING
-                using namespace std::chrono;
-                milliseconds requestBeginAt = duration_cast< milliseconds >(system_clock::now().time_since_epoch());
-#endif
+                MBGL_TIMING_START(watch);
                 tasks[req] = onlineFileSource.request(resource, [=] (Response onlineResponse) mutable {
                     this->offlineDatabase->put(resource, onlineResponse);
-#if MBGL_TILE_TIMING
-                    milliseconds requestEndAt = duration_cast< milliseconds >(system_clock::now().time_since_epoch());
                     if (resource.kind == Resource::Kind::Tile) {
-                        Log::Debug(Event::HttpRequest,
-                                   "Tile:%s, Requesting time:%llims, Size:%u",
-                                   resource.url.c_str(),
-                                   requestEndAt - requestBeginAt,
-                                   onlineResponse.data->size()
-                                   );
+                        MBGL_TIMING_FINISH(watch,
+                                           " Action: " << "Requesting" <<
+                                           " URL: " << resource.url.c_str() <<
+                                           " Size: " <<  onlineResponse.data->size() << "B," <<
+                                           " Time")
                     }
-#endif
                     callback(onlineResponse);
                 });
             }