mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 02:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warning re shadowing, implicit conversion and added include <cstdio>

Browse Source
This commit is contained in:
Tobias Widlund 2018-06-30 11:39:55 +02:00
parent c7952e4d4f
commit 1c467a5847
6 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/TracyCallstack.cpp
View File

@ -1,4 +1,5 @@
#include "TracyCallstack.hpp"
#include <cstdio>
#ifdef TRACY_HAS_CALLSTACK

8
client/TracyProfiler.cpp
View File

@ -775,10 +775,10 @@ void Profiler::CalibrateDelay()
auto mindiff = std::numeric_limits<int64_t>::max();
for( int i=0; i<Iterations * 10; i++ )
{
const auto t0 = GetTime();
const auto t1 = GetTime();
const auto dt = t1 - t0;
if( dt > 0 && dt < mindiff ) mindiff = dt;
const auto t0_inner = GetTime();
const auto t1_inner = GetTime();
const auto dt_inner = t1_inner - t0_inner;
if( dt_inner > 0 && dt_inner < mindiff ) mindiff = dt_inner;
}
m_resolution = mindiff;

10
client/concurrentqueue.h
View File

@ -1713,8 +1713,8 @@ private:
///////////////////////////
struct ExplicitProducer : public ProducerBase
{
explicit ExplicitProducer(ConcurrentQueue* parent) :
ProducerBase(parent, true),
explicit ExplicitProducer(ConcurrentQueue* _parent) :
ProducerBase(_parent, true),
blockIndex(nullptr),
pr_blockIndexSlotsUsed(0),
pr_blockIndexSize(EXPLICIT_INITIAL_INDEX_SIZE >> 1),
@ -1722,7 +1722,7 @@ private:
pr_blockIndexEntries(nullptr),
pr_blockIndexRaw(nullptr)
{
size_t poolBasedIndexSize = details::ceil_to_pow_2(parent->initialBlockPoolSize) >> 1;
size_t poolBasedIndexSize = details::ceil_to_pow_2(_parent->initialBlockPoolSize) >> 1;
if (poolBasedIndexSize > pr_blockIndexSize) {
pr_blockIndexSize = poolBasedIndexSize;
}
@ -2397,8 +2397,8 @@ private:
struct ImplicitProducer : public ProducerBase
{
ImplicitProducer(ConcurrentQueue* parent) :
ProducerBase(parent, false),
ImplicitProducer(ConcurrentQueue* _parent) :
ProducerBase(_parent, false),
nextBlockIndexCapacity(IMPLICIT_INITIAL_INDEX_SIZE),
blockIndex(nullptr)
{

5
client/tracy_rpmalloc.cpp
View File

@ -719,7 +719,8 @@ _memory_unmap_deferred(heap_t* heap, size_t wanted_count) {
do {
//Verify that we own the master span, otherwise re-defer to owner
void* next = span->next_span;
if (!found_span && SPAN_COUNT(span->flags) == wanted_count) {
size_t span_count = SPAN_COUNT(span->flags);
if (!found_span && span_count == wanted_count) {
assert(!SPAN_HAS_FLAG(span->flags, SPAN_FLAG_MASTER) || !SPAN_HAS_FLAG(span->flags, SPAN_FLAG_SUBSPAN));
found_span = span;
}
@ -1522,9 +1523,7 @@ rpmalloc_initialize_config(const rpmalloc_config_t* config) {
if (config)
memcpy(&_memory_config, config, sizeof(rpmalloc_config_t));
int default_mapper = 0;
if (!_memory_config.memory_map || !_memory_config.memory_unmap) {
default_mapper = 1;
_memory_config.memory_map = _memory_map_os;
_memory_config.memory_unmap = _memory_unmap_os;
}

1
common/TracyAlloc.hpp
View File

@ -1,5 +1,6 @@
#ifndef __TRACYALLOC_HPP__
#define __TRACYALLOC_HPP__
#include <cstdlib>
#ifdef TRACY_ENABLE
# include "../client/tracy_rpmalloc.hpp"

8
common/TracySystem.cpp
View File

@ -85,10 +85,10 @@ void SetThreadName( std::thread::native_handle_type handle, const char* name )
#ifdef TRACY_COLLECT_THREAD_NAMES
{
rpmalloc_thread_initialize();
const auto sz = strlen( name );
char* buf = (char*)tracy_malloc( sz+1 );
memcpy( buf, name, sz );
buf[sz+1] = '\0';
const auto sz_inner = strlen( name );
char* buf = (char*)tracy_malloc( sz_inner+1 );
memcpy( buf, name, sz_inner );
buf[sz_inner+1] = '\0';
auto data = (ThreadNameData*)tracy_malloc( sizeof( ThreadNameData ) );
# ifdef _WIN32
data->id = GetThreadId( static_cast<HANDLE>( handle ) );