shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00
Code Releases Activity

Include a thread identifier in log messages

Browse Source 
To allow messages from different threads to be untangled,
include an integer thread identifier in log messages.

* src/util/logging.c: Include thread ID
* src/util/threads.h, src/util/threads.h, src/util/threads-pthread.c:
  Add new virThreadSelfID() function
* configure.ac: Check for sys/syscall.h
This commit is contained in:
Daniel P. Berrange 2010-11-18 13:03:56 +00:00
parent 388fa6257e
commit 9288c31bf7
6 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -110,7 +110,7 @@ LIBS=$old_libs
dnl Availability of various common headers (non-fatal if missing).
AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/un.h \
sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \
sys/un.h])
sys/un.h sys/syscall.h])
AC_CHECK_LIB([intl],[gettext],[])

1
src/libvirt_private.syms
View File

@ -734,6 +734,7 @@ virThreadCreate;
virThreadIsSelf;
virThreadJoin;
virThreadSelf;
virThreadSelfID;
# usb.h

6
src/util/logging.c
View File

@ -548,14 +548,16 @@ void virLogMessage(const char *category, int priority, const char *funcname,
localtime_r(&cur_time.tv_sec, &time_info);
if ((funcname != NULL)) {
ret = virAsprintf(&msg, "%02d:%02d:%02d.%03d: %s : %s:%lld : %s\n",
ret = virAsprintf(&msg, "%02d:%02d:%02d.%03d: %d: %s : %s:%lld : %s\n",
time_info.tm_hour, time_info.tm_min,
time_info.tm_sec, (int) cur_time.tv_usec / 1000,
virThreadSelfID(),
virLogPriorityString(priority), funcname, linenr, str);
} else {
ret = virAsprintf(&msg, "%02d:%02d:%02d.%03d: %s : %s\n",
ret = virAsprintf(&msg, "%02d:%02d:%02d.%03d: %d: %s : %s\n",
time_info.tm_hour, time_info.tm_min,
time_info.tm_sec, (int) cur_time.tv_usec / 1000,
virThreadSelfID(),
virLogPriorityString(priority), str);
}
VIR_FREE(str);

16
src/util/threads-pthread.c
View File

@ -21,6 +21,11 @@
#include <config.h>
#include <unistd.h>
#if HAVE_SYS_SYSCALL_H
# include <sys/syscall.h>
#endif
/* Nothing special required for pthreads */
int virThreadInitialize(void)
@ -170,6 +175,17 @@ bool virThreadIsSelf(virThreadPtr thread)
return pthread_equal(pthread_self(), thread->thread) ? true : false;
}
int virThreadSelfID(void)
{
#if defined(HAVE_SYS_SYSCALL_H) && defined(SYS_gettid)
pid_t tid;
tid = syscall(SYS_gettid);
return (int)tid;
#else
return (int)pthread_self();
#endif
}
void virThreadJoin(virThreadPtr thread)
{
pthread_join(thread->thread, NULL);

6
src/util/threads-win32.c
View File

@ -288,6 +288,12 @@ bool virThreadIsSelf(virThreadPtr thread)
return self.thread == thread->thread ? true : false;
}
int virThreadSelfID(void)
{
return (int)GetCurrentThreadId();
}
void virThreadJoin(virThreadPtr thread)
{
if (thread->joinable) {

1
src/util/threads.h
View File

@ -51,6 +51,7 @@ int virThreadCreate(virThreadPtr thread,
void virThreadSelf(virThreadPtr thread);
bool virThreadIsSelf(virThreadPtr thread);
void virThreadJoin(virThreadPtr thread);
int virThreadSelfID(void);
int virMutexInit(virMutexPtr m) ATTRIBUTE_RETURN_CHECK;
int virMutexInitRecursive(virMutexPtr m) ATTRIBUTE_RETURN_CHECK;