Skip to content

Tracy #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
CrosRoad95 wants to merge 6 commits into
base: develop
Choose a base branch
from
Draft

Tracy #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1bcaf2e
rever project.cpp
CrosRoad95 Apr 20, 2025
ccedeac
Merge branch 'develop' of https://github.com/CrosRoad95/Framework int…
CrosRoad95 Jul 7, 2025
21285c4
Merge branch 'develop' of https://github.com/CrosRoad95/Framework int…
CrosRoad95 Jul 10, 2025
44ab4b8
Add tracy 0.12.2 lib, most basic profiling
CrosRoad95 Jul 10, 2025
8bed4f4
Merge branch 'develop' into feature/tracy
CrosRoad95 Jul 11, 2025
96180b1
Merge branch 'develop' into feature/tracy
CrosRoad95 Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ include_directories(
"${PROJECT_SOURCE_DIR}/vendors/ultralight/include"
"${PROJECT_SOURCE_DIR}/vendors/directxtk"
"${PROJECT_SOURCE_DIR}/vendors/ultralight/include"
"${PROJECT_SOURCE_DIR}/vendors/tracy/public"
"${PROJECT_SOURCE_DIR}/vendors"
"${PROJECT_SOURCE_DIR}/code/framework/src/"
"${PROJECT_SOURCE_DIR}/code/framework/src/services"
Expand Down
2 changes: 1 addition & 1 deletion code/framework/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ macro(link_shared_deps target_name)
endif()

# Global libraries
target_link_libraries(${target_name} slikenet glm spdlog cppfs nlohmann_json Sentry httplib ${OPENSSL_LIBRARIES} Curl flecs_static semver Hash)
target_link_libraries(${target_name} slikenet glm spdlog cppfs nlohmann_json Sentry httplib ${OPENSSL_LIBRARIES} Curl flecs_static semver Hash TracyClient)

# Required libraries for windows
if(WIN32)
Expand Down
3 changes: 3 additions & 0 deletions code/framework/src/integrations/client/instance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include "graphics/backend/d3d11.h"
#include "graphics/backend/d3d12.h"
#include "graphics/backend/d3d9.h"
#include <tracy/Tracy.hpp>

namespace Framework::Integrations::Client {
bool AssetDownloadFileProgress::OnFile(SLNet::FileListTransferCBInterface::OnFileStruct *onFileStruct) {
Expand Down Expand Up @@ -238,6 +239,8 @@ namespace Framework::Integrations::Client {
}

void Instance::Update() {
ZoneScoped;

if (_presence && _presence->IsInitialized()) {
_presence->Update();
}
Expand Down
3 changes: 3 additions & 0 deletions code/framework/src/integrations/server/instance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <cppfs/FileHandle.h>
#include <cppfs/fs.h>
#include <csignal>
#include <tracy/Tracy.hpp>

namespace Framework::Integrations::Server {
Instance::Instance(): _alive(false), _shuttingDown(false) {
Expand Down Expand Up @@ -501,6 +502,8 @@ namespace Framework::Integrations::Server {
}

void Instance::Update() {
ZoneScoped;

const auto start = std::chrono::high_resolution_clock::now();
if (_nextTick <= start) {
if (_networkingEngine) {
Expand Down
Loading