Merge pull request #321 from openzim/fix_thread_termination

Author: mgautierfr

src/writer/creator.cpp

@@ -89,7 +89,7 @@ namespace zim
       {
         pthread_t thread;
         pthread_create(&thread, NULL, taskRunner, this->data.get());
-        pthread_detach(thread);
+        data->runningWriters.push_back(thread);
       }
 
       pthread_create(&data->writerThread, NULL, clusterWriter, this->data.get());
@@ -199,6 +199,10 @@ namespace zim
         data->taskList.pushToQueue(nullptr);
       }
 
+      for(auto& thread: data->runningWriters) {
+        pthread_join(thread, nullptr);
+      }
+
       // Be sure that all cluster are closed
       // Wait for writerThread to finish.
       data->clusterToWrite.pushToQueue(nullptr);

src/writer/creatordata.h

@@ -66,6 +66,7 @@ namespace zim
         typedef std::vector<Cluster*> ClusterList;
         typedef Queue<Cluster*> ClusterQueue;
         typedef Queue<Task*> TaskQueue;
+        typedef std::vector<pthread_t> ThreadList;
 
         CreatorData(const std::string& fname, bool verbose,
                        bool withIndex, std::string language);
@@ -99,6 +100,7 @@ namespace zim
         ClusterList clustersList;
         ClusterQueue clusterToWrite;
         TaskQueue taskList;
+        ThreadList runningWriters;
         pthread_t  writerThread;
         CompressionType compression = zimcompLzma;
         std::string basename;