summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPravin <pshelar@nicira.com>2014-03-21 09:20:42 -0700
committerPravin B Shelar <pshelar@nicira.com>2014-03-21 11:48:28 -0700
commit275eebb92d46e8647861f0b25d9b0fb300379d2d (patch)
tree09506f0696c7b6d94e1072a4e7b7e0fbf035c1a3 /lib
parent20ebd771520db301d24c57c22fde989692adf913 (diff)
downloadopenvswitch-275eebb92d46e8647861f0b25d9b0fb300379d2d.tar.gz
utils: Introduce xsleep for RCU quiescent state
Signed-off-by: Pravin B Shelar <pshelar@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/daemon.c2
-rw-r--r--lib/util.c12
-rw-r--r--lib/util.h1
3 files changed, 14 insertions, 1 deletions
diff --git a/lib/daemon.c b/lib/daemon.c
index 9d96cba8b..c1c6550a9 100644
--- a/lib/daemon.c
+++ b/lib/daemon.c
@@ -416,7 +416,7 @@ monitor_daemon(pid_t daemon_pid)
if (now >= wakeup) {
break;
}
- sleep(wakeup - now);
+ xsleep(wakeup - now);
}
}
last_restart = time(NULL);
diff --git a/lib/util.c b/lib/util.c
index 0d1d9a52b..805f33a8c 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -30,6 +30,7 @@
#include "bitmap.h"
#include "byte-order.h"
#include "coverage.h"
+#include "ovs-rcu.h"
#include "ovs-thread.h"
#include "vlog.h"
#ifdef HAVE_PTHREAD_SET_NAME_NP
@@ -1726,6 +1727,17 @@ exit:
return ok;
}
+unsigned int
+xsleep(unsigned int seconds)
+{
+ unsigned int t;
+
+ ovsrcu_quiesce_start();
+ t = sleep(seconds);
+ ovsrcu_quiesce_end();
+ return t;
+}
+
#ifdef _WIN32
char *
diff --git a/lib/util.h b/lib/util.h
index 3db005aae..13ff58ece 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -507,6 +507,7 @@ char *ovs_format_message(int error);
char *ovs_lasterror_to_string(void);
int ftruncate(int fd, off_t length);
#endif
+unsigned int xsleep(unsigned int seconds);
#ifdef __cplusplus
}