#include "fatal-signal.h"
#include "hash.h"
#include "hmap.h"
+#include "ovs-thread.h"
#include "signals.h"
#include "unixctl.h"
#include "util.h"
/* backtrace() from <execinfo.h> is really useful, but it is not signal safe
* everywhere, such as on x86-64. */
-#if HAVE_EXECINFO_H && !defined __x86_64__
+#if HAVE_BACKTRACE && !defined __x86_64__
# define USE_BACKTRACE 1
# include <execinfo.h>
#else
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:
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));
}
}