Check for critical work every swtch

f6455ee3 · Silas Boyd-Wickizer · 15145902 · f6455ee3 · f6455ee3 · f6455ee3
--- a/include/wq.hh
+++ b/include/wq.hh
@@ -86,6 +86,7 @@ void  xfreework(void* ptr, unsigned long nbytes);

 #if defined(XV6_KERNEL)
 int   wqcrit_push(work* w, int c);
+void  wqcrit_trywork(void);
 #endif

 #if defined(XV6_USER)

--- a/kernel/sched.cc
+++ b/kernel/sched.cc
@@ -11,6 +11,7 @@
 #include "kmtrace.hh"
 #include "sched.hh"
 #include "vm.hh"
+#include "wq.hh"

 enum { sched_debug = 0 };
 enum { steal_nonexec = 1 };
@@ -30,6 +31,7 @@ post_swtch(void)
      mycpu()->prev != idleproc())
    addrun(mycpu()->prev);
  release(&mycpu()->prev->lock);
+  wqcrit_trywork();
 }

 void

--- a/kernel/wqkern.cc
+++ b/kernel/wqkern.cc
@@ -33,6 +33,13 @@ wq_push(work *w)
  return wq_->push(w, mycpuid());
 }

+void
+wqcrit_trywork(void)
+{
+  while (wqcrit_->trywork(false))
+    ;
+}
+
 int
 wqcrit_push(work *w, int c)
 {