From 3265de15799088c923b908accce4757b37c24804 Mon Sep 17 00:00:00 2001
From: kelson42 <kelson@kiwix.org>
Date: Wed, 2 Apr 2014 17:04:19 +0200
Subject: [PATCH] + Use now kiwix::sleep(0

---
 src/common/kiwix/indexer.cpp | 40 ++++++++----------------------------
 src/common/kiwix/indexer.h   |  9 ++------
 2 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/src/common/kiwix/indexer.cpp b/src/common/kiwix/indexer.cpp
index 34357561f..0092bc8d0 100644
--- a/src/common/kiwix/indexer.cpp
+++ b/src/common/kiwix/indexer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 Emmanuel Engelhart <kelson@kiwix.org>
+ * Copyright 2011-2014 Emmanuel Engelhart <kelson@kiwix.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU  General Public License as published by
@@ -250,11 +250,8 @@ namespace kiwix {
     writeTextFile(path, self->getZimId());
 
     self->setProgression(100);
-#ifdef _WIN32
-    Sleep(100);
-#else
-    usleep(100000);
-#endif
+    kiwix::sleep(100);
+
     self->articleIndexerRunning(false);
     pthread_exit(NULL);
     return NULL;
@@ -285,21 +282,12 @@ namespace kiwix {
     pthread_mutex_lock(&toParseQueueMutex); 
     this->toParseQueue.push(token);
     pthread_mutex_unlock(&toParseQueueMutex); 
-#ifdef _WIN32
-    Sleep(int(this->toParseQueue.size() / 200) / 10 * 1000);
-#else
-    usleep(int(this->toParseQueue.size() / 200) / 10 * 1000000);
-#endif
+    kiwix::sleep(int(this->toParseQueue.size() / 200) / 10 * 1000);
   }
 
   bool Indexer::popFromToParseQueue(indexerToken &token) {
     while (this->isToParseQueueEmpty() && this->isArticleExtractorRunning()) {
-#ifdef _WIN32
-      Sleep(500);
-#else
-      usleep(500000);
-#endif
-
+      kiwix::sleep(500);
       if (this->getVerboseFlag()) {
 	std::cout << "Waiting... ToParseQueue is empty for now..." << std::endl;
       }
@@ -331,20 +319,12 @@ namespace kiwix {
     pthread_mutex_lock(&toIndexQueueMutex); 
     this->toIndexQueue.push(token);
     pthread_mutex_unlock(&toIndexQueueMutex);
-#ifdef _WIN32
-    Sleep(int(this->toIndexQueue.size() / 200) / 10 * 1000);
-#else
-    usleep(int(this->toIndexQueue.size() / 200) / 10 * 1000000);
-#endif
+    kiwix::sleep(int(this->toIndexQueue.size() / 200) / 10 * 1000);
   }
 
   bool Indexer::popFromToIndexQueue(indexerToken &token) {
     while (this->isToIndexQueueEmpty() && this->isArticleParserRunning()) {
-#ifdef _WIN32
-      Sleep(500);
-#else
-      usleep(500000);
-#endif
+      kiwix::sleep(500);
       if (this->getVerboseFlag()) {
 	std::cout << "Waiting... ToIndexQueue is empty for now..." << std::endl;
       }
@@ -447,11 +427,7 @@ namespace kiwix {
     pthread_detach(this->articleExtractor);
 
     while(this->isArticleExtractorRunning() && this->getArticleCount() == 0) {
-#ifdef _WIN32
-    Sleep(100);
-#else
-    usleep(100000);
-#endif
+      kiwix::sleep(100);
     }
     
     this->articleParserRunning(true);
diff --git a/src/common/kiwix/indexer.h b/src/common/kiwix/indexer.h
index 1452ddf4e..410509336 100644
--- a/src/common/kiwix/indexer.h
+++ b/src/common/kiwix/indexer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 Emmanuel Engelhart <kelson@kiwix.org>
+ * Copyright 2014 Emmanuel Engelhart <kelson@kiwix.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU  General Public License as published by
@@ -28,14 +28,9 @@
 #include <iostream>
 #include <sstream>
 
-#ifdef _WIN32
-#include <Windows.h>
-#else
-#include <unistd.h>
-#endif
-
 #include <pthread.h>
 #include <stringTools.h>
+#include <otherTools.h>
 #include <resourceTools.h>
 #include <zim/file.h>
 #include <zim/article.h>