[#3351] fixed memory leaks

Author: Razvan Becheriu

src/lib/asiolink/process_spawn.cc

@@ -154,7 +154,7 @@ class ProcessSpawnImpl : boost::noncopyable {
         /// @brief Constructor
         ///
         /// @param io_service The IOService which handles signal handlers.
-        IOSignalSetInitializer(IOServicePtr io_service) {
+        IOSignalSetInitializer(IOServicePtr io_service) : io_service_(io_service) {
             if (!io_service) {
                 isc_throw(ProcessSpawnError, "NULL IOService instance");
             }
@@ -168,6 +168,8 @@ class ProcessSpawnImpl : boost::noncopyable {
         /// @brief Destructor
         ~IOSignalSetInitializer() {
             io_signal_set_->remove(SIGCHLD);
+            io_signal_set_.reset();
+            io_service_->stopAndPoll();
         }
 
     public:
@@ -181,6 +183,9 @@ class ProcessSpawnImpl : boost::noncopyable {
 
     private:
 
+        /// @brief IOService instance to process IO.
+        asiolink::IOServicePtr io_service_;
+
         /// @brief ASIO signal set.
         IOSignalSetPtr io_signal_set_;
     };

src/lib/asiolink/tests/io_service_signal_unittests.cc

@@ -61,12 +61,11 @@ class IOSignalTest : public ::testing::Test {
 
     /// @brief Destructor.
     ~IOSignalTest() {
+        test_timer_.cancel();
+        io_service_->stopAndPoll();
         io_signal_set_.reset();
         // Make sure the cancel handler for the IOSignalSet is called.
-        if (io_service_->stopped()) {
-            io_service_->restart();
-        }
-        io_service_->poll();
+        io_service_->stopAndPoll();
     }
 
     /// @brief Method used as the IOSignalSet handler.

src/lib/asiolink/tests/process_spawn_unittest.cc

@@ -56,7 +56,7 @@ class ProcessSpawnTest : public ::testing::Test {
     ProcessSpawnTest() :
         io_service_(getIOService()), test_timer_(io_service_),
         test_time_ms_(0), io_signal_set_(), processed_signals_() {
-        ProcessSpawn::setIOService(getIOService());
+        ProcessSpawn::setIOService(io_service_);
 
         io_signal_set_.reset(new IOSignalSet(io_service_,
                                              std::bind(&ProcessSpawnTest::processSignal,
@@ -66,8 +66,11 @@ class ProcessSpawnTest : public ::testing::Test {
 
     /// @brief Destructor.
     ~ProcessSpawnTest() {
+        test_timer_.cancel();
+        io_service_->stopAndPoll();
         io_signal_set_->remove(SIGCHLD);
         io_signal_set_.reset();
+        ProcessSpawn::setIOService(IOServicePtr());
         // Make sure the cancel handler for the IOSignalSet is called.
         io_service_->stopAndPoll();
     }

src/lib/cc/tests/data_unittests.cc

@@ -1193,6 +1193,7 @@ TEST(Element, isEquivalent) {
         ElementPtr l = Element::createList();
         l->add(l);
         EXPECT_THROW(isEquivalent(l, l), isc::BadValue);
+        l->remove(0);
     }
 }