Added NetworkProfiler

dedmen · Nov 24, 2019 · cfbebc6 · cfbebc6
1 parent 76f676d
commit cfbebc6
Show file tree

Hide file tree

Showing 10 changed files with 639 additions and 13 deletions.
diff --git a/intercept b/intercept
diff --git a/src/AdapterTracy.cpp b/src/AdapterTracy.cpp
@@ -18,7 +18,7 @@ class ScopeTempStorageTracy final : public ScopeTempStorage {
 public:
 
     ScopeTempStorageTracy(const tracy::SourceLocationData* srcloc) : zone(srcloc) {}
-    ScopeTempStorageTracy(const tracy::SourceLocationData* srcloc, uint64_t threadID) : zone(srcloc, threadID) {}
+    //ScopeTempStorageTracy(const tracy::SourceLocationData* srcloc, uint64_t threadID) : zone(srcloc, threadID) {}
     tracy::ScopedZone zone;
 };
 
@@ -63,12 +63,13 @@ std::shared_ptr<ScopeTempStorage> AdapterTracy::enterScope(std::shared_ptr<Scope
 }
 
 std::shared_ptr<ScopeTempStorage> AdapterTracy::enterScope(std::shared_ptr<ScopeInfo> scope, uint64_t threadID) {
-    auto info = std::dynamic_pointer_cast<ScopeInfoTracy>(scope);
-    if (!info || !isConnected()) return nullptr; //#TODO debugbreak? log error?
-    ensureReady();
-
-    auto ret = std::make_shared<ScopeTempStorageTracy>(&info->info, threadID);
-    return ret;
+    return enterScope(scope);
+    //auto info = std::dynamic_pointer_cast<ScopeInfoTracy>(scope);
+    //if (!info || !isConnected()) return nullptr; //#TODO debugbreak? log error?
+    //ensureReady();
+    //
+    //auto ret = std::make_shared<ScopeTempStorageTracy>(&info->info, threadID);
+    //return ret;
 }
 
 void AdapterTracy::leaveScope(std::shared_ptr<ScopeTempStorage> tempStorage) {
@@ -114,6 +115,70 @@ bool AdapterTracy::isConnected() {
     return tracy::s_profiler.IsConnected();
 }
 
+
+struct CallstackStruct {
+    intercept::types::auto_array<std::pair<intercept::types::r_string, uint32_t>> data;
+};
+
+void DestructCallstackStruct(void* data) {
+    auto str = (CallstackStruct*)data;
+
+    str->data.clear();
+    delete str;
+}
+
+void AdapterTracy::sendCallstack(intercept::types::auto_array<std::pair<intercept::types::r_string, uint32_t>>& cs) {
+    if (cs.size() > 63)
+        cs.resize(63);
+
+    uint32_t depth = cs.size();
+
+    const char* func[64];
+    uint32_t fsz[64];
+    uint32_t ssz[64];
+    uint32_t spaceNeeded = 4;     // cnt
+
+    uint32_t cnt = 0;
+    for (auto& [file, line] : cs) {
+        func[cnt] = file.c_str();
+        fsz[cnt] = uint32_t(strlen(func[cnt]));
+        ssz[cnt] = uint32_t(file.length());
+        spaceNeeded += fsz[cnt] + ssz[cnt];
+        cnt++;
+    }
+
+    spaceNeeded += cnt * (4 + 4 + 4);     // source line, function string length, source string length
+
+    auto ptr = (char*)tracy::tracy_malloc(spaceNeeded + 4);
+    auto dst = ptr;
+    memcpy(dst, &spaceNeeded, 4); dst += 4;
+    memcpy(dst, &cnt, 4); dst += 4;
+
+
+    cnt = 0;
+    for (auto& [file, line] : cs) {
+        memcpy(dst, &line, 4); dst += 4;
+        memcpy(dst, fsz + cnt, 4); dst += 4;
+        memcpy(dst, func[cnt], fsz[cnt]); dst += fsz[cnt];
+        memcpy(dst, ssz + cnt, 4); dst += 4;
+        memcpy(dst, file.c_str(), ssz[cnt]), dst += ssz[cnt];
+        cnt++;
+    }
+    assert(dst - ptr == spaceNeeded + 4);
+
+    tracy::Magic magic;
+    auto token = tracy::GetToken();
+    auto& tail = token->get_tail_index();
+    auto item = token->enqueue_begin(magic);
+    tracy::MemWrite(&item->hdr.type, tracy::QueueType::CallstackArma);
+    tracy::MemWrite(&item->callstackAlloc.ptr, (uint64_t)ptr);
+    auto str = new CallstackStruct();
+    str->data = cs;
+    tracy::MemWrite(&item->callstackAlloc.nativePtr, (uint64_t)str);
+    tail.store(magic + 1, std::memory_order_release);
+
+}
+
 void AdapterTracy::ensureReady() {
     if (tracy::s_token.ptr) return;
 

diff --git a/src/AdapterTracy.hpp b/src/AdapterTracy.hpp
@@ -24,6 +24,7 @@ class AdapterTracy final : public ProfilerAdapter
 	std::shared_ptr<ScopeInfo> createScopeStatic(const char* name, const char* filename, uint32_t fileline) const;
 	static bool isConnected();
 
+	static void sendCallstack(intercept::types::auto_array<std::pair<intercept::types::r_string, uint32_t>>& cs);
 private:
 	static void ensureReady();
 	using scopeCacheKey = std::tuple<intercept::types::r_string, intercept::types::r_string,uint32_t>;

diff --git a/src/ArmaScriptProfiler.vcxproj b/src/ArmaScriptProfiler.vcxproj
@@ -164,6 +164,7 @@
     <ClInclude Include="EngineProfiling.h" />
     <ClInclude Include="FAllocHook.h" />
     <ClInclude Include="HookManager.hpp" />
+    <ClInclude Include="NetworkProfiler.hpp" />
     <ClInclude Include="ProfilerAdapter.hpp" />
     <ClInclude Include="scriptProfiler.hpp" />
     <ClInclude Include="SignalSlot.hpp" />
@@ -218,6 +219,7 @@
     <ClCompile Include="FAllocHook.cpp" />
     <ClCompile Include="HookManager.cpp" />
     <ClCompile Include="main.cpp" />
+    <ClCompile Include="NetworkProfiler.cpp" />
     <ClCompile Include="scriptProfiler.cpp" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/ArmaScriptProfiler.vcxproj.filters b/src/ArmaScriptProfiler.vcxproj.filters
@@ -60,6 +60,9 @@
     <ClInclude Include="FAllocHook.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
+    <ClInclude Include="NetworkProfiler.hpp">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="scriptProfiler.cpp">
@@ -194,6 +197,9 @@
     <ClCompile Include="FAllocHook.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="NetworkProfiler.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <MASM Include="hooks.asm">