Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/wolfpld/tracy.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartosz Taudul <wolf@nereid.pl>2021-05-24 00:51:56 +0300
committerBartosz Taudul <wolf@nereid.pl>2021-05-24 00:51:56 +0300
commitf8ccd8c40d18b99a5716df2cb8b2cb5303a21e30 (patch)
tree4f017179b9c01fb4fecbf9762721b42da0577db0
parenta6011cd1ad27451098c74c3e36bea1ec1e5aec7a (diff)
Move TracyStackFrames to common.
-rw-r--r--TracyClient.cpp1
-rw-r--r--capture/build/win32/capture.vcxproj4
-rw-r--r--capture/build/win32/capture.vcxproj.filters12
-rw-r--r--capture/src/capture.cpp2
-rw-r--r--common/TracyStackFrames.cpp (renamed from server/TracyStackFrames.cpp)0
-rw-r--r--common/TracyStackFrames.hpp (renamed from server/TracyStackFrames.hpp)0
-rw-r--r--csvexport/build/win32/csvexport.vcxproj2
-rw-r--r--csvexport/build/win32/csvexport.vcxproj.filters6
-rw-r--r--import-chrome/build/win32/import-chrome.vcxproj2
-rw-r--r--import-chrome/build/win32/import-chrome.vcxproj.filters6
-rw-r--r--profiler/build/win32/Tracy.vcxproj4
-rw-r--r--profiler/build/win32/Tracy.vcxproj.filters12
-rw-r--r--server/TracyView.cpp2
-rw-r--r--server/TracyWorker.cpp2
-rw-r--r--update/build/win32/update.vcxproj2
-rw-r--r--update/build/win32/update.vcxproj.filters6
16 files changed, 44 insertions, 19 deletions
diff --git a/TracyClient.cpp b/TracyClient.cpp
index 838c3bd8..bd6026da 100644
--- a/TracyClient.cpp
+++ b/TracyClient.cpp
@@ -41,6 +41,7 @@
# else
# include "libbacktrace/elf.cpp"
# endif
+# include "common/TracyStackFrames.cpp"
#endif
#ifdef _MSC_VER
diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj
index ace19c62..4b172cb4 100644
--- a/capture/build/win32/capture.vcxproj
+++ b/capture/build/win32/capture.vcxproj
@@ -86,6 +86,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\common\TracySocket.cpp" />
+ <ClCompile Include="..\..\..\common\TracyStackFrames.cpp" />
<ClCompile Include="..\..\..\common\TracySystem.cpp" />
<ClCompile Include="..\..\..\common\tracy_lz4.cpp" />
<ClCompile Include="..\..\..\common\tracy_lz4hc.cpp" />
@@ -93,7 +94,6 @@
<ClCompile Include="..\..\..\server\TracyMemory.cpp" />
<ClCompile Include="..\..\..\server\TracyMmap.cpp" />
<ClCompile Include="..\..\..\server\TracyPrint.cpp" />
- <ClCompile Include="..\..\..\server\TracyStackFrames.cpp" />
<ClCompile Include="..\..\..\server\TracyTaskDispatch.cpp" />
<ClCompile Include="..\..\..\server\TracyTextureCompression.cpp" />
<ClCompile Include="..\..\..\server\TracyThreadCompress.cpp" />
@@ -137,6 +137,7 @@
<ClInclude Include="..\..\..\common\TracyProtocol.hpp" />
<ClInclude Include="..\..\..\common\TracyQueue.hpp" />
<ClInclude Include="..\..\..\common\TracySocket.hpp" />
+ <ClInclude Include="..\..\..\common\TracyStackFrames.hpp" />
<ClInclude Include="..\..\..\common\TracySystem.hpp" />
<ClInclude Include="..\..\..\common\tracy_lz4.hpp" />
<ClInclude Include="..\..\..\common\tracy_lz4hc.hpp" />
@@ -150,7 +151,6 @@
<ClInclude Include="..\..\..\server\TracyPopcnt.hpp" />
<ClInclude Include="..\..\..\server\TracyPrint.hpp" />
<ClInclude Include="..\..\..\server\TracySlab.hpp" />
- <ClInclude Include="..\..\..\server\TracyStackFrames.hpp" />
<ClInclude Include="..\..\..\server\TracyTaskDispatch.hpp" />
<ClInclude Include="..\..\..\server\TracyTextureCompression.hpp" />
<ClInclude Include="..\..\..\server\TracyThreadCompress.hpp" />
diff --git a/capture/build/win32/capture.vcxproj.filters b/capture/build/win32/capture.vcxproj.filters
index c3d3ce2b..c81c2920 100644
--- a/capture/build/win32/capture.vcxproj.filters
+++ b/capture/build/win32/capture.vcxproj.filters
@@ -69,9 +69,6 @@
<ClCompile Include="..\..\..\getopt\getopt.c">
<Filter>getopt</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\server\TracyStackFrames.cpp">
- <Filter>server</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\zstd\common\debug.c">
<Filter>zstd\common</Filter>
</ClCompile>
@@ -159,6 +156,9 @@
<ClCompile Include="..\..\..\zstd\dictBuilder\zdict.c">
<Filter>zstd\dictBuilder</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\common\TracyStackFrames.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\common\tracy_lz4.hpp">
@@ -236,9 +236,6 @@
<ClInclude Include="..\..\..\getopt\getopt.h">
<Filter>getopt</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\server\TracyStackFrames.hpp">
- <Filter>server</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\zstd\zstd.h">
<Filter>zstd</Filter>
</ClInclude>
@@ -344,5 +341,8 @@
<ClInclude Include="..\..\..\zstd\zdict.h">
<Filter>zstd</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\common\TracyStackFrames.hpp">
+ <Filter>common</Filter>
+ </ClInclude>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/capture/src/capture.cpp b/capture/src/capture.cpp
index 4736550e..749c3579 100644
--- a/capture/src/capture.cpp
+++ b/capture/src/capture.cpp
@@ -14,10 +14,10 @@
#include <sys/stat.h>
#include "../../common/TracyProtocol.hpp"
+#include "../../common/TracyStackFrames.hpp"
#include "../../server/TracyFileWrite.hpp"
#include "../../server/TracyMemory.hpp"
#include "../../server/TracyPrint.hpp"
-#include "../../server/TracyStackFrames.hpp"
#include "../../server/TracyWorker.hpp"
#ifdef _WIN32
diff --git a/server/TracyStackFrames.cpp b/common/TracyStackFrames.cpp
index 20027d25..20027d25 100644
--- a/server/TracyStackFrames.cpp
+++ b/common/TracyStackFrames.cpp
diff --git a/server/TracyStackFrames.hpp b/common/TracyStackFrames.hpp
index 90290f48..90290f48 100644
--- a/server/TracyStackFrames.hpp
+++ b/common/TracyStackFrames.hpp
diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj
index 290980c1..b1ffea87 100644
--- a/csvexport/build/win32/csvexport.vcxproj
+++ b/csvexport/build/win32/csvexport.vcxproj
@@ -86,6 +86,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\common\TracySocket.cpp" />
+ <ClCompile Include="..\..\..\common\TracyStackFrames.cpp" />
<ClCompile Include="..\..\..\common\TracySystem.cpp" />
<ClCompile Include="..\..\..\common\tracy_lz4.cpp" />
<ClCompile Include="..\..\..\common\tracy_lz4hc.cpp" />
@@ -136,6 +137,7 @@
<ClInclude Include="..\..\..\common\TracyProtocol.hpp" />
<ClInclude Include="..\..\..\common\TracyQueue.hpp" />
<ClInclude Include="..\..\..\common\TracySocket.hpp" />
+ <ClInclude Include="..\..\..\common\TracyStackFrames.hpp" />
<ClInclude Include="..\..\..\common\TracySystem.hpp" />
<ClInclude Include="..\..\..\common\tracy_lz4.hpp" />
<ClInclude Include="..\..\..\common\tracy_lz4hc.hpp" />
diff --git a/csvexport/build/win32/csvexport.vcxproj.filters b/csvexport/build/win32/csvexport.vcxproj.filters
index 4b41bb3e..837d7985 100644
--- a/csvexport/build/win32/csvexport.vcxproj.filters
+++ b/csvexport/build/win32/csvexport.vcxproj.filters
@@ -156,6 +156,9 @@
<ClCompile Include="..\..\..\zstd\dictBuilder\zdict.c">
<Filter>zstd\dictBuilder</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\common\TracyStackFrames.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\common\tracy_lz4.hpp">
@@ -338,5 +341,8 @@
<ClInclude Include="..\..\..\zstd\dictBuilder\divsufsort.h">
<Filter>zstd\dictBuilder</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\common\TracyStackFrames.hpp">
+ <Filter>common</Filter>
+ </ClInclude>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj
index 36e1b37e..6cd81897 100644
--- a/import-chrome/build/win32/import-chrome.vcxproj
+++ b/import-chrome/build/win32/import-chrome.vcxproj
@@ -86,6 +86,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\common\TracySocket.cpp" />
+ <ClCompile Include="..\..\..\common\TracyStackFrames.cpp" />
<ClCompile Include="..\..\..\common\TracySystem.cpp" />
<ClCompile Include="..\..\..\common\tracy_lz4.cpp" />
<ClCompile Include="..\..\..\common\tracy_lz4hc.cpp" />
@@ -134,6 +135,7 @@
<ClInclude Include="..\..\..\common\TracyProtocol.hpp" />
<ClInclude Include="..\..\..\common\TracyQueue.hpp" />
<ClInclude Include="..\..\..\common\TracySocket.hpp" />
+ <ClInclude Include="..\..\..\common\TracyStackFrames.hpp" />
<ClInclude Include="..\..\..\common\TracySystem.hpp" />
<ClInclude Include="..\..\..\common\tracy_lz4.hpp" />
<ClInclude Include="..\..\..\common\tracy_lz4hc.hpp" />
diff --git a/import-chrome/build/win32/import-chrome.vcxproj.filters b/import-chrome/build/win32/import-chrome.vcxproj.filters
index 7c26e2f2..4abea113 100644
--- a/import-chrome/build/win32/import-chrome.vcxproj.filters
+++ b/import-chrome/build/win32/import-chrome.vcxproj.filters
@@ -147,6 +147,9 @@
<ClCompile Include="..\..\..\zstd\dictBuilder\zdict.c">
<Filter>zstd\dictBuilder</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\common\TracyStackFrames.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\common\tracy_lz4.hpp">
@@ -323,5 +326,8 @@
<ClInclude Include="..\..\..\zstd\dictBuilder\divsufsort.h">
<Filter>zstd\dictBuilder</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\common\TracyStackFrames.hpp">
+ <Filter>common</Filter>
+ </ClInclude>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj
index b6dac3d5..f3f418b3 100644
--- a/profiler/build/win32/Tracy.vcxproj
+++ b/profiler/build/win32/Tracy.vcxproj
@@ -104,6 +104,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\common\TracySocket.cpp" />
+ <ClCompile Include="..\..\..\common\TracyStackFrames.cpp" />
<ClCompile Include="..\..\..\common\TracySystem.cpp" />
<ClCompile Include="..\..\..\common\tracy_lz4.cpp" />
<ClCompile Include="..\..\..\common\tracy_lz4hc.cpp" />
@@ -126,7 +127,6 @@
<ClCompile Include="..\..\..\server\TracySourceContents.cpp" />
<ClCompile Include="..\..\..\server\TracySourceTokenizer.cpp" />
<ClCompile Include="..\..\..\server\TracySourceView.cpp" />
- <ClCompile Include="..\..\..\server\TracyStackFrames.cpp" />
<ClCompile Include="..\..\..\server\TracyStorage.cpp" />
<ClCompile Include="..\..\..\server\TracyTaskDispatch.cpp" />
<ClCompile Include="..\..\..\server\TracyTexture.cpp" />
@@ -184,6 +184,7 @@
<ClInclude Include="..\..\..\common\TracyProtocol.hpp" />
<ClInclude Include="..\..\..\common\TracyQueue.hpp" />
<ClInclude Include="..\..\..\common\TracySocket.hpp" />
+ <ClInclude Include="..\..\..\common\TracyStackFrames.hpp" />
<ClInclude Include="..\..\..\common\TracySystem.hpp" />
<ClInclude Include="..\..\..\common\tracy_lz4.hpp" />
<ClInclude Include="..\..\..\common\tracy_lz4hc.hpp" />
@@ -222,7 +223,6 @@
<ClInclude Include="..\..\..\server\TracySourceContents.hpp" />
<ClInclude Include="..\..\..\server\TracySourceTokenizer.hpp" />
<ClInclude Include="..\..\..\server\TracySourceView.hpp" />
- <ClInclude Include="..\..\..\server\TracyStackFrames.hpp" />
<ClInclude Include="..\..\..\server\TracyStorage.hpp" />
<ClInclude Include="..\..\..\server\TracyStringDiscovery.hpp" />
<ClInclude Include="..\..\..\server\TracyTaskDispatch.hpp" />
diff --git a/profiler/build/win32/Tracy.vcxproj.filters b/profiler/build/win32/Tracy.vcxproj.filters
index 2f97b54e..6e0b3322 100644
--- a/profiler/build/win32/Tracy.vcxproj.filters
+++ b/profiler/build/win32/Tracy.vcxproj.filters
@@ -147,9 +147,6 @@
<ClCompile Include="..\..\src\HttpRequest.cpp">
<Filter>src</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\server\TracyStackFrames.cpp">
- <Filter>server</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\imgui\imgui_tables.cpp">
<Filter>imgui</Filter>
</ClCompile>
@@ -249,6 +246,9 @@
<ClCompile Include="..\..\..\zstd\dictBuilder\zdict.c">
<Filter>zstd\dictBuilder</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\common\TracyStackFrames.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\common\tracy_lz4.hpp">
@@ -458,9 +458,6 @@
<ClInclude Include="..\..\src\HttpRequest.hpp">
<Filter>src</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\server\TracyStackFrames.hpp">
- <Filter>server</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\server\TracySortedVector.hpp">
<Filter>server</Filter>
</ClInclude>
@@ -578,6 +575,9 @@
<ClInclude Include="..\..\..\zstd\dictBuilder\divsufsort.h">
<Filter>zstd\dictBuilder</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\common\TracyStackFrames.hpp">
+ <Filter>common</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Natvis Include="DebugVis.natvis" />
diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 3388963d..87cb2c6f 100644
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -42,8 +42,8 @@
#include "TracyPrint.hpp"
#include "TracySort.hpp"
#include "TracySourceView.hpp"
-#include "TracyStackFrames.hpp"
#include "TracyView.hpp"
+#include "../common/TracyStackFrames.hpp"
#include "imgui_internal.h"
diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
index f50ccb09..039405ca 100644
--- a/server/TracyWorker.cpp
+++ b/server/TracyWorker.cpp
@@ -29,11 +29,11 @@
#include "TracyFileRead.hpp"
#include "TracyFileWrite.hpp"
#include "TracySort.hpp"
-#include "TracyStackFrames.hpp"
#include "TracyTaskDispatch.hpp"
#include "TracyVersion.hpp"
#include "TracyWorker.hpp"
#include "TracyYield.hpp"
+#include "../common/TracyStackFrames.hpp"
namespace tracy
{
diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj
index 766c920e..f7d5fa7d 100644
--- a/update/build/win32/update.vcxproj
+++ b/update/build/win32/update.vcxproj
@@ -86,6 +86,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\common\TracySocket.cpp" />
+ <ClCompile Include="..\..\..\common\TracyStackFrames.cpp" />
<ClCompile Include="..\..\..\common\TracySystem.cpp" />
<ClCompile Include="..\..\..\common\tracy_lz4.cpp" />
<ClCompile Include="..\..\..\common\tracy_lz4hc.cpp" />
@@ -136,6 +137,7 @@
<ClInclude Include="..\..\..\common\TracyProtocol.hpp" />
<ClInclude Include="..\..\..\common\TracyQueue.hpp" />
<ClInclude Include="..\..\..\common\TracySocket.hpp" />
+ <ClInclude Include="..\..\..\common\TracyStackFrames.hpp" />
<ClInclude Include="..\..\..\common\TracySystem.hpp" />
<ClInclude Include="..\..\..\common\tracy_lz4.hpp" />
<ClInclude Include="..\..\..\common\tracy_lz4hc.hpp" />
diff --git a/update/build/win32/update.vcxproj.filters b/update/build/win32/update.vcxproj.filters
index 6e9ebba3..cb586be7 100644
--- a/update/build/win32/update.vcxproj.filters
+++ b/update/build/win32/update.vcxproj.filters
@@ -156,6 +156,9 @@
<ClCompile Include="..\..\..\zstd\dictBuilder\zdict.c">
<Filter>zstd\dictBuilder</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\common\TracyStackFrames.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\common\tracy_lz4.hpp">
@@ -338,5 +341,8 @@
<ClInclude Include="..\..\..\zstd\dictBuilder\divsufsort.h">
<Filter>zstd\dictBuilder</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\common\TracyStackFrames.hpp">
+ <Filter>common</Filter>
+ </ClInclude>
</ItemGroup>
</Project> \ No newline at end of file