Merge branch 'master' of github.com:cloudius-systems/osv

TODO.zfs

 
- - make delay() do something useful
  - sort out various timing functions in <sys/time.h>

bsd/porting/synch.cc

@@ -65,9 +65,11 @@ int synch_port::msleep(void *chan, struct mtx *mtx,
         wait_lock = &mtx->_mutex;
     }
 
-    mutex_lock(&_lock);
-    _evlist.insert(std::make_pair(chan, &wait));
-    mutex_unlock(&_lock);
+    if (chan) {
+        mutex_lock(&_lock);
+        _evlist.insert(std::make_pair(chan, &wait));
+        mutex_unlock(&_lock);
+    }
 
     if (timo_hz) {
         u64 nanoseconds = timo_hz*(1000000000L/hz);
@@ -147,6 +149,11 @@ extern "C" int tsleep(void *chan, int priority, const char *wmesg, int timo)
     return (msleep(chan, 0, priority, wmesg, timo));
 }
 
+extern "C" void bsd_pause(const char *wmesg, int timo)
+{
+    msleep(0, 0, 0, wmesg, timo);
+}
+
 extern "C" void wakeup(void* chan)
 {
     synch_port::instance()->wakeup(chan);

bsd/porting/synch.h

@@ -10,6 +10,8 @@ int msleep(void *chan, struct mtx *mtx, int priority, const char *wmesg,
 
 int tsleep(void *chan, int priority, const char *wmesg, int timo);
 
+void bsd_pause(const char *wmesg, int timo);
+
 void wakeup(void* chan);
 
 void wakeup_one(void* chan);

bsd/sys/cddl/compat/opensolaris/sys/systm.h

@@ -38,7 +38,7 @@
 #define	PAGEOFFSET	(PAGESIZE - 1)
 #define	PAGEMASK	(~PAGEOFFSET)
 
-#define	delay(x)	do { } while (0)	// need to do something
+#define	delay(x)	bsd_pause("soldelay", (x))
 
 #endif	/* _KERNEL */
 

tests/tst-bsd-kthread.c

@@ -42,6 +42,6 @@ int main(int argc, char **argv)
 	 * Sleep a bit to wait for the thread to terminate.  Unfortunately the
 	 * BSD kthread interface has no nice way to wait for thread termination.
 	 */
-	tsleep(&error, 0, "kthread_test", 200);
+	bsd_pause("kthread_test", 200);
 	return 0;
 }