only set scope exit after it was determined that spinning was changed to true

wjwwood · wjwwood · commit 1c9eb0b36798 · 2015-11-17T11:32:58.000-08:00
diff --git a/rclcpp/src/rclcpp/executor.cpp b/rclcpp/src/rclcpp/executor.cpp
@@ -110,10 +110,10 @@ Executor::spin_node_some(rclcpp::node::Node::SharedPtr node)
 void
 Executor::spin_some()
 {
-  RCLCPP_SCOPE_EXIT(this->spinning.store(false); );
   if (spinning.exchange(true)) {
     throw std::runtime_error("spin_some() called while already spinning");
   }
+  RCLCPP_SCOPE_EXIT(this->spinning.store(false); );
   AnyExecutable::SharedPtr any_exec;
   while ((any_exec = get_next_executable(std::chrono::milliseconds::zero())) && spinning.load()) {
     execute_any_executable(any_exec);
@@ -123,10 +123,10 @@ Executor::spin_some()
 void
 Executor::spin_once(std::chrono::nanoseconds timeout)
 {
-  RCLCPP_SCOPE_EXIT(this->spinning.store(false); );
   if (spinning.exchange(true)) {
     throw std::runtime_error("spin_once() called while already spinning");
   }
+  RCLCPP_SCOPE_EXIT(this->spinning.store(false); );
   auto any_exec = get_next_executable(timeout);
   if (any_exec) {
     execute_any_executable(any_exec);
diff --git a/rclcpp/src/rclcpp/executors/multi_threaded_executor.cpp b/rclcpp/src/rclcpp/executors/multi_threaded_executor.cpp
@@ -38,10 +38,10 @@ MultiThreadedExecutor::~MultiThreadedExecutor() {}
 void
 MultiThreadedExecutor::spin()
 {
-  RCLCPP_SCOPE_EXIT(this->spinning.store(false); );
   if (spinning.exchange(true)) {
     throw std::runtime_error("spin() called while already spinning");
   }
+  RCLCPP_SCOPE_EXIT(this->spinning.store(false); );
   std::vector<std::thread> threads;
   {
     std::lock_guard<std::mutex> wait_lock(wait_mutex_);
diff --git a/rclcpp/src/rclcpp/executors/single_threaded_executor.cpp b/rclcpp/src/rclcpp/executors/single_threaded_executor.cpp
@@ -28,10 +28,10 @@ SingleThreadedExecutor::~SingleThreadedExecutor() {}
 void
 SingleThreadedExecutor::spin()
 {
-  RCLCPP_SCOPE_EXIT(this->spinning.store(false); );
   if (spinning.exchange(true)) {
     throw std::runtime_error("spin_some() called while already spinning");
   }
+  RCLCPP_SCOPE_EXIT(this->spinning.store(false); );
   while (rclcpp::utilities::ok() && spinning.load()) {
     auto any_exec = get_next_executable();
     execute_any_executable(any_exec);

Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,10 @@ Executor::spin_node_some(rclcpp::node::Node::SharedPtr node)`
`110`	`110`	`void`
`111`	`111`	`Executor::spin_some()`
`112`	`112`	`{`
`113`		`- RCLCPP_SCOPE_EXIT(this->spinning.store(false); );`
`114`	`113`	`if (spinning.exchange(true)) {`
`115`	`114`	`throw std::runtime_error("spin_some() called while already spinning");`
`116`	`115`	`}`
	`116`	`+ RCLCPP_SCOPE_EXIT(this->spinning.store(false); );`
`117`	`117`	`AnyExecutable::SharedPtr any_exec;`
`118`	`118`	`while ((any_exec = get_next_executable(std::chrono::milliseconds::zero())) && spinning.load()) {`
`119`	`119`	`execute_any_executable(any_exec);`
`@@ -123,10 +123,10 @@ Executor::spin_some()`
`123`	`123`	`void`
`124`	`124`	`Executor::spin_once(std::chrono::nanoseconds timeout)`
`125`	`125`	`{`
`126`		`- RCLCPP_SCOPE_EXIT(this->spinning.store(false); );`
`127`	`126`	`if (spinning.exchange(true)) {`
`128`	`127`	`throw std::runtime_error("spin_once() called while already spinning");`
`129`	`128`	`}`
	`129`	`+ RCLCPP_SCOPE_EXIT(this->spinning.store(false); );`
`130`	`130`	`auto any_exec = get_next_executable(timeout);`
`131`	`131`	`if (any_exec) {`
`132`	`132`	`execute_any_executable(any_exec);`
Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,10 @@ MultiThreadedExecutor::~MultiThreadedExecutor() {}`
`38`	`38`	`void`
`39`	`39`	`MultiThreadedExecutor::spin()`
`40`	`40`	`{`
`41`		`- RCLCPP_SCOPE_EXIT(this->spinning.store(false); );`
`42`	`41`	`if (spinning.exchange(true)) {`
`43`	`42`	`throw std::runtime_error("spin() called while already spinning");`
`44`	`43`	`}`
	`44`	`+ RCLCPP_SCOPE_EXIT(this->spinning.store(false); );`
`45`	`45`	`std::vector<std::thread> threads;`
`46`	`46`	`{`
`47`	`47`	`std::lock_guard<std::mutex> wait_lock(wait_mutex_);`
Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,10 @@ SingleThreadedExecutor::~SingleThreadedExecutor() {}`
`28`	`28`	`void`
`29`	`29`	`SingleThreadedExecutor::spin()`
`30`	`30`	`{`
`31`		`- RCLCPP_SCOPE_EXIT(this->spinning.store(false); );`
`32`	`31`	`if (spinning.exchange(true)) {`
`33`	`32`	`throw std::runtime_error("spin_some() called while already spinning");`
`34`	`33`	`}`
	`34`	`+ RCLCPP_SCOPE_EXIT(this->spinning.store(false); );`
`35`	`35`	`while (rclcpp::utilities::ok() && spinning.load()) {`
`36`	`36`	`auto any_exec = get_next_executable();`
`37`	`37`	`execute_any_executable(any_exec);`