fuss with debug prints

10 files changed, 31 insertions, 24 deletions

diff --git a/platform/default/src/mbgl/gfx/headless_frontend.cpp b/platform/default/src/mbgl/gfx/headless_frontend.cpp
index e097efe13c..534e03bef4 100644
--- a/platform/default/src/mbgl/gfx/headless_frontend.cpp
+++ b/platform/default/src/mbgl/gfx/headless_frontend.cpp
@@ -9,7 +9,6 @@
 #include <mbgl/renderer/renderer.hpp>
 #include <mbgl/renderer/renderer_impl.hpp>
 #include <mbgl/renderer/render_tree.hpp>
-#include <iostream>
 
 namespace mbgl {
 
@@ -47,7 +46,6 @@ HeadlessFrontend::~HeadlessFrontend() = default;
 
 void HeadlessFrontend::reset() {
     assert(renderer);
-    // TODO: watch out, map::impl calls this
     renderer.reset();
     optional<std::string> localFontFamily;
     renderer = std::make_unique<Renderer>(*getBackend(), pixelRatio, localFontFamily);
@@ -65,7 +63,6 @@ PremultipliedImage HeadlessFrontend::updateSync(std::shared_ptr<UpdateParameters
     std::unique_ptr<RenderTree> renderTree = nullptr;
     while (!renderTree) {
         util::RunLoop::Get()->runOnce();
-        std::clog << "reateRenderTree\n";
         renderTree = orchestrator.createRenderTree(params);
     }
     renderer->impl->render(*renderTree);
diff --git a/src/mbgl/actor/scheduler.cpp b/src/mbgl/actor/scheduler.cpp
index cb0c7728ec..fa5127387c 100644
--- a/src/mbgl/actor/scheduler.cpp
+++ b/src/mbgl/actor/scheduler.cpp
@@ -1,6 +1,7 @@
 #include <mbgl/actor/scheduler.hpp>
 #include <mbgl/util/thread_local.hpp>
 #include <mbgl/util/thread_pool.hpp>
+#include <iostream>
 
 namespace mbgl {
 
@@ -21,17 +22,21 @@ Scheduler* Scheduler::GetCurrent() {
 
 // static
 std::shared_ptr<Scheduler> Scheduler::GetBackground() {
-    static std::weak_ptr<Scheduler> weak;
-    static std::mutex mtx;
-
-    std::lock_guard<std::mutex> lock(mtx);
-    std::shared_ptr<Scheduler> scheduler = weak.lock();
-
-    if (!scheduler) {
-        weak = scheduler = std::make_shared<ThreadPool>(4);
-    }
-
-    return scheduler;
+    // static std::weak_ptr<Scheduler> weak;
+    // static std::mutex mtx;
+    // 
+    // std::lock_guard<std::mutex> lock(mtx);
+    // std::shared_ptr<Scheduler> scheduler = weak.lock();
+    // 
+    // if (!scheduler) {
+    //     std::clog << "creating scheduler\n";
+    //     weak = scheduler = std::make_shared<ThreadPool>(4);
+    // } else {
+    //     std::clog << "re-using scheduler\n";      
+    // }
+    // 
+    // return scheduler;
+    return std::make_shared<ThreadPool>(2);
 }
 
 } //namespace mbgl
diff --git a/src/mbgl/gl/context.cpp b/src/mbgl/gl/context.cpp
index 4d9c2055de..bcef44e117 100644
--- a/src/mbgl/gl/context.cpp
+++ b/src/mbgl/gl/context.cpp
@@ -14,6 +14,7 @@
 #include <mbgl/util/logging.hpp>
 
 #include <cstring>
+#include <iostream>
 
 namespace mbgl {
 namespace gl {
@@ -55,6 +56,7 @@ Context::Context(RendererBackend& backend_)
           MBGL_CHECK_ERROR(glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &value));
           return value;
       }()), backend(backend_) {
+        std::clog << "creating context here\n";
 }
 
 Context::~Context() {
diff --git a/src/mbgl/programs/programs.cpp b/src/mbgl/programs/programs.cpp
index f82e46c9a2..41ed0f6c40 100644
--- a/src/mbgl/programs/programs.cpp
+++ b/src/mbgl/programs/programs.cpp
@@ -9,6 +9,7 @@
 #include <mbgl/programs/line_program.hpp>
 #include <mbgl/programs/raster_program.hpp>
 #include <mbgl/programs/symbol_program.hpp>
+#include <iostream>
 
 namespace mbgl {
 
@@ -17,6 +18,8 @@ Programs::Programs(gfx::Context& context_, const ProgramParameters& programParam
       clippingMask(context_, programParameters_),
       context(context_),
       programParameters(std::move(programParameters_)) {
+        
+        std::clog << "creating Programs\n";
 }
 
 Programs::~Programs() = default;
diff --git a/src/mbgl/renderer/render_source.cpp b/src/mbgl/renderer/render_source.cpp
index 30380d220c..14b0610bb4 100644
--- a/src/mbgl/renderer/render_source.cpp
+++ b/src/mbgl/renderer/render_source.cpp
@@ -19,7 +19,7 @@ namespace mbgl {
 using namespace style;
 
 std::unique_ptr<RenderSource> RenderSource::create(Immutable<Source::Impl> impl) {
-    std::clog << "RenderSource::create \n";
+    // std::clog << "RenderSource::create \n";
     switch (impl->type) {
     case SourceType::Vector:
         return std::make_unique<RenderVectorSource>(staticImmutableCast<VectorSource::Impl>(impl));
diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp
index d6527ebc46..c7623646fa 100644
--- a/src/mbgl/renderer/renderer_impl.cpp
+++ b/src/mbgl/renderer/renderer_impl.cpp
@@ -45,7 +45,7 @@ void Renderer::Impl::setObserver(RendererObserver* observer_) {
 
 void Renderer::Impl::render(const RenderTree& renderTree) {
     if (renderState == RenderState::Never) {
-        std::clog << "RenderState::Never\n";
+        // std::clog << "RenderState::Never\n";
         observer->onWillStartRenderingMap();
     }
 
@@ -54,16 +54,16 @@ void Renderer::Impl::render(const RenderTree& renderTree) {
 
     if (!staticData) {
         std::clog << "creating static data\n";
-        staticData = std::make_unique<RenderStaticData>(backend.getContext(), pixelRatio);
+        staticData = std::make_shared<RenderStaticData>(backend.getContext(), pixelRatio);
     }
     staticData->has3D = renderTreeParameters.has3D;
 
     auto& context = backend.getContext();
 
     // Blocks execution until the renderable is available.
-    std::clog << "Waiting\n";
+    // std::clog << "Waiting\n";
     backend.getDefaultRenderable().wait();
-    std::clog << "DONE WAITING\n";
+    // std::clog << "DONE WAITING\n";
 
     PaintParameters parameters {
         context,
diff --git a/src/mbgl/renderer/renderer_impl.hpp b/src/mbgl/renderer/renderer_impl.hpp
index 22ac2d6f11..db7abe5ab9 100644
--- a/src/mbgl/renderer/renderer_impl.hpp
+++ b/src/mbgl/renderer/renderer_impl.hpp
@@ -25,6 +25,7 @@ public:
     // TODO: Move orchestrator to Map::Impl.
     RenderOrchestrator orchestrator;
     void render(const RenderTree&);
+    std::shared_ptr<RenderStaticData> staticData;
 private:
     friend class Renderer;
 
@@ -39,7 +40,6 @@ private:
     RendererObserver* observer;
 
     const float pixelRatio;
-    std::unique_ptr<RenderStaticData> staticData;
 
     enum class RenderState {
         Never,
diff --git a/src/mbgl/renderer/sources/render_tile_source.cpp b/src/mbgl/renderer/sources/render_tile_source.cpp
index 7c298ff698..d46ce236c9 100644
--- a/src/mbgl/renderer/sources/render_tile_source.cpp
+++ b/src/mbgl/renderer/sources/render_tile_source.cpp
@@ -46,7 +46,7 @@ void TileSourceRenderItem::render(PaintParameters& parameters) const {
 RenderTileSource::RenderTileSource(Immutable<style::Source::Impl> impl_)
     : RenderSource(std::move(impl_))
     , renderTiles(makeMutable<std::vector<RenderTile>>()) {
-      std::clog << "creating at RenderTileSource\n";
+      // std::clog << "creating at RenderTileSource\n";
     tilePyramid.setObserver(this);
 }
 
diff --git a/src/mbgl/renderer/tile_pyramid.cpp b/src/mbgl/renderer/tile_pyramid.cpp
index ac5a46691f..1c6915913a 100644
--- a/src/mbgl/renderer/tile_pyramid.cpp
+++ b/src/mbgl/renderer/tile_pyramid.cpp
@@ -26,7 +26,7 @@ static TileObserver nullObserver;
 
 TilePyramid::TilePyramid()
     : observer(&nullObserver) {
-      std::clog << "creating TilePyramid\n";
+      // std::clog << "creating TilePyramid\n";
 }
 
 TilePyramid::~TilePyramid() = default;
@@ -62,7 +62,7 @@ void TilePyramid::update(const std::vector<Immutable<style::LayerProperties>>& l
                          std::function<std::unique_ptr<Tile> (const OverscaledTileID&)> createTile) {
     // If we need a relayout, abandon any cached tiles; they're now stale.
     if (needsRelayout) {
-        std::clog << "needing relayout\n";
+        // std::clog << "needing relayout\n";
         cache.clear();
     }
 
diff --git a/src/mbgl/style/sources/vector_source.cpp b/src/mbgl/style/sources/vector_source.cpp
index ff5ef8eaa1..95f2a0cf5c 100644
--- a/src/mbgl/style/sources/vector_source.cpp
+++ b/src/mbgl/style/sources/vector_source.cpp
@@ -68,7 +68,7 @@ void VectorSource::loadDescription(FileSource& fileSource) {
 
             baseImpl = makeMutable<Impl>(impl(), *tileset);
             loaded = true;
-            std::clog << "calling onSourceLoaded\n";
+            // std::clog << "calling onSourceLoaded\n";
             observer->onSourceLoaded(*this);
 
             if (changed) {