pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-31 02:41:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spice: add [pid:tid] to log lines

Browse Source
This commit is contained in:
Arnon Gilboa 2009-11-17 16:47:41 +02:00 committed by Yaniv Kamay
parent 18270e0235
commit 702b92cdb8
4 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/debug.h
View File

@ -24,6 +24,8 @@
#include <log4cpp/Category.hh>
#include <log4cpp/convenience.h>
#include "platform.h"
#ifdef WIN32
#define snprintf _snprintf
#endif
@ -74,10 +76,11 @@ static inline std::string pretty_func_to_func_name(const std::string& f_name)
LOG4CPP_LOGGER("spice")
#define LOG(type, format, ...) { \
std::string log_message; \
string_printf(log_message, "%s: " format, FUNC_NAME, ## __VA_ARGS__); \
LOG4CPP_##type(logger, log_message.c_str()); \
#define LOG(type, format, ...) { \
std::string log_message; \
string_printf(log_message, "[%llu:%llu] %s: " format, Platform::get_process_id(), \
Platform::get_thread_id(), FUNC_NAME, ## __VA_ARGS__); \
LOG4CPP_##type(logger, log_message.c_str()); \
}
#define LOG_INFO(format, ...) LOG(INFO, format, ## __VA_ARGS__)

2
client/platform.h
View File

@ -38,6 +38,8 @@ public:
static void yield();
static uint64_t get_monolithic_time();
static void get_temp_dir(std::string& path);
static uint64_t get_process_id();
static uint64_t get_thread_id();
static const MonitorsList& init_monitors();
static void destroy_monitors();

11
client/windows/platform.cpp
View File

@ -207,6 +207,17 @@ void Platform::get_temp_dir(std::string& path)
delete[] tmp_path;
}
uint64_t Platform::get_process_id()
{
static uint64_t pid = GetCurrentProcessId();
return pid;
}
uint64_t Platform::get_thread_id()
{
return GetCurrentThreadId();
}
class WinMonitor: public Monitor {
public:
WinMonitor(int id, const wchar_t* name, const wchar_t* string);

11
client/x11/platform.cpp
View File

@ -223,6 +223,17 @@ void Platform::get_temp_dir(std::string& path)
path = "/tmp/";
}
uint64_t Platform::get_process_id()
{
static uint64_t pid = uint64_t(getpid());
return pid;
}
uint64_t Platform::get_thread_id()
{
return uint64_t(syscall(SYS_gettid));
}
void Platform::msleep(unsigned int millisec)
{
usleep(millisec * 1000);