Skip to content

Commit 0aaf015

Browse files
author
TSUNG-WEI HUANG
committed
updated exe
1 parent ac18be7 commit 0aaf015

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

doxygen/contributing/contributors.dox

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ We are grateful for the following contributors (alphabetic order) to the %Taskfl
2121
@li <a href="https://github.com/dian-lun-lin">Dian-Lun Lin</a>: applied %Taskflow to win the champion award of the IEEE HPEC 2020 %Graph Challenge
2222
@li <a href="https://github.com/fstrugar">Filip Strugar</a>: fixed the bugs in fire-and-get taskflow execution and parallel algorithms
2323
@li <a href="https://github.com/ForgeMistress">Foge Mistress</a>: helped design the executor interface to avoid over-subscribed threads
24+
@li <a href="https://github.com/fran6co">Francisco Facioni</a>: improved the interface of %Taskflow exception support through macro
2425
@li <a href="https://github.com/largerock">George Price</a>: improved the documentation pages and fixed several typos
2526
@li <a href="https://github.com/totalgee">Glen Fraser</a>: contributed to the design of executor and threadpool
2627
@li <a href="https://github.com/guannan-git">Guannan Guo</a>: benchmarked different scheduling algorithms and architectures
@@ -67,6 +68,7 @@ We are grateful for the following contributors (alphabetic order) to the %Taskfl
6768
@li <a href="https://github.com/QiuYilin">Yilin Qiu</a>: helped implement the dependency removal methods in %Taskflow
6869
@li <a href="https://guozz.cn/">Zizheng Guo</a>: applied %Taskflow to speed up VLSI timing analysis and shared his feedback
6970

71+
7072
Please @ContactUs if we forgot your name!
7173

7274
@section ThankYouForUsingTaskflow Thank You for Using Taskflow

taskflow/core/executor.hpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,21 +1096,6 @@ class Executor {
10961096
void _corun_until(Worker&, P&&);
10971097
};
10981098

1099-
#ifdef TF_DISABLE_EXCEPTION_HANDLING
1100-
1101-
#define TF_EXECUTOR_EXCEPTION_HANDLER(worker, node, code_block) \
1102-
do { code_block; } while(0)
1103-
#else
1104-
1105-
#define TF_EXECUTOR_EXCEPTION_HANDLER(worker, node, code_block) \
1106-
try { \
1107-
code_block; \
1108-
} catch(...) { \
1109-
_process_exception(worker, node); \
1110-
}
1111-
#endif
1112-
1113-
11141099
// Constructor
11151100
inline Executor::Executor(size_t N) :
11161101
_MAX_STEALS {((N+1) << 1)},

taskflow/core/notifier.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ class Notifier {
106106
}
107107

108108
// commit_wait commits waiting.
109+
// only the waiter itself can call
109110
void commit_wait(Waiter* w) {
110111
#ifdef __cpp_lib_atomic_wait
111112
w->state.store(Waiter::kNotSignaled, std::memory_order_relaxed);

taskflow/utility/macros.hpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,19 @@
1515
#else
1616
#define TF_NO_INLINE
1717
#endif
18+
19+
// ----------------------------------------------------------------------------
20+
21+
#ifdef TF_DISABLE_EXCEPTION_HANDLING
22+
#define TF_EXECUTOR_EXCEPTION_HANDLER(worker, node, code_block) \
23+
do { code_block; } while(0)
24+
#else
25+
#define TF_EXECUTOR_EXCEPTION_HANDLER(worker, node, code_block) \
26+
try { \
27+
code_block; \
28+
} catch(...) { \
29+
_process_exception(worker, node); \
30+
}
31+
#endif
32+
33+
// ----------------------------------------------------------------------------

0 commit comments

Comments
 (0)