mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-05-05 06:33:52 +00:00
Code Issues Releases Wiki Activity

Merge pull request #188 from annacrombie/fix_TRACY_NO_FILESELECTOR_macro

Browse Source 
fix TRACY_NO_FILESELECTOR macro
This commit is contained in:
Bartosz Taudul 2021-03-17 02:19:10 +01:00 committed by GitHub
commit eaef966aa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manual/techdoc.tex
View File

@ -143,6 +143,8 @@ In the header of the \texttt{build.mk} file you can find definitions of the resu
By default, the profiler uses X11 on Linux. If you would like to support Wayland instead, set the environment variable \texttt{TRACY\_USE\_WAYLAND} before running make. By default, the profiler uses X11 on Linux. If you would like to support Wayland instead, set the environment variable \texttt{TRACY\_USE\_WAYLAND} before running make.
Additionally, the variable \texttt{TRACY\_NO\_FILESELECTOR} may be set to remove Tracy's GTK 3 dependency at the expense of a file selection dialog. Note that this means you will not be able to use certain features, e.g. opening a saved trace.
\section{Client part} \section{Client part}
The client portion of Tracy is basically a queue. Application threads are producing queue items through the instrumentation macros and a dedicated profiler thread consumes the items to send them over the network, to the server. The client portion of Tracy is basically a queue. Application threads are producing queue items through the instrumentation macros and a dedicated profiler thread consumes the items to send them over the network, to the server.

18
profiler/build/unix/build.mk
View File

@ -19,14 +19,18 @@ IMAGE := $(PROJECT)-$(BUILD)
FILTER := ../../../nfd/nfd_win.cpp FILTER := ../../../nfd/nfd_win.cpp
include ../../../common/src-from-vcxproj.mk include ../../../common/src-from-vcxproj.mk
UNAME := $(shell uname -s) ifdef TRACY_NO_FILESELECTOR
ifeq ($(UNAME),Darwin) CXXFLAGS += -DTRACY_NO_FILESELECTOR
SRC3 += ../../../nfd/nfd_cocoa.m
LIBS += -framework CoreFoundation -framework AppKit
else else
SRC2 += ../../../nfd/nfd_gtk.c UNAME := $(shell uname -s)
INCLUDES += $(shell pkg-config --cflags gtk+-3.0) ifeq ($(UNAME),Darwin)
LIBS += $(shell pkg-config --libs gtk+-3.0) SRC3 += ../../../nfd/nfd_cocoa.m
LIBS += -framework CoreFoundation -framework AppKit
else
SRC2 += ../../../nfd/nfd_gtk.c
INCLUDES += $(shell pkg-config --cflags gtk+-3.0)
LIBS += $(shell pkg-config --libs gtk+-3.0)
endif
endif endif
include ../../../common/unix.mk include ../../../common/unix.mk

8
profiler/src/main.cpp
View File

@ -15,10 +15,13 @@
#include <GL/gl3w.h> #include <GL/gl3w.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include <memory> #include <memory>
#include "../nfd/nfd.h"
#include <sys/stat.h> #include <sys/stat.h>
#include <locale.h> #include <locale.h>
#ifndef TRACY_NO_FILESELECTOR
# include "../nfd/nfd.h"
#endif
#ifdef _WIN32 #ifdef _WIN32
# include <windows.h> # include <windows.h>
# include <shellapi.h> # include <shellapi.h>
@ -747,6 +750,8 @@ static void DrawContents()
} }
} }
ImGui::SameLine( 0, ImGui::GetFontSize() * 2 ); ImGui::SameLine( 0, ImGui::GetFontSize() * 2 );
#ifndef TRACY_NO_FILESELECTOR
if( ImGui::Button( ICON_FA_FOLDER_OPEN " Open saved trace" ) && !loadThread.joinable() ) if( ImGui::Button( ICON_FA_FOLDER_OPEN " Open saved trace" ) && !loadThread.joinable() )
{ {
nfdchar_t* fn; nfdchar_t* fn;
@ -792,6 +797,7 @@ static void DrawContents()
if( loadThread.joinable() ) { loadThread.join(); } if( loadThread.joinable() ) { loadThread.join(); }
tracy::BadVersion( badVer ); tracy::BadVersion( badVer );
} }
#endif
if( !clients.empty() ) if( !clients.empty() )
{ {

2
server/TracySourceView.cpp
View File

@ -3785,6 +3785,7 @@ void SourceView::CheckWrite( size_t line, RegsX86 reg, size_t limit )
} }
} }
#ifndef TRACY_NO_FILESELECTOR
void SourceView::Save( const Worker& worker, size_t start, size_t stop ) void SourceView::Save( const Worker& worker, size_t start, size_t stop )
{ {
assert( start < m_asm.size() ); assert( start < m_asm.size() );
@ -3867,5 +3868,6 @@ void SourceView::Save( const Worker& worker, size_t start, size_t stop )
} }
} }
} }
#endif
} }