Merge pull request #289 from vsg-dev/Profiler

Profiler

examples/animation/vsganimation/vsganimation.cpp

@@ -159,6 +159,18 @@ int main(int argc, char** argv)
 
         instrumentation = gpu_instrumentation;
     }
+    else if (arguments.read({"--profiler", "--pr"}))
+    {
+        // set Profiler options
+        auto settings = vsg::Profiler::Settings::create();
+        arguments.read("--cpu", settings->cpu_instrumentation_level);
+        arguments.read("--gpu", settings->gpu_instrumentation_level);
+        arguments.read("--log-size", settings->log_size);
+        arguments.read("--gpu-size", settings->gpu_timestamp_size);
+
+        // create the profiler
+        instrumentation = vsg::Profiler::create(settings);
+    }
 #ifdef Tracy_FOUND
     else if (arguments.read("--tracy"))
     {
@@ -490,5 +502,11 @@ int main(int argc, char** argv)
         std::cout << "Average update time = " << (updateTime / numFramesCompleted)*1000.0 <<" ms"<< std::endl;
     }
 
+    if (auto profiler = instrumentation.cast<vsg::Profiler>())
+    {
+        instrumentation->finish();
+        profiler->log->report(std::cout);
+    }
+
     return 0;
 }

examples/app/vsgviewer/vsgviewer.cpp

@@ -130,6 +130,18 @@ int main(int argc, char** argv)
 
             instrumentation = gpu_instrumentation;
         }
+        else if (arguments.read({"--profiler", "--pr"}))
+        {
+            // set Profiler options
+            auto settings = vsg::Profiler::Settings::create();
+            arguments.read("--cpu", settings->cpu_instrumentation_level);
+            arguments.read("--gpu", settings->gpu_instrumentation_level);
+            arguments.read("--log-size", settings->log_size);
+            arguments.read("--gpu-size", settings->gpu_timestamp_size);
+
+            // create the profiler
+            instrumentation = vsg::Profiler::create(settings);
+        }
 
         // should animations be automatically played
         auto autoPlay = !arguments.read({"--no-auto-play", "--nop"});
@@ -287,6 +299,12 @@ int main(int argc, char** argv)
             double fps = static_cast<double>(fs->frameCount) / std::chrono::duration<double, std::chrono::seconds::period>(vsg::clock::now() - viewer->start_point()).count();
             std::cout<<"Average frame rate = "<<fps<<" fps"<<std::endl;
         }
+
+        if (auto profiler = instrumentation.cast<vsg::Profiler>())
+        {
+            instrumentation->finish();
+            profiler->log->report(std::cout);
+        }
     }
     catch (const vsg::Exception& ve)
     {

examples/nodes/vsgshadow/vsgshadow.cpp

@@ -224,6 +224,18 @@ int main(int argc, char** argv)
 
         instrumentation = gpu_instrumentation;
     }
+    else if (arguments.read({"--profiler", "--pr"}))
+    {
+        // set Profiler options
+        auto settings = vsg::Profiler::Settings::create();
+        arguments.read("--cpu", settings->cpu_instrumentation_level);
+        arguments.read("--gpu", settings->gpu_instrumentation_level);
+        arguments.read("--log-size", settings->log_size);
+        arguments.read("--gpu-size", settings->gpu_timestamp_size);
+
+        // create the profiler
+        instrumentation = vsg::Profiler::create(settings);
+    }
 #ifdef Tracy_FOUND
     else if (arguments.read("--tracy"))
     {
@@ -575,5 +587,11 @@ int main(int argc, char** argv)
         std::cout << "Average frame rate = " << (numFramesCompleted / duration) << std::endl;
     }
 
+    if (auto profiler = instrumentation.cast<vsg::Profiler>())
+    {
+        instrumentation->finish();
+        profiler->log->report(std::cout);
+    }
+
     return 0;
 }

examples/threading/vsgdynamicload/vsgdynamicload.cpp

