clean up exception throwing behavior in TFdManagedThread

ifwe · Nov 5, 2015 · 88f69ff · 88f69ff
1 parent ba984c5
commit 88f69ff
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 22 deletions.
diff --git a/src/thread/fd_managed_thread.cc b/src/thread/fd_managed_thread.cc
@@ -50,7 +50,7 @@ void TFdManagedThread::Start() {
   assert(this);
 
   if (OptThread.IsKnown()) {
-    THROW_ERROR(TThreadAlreadyStarted);
+    throw std::logic_error("Worker thread is already started");
   }
 
   assert(!ShutdownRequestedSem.GetFd().IsReadable());
@@ -71,7 +71,8 @@ void TFdManagedThread::RequestShutdown() {
   assert(this);
 
   if (OptThread.IsUnknown()) {
-    THROW_ERROR(TThreadAlreadyShutDown);
+    throw std::logic_error(
+        "Cannot request shutdown on nonexistent worker thread");
   }
 
   ShutdownRequestedSem.Push();
@@ -86,7 +87,7 @@ void TFdManagedThread::Join() {
   assert(this);
 
   if (OptThread.IsUnknown()) {
-    THROW_ERROR(TCannotJoinNonexistentThread);
+    throw std::logic_error("Cannot join nonexistent worker thread");
   }
 
   ShutdownFinishedSem.Pop();

diff --git a/src/thread/fd_managed_thread.h b/src/thread/fd_managed_thread.h
@@ -50,18 +50,9 @@ namespace Thread {
     NO_COPY_SEMANTICS(TFdManagedThread);
 
     public:
-    DEFINE_ERROR(TThreadAlreadyStarted, std::runtime_error,
-        "Worker thread is already started");
-
-    DEFINE_ERROR(TThreadAlreadyShutDown, std::runtime_error,
-        "Cannot request shutdown on nonexistent worker thread");
-
     DEFINE_ERROR(TThreadThrewUnknownException, std::runtime_error,
         "Worker thread threw unknown exception");
 
-    DEFINE_ERROR(TCannotJoinNonexistentThread, std::runtime_error,
-        "Cannot join nonexistent worker thread");
-
     class TThreadThrewStdException final : public std::runtime_error {
       public:
       TThreadThrewStdException(const char *what_msg)

diff --git a/src/thread/fd_managed_thread.test.cc b/src/thread/fd_managed_thread.test.cc
@@ -200,7 +200,7 @@ namespace {
 
     try {
       worker.Join();
-    } catch (const TFdManagedThread::TThreadThrewStdException &x) {
+    } catch (const TFdManagedThread::TThreadThrewStdException &) {
       threw = true;
     }
 
@@ -220,7 +220,7 @@ namespace {
 
     try {
       worker.Join();
-    } catch (const TFdManagedThread::TThreadThrewStdException &x) {
+    } catch (const TFdManagedThread::TThreadThrewStdException &) {
       threw = true;
     }
 
@@ -243,7 +243,7 @@ namespace {
 
     try {
       worker.Join();
-    } catch (const TFdManagedThread::TThreadThrewUnknownException &x) {
+    } catch (const TFdManagedThread::TThreadThrewUnknownException &) {
       threw = true;
     }
 
@@ -263,7 +263,7 @@ namespace {
 
     try {
       worker.Join();
-    } catch (const TFdManagedThread::TThreadThrewUnknownException &x) {
+    } catch (const TFdManagedThread::TThreadThrewUnknownException &) {
       threw = true;
     }
 
@@ -280,8 +280,8 @@ namespace {
 
     try {
       worker.Start();
-    } catch (const TFdManagedThread::TThreadAlreadyStarted &x) {
-      threw = true;
+    } catch (const std::logic_error &) {
+      threw = true;  // worker already started
     }
 
     ASSERT_TRUE(threw);
@@ -296,17 +296,17 @@ namespace {
 
     try {
       worker.Join();
-    } catch (const TFdManagedThread::TCannotJoinNonexistentThread &x) {
-      threw = true;
+    } catch (const std::logic_error &) {
+      threw = true;  // cannot join nonexistent thread
     }
 
     ASSERT_TRUE(threw);
     threw = false;
 
     try {
       worker.RequestShutdown();
-    } catch (const TFdManagedThread::TThreadAlreadyShutDown &x) {
-      threw = true;
+    } catch (const std::logic_error &) {
+      threw = true;  // worker already shut down
     }
 
     ASSERT_TRUE(threw);