updated worker interface

twhuang · twhuang · commit efb2f70be969 · 2022-07-21T17:46:56.000-06:00
diff --git a/doxygen/contributing/contributors.dox b/doxygen/contributing/contributors.dox
@@ -97,7 +97,8 @@ We are grateful for the following organizations and projects that are using %Tas
 @li <a href="https://github.com/maxbachmann/RapidFuzz">RapidFuxx</a>: Rapid fuzzy string matching in Python using various string metrics
 @li <a href="https://github.com/KomodoPlatform/atomicDEX-Desktop">AtomicDEX</a>: Secure wallet and decentralized exchange rolled into one application
 @li <a href="https://github.com/intel-ai/oox">OOX</a>: Out-of-order task execution library in modern C++
-@li <a href="https://reagent.ai/">ReAgent</a>: An open end-to-end platform for applied reinforcement learning  developed and used at Facebook. 
+@li <a href="https://reagent.ai/">ReAgent</a>: An open end-to-end platform for applied reinforcement learning  developed and used at Facebook
+@li <a href="https://github.com/GauravDawra/Beast">Beast-Build</a>: A build system built for speed and power 
 
 ... more at [GitHub](https://github.com/search?q=taskflow&type=Code).
 
diff --git a/doxygen/releases/release-3.5.0.dox b/doxygen/releases/release-3.5.0.dox
@@ -51,6 +51,7 @@ To use %Taskflow v3.5.0, you need a compiler that supports C++17:
 @section release-3-5-0_bug_fixes Bug Fixes 
 
 + Fixed the compilation error in the graph pipeline benchmark
++ Fixed the compilation error in unknown OS (replaced with @c TF_OS_UNKNOWN)
 
 If you encounter any potential bugs, please submit an issue at @IssueTracker.
 
diff --git a/examples/worker_interface.cpp b/examples/worker_interface.cpp
@@ -8,15 +8,18 @@ class CustomWorkerBehavior : public tf::WorkerInterface {
   public:
   
   // to call before the worker enters the scheduling loop
-  void scheduler_prologue(tf::Worker& wv) override {
-    std::cout << tf::stringify("worker ", wv.id(), " enters the scheduler loop\n"); 
+  void scheduler_prologue(tf::Worker& w) override {
+    std::cout << tf::stringify(
+      "worker ", w.id(), " (native=", w.thread()->native_handle(), ") enters scheduler\n"
+    ); 
   }
 
   // to call after the worker leaves the scheduling loop
-  void scheduler_epilogue(tf::Worker& wv, std::exception_ptr) override {
-    std::cout << tf::stringify("worker ", wv.id(), " leaves the scheduler loop\n"); 
+  void scheduler_epilogue(tf::Worker& w, std::exception_ptr) override {
+    std::cout << tf::stringify(
+      "worker ", w.id(), " (native=", w.thread()->native_handle(), ") leaves scheduler\n"
+    ); 
   }
-
 };
 
 int main() {
diff --git a/taskflow/core/executor.hpp b/taskflow/core/executor.hpp
@@ -1198,9 +1198,7 @@ inline void Executor::_schedule(Node* node) {
 }
 
 // Procedure: _schedule
-inline void Executor::_schedule(
-  Worker& worker, const SmallVector<Node*>& nodes
-) {
+inline void Executor::_schedule(Worker& worker, const SmallVector<Node*>& nodes) {
 
   // We need to cacth the node count to avoid accessing the nodes
   // vector while the parent topology is removed!
@@ -1449,7 +1447,8 @@ inline void Executor::_tear_down_invoke(Worker& worker, Node* node) {
       _tear_down_topology(worker, node->_topology);
     }
   }
-  else {  // joined subflow
+  // joined subflow
+  else {  
     node->_parent->_join_counter.fetch_sub(1);
   }
 }
diff --git a/taskflow/utility/os.hpp b/taskflow/utility/os.hpp
@@ -80,7 +80,7 @@
      TF_OS_LINUX + TF_OS_DRAGONFLY + TF_OS_FREEBSD + TF_OS_NETBSD +        \
      TF_OS_OPENBSD + TF_OS_DARWIN + TF_OS_WINDOWS + TF_OS_HURD +           \
      TF_OS_SOLARIS)
-#error Unknown OS
+#define TF_OS_UNKNOWN 1
 #endif
 
 #if TF_OS_LINUX || TF_OS_DRAGONFLY || TF_OS_FREEBSD || TF_OS_NETBSD ||     \

Original file line number	Diff line number	Diff line change
`@@ -1198,9 +1198,7 @@ inline void Executor::_schedule(Node* node) {`
`1198`	`1198`	`}`
`1199`	`1199`
`1200`	`1200`	`// Procedure: _schedule`
`1201`		`-inline void Executor::_schedule(`
`1202`		`- Worker& worker, const SmallVector<Node*>& nodes`
`1203`		`-) {`
	`1201`	`+inline void Executor::_schedule(Worker& worker, const SmallVector<Node*>& nodes) {`
`1204`	`1202`
`1205`	`1203`	`// We need to cacth the node count to avoid accessing the nodes`
`1206`	`1204`	`// vector while the parent topology is removed!`
`@@ -1449,7 +1447,8 @@ inline void Executor::_tear_down_invoke(Worker& worker, Node* node) {`
`1449`	`1447`	`_tear_down_topology(worker, node->_topology);`
`1450`	`1448`	`}`
`1451`	`1449`	`}`
`1452`		`- else { // joined subflow`
	`1450`	`+ // joined subflow`
	`1451`	`+ else {`
`1453`	`1452`	`node->_parent->_join_counter.fetch_sub(1);`
`1454`	`1453`	`}`
`1455`	`1454`	`}`