commit f35a5a9b08bbdf4db157c365c98bf8413bec775f
author Davide Pesavento <davide.pesavento@lip6.fr> Fri Dec 18 18:57:45 2015 +0100
committer Davide Pesavento <davide.pesavento@lip6.fr> Fri Dec 18 19:21:46 2015 +0100
tree 158d11ccd048344c30f42f0cadff971db539179a
parent f68f378a23996c34aedfd4f99e8e18141c186bde

tests: in LimitedIo, use std::exception_ptr to avoid slicing

Change-Id: I459792cf80ee189842ada84c3a514134bcd79a29
Refs: #3327

tests/limited-io.cpp

diff --git a/tests/limited-io.cpp b/tests/limited-io.cpp
index ec62041..dfc1a09 100644
--- a/tests/limited-io.cpp
+++ b/tests/limited-io.cpp
@@ -1,12 +1,12 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014,  Regents of the University of California,
- *                      Arizona Board of Regents,
- *                      Colorado State University,
- *                      University Pierre & Marie Curie, Sorbonne University,
- *                      Washington University in St. Louis,
- *                      Beijing Institute of Technology,
- *                      The University of Memphis
+ * Copyright (c) 2014-2015,  Regents of the University of California,
+ *                           Arizona Board of Regents,
+ *                           Colorado State University,
+ *                           University Pierre & Marie Curie, Sorbonne University,
+ *                           Washington University in St. Louis,
+ *                           Beijing Institute of Technology,
+ *                           The University of Memphis.
  *
  * This file is part of NFD (Named Data Networking Forwarding Daemon).
  * See AUTHORS.md for complete list of NFD authors and contributors.
@@ -24,6 +24,8 @@
  */
 
 #include "limited-io.hpp"
+#include "core/extended-error-message.hpp"
+#include "core/global-io.hpp"
 #include "core/logger.hpp"
 
 namespace nfd {
@@ -34,17 +36,10 @@
 const int LimitedIo::UNLIMITED_OPS = std::numeric_limits<int>::max();
 const time::nanoseconds LimitedIo::UNLIMITED_TIME = time::nanoseconds::min();
 
-LimitedIo::LimitedIo()
-  : m_uttf(nullptr)
-  , m_isRunning(false)
-  , m_nOpsRemaining(0)
-{
-}
-
 LimitedIo::LimitedIo(UnitTestTimeFixture* uttf)
   : m_uttf(uttf)
-  , m_isRunning(false)
   , m_nOpsRemaining(0)
+  , m_isRunning(false)
 {
 }
 
@@ -74,17 +69,18 @@
       m_uttf->advanceClocks(tick, time::nanoseconds::max());
     }
   }
-  catch (StopException&) {
+  catch (const StopException&) {
   }
-  catch (std::exception& ex) {
+  catch (const std::exception& ex) {
+    NFD_LOG_ERROR("g_io.run() exception: " << getExtendedErrorMessage(ex));
     m_reason = EXCEPTION;
-    NFD_LOG_ERROR("g_io.run() exception: " << ex.what());
-    m_lastException = ex;
+    m_lastException = std::current_exception();
   }
 
   getGlobalIoService().reset();
   scheduler::cancel(m_timeout);
   m_isRunning = false;
+
   return m_reason;
 }
 
@@ -97,6 +93,7 @@
   }
 
   --m_nOpsRemaining;
+
   if (m_nOpsRemaining <= 0) {
     m_reason = EXCEED_OPS;
     getGlobalIoService().stop();
@@ -116,11 +113,5 @@
   }
 }
 
-const std::exception&
-LimitedIo::getLastException() const
-{
-  return m_lastException;
-}
-
 } // namespace tests
 } // namespace nfd