Link/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

logging simplification

Browse Source
This commit is contained in:
Benoit Jacob 2020-11-11 21:42:46 -05:00
parent f1a0e97bee
commit bd147e2dee
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
client/TracySysTrace.cpp
View File

@ -594,6 +594,7 @@ void SysTraceSendExternalName( uint64_t thread )
# include <inttypes.h> # include <inttypes.h>
# include <limits> # include <limits>
# include <poll.h> # include <poll.h>
# include <stdarg.h>
# include <stdio.h> # include <stdio.h>
# include <stdlib.h> # include <stdlib.h>
# include <string.h> # include <string.h>
@ -631,19 +632,19 @@ static int s_numCpus = 0;
static constexpr size_t RingBufSize = 64*1024; static constexpr size_t RingBufSize = 64*1024;
static RingBuffer<RingBufSize>* s_ring = nullptr; static RingBuffer<RingBufSize>* s_ring = nullptr;
#define TRACY_LOG_ERROR_ERRNO(msg) \ static void log_error_errno(const char* file, int line, const char *format, ...) {
do { \ va_list ap;
fprintf(stderr, "ERROR (%s:%d) %s (errno=%d, %s)\n", \ va_start(ap, format);
__FILE__, __LINE__, msg, errno, strerror(errno)); \ char buf[256];
fflush(stderr); \ vsnprintf(buf, sizeof(buf), format, ap);
} while(false) va_end(ap);
fprintf(stderr, "ERROR (%s:%d) %s (errno=%d, %s)\n",
file, line, buf, errno, strerror(errno));
fflush(stderr);
}
#define TRACY_LOG_ERROR_ERRNO_FMT(fmt, ...) \ #define TRACY_LOG_ERROR_ERRNO(...) \
do { \ ::tracy::log_error_errno(__FILE__, __LINE__, __VA_ARGS__)
fprintf(stderr, "ERROR (%s:%d) " fmt " (errno=%d, %s)\n", \
__FILE__, __LINE__, __VA_ARGS__, errno, strerror(errno)); \
fflush(stderr); \
} while(false)
static int perf_event_open( struct perf_event_attr* hw_event, pid_t pid, int cpu, int group_fd, unsigned long flags ) static int perf_event_open( struct perf_event_attr* hw_event, pid_t pid, int cpu, int group_fd, unsigned long flags )
{ {
@ -838,7 +839,6 @@ static bool OpenAsRoot(Mode mode, const char* filename, Channel* ch) {
int pipefd[2]; int pipefd[2];
if( pipe( pipefd ) == -1 ) if( pipe( pipefd ) == -1 )
{ {
TRACY_LOG_ERROR_ERRNO("pipe failed");
return false; return false;
} }
int read_end = pipefd[0]; int read_end = pipefd[0];
@ -848,7 +848,6 @@ static bool OpenAsRoot(Mode mode, const char* filename, Channel* ch) {
const int pid = fork(); const int pid = fork();
if (pid == -1) { if (pid == -1) {
TRACY_LOG_ERROR_ERRNO("fork failed");
return false; return false;
} }
@ -869,7 +868,6 @@ static bool OpenAsRoot(Mode mode, const char* filename, Channel* ch) {
execlp( "su", "su", "root", "dd", dd_arg, "status=none", nullptr); execlp( "su", "su", "root", "dd", dd_arg, "status=none", nullptr);
// The above exec only returns in case of failure. Since here we're in the // The above exec only returns in case of failure. Since here we're in the
// child process, we want any error to be fatal. // child process, we want any error to be fatal.
TRACY_LOG_ERROR_ERRNO_FMT("exec failed: su root dd %s", dd_arg);
exit( EXIT_FAILURE ); exit( EXIT_FAILURE );
} }
@ -971,7 +969,7 @@ static bool TraceWrite( const char* path, size_t psz, const char* val, size_t vs
memcpy( tmp + sizeof( BasePath ) - 1, path, psz ); memcpy( tmp + sizeof( BasePath ) - 1, path, psz );
if (!WriteBufferToFile(tmp, val, vsz)) { if (!WriteBufferToFile(tmp, val, vsz)) {
TRACY_LOG_ERROR_ERRNO_FMT("failed to write to %s", tmp); TRACY_LOG_ERROR_ERRNO("failed to write to %s", tmp);
return false; return false;
} }
@ -1335,11 +1333,10 @@ void SysTraceSendExternalName( uint64_t thread )
GetProfiler().SendString( thread, buf, QueueType::ExternalThreadName ); GetProfiler().SendString( thread, buf, QueueType::ExternalThreadName );
return true; return true;
})) { })) {
TRACY_LOG_ERROR_ERRNO_FMT("failed to read %s", fn); TRACY_LOG_ERROR_ERRNO("failed to read %s", fn);
return;
} }
FILE* f;
sprintf( fn, "/proc/%" PRIu64 "/status", thread ); sprintf( fn, "/proc/%" PRIu64 "/status", thread );
if (!ReadFileWithFunction(fn, [=](int fd){ if (!ReadFileWithFunction(fn, [=](int fd){
FILE* f = fdopen(dup(fd), "rb"); FILE* f = fdopen(dup(fd), "rb");
@ -1382,13 +1379,15 @@ void SysTraceSendExternalName( uint64_t thread )
GetProfiler().SendString( thread, buf, QueueType::ExternalName ); GetProfiler().SendString( thread, buf, QueueType::ExternalName );
return true; return true;
})) { })) {
TRACY_LOG_ERROR_ERRNO_FMT("failed to read %s", fn); TRACY_LOG_ERROR_ERRNO("failed to read %s", fn);
return false;
} }
} }
return true; return true;
})) { })) {
TRACY_LOG_ERROR_ERRNO_FMT("failed to read %s", fn); TRACY_LOG_ERROR_ERRNO("failed to read %s", fn);
GetProfiler().SendString( thread, "???", 3, QueueType::ExternalName ); GetProfiler().SendString( thread, "???", 3, QueueType::ExternalName );
return;
} }
} }