External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Cleaning up some of the logging code

Browse Source 
* src/util/logging.c: fix virLogDumpAllFD() to avoid snprintf, simplify
  the code and provide more useful signal descriptions. Also remove an
  unused variable.
This commit is contained in:
Daniel Veillard 2011-03-07 21:23:53 +08:00
parent 82dfc6f38e
commit bcb40b852c
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/util/logging.c
View File

@ -30,6 +30,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <signal.h>
#if HAVE_SYSLOG_H #if HAVE_SYSLOG_H
# include <syslog.h> # include <syslog.h>
#endif #endif
@ -283,6 +284,9 @@ static void virLogStr(const char *str, int len) {
static void virLogDumpAllFD(const char *msg, int len) { static void virLogDumpAllFD(const char *msg, int len) {
int i, found = 0; int i, found = 0;
if (len <= 0)
len = strlen(msg);
for (i = 0; i < virLogNbOutputs;i++) { for (i = 0; i < virLogNbOutputs;i++) {
if (virLogOutputs[i].f == virLogOutputToFd) { if (virLogOutputs[i].f == virLogOutputToFd) {
int fd = (long) virLogOutputs[i].data; int fd = (long) virLogOutputs[i].data;
@ -308,24 +312,38 @@ static void virLogDumpAllFD(const char *msg, int len) {
*/ */
void void
virLogEmergencyDumpAll(int signum) { virLogEmergencyDumpAll(int signum) {
int ret = 0, len; int len;
char buf[100];
if (virLogLen == 0)
return;
virLogLock(); virLogLock();
snprintf(buf, sizeof(buf) - 1, switch (signum) {
"Caught signal %d, dumping internal log buffer:\n", signum); case SIGFPE:
buf[sizeof(buf) - 1] = 0; virLogDumpAllFD( "Caught signal Floating-point exception", -1);
virLogDumpAllFD(buf, strlen(buf)); break;
snprintf(buf, sizeof(buf) - 1, "\n\n ====== start of log =====\n\n"); case SIGSEGV:
virLogDumpAllFD(buf, strlen(buf)); virLogDumpAllFD( "Caught Segmentation violation", -1);
break;
case SIGILL:
virLogDumpAllFD( "Caught illegal instruction", -1);
break;
case SIGABRT:
virLogDumpAllFD( "Caught abort signal", -1);
break;
case SIGBUS:
virLogDumpAllFD( "Caught bus error", -1);
break;
case SIGUSR2:
virLogDumpAllFD( "Caught User-defined signal 2", -1);
break;
default:
virLogDumpAllFD( "Caught unexpected signal", -1);
break;
}
virLogDumpAllFD(" dumping internal log buffer:\n", -1);
virLogDumpAllFD("\n\n ====== start of log =====\n\n", -1);
while (virLogLen > 0) { while (virLogLen > 0) {
if (virLogStart + virLogLen < LOG_BUFFER_SIZE) { if (virLogStart + virLogLen < LOG_BUFFER_SIZE) {
virLogBuffer[virLogStart + virLogLen] = 0; virLogBuffer[virLogStart + virLogLen] = 0;
virLogDumpAllFD(&virLogBuffer[virLogStart], virLogLen); virLogDumpAllFD(&virLogBuffer[virLogStart], virLogLen);
ret += virLogLen;
virLogStart += virLogLen; virLogStart += virLogLen;
virLogLen = 0; virLogLen = 0;
} else { } else {
@ -336,8 +354,7 @@ virLogEmergencyDumpAll(int signum) {
virLogStart = 0; virLogStart = 0;
} }
} }
snprintf(buf, sizeof(buf) - 1, "\n\n ====== end of log =====\n\n"); virLogDumpAllFD("\n\n ====== end of log =====\n\n", -1);
virLogDumpAllFD(buf, strlen(buf));
virLogUnlock(); virLogUnlock();
} }