kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-23 03:52:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

+ add mutex to be thread safe

Browse Source
This commit is contained in:
kelson42 2010-01-18 15:32:54 +00:00
parent 264fc8e0d4
commit 75995a8b2d
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/kiwix-serve.cpp
View File

@ -13,10 +13,12 @@
#include <zim/file.h> #include <zim/file.h>
#include <zim/article.h> #include <zim/article.h>
#include <zim/fileiterator.h> #include <zim/fileiterator.h>
#include<pthread.h>
using namespace std; using namespace std;
static zim::File* zimFileHandler; static zim::File* zimFileHandler;
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
static int accessHandlerCallback(void *cls, static int accessHandlerCallback(void *cls,
struct MHD_Connection * connection, struct MHD_Connection * connection,
@ -75,6 +77,9 @@ static int accessHandlerCallback(void *cls,
} }
title[titleOffset] = 0; title[titleOffset] = 0;
/* Mutext lock */
pthread_mutex_lock(&lock);
/* Load the article from the ZIM file */ /* Load the article from the ZIM file */
cout << "Loading '" << title << "' in namespace '" << ns << "'... " << endl; cout << "Loading '" << title << "' in namespace '" << ns << "'... " << endl;
try { try {
@ -117,6 +122,9 @@ static int accessHandlerCallback(void *cls,
std::cerr << e.what() << std::endl; std::cerr << e.what() << std::endl;
} }
/* Mutext unlock */
pthread_mutex_unlock(&lock);
/* clear context pointer */ /* clear context pointer */
*ptr = NULL; *ptr = NULL;
@ -172,11 +180,17 @@ int main(int argc, char **argv) {
exit(1); exit(1);
} }
/* Mutext init */
pthread_mutex_init(&lock, NULL);
/* Run endless */ /* Run endless */
while (42) sleep(1); while (42) sleep(1);
/* Stop the daemon */ /* Stop the daemon */
MHD_stop_daemon(daemon); MHD_stop_daemon(daemon);
/* Mutext destroy */
pthread_mutex_destroy(&lock);
exit(0); exit(0);
} }