@@ -156,6 +156,18 @@ int main(int argc, char** argv)
 
             instrumentation = gpu_instrumentation;
         }
+        else if (arguments.read({"--profiler", "--pr"}))
+        {
+            // set Profiler options
+            auto settings = vsg::Profiler::Settings::create();
+            arguments.read("--cpu", settings->cpu_instrumentation_level);
+            arguments.read("--gpu", settings->gpu_instrumentation_level);
+            arguments.read("--log-size", settings->log_size);
+            arguments.read("--gpu-size", settings->gpu_timestamp_size);
+
+            // create the profiler
+            instrumentation = vsg::Profiler::create(settings);
+        }
 #ifdef Tracy_FOUND
         else if (arguments.read("--tracy"))
         {
@@ -263,6 +275,12 @@ int main(int argc, char** argv)
 
             // if (loadThreads->queue->empty()) break;
         }
+
+        if (auto profiler = instrumentation.cast<vsg::Profiler>())
+        {
+            instrumentation->finish();
+            profiler->log->report(std::cout);
+        }
     }
     catch (const vsg::Exception& ve)
     {

examples/utils/vsginstrumentation/CMakeLists.txt

@@ -1,6 +1,5 @@
 set(SOURCES
     vsginstrumentation.cpp
-    Profiler.cpp
 )
 
 add_executable(vsginstrumentation ${SOURCES})

examples/utils/vsginstrumentation/vsginstrumentation.cpp

@@ -11,9 +11,6 @@
 #include <iostream>
 #include <thread>
 
-#include "Profiler.h"
-
-
 class InstrumentationHandler : public vsg::Inherit<vsg::Visitor, InstrumentationHandler>
 {
 public:
@@ -122,9 +119,14 @@ int main(int argc, char** argv)
         bool decorate = arguments.read("--decorate");
 
         // set Profiler options
-        auto instrumentation = vsg::Profiler::create();
-        arguments.read("--cpu", instrumentation->settings->cpu_instrumentation_level);
-        arguments.read("--gpu", instrumentation->settings->gpu_instrumentation_level);
+        auto settings = vsg::Profiler::Settings::create();
+        arguments.read("--cpu", settings->cpu_instrumentation_level);
+        arguments.read("--gpu", settings->gpu_instrumentation_level);
+        arguments.read("--log-size", settings->log_size);
+        arguments.read("--gpu-size", settings->gpu_timestamp_size);
+
+        // create the profiler
+        auto instrumentation = vsg::Profiler::create(settings);
 
         auto window = vsg::Window::create(windowTraits);
         if (!window)
@@ -239,7 +241,7 @@ int main(int argc, char** argv)
         animationPathHandler->printFrameStatsToConsole = true;
         viewer->addEventHandler(animationPathHandler);
 
-        // add event handler to control the cpu and gpu_instrumentation_level using the 'c', 'g' keys to reduce the cpu and gpu instruemntation level, and 'C' and 'G' to increase them respectively.
+        // add event handler to control the cpu and gpu_instrumentation_level using the 'c', 'g' keys to reduce the cpu and gpu instrumentation level, and 'C' and 'G' to increase them respectively.
         viewer->addEventHandler(InstrumentationHandler::create(instrumentation));
 
         viewer->addEventHandler(vsg::Trackball::create(camera, ellipsoidModel));
@@ -276,6 +278,12 @@ int main(int argc, char** argv)
             double fps = static_cast<double>(fs->frameCount) / std::chrono::duration<double, std::chrono::seconds::period>(vsg::clock::now() - viewer->start_point()).count();
             std::cout<<"Average frame rate = "<<fps<<" fps"<<std::endl;
         }
+
+        if (instrumentation && instrumentation->log)
+        {
+            instrumentation->finish();
+            instrumentation->log->report(std::cout);
+        }
     }
     catch (const vsg::Exception& ve)
     {