smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

+ Use now kiwix::sleep(0

This commit is contained in:
kelson42 2014-04-02 17:04:19 +02:00
parent 69684009e3
commit 3265de1579
2 changed files with 10 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/common/kiwix/indexer.cpp
View File

@ -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 * 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 * it under the terms of the GNU General Public License as published by
@ -250,11 +250,8 @@ namespace kiwix {
writeTextFile(path, self->getZimId()); writeTextFile(path, self->getZimId());
self->setProgression(100); self->setProgression(100);
#ifdef _WIN32 kiwix::sleep(100);
Sleep(100);
#else
usleep(100000);
#endif
self->articleIndexerRunning(false); self->articleIndexerRunning(false);
pthread_exit(NULL); pthread_exit(NULL);
return NULL; return NULL;
@ -285,21 +282,12 @@ namespace kiwix {
pthread_mutex_lock(&toParseQueueMutex); pthread_mutex_lock(&toParseQueueMutex);
this->toParseQueue.push(token); this->toParseQueue.push(token);
pthread_mutex_unlock(&toParseQueueMutex); pthread_mutex_unlock(&toParseQueueMutex);
#ifdef _WIN32 kiwix::sleep(int(this->toParseQueue.size() / 200) / 10 * 1000);
Sleep(int(this->toParseQueue.size() / 200) / 10 * 1000);
#else
usleep(int(this->toParseQueue.size() / 200) / 10 * 1000000);
#endif
} }
bool Indexer::popFromToParseQueue(indexerToken &token) { bool Indexer::popFromToParseQueue(indexerToken &token) {
while (this->isToParseQueueEmpty() && this->isArticleExtractorRunning()) { while (this->isToParseQueueEmpty() && this->isArticleExtractorRunning()) {
#ifdef _WIN32 kiwix::sleep(500);
Sleep(500);
#else
usleep(500000);
#endif
if (this->getVerboseFlag()) { if (this->getVerboseFlag()) {
std::cout << "Waiting... ToParseQueue is empty for now..." << std::endl; std::cout << "Waiting... ToParseQueue is empty for now..." << std::endl;
} }
@ -331,20 +319,12 @@ namespace kiwix {
pthread_mutex_lock(&toIndexQueueMutex); pthread_mutex_lock(&toIndexQueueMutex);
this->toIndexQueue.push(token); this->toIndexQueue.push(token);
pthread_mutex_unlock(&toIndexQueueMutex); pthread_mutex_unlock(&toIndexQueueMutex);
#ifdef _WIN32 kiwix::sleep(int(this->toIndexQueue.size() / 200) / 10 * 1000);
Sleep(int(this->toIndexQueue.size() / 200) / 10 * 1000);
#else
usleep(int(this->toIndexQueue.size() / 200) / 10 * 1000000);
#endif
} }
bool Indexer::popFromToIndexQueue(indexerToken &token) { bool Indexer::popFromToIndexQueue(indexerToken &token) {
while (this->isToIndexQueueEmpty() && this->isArticleParserRunning()) { while (this->isToIndexQueueEmpty() && this->isArticleParserRunning()) {
#ifdef _WIN32 kiwix::sleep(500);
Sleep(500);
#else
usleep(500000);
#endif
if (this->getVerboseFlag()) { if (this->getVerboseFlag()) {
std::cout << "Waiting... ToIndexQueue is empty for now..." << std::endl; std::cout << "Waiting... ToIndexQueue is empty for now..." << std::endl;
} }
@ -447,11 +427,7 @@ namespace kiwix {
pthread_detach(this->articleExtractor); pthread_detach(this->articleExtractor);
while(this->isArticleExtractorRunning() && this->getArticleCount() == 0) { while(this->isArticleExtractorRunning() && this->getArticleCount() == 0) {
#ifdef _WIN32 kiwix::sleep(100);
Sleep(100);
#else
usleep(100000);
#endif
} }
this->articleParserRunning(true); this->articleParserRunning(true);

9
src/common/kiwix/indexer.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License as published by
@ -28,14 +28,9 @@
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#ifdef _WIN32
#include <Windows.h>
#else
#include <unistd.h>
#endif
#include <pthread.h> #include <pthread.h>
#include <stringTools.h> #include <stringTools.h>
#include <otherTools.h>
#include <resourceTools.h> #include <resourceTools.h>
#include <zim/file.h> #include <zim/file.h>
#include <zim/article.h> #include <zim/article.h>