mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-29 13:27:59 +00:00
Code Issues Releases Wiki Activity

signals: New function signal_name().

Browse Source 
This will acquire a new user in an upcoming commit.
This commit is contained in:
Ben Pfaff 2011-04-01 10:22:51 -07:00
parent 67a51a1d85
commit b725cf028c
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/process.c
View File

@ -30,6 +30,7 @@
#include "fatal-signal.h" #include "fatal-signal.h"
#include "list.h" #include "list.h"
#include "poll-loop.h" #include "poll-loop.h"
#include "signals.h"
#include "socket-util.h" #include "socket-util.h"
#include "util.h" #include "util.h"
#include "vlog.h" #include "vlog.h"
@ -353,17 +354,10 @@ process_status_msg(int status)
struct ds ds = DS_EMPTY_INITIALIZER; struct ds ds = DS_EMPTY_INITIALIZER;
if (WIFEXITED(status)) { if (WIFEXITED(status)) {
ds_put_format(&ds, "exit status %d", WEXITSTATUS(status)); ds_put_format(&ds, "exit status %d", WEXITSTATUS(status));
} else if (WIFSIGNALED(status) || WIFSTOPPED(status)) { } else if (WIFSIGNALED(status)) {
int signr = WIFSIGNALED(status) ? WTERMSIG(status) : WSTOPSIG(status); ds_put_format(&ds, "killed (%s)", signal_name(WTERMSIG(status)));
const char *name = NULL; } else if (WIFSTOPPED(status)) {
#ifdef HAVE_STRSIGNAL ds_put_format(&ds, "stopped (%s)", signal_name(WSTOPSIG(status)));
name = strsignal(signr);
#endif
ds_put_format(&ds, "%s by signal %d",
WIFSIGNALED(status) ? "killed" : "stopped", signr);
if (name) {
ds_put_format(&ds, " (%s)", name);
}
} else { } else {
ds_put_format(&ds, "terminated abnormally (%x)", status); ds_put_format(&ds, "terminated abnormally (%x)", status);
} }

24
lib/signals.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2009 Nicira Networks. * Copyright (c) 2008, 2009, 2011 Nicira Networks.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -23,6 +23,7 @@
#include <unistd.h> #include <unistd.h>
#include "poll-loop.h" #include "poll-loop.h"
#include "socket-util.h" #include "socket-util.h"
#include "type-props.h"
#include "util.h" #include "util.h"
#if defined(_NSIG) #if defined(_NSIG)
@ -126,3 +127,24 @@ signal_handler(int signr)
signaled[signr] = true; signaled[signr] = true;
} }
} }
/* Returns the name of signal 'signum' as a string. The string may be in a
* static buffer that is reused from one call to the next.
*
* The string is probably a (possibly multi-word) description of the signal
* (e.g. "Hangup") instead of just the stringified version of the macro
* (e.g. "SIGHUP"). */
const char *
signal_name(int signum)
{
const char *name = NULL;
#ifdef HAVE_STRSIGNAL
name = strsignal(signum);
#endif
if (!name) {
static char buffer[7 + INT_STRLEN(int) + 1];
sprintf(buffer, "signal %d", signum);
name = buffer;
}
return name;
}

2
lib/signals.h
View File

@ -24,4 +24,6 @@ struct signal *signal_register(int signr);
bool signal_poll(struct signal *); bool signal_poll(struct signal *);
void signal_wait(struct signal *); void signal_wait(struct signal *);
const char *signal_name(int signum);
#endif /* signals.h */ #endif /* signals.h */