Move to PerFrame handler to work on server

dedmen · Oct 25, 2018 · 9aabdb9 · 9aabdb9
1 parent ea1f910
commit 9aabdb9
Show file tree

Hide file tree

Showing 6 changed files with 233 additions and 111 deletions.
diff --git a/brofiler b/brofiler
diff --git a/src/ArmaScriptProfiler.vcxproj b/src/ArmaScriptProfiler.vcxproj
@@ -154,10 +154,19 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\brofiler\BrofilerCore\Brofiler.h" />
+    <ClInclude Include="..\brofiler\BrofilerCore\Common.h" />
+    <ClInclude Include="..\brofiler\BrofilerCore\Core.h" />
+    <ClInclude Include="..\brofiler\BrofilerCore\Event.h" />
+    <ClInclude Include="..\brofiler\BrofilerCore\EventDescriptionBoard.h" />
+    <ClInclude Include="..\brofiler\BrofilerCore\Message.h" />
+    <ClInclude Include="..\brofiler\BrofilerCore\ProfilerServer.h" />
+    <ClInclude Include="..\brofiler\BrofilerCore\ThreadID.h" />
     <ClInclude Include="scriptProfiler.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\brofiler\BrofilerCore\CallstackCollector.cpp" />
+    <ClCompile Include="..\brofiler\BrofilerCore\CityHash.cpp" />
     <ClCompile Include="..\brofiler\BrofilerCore\Core.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)brofilercore.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)brofilercore.obj</ObjectFileName>
@@ -166,14 +175,12 @@
     </ClCompile>
     <ClCompile Include="..\brofiler\BrofilerCore\Event.cpp" />
     <ClCompile Include="..\brofiler\BrofilerCore\EventDescriptionBoard.cpp" />
+    <ClCompile Include="..\brofiler\BrofilerCore\Memory.cpp" />
     <ClCompile Include="..\brofiler\BrofilerCore\Message.cpp" />
-    <ClCompile Include="..\brofiler\BrofilerCore\Platform\SamplingProfiler.cpp" />
     <ClCompile Include="..\brofiler\BrofilerCore\Platform\SchedulerTrace.cpp" />
     <ClCompile Include="..\brofiler\BrofilerCore\Platform\SymbolEngine.cpp" />
     <ClCompile Include="..\brofiler\BrofilerCore\Platform\Windows\EtwTracer.cpp" />
-    <ClCompile Include="..\brofiler\BrofilerCore\Platform\Windows\Sampler.cpp" />
     <ClCompile Include="..\brofiler\BrofilerCore\Platform\Windows\SymEngine.cpp" />
-    <ClCompile Include="..\brofiler\BrofilerCore\Platform\Windows\WinThreadsEnumerator.cpp" />
     <ClCompile Include="..\brofiler\BrofilerCore\ProfilerServer.cpp" />
     <ClCompile Include="..\brofiler\BrofilerCore\Serialization.cpp" />
     <ClCompile Include="..\brofiler\BrofilerCore\SwitchContextCollector.cpp" />

diff --git a/src/ArmaScriptProfiler.vcxproj.filters b/src/ArmaScriptProfiler.vcxproj.filters
@@ -33,6 +33,30 @@
     <ClInclude Include="scriptProfiler.hpp">
       <Filter>Headerdateien</Filter>
     </ClInclude>
+    <ClInclude Include="..\brofiler\BrofilerCore\Brofiler.h">
+      <Filter>brofiler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\brofiler\BrofilerCore\Common.h">
+      <Filter>brofiler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\brofiler\BrofilerCore\Core.h">
+      <Filter>brofiler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\brofiler\BrofilerCore\Event.h">
+      <Filter>brofiler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\brofiler\BrofilerCore\EventDescriptionBoard.h">
+      <Filter>brofiler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\brofiler\BrofilerCore\Message.h">
+      <Filter>brofiler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\brofiler\BrofilerCore\ProfilerServer.h">
+      <Filter>brofiler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\brofiler\BrofilerCore\ThreadID.h">
+      <Filter>brofiler</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="scriptProfiler.cpp">
@@ -182,9 +206,6 @@
     <ClCompile Include="..\brofiler\BrofilerCore\SysCallCollector.cpp">
       <Filter>brofiler</Filter>
     </ClCompile>
-    <ClCompile Include="..\brofiler\BrofilerCore\Platform\SamplingProfiler.cpp">
-      <Filter>brofiler</Filter>
-    </ClCompile>
     <ClCompile Include="..\brofiler\BrofilerCore\Platform\SchedulerTrace.cpp">
       <Filter>brofiler</Filter>
     </ClCompile>
@@ -194,16 +215,16 @@
     <ClCompile Include="..\brofiler\BrofilerCore\Platform\Windows\EtwTracer.cpp">
       <Filter>brofiler</Filter>
     </ClCompile>
-    <ClCompile Include="..\brofiler\BrofilerCore\Platform\Windows\Sampler.cpp">
+    <ClCompile Include="..\brofiler\BrofilerCore\Platform\Windows\SymEngine.cpp">
       <Filter>brofiler</Filter>
     </ClCompile>
-    <ClCompile Include="..\brofiler\BrofilerCore\Platform\Windows\SymEngine.cpp">
+    <ClCompile Include="..\brofiler\BrofilerCore\SwitchContextCollector.cpp">
       <Filter>brofiler</Filter>
     </ClCompile>
-    <ClCompile Include="..\brofiler\BrofilerCore\Platform\Windows\WinThreadsEnumerator.cpp">
+    <ClCompile Include="..\brofiler\BrofilerCore\CityHash.cpp">
       <Filter>brofiler</Filter>
     </ClCompile>
-    <ClCompile Include="..\brofiler\BrofilerCore\SwitchContextCollector.cpp">
+    <ClCompile Include="..\brofiler\BrofilerCore\Memory.cpp">
       <Filter>brofiler</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/src/main.cpp b/src/main.cpp
@@ -20,4 +20,8 @@ void intercept::pre_start() {
 
 void intercept::pre_init() {
     profiler.preInit();
+}
+
+void intercept::on_frame() {
+    profiler.perFrame();
 }