#include <config.h>
#include "timeval.h"
#include <errno.h>
-#if HAVE_EXECINFO_H
-#include <execinfo.h>
-#endif
#include <poll.h>
#include <signal.h>
#include <stdlib.h>
#include "fatal-signal.h"
#include "hash.h"
#include "hmap.h"
+#include "ovs-thread.h"
#include "signals.h"
#include "unixctl.h"
#include "util.h"
#include "vlog.h"
+/* backtrace() from <execinfo.h> is really useful, but it is not signal safe
+ * everywhere, such as on x86-64. */
+#if HAVE_BACKTRACE && !defined __x86_64__
+# define USE_BACKTRACE 1
+# include <execinfo.h>
+#else
+# define USE_BACKTRACE 0
+#endif
+
VLOG_DEFINE_THIS_MODULE(timeval);
/* The clock to use for measuring time intervals. This is CLOCK_MONOTONIC by
const struct timespec *a, const struct timespec *b);
static unixctl_cb_func backtrace_cb;
-#ifndef HAVE_EXECINFO_H
-#define HAVE_EXECINFO_H 0
-
+#if !USE_BACKTRACE
static int
backtrace(void **buffer OVS_UNUSED, int size OVS_UNUSED)
{
{
NOT_REACHED();
}
-#endif
+#endif /* !USE_BACKTRACE */
/* Initializes the timetracking module, if not already initialized. */
static void
* initialization which is not signal safe. This can cause deadlocks if
* run from the signal handler. As a workaround, force the initialization
* to happen here. */
- if (HAVE_EXECINFO_H) {
+ if (USE_BACKTRACE) {
void *bt[1];
backtrace(bt, ARRAY_SIZE(bt));
memset(traces, 0, sizeof traces);
- if (HAVE_EXECINFO_H && CACHE_TIME) {
+ if (USE_BACKTRACE && CACHE_TIME) {
unixctl_command_register("backtrace", "", 0, 0, backtrace_cb, NULL);
}
xsigaction(SIGALRM, &sa, NULL);
}
-/* Remove SA_RESTART from the flags for SIGALRM, so that any system call that
- * is interrupted by the periodic timer interrupt will return EINTR instead of
- * continuing after the signal handler returns.
- *
- * time_disable_restart() and time_enable_restart() may be usefully wrapped
- * around function calls that might otherwise block forever unless interrupted
- * by a signal, e.g.:
- *
- * time_disable_restart();
- * fcntl(fd, F_SETLKW, &lock);
- * time_enable_restart();
- */
-void
-time_disable_restart(void)
-{
- time_init();
- set_up_signal(0);
-}
-
-/* Add SA_RESTART to the flags for SIGALRM, so that any system call that
- * is interrupted by the periodic timer interrupt will continue after the
- * signal handler returns instead of returning EINTR. */
-void
-time_enable_restart(void)
-{
- time_init();
- set_up_signal(SA_RESTART);
-}
-
static void
set_up_timer(void)
{
}
if (timer_create(monotonic_clock, NULL, &timer_id)) {
- VLOG_FATAL("timer_create failed (%s)", strerror(errno));
+ VLOG_FATAL("timer_create failed (%s)", ovs_strerror(errno));
}
itimer.it_interval.tv_sec = 0;
itimer.it_value = itimer.it_interval;
if (timer_settime(timer_id, 0, &itimer, NULL)) {
- VLOG_FATAL("timer_settime failed (%s)", strerror(errno));
+ VLOG_FATAL("timer_settime failed (%s)", ovs_strerror(errno));
}
}
long long int now;
long long int msecs;
- sigset_t oldsigs;
-
+ assert_single_threaded();
time_init();
time_refresh();
now = time_msec();
msecs = secs * 1000LL;
-
- block_sigalrm(&oldsigs);
deadline = now < LLONG_MAX - msecs ? now + msecs : LLONG_MAX;
- unblock_sigalrm(&oldsigs);
}
/* Like poll(), except:
wall_tick = true;
monotonic_tick = true;
- if (HAVE_EXECINFO_H && CACHE_TIME) {
+ if (USE_BACKTRACE && CACHE_TIME) {
struct trace *trace = &traces[trace_head];
trace->n_frames = backtrace(trace->backtrace,
sigset_t sigalrm;
sigemptyset(&sigalrm);
sigaddset(&sigalrm, SIGALRM);
- xsigprocmask(SIG_BLOCK, &sigalrm, oldsigs);
+ xpthread_sigmask(SIG_BLOCK, &sigalrm, oldsigs);
}
static void
unblock_sigalrm(const sigset_t *oldsigs)
{
- xsigprocmask(SIG_SETMASK, oldsigs, NULL);
+ xpthread_sigmask(SIG_SETMASK, oldsigs, NULL);
}
long long int
xgettimeofday(struct timeval *tv)
{
if (gettimeofday(tv, NULL) == -1) {
- VLOG_FATAL("gettimeofday failed (%s)", strerror(errno));
+ VLOG_FATAL("gettimeofday failed (%s)", ovs_strerror(errno));
}
}
{
time_init();
- if (HAVE_EXECINFO_H && CACHE_TIME) {
+ if (USE_BACKTRACE && CACHE_TIME) {
struct hmap trace_map = HMAP_INITIALIZER(&trace_map);
struct trace *trace, *next;
sigset_t oldsigs;
{
struct ds ds = DS_EMPTY_INITIALIZER;
- ovs_assert(HAVE_EXECINFO_H && CACHE_TIME);
+ ovs_assert(USE_BACKTRACE && CACHE_TIME);
format_backtraces(&ds, 0);
unixctl_command_reply(conn, ds_cstr(&ds));
ds_destroy(&ds);