From: SomeDude <SomeDude@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw>
Date: Tue, 29 Jan 2008 16:41:00 +0000 (+0100)
Subject: version 0.1.3
X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=commitdiff_plain;h=c7fcb4c4bc5012a584add81a9509fc1f84c3c688

version 0.1.3
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be285e2..4e06722 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,26 +53,29 @@ src/nntp/mime/Mime.cpp
 src/nntp/mime/MimeChar.cpp
 src/nntp/mime/MimeCode.cpp
 src/nntp/mime/MimeType.cpp
+src/pthreadwrapper/guard.cpp
+src/pthreadwrapper/mutex.cpp
+src/pthreadwrapper/runnable.cpp
+src/pthreadwrapper/thread.cpp
 src/xyssl/sha1.c
 )
 
 ADD_DEFINITIONS(-DTIXML_USE_STL)
 
-IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+IF(CMAKE_COMPILER_IS_GNUCXX)
 	ADD_DEFINITIONS(-fpermissive)
-ENDIF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 ADD_EXECUTABLE(fms ${FMS_SRC})
 
-INCLUDE_DIRECTORIES(libs/sqlite3 libs/tinyxml)
-
 IF(WIN32)
 	TARGET_LINK_LIBRARIES(fms ws2_32)
 ENDIF(WIN32)
 
 FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_s)
 FIND_LIBRARY(TINYXML_LIBRARY NAMES tinyxml tinyxml_s)
-FIND_LIBRARY(ZTHREADS_LIBRARY NAMES zthread ZThread zthread_s)
+#FIND_LIBRARY(ZTHREADS_LIBRARY NAMES zthread ZThread zthread_s)
+FIND_LIBRARY(PTHREADS_LIBRARY NAMES pthread pthreads pthreadvc2)
 
 IF(SQLITE3_LIBRARY)
 	TARGET_LINK_LIBRARIES(fms ${SQLITE3_LIBRARY})
@@ -80,8 +83,7 @@ ELSE(SQLITE3_LIBRARY)
 	MESSAGE(STATUS "Could not find system SQLite library.  Will compile from included source.")
 	ADD_LIBRARY(sqlite3 libs/sqlite3/sqlite3.c)
 	TARGET_LINK_LIBRARIES(fms sqlite3)
-ADD_LIBRARY(tinyxml libs/tinyxml/tinystr.cpp libs/tinyxml/tinyxml.cpp libs/tinyxml/tinyxmlerror.cpp libs/tinyxml/tinyxmlparser.cpp)
-
+	INCLUDE_DIRECTORIES(libs/sqlite3)
 ENDIF(SQLITE3_LIBRARY)
 
 IF(TINYXML_LIBRARY)
@@ -90,10 +92,17 @@ ELSE(TINYXML_LIBRARY)
 	MESSAGE(STATUS "Could not find system TinyXML library.  Will compile from included source.")
 	ADD_LIBRARY(tinyxml libs/tinyxml/tinystr.cpp libs/tinyxml/tinyxml.cpp libs/tinyxml/tinyxmlerror.cpp libs/tinyxml/tinyxmlparser.cpp)
 	TARGET_LINK_LIBRARIES(fms tinyxml)
+	INCLUDE_DIRECTORIES(libs/tinyxml)
 ENDIF(TINYXML_LIBRARY)
 
-IF(ZTHREADS_LIBRARY)
-	TARGET_LINK_LIBRARIES(fms ${ZTHREADS_LIBRARY})
-ELSE(ZTHREADS_LIBRARY)
-	MESSAGE(FATAL_ERROR "Could not find ZThreads library.  You must set the location manually.")
-ENDIF(ZTHREADS_LIBRARY)
+#IF(ZTHREADS_LIBRARY)
+#	TARGET_LINK_LIBRARIES(fms ${ZTHREADS_LIBRARY})
+#ELSE(ZTHREADS_LIBRARY)
+#	MESSAGE(FATAL_ERROR "Could not find ZThreads library.  You must set the location manually.")
+#ENDIF(ZTHREADS_LIBRARY)
+
+IF(PTHREADS_LIBRARY)
+	TARGET_LINK_LIBRARIES(fms ${PTHREADS_LIBRARY})
+ELSE(PTHREADS_LIBRARY)
+	MESSAGE(FATAL ERROR "Could not find pthreads library.  You must set the location manually.")
+ENDIF(PTHREADS_LIBRARY)
diff --git a/include/commandthread.h b/include/commandthread.h
index 0d51366..58a7129 100644
--- a/include/commandthread.h
+++ b/include/commandthread.h
@@ -4,13 +4,14 @@
 #include "ilogger.h"
 #include "idatabase.h"
 
-#include <zthread/Thread.h>
+//#include <zthread/Thread.h>
+#include "pthreadwrapper.h"
 
-class CommandThread:public ZThread::Runnable,public ILogger, public IDatabase
+class CommandThread:public PThread::Runnable,public ILogger, public IDatabase
 {
 public:
 
-	void run();
+	void Run();
 
 private:
 
diff --git a/include/db/sqlite3db/sqlite3db.h b/include/db/sqlite3db/sqlite3db.h
index 24c4a3a..91bdfec 100644
--- a/include/db/sqlite3db/sqlite3db.h
+++ b/include/db/sqlite3db/sqlite3db.h
@@ -1,17 +1,19 @@
 #ifndef _sqlite3db_
 #define _sqlite3db_
 
-#include <zthread/Singleton.h>
-#include <zthread/Mutex.h>
+//#include <zthread/Singleton.h>
+//#include <zthread/Mutex.h>
 #include <sqlite3.h>
 #include <string>
+#include "../../pthreadwrapper/singleton.h"
+#include "../../pthreadwrapper/mutex.h"
 
 #include "../sqlite3db.h"
 
 namespace SQLite3DB
 {
 
-class DB:public ZThread::Singleton<DB>
+class DB:public PThread::Singleton<DB>
 {
 public:
 	DB();
@@ -35,7 +37,7 @@ public:
 
 	sqlite3 *GetDB() { return m_db; }
 
-	ZThread::Mutex m_mutex;			// public so that recordset and statment can lock this mutex themselves
+	PThread::Mutex m_mutex;			// public so that recordset and statment can lock this mutex themselves
 
 private:
 	void Initialize();
diff --git a/include/freenet/freenetmasterthread.h b/include/freenet/freenetmasterthread.h
index f84acc1..e1f2453 100644
--- a/include/freenet/freenetmasterthread.h
+++ b/include/freenet/freenetmasterthread.h
@@ -7,12 +7,13 @@
 #include "ifcpconnected.h"
 #include "iperiodicprocessor.h"
 
-#include <zthread/Runnable.h>
+//#include <zthread/Runnable.h>
+#include "../pthreadwrapper/runnable.h"
 
 // forward declaration
 class IFreenetRegistrable;
 
-class FreenetMasterThread:public ZThread::Runnable,public ILogger, public IFCPMessageHandler
+class FreenetMasterThread:public PThread::Runnable,public ILogger, public IFCPMessageHandler
 {
 public:
 	FreenetMasterThread();
@@ -20,7 +21,7 @@ public:
 	
 	const bool HandleMessage(FCPMessage &message);
 
-	void run();
+	void Run();
 
 	// registration methods for children objects
 	void RegisterPeriodicProcessor(IPeriodicProcessor *obj);
diff --git a/include/freenet/iindexinserter.h b/include/freenet/iindexinserter.h
index ccf1cd5..fc1a6bc 100644
--- a/include/freenet/iindexinserter.h
+++ b/include/freenet/iindexinserter.h
@@ -117,7 +117,7 @@ template <class IDTYPE>
 void IIndexInserter<IDTYPE>::InitializeIIndexInserter()
 {
 	m_fcpuniquename="";
-	Option::instance()->Get("MessageBase",m_messagebase);
+	Option::Instance()->Get("MessageBase",m_messagebase);
 	m_lastchecked.SetToGMTime();
 }
 
diff --git a/include/freenet/iindexrequester.h b/include/freenet/iindexrequester.h
index 8f9e4e5..eeb8ccf 100644
--- a/include/freenet/iindexrequester.h
+++ b/include/freenet/iindexrequester.h
@@ -127,7 +127,7 @@ void IIndexRequester<IDTYPE>::InitializeIIndexRequester()
 	m_maxrequests=-1;
 	m_fcpuniquename="";
 
-	Option::instance()->Get("MessageBase",m_messagebase);
+	Option::Instance()->Get("MessageBase",m_messagebase);
 	m_tempdate.SetToGMTime();
 }
 
diff --git a/include/global.h b/include/global.h
index 1eccbcc..167c3e0 100644
--- a/include/global.h
+++ b/include/global.h
@@ -2,9 +2,10 @@
 #define _global_
 
 #include <vector>
-#include <zthread/Thread.h>
+//#include <zthread/Thread.h>
+#include "pthreadwrapper/thread.h"
 
-#define FMS_VERSION	"0.1.2"
+#define FMS_VERSION	"0.1.3"
 
 // opens database and creates tables and initial inserts if necessary
 void SetupDB();
@@ -13,8 +14,8 @@ void SetupDefaultOptions();
 // opens logfile and sets it up
 void SetupLogFile();
 
-void StartThreads(std::vector<ZThread::Thread *> &threads);
-void ShutdownThreads(std::vector<ZThread::Thread *> &threads);
+void StartThreads(std::vector<PThread::Thread *> &threads);
+void ShutdownThreads(std::vector<PThread::Thread *> &threads);
 
 // needed for Windows to setup network
 void SetupNetwork();
diff --git a/include/idatabase.h b/include/idatabase.h
index 6138d08..ddf9ba9 100644
--- a/include/idatabase.h
+++ b/include/idatabase.h
@@ -9,7 +9,7 @@
 class IDatabase
 {
 public:
-	IDatabase():m_db(SQLite3DB::DB::instance()) {}
+	IDatabase():m_db(SQLite3DB::DB::Instance()) {}
 	
 protected:
 	SQLite3DB::DB *m_db;
diff --git a/include/ilogger.h b/include/ilogger.h
index 797c024..b03499d 100644
--- a/include/ilogger.h
+++ b/include/ilogger.h
@@ -9,7 +9,7 @@
 class ILogger
 {
 public:
-	ILogger():m_log(LogFile::instance()) {}
+	ILogger():m_log(LogFile::Instance()) {}
 	
 protected:
 	LogFile *m_log;
diff --git a/include/logfile.h b/include/logfile.h
index a076d65..3008caa 100644
--- a/include/logfile.h
+++ b/include/logfile.h
@@ -1,10 +1,13 @@
 #ifndef _logfile_
 #define _logfile_
 
-#include <zthread/Singleton.h>
-#include <zthread/Mutex.h>
+//#include <zthread/Singleton.h>
+//#include <zthread/Mutex.h>
+#include "pthreadwrapper/singleton.h"
+#include "pthreadwrapper/mutex.h"
+#include <string>
 
-class LogFile:public ZThread::Singleton<LogFile>
+class LogFile:public PThread::Singleton<LogFile>
 {
 public:
 	LogFile();
@@ -57,7 +60,7 @@ private:
 	bool m_writenewline;
 	char *m_datebuffer;
 
-	ZThread::Mutex m_logmutex;
+	PThread::Mutex m_logmutex;
 	
 };
 
diff --git a/include/messagelist.h b/include/messagelist.h
index aa12bee..be1df9e 100644
--- a/include/messagelist.h
+++ b/include/messagelist.h
@@ -18,4 +18,4 @@ private:
 
 };
 
-#endif	// _messagelist_
\ No newline at end of file
+#endif	// _messagelist_
diff --git a/include/nntp/mime/MimeChar.h b/include/nntp/mime/MimeChar.h
index b334b00..3fc2b61 100644
--- a/include/nntp/mime/MimeChar.h
+++ b/include/nntp/mime/MimeChar.h
@@ -31,4 +31,4 @@ private:
 	static const unsigned char m_aCharTbl[128];
 };
 
-#endif // _MIME_CHAR_H
\ No newline at end of file
+#endif // _MIME_CHAR_H
diff --git a/include/nntp/nntpconnection.h b/include/nntp/nntpconnection.h
index dd365c4..64a1645 100644
--- a/include/nntp/nntpconnection.h
+++ b/include/nntp/nntpconnection.h
@@ -7,7 +7,8 @@
 
 #include <string>
 #include <vector>
-#include <zthread/Runnable.h>
+//#include <zthread/Runnable.h>
+#include "../pthreadwrapper/runnable.h"
 
 #ifdef _WIN32
 
@@ -20,7 +21,7 @@
 	#include <arpa/inet.h>
 #endif
 
-class NNTPConnection:public ZThread::Runnable,public ILogger//,public IDatabase
+class NNTPConnection:public PThread::Runnable,public ILogger
 {
 public:
 	NNTPConnection(SOCKET sock);
@@ -29,7 +30,7 @@ public:
 	void Disconnect();
 	const bool Disconnected()		{ return m_socket==INVALID_SOCKET; }
 
-	void run();
+	void Run();
 
 private:
 
diff --git a/include/nntp/nntplistener.h b/include/nntp/nntplistener.h
index 53b5d86..e109137 100644
--- a/include/nntp/nntplistener.h
+++ b/include/nntp/nntplistener.h
@@ -3,30 +3,32 @@
 
 #include <list>
 #include <vector>
-#include <zthread/Thread.h>
-#include <zthread/Task.h>
-#include <zthread/ZThread.h>
-#include <zthread/ThreadedExecutor.h>
+//#include <zthread/Thread.h>
+//#include <zthread/Task.h>
+//#include <zthread/ZThread.h>
+//#include <zthread/ThreadedExecutor.h>
+#include "../pthreadwrapper/runnable.h"
 
 #include "../socketdefines.h"
 
 /**
 	\brief Listens for NNTP connections
 */
-class NNTPListener:public ZThread::Runnable
+class NNTPListener:public PThread::Runnable
 {
 public:
 	NNTPListener();
 	~NNTPListener();
 
-	void run();
+	void Run();
 	void StartListen();
 
 private:
 
 	unsigned short m_listenport;
 	std::vector<SOCKET> m_listensockets;
-	ZThread::ThreadedExecutor m_connections;
+	//ZThread::ThreadedExecutor m_connections;
+	std::vector<PThread::Thread *> m_connectionthreads;
 
 };
 
diff --git a/include/option.h b/include/option.h
index abe1a58..c18c716 100644
--- a/include/option.h
+++ b/include/option.h
@@ -4,10 +4,11 @@
 #include "db/sqlite3db.h"
 
 #include <sstream>
-#include <zthread/Singleton.h>
+//#include <zthread/Singleton.h>
+#include "pthreadwrapper/singleton.h"
 
 //just a wrapper around the database for the options table
-class Option:public ZThread::Singleton<Option>
+class Option:public PThread::Singleton<Option>
 {
 public:
 	const bool Get(const std::string &option, std::string &value);
@@ -25,14 +26,14 @@ void Option::Set(const std::string &option, const T &value)
 	std::string tempval;
 	if(Get(option,tempval)==true)
 	{
-		SQLite3DB::Statement st=SQLite3DB::DB::instance()->Prepare("UPDATE tblOption SET OptionValue=? WHERE Option=?;");
+		SQLite3DB::Statement st=SQLite3DB::DB::Instance()->Prepare("UPDATE tblOption SET OptionValue=? WHERE Option=?;");
 		st.Bind(0,valuestr.str());
 		st.Bind(1,option);
 		st.Step();
 	}
 	else
 	{
-		SQLite3DB::Statement st=SQLite3DB::DB::instance()->Prepare("INSERT INTO tblOption(Option,OptionValue) VALUES(?,?);");
+		SQLite3DB::Statement st=SQLite3DB::DB::Instance()->Prepare("INSERT INTO tblOption(Option,OptionValue) VALUES(?,?);");
 		st.Bind(0,option);
 		st.Bind(1,valuestr.str());
 		st.Step();
diff --git a/include/pthreadwrapper.h b/include/pthreadwrapper.h
new file mode 100644
index 0000000..0fc6afe
--- /dev/null
+++ b/include/pthreadwrapper.h
@@ -0,0 +1,28 @@
+/**
+	Light C++ wrapper around PThreads
+*/
+
+#ifndef _pthread_wrapper_
+
+#include <pthread.h>
+
+namespace PThread
+{
+
+	// forward declarations
+	class NonCopyable;
+	class Mutex;
+	class Guard;
+	class Runnable;
+	class Thread;
+
+}	// namespace
+
+#include "pthreadwrapper/noncopyable.h"
+#include "pthreadwrapper/mutex.h"
+#include "pthreadwrapper/guard.h"
+#include "pthreadwrapper/runnable.h"
+#include "pthreadwrapper/thread.h"
+#include "pthreadwrapper/singleton.h"
+
+#endif	// _pthread_wrapper_
diff --git a/include/pthreadwrapper/guard.h b/include/pthreadwrapper/guard.h
new file mode 100644
index 0000000..b9b9a14
--- /dev/null
+++ b/include/pthreadwrapper/guard.h
@@ -0,0 +1,21 @@
+#ifndef _pthread_guard_
+#define _pthread_guard_
+
+namespace PThread
+{
+
+class Mutex;
+
+class Guard
+{
+public:
+	Guard();
+	Guard(Mutex &mutex);
+	~Guard();
+private:
+	Mutex *m_mutex;
+};
+
+}	// namespace
+
+#endif	// _pthread_guard_
diff --git a/include/pthreadwrapper/mutex.h b/include/pthreadwrapper/mutex.h
new file mode 100644
index 0000000..44e9085
--- /dev/null
+++ b/include/pthreadwrapper/mutex.h
@@ -0,0 +1,26 @@
+#ifndef _pthread_mutex_
+#define _pthread_mutex_
+
+#include <pthread.h>
+#include <exception>
+
+namespace PThread
+{
+
+class Mutex
+{
+public:
+	Mutex();
+	~Mutex();
+
+	void Acquire() throw(std::exception);
+	void Release();
+
+private:
+	pthread_mutex_t m_mutex;
+	pthread_mutexattr_t m_attr;
+};
+
+}	// namespace
+
+#endif	// _pthread_mutex_
diff --git a/include/pthreadwrapper/noncopyable.h b/include/pthreadwrapper/noncopyable.h
new file mode 100644
index 0000000..e6ebb8a
--- /dev/null
+++ b/include/pthreadwrapper/noncopyable.h
@@ -0,0 +1,21 @@
+#ifndef _pthread_noncopyable_
+#define _pthread_noncopyable_
+
+namespace PThread
+{
+
+class NonCopyable
+{
+protected:
+	NonCopyable()	{}
+	~NonCopyable()	{}
+
+private:
+	// restrict copy and assignment
+	NonCopyable(const NonCopyable &rhs);
+	const NonCopyable &operator=(const NonCopyable &rhs);
+};
+	
+}	// namespace
+
+#endif	// _pthread_noncopyable_
diff --git a/include/pthreadwrapper/runnable.h b/include/pthreadwrapper/runnable.h
new file mode 100644
index 0000000..7906f19
--- /dev/null
+++ b/include/pthreadwrapper/runnable.h
@@ -0,0 +1,32 @@
+#ifndef _pthread_runnable_
+#define _pthread_runnable_
+
+#include "thread.h"
+
+namespace PThread
+{
+
+class Thread;
+
+class Runnable
+{
+public:
+	Runnable():m_thread(0)	{}
+	~Runnable()				{}
+
+	virtual void Run()=0;
+
+protected:
+	void Sleep(const long ms);
+	const bool IsCancelled();
+
+private:
+
+	friend Thread;
+	Thread *m_thread;
+
+};
+
+}	// namespace
+
+#endif	// _pthread_runnable_
diff --git a/include/pthreadwrapper/singleton.h b/include/pthreadwrapper/singleton.h
new file mode 100644
index 0000000..bfe99ad
--- /dev/null
+++ b/include/pthreadwrapper/singleton.h
@@ -0,0 +1,69 @@
+#ifndef _pthread_singleton_
+#define _pthread_singleton_
+
+#include "noncopyable.h"
+#include "guard.h"
+
+#include <cassert>
+
+namespace PThread
+{
+
+//! SingletonDestroyer
+template <class T>
+class Destroyer {
+  
+  T* doomed;
+  
+ public:
+  
+  Destroyer(T* q) : doomed(q) {
+    assert(doomed);
+  }
+  
+  ~Destroyer();
+
+};
+
+template <class T>
+Destroyer<T>::~Destroyer() {
+  
+  try {
+    
+    if(doomed)
+      delete doomed;
+    
+  } catch(...) { }
+  
+  doomed = 0;
+  
+}   
+
+template <class T>
+class Singleton:public NonCopyable
+{
+public:
+
+	static T *Instance();
+
+private:
+	
+};
+
+template <class T>
+T *Singleton<T>::Instance()
+{
+	static T *obj=0;
+	static Mutex mutex;
+	Guard g(mutex);
+	if(obj==0)
+	{
+		obj=new T();
+		static Destroyer<T> des(obj);
+	}
+	return const_cast<T*>(obj);
+}
+
+}	// namespace
+
+#endif	// _pthread_singleton_
diff --git a/include/pthreadwrapper/thread.h b/include/pthreadwrapper/thread.h
new file mode 100644
index 0000000..18e731e
--- /dev/null
+++ b/include/pthreadwrapper/thread.h
@@ -0,0 +1,40 @@
+#ifndef _pthread_thread_
+#define _pthread_thread_
+
+#include "noncopyable.h"
+#include "runnable.h"
+#include <pthread.h>
+
+namespace PThread
+{
+
+class Runnable;
+
+class Thread:public NonCopyable
+{
+public:
+	Thread();
+	Thread(Runnable *runnable);
+	~Thread();
+
+	void Join();
+	void Cancel();
+
+	void Sleep(const long ms);
+	const bool IsCancelled()	{ return m_cancelled; }
+	const bool IsRunning()		{ return m_running; }
+
+private:
+	void Start();
+	static void *EntryPoint(void *pthis);
+
+	pthread_t m_thread;
+	bool m_running;				// thread (object) is currently running
+	bool m_cancelled;
+	Runnable *m_runnable;		// actual object that is being run
+
+};
+
+}	// namespace
+
+#endif	// _pthread_thread_
diff --git a/src/commandthread.cpp b/src/commandthread.cpp
index 7d872f0..8b9ddc3 100644
--- a/src/commandthread.cpp
+++ b/src/commandthread.cpp
@@ -44,17 +44,21 @@ void CommandThread::HandleQuit()
 	m_running=false;	
 }
 
-void CommandThread::run()
+void CommandThread::Run()
 {
 	std::string input;
 	m_running=true;
+
+	m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"CommandThread::run thread started.");
 	
 	do
 	{
+
+		std::cout << ">";
 		std::cin >> input;
 		
 		HandleInput(input);
 		
-	}while(m_running==true);
+	}while(m_running && !IsCancelled());
 	
 }
diff --git a/src/db/sqlite3db.cpp b/src/db/sqlite3db.cpp
index 809fc68..1b63715 100644
--- a/src/db/sqlite3db.cpp
+++ b/src/db/sqlite3db.cpp
@@ -30,7 +30,8 @@ const bool DB::Close()
 {
 	if(IsOpen())
 	{
-		ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		PThread::Guard g(m_mutex);
 		m_lastresult=sqlite3_close(m_db);
 		if(m_lastresult==SQLITE_OK)
 		{
@@ -52,7 +53,8 @@ const bool DB::Execute(const std::string &sql)
 {
 	if(IsOpen())
 	{
-		ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		PThread::Guard g(m_mutex);
 		m_lastresult=sqlite3_exec(m_db,sql.c_str(),NULL,NULL,NULL);
 		if(m_lastresult==SQLITE_OK)
 		{
@@ -73,7 +75,8 @@ const bool DB::ExecuteInsert(const std::string &sql, long &insertid)
 {
 	if(IsOpen())
 	{
-		ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		PThread::Guard g(m_mutex);
 		m_lastresult=sqlite3_exec(m_db,sql.c_str(),NULL,NULL,NULL);
 		if(m_lastresult==SQLITE_OK)
 		{
@@ -95,7 +98,8 @@ const int DB::GetLastError(std::string &errormessage)
 {
 	if(IsOpen())
 	{
-		ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		PThread::Guard g(m_mutex);
 		int errcode=sqlite3_errcode(m_db);
 		const char *errmsg=sqlite3_errmsg(m_db);
 		if(errmsg)
@@ -118,7 +122,8 @@ void DB::Initialize()
 
 const bool DB::IsOpen()
 {
-	ZThread::Guard<ZThread::Mutex> g(m_mutex);
+	//ZThread::Guard<ZThread::Mutex> g(m_mutex);
+	PThread::Guard g(m_mutex);
 	return m_db ? true : false; 
 }
 
@@ -130,7 +135,8 @@ const bool DB::Open(const std::string &filename)
 	}
 	if(IsOpen()==false)
 	{
-		ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		PThread::Guard g(m_mutex);
 		m_lastresult=sqlite3_open(filename.c_str(),&m_db);
 		if(m_lastresult==SQLITE_OK)
 		{
@@ -151,7 +157,8 @@ Statement DB::Prepare(const std::string &sql)
 {
 	if(IsOpen())
 	{
-		ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		PThread::Guard g(m_mutex);
 		sqlite3_stmt *statement=NULL;
 		m_lastresult=sqlite3_prepare_v2(m_db,sql.c_str(),sql.size(),&statement,NULL);
 		if(m_lastresult==SQLITE_OK)
@@ -173,7 +180,8 @@ Recordset DB::Query(const std::string &sql)
 {
 	if(IsOpen())
 	{
-		ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		PThread::Guard g(m_mutex);
 		char **rs=NULL;
 		int rows,cols;
 		m_lastresult=sqlite3_get_table(m_db,sql.c_str(),&rs,&rows,&cols,NULL);
@@ -197,10 +205,15 @@ const int DB::SetBusyTimeout(const int ms)
 {
 	if(IsOpen())
 	{
-		ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(m_mutex);
+		PThread::Guard g(m_mutex);
 		m_lastresult=sqlite3_busy_timeout(m_db,ms);
 		return m_lastresult;
 	}
+	else
+	{
+		return SQLITE_ERROR;
+	}
 }
 
 }	// namespace
diff --git a/src/db/sqlite3recordset.cpp b/src/db/sqlite3recordset.cpp
index e9cdf5f..9ddfb23 100644
--- a/src/db/sqlite3recordset.cpp
+++ b/src/db/sqlite3recordset.cpp
@@ -76,7 +76,8 @@ void Recordset::Open(const std::string &sql, DB *db)
 	Free();
 	m_currentrow=0;
 
-	ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+	//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+	PThread::Guard g(DB::Instance()->m_mutex);
 	if(sqlite3_get_table(db->GetDB(),sql.c_str(),&m_rs,&m_rows,&m_cols,NULL)==SQLITE_OK)
 	{
 	}
diff --git a/src/db/sqlite3statement.cpp b/src/db/sqlite3statement.cpp
index 39c699f..54c26fe 100644
--- a/src/db/sqlite3statement.cpp
+++ b/src/db/sqlite3statement.cpp
@@ -58,7 +58,8 @@ const bool Statement::Bind(const int column)
 {
 	if(Valid() && column>=0 && column<m_parametercount)
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_null(m_statement,column+1)==SQLITE_OK)
 		{
 			return true;
@@ -78,7 +79,8 @@ const bool Statement::Bind(const int column, const int value)
 {
 	if(Valid() && column>=0 && column<m_parametercount)
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_int(m_statement,column+1,value)==SQLITE_OK)
 		{
 			return true;
@@ -98,7 +100,8 @@ const bool Statement::Bind(const int column, const double value)
 {
 	if(Valid() && column>=0 && column<m_parametercount)
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_double(m_statement,column+1,value)==SQLITE_OK)
 		{
 			return true;
@@ -122,7 +125,8 @@ const bool Statement::Bind(const int column, const std::string &value)
 		strncpy(text,value.c_str(),value.size());
 		text[value.size()]=NULL;
 		textptrs.push_back(text);
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_text(m_statement,column+1,text,value.size(),NULL)==SQLITE_OK)
 		{
 			return true;
@@ -142,7 +146,8 @@ const bool Statement::Bind(const int column, const void *data, const int length)
 {
 	if(Valid() && column>=0 && column<m_parametercount)
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_blob(m_statement,column+1,data,length,NULL)==SQLITE_OK)
 		{
 			return true;
@@ -162,7 +167,8 @@ void Statement::Finalize()
 {
 	if(m_statement)
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		m_statementcount[m_statement]--;
 		if(m_statementcount[m_statement]<=0)
 		{
@@ -186,7 +192,8 @@ Statement &Statement::operator=(const Statement &rhs)
 
 		if(m_statement)
 		{
-			ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+			//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+			PThread::Guard g(DB::Instance()->m_mutex);
 			m_statementcount[m_statement]++;
 		}
 	}
@@ -197,7 +204,8 @@ const bool Statement::Reset()
 {
 	if(Valid())
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_reset(m_statement)==SQLITE_OK)
 		{
 			return true;
@@ -217,7 +225,8 @@ const bool Statement::ResultBlob(const int column, void *data, int &length)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		data=(void *)sqlite3_column_blob(m_statement,column);
 		length=sqlite3_column_bytes(m_statement,column);
 		return true;
@@ -232,7 +241,8 @@ const bool Statement::ResultDouble(const int column, double &result)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		result=sqlite3_column_double(m_statement,column);
 		return true;
 	}
@@ -246,7 +256,8 @@ const bool Statement::ResultInt(const int column, int &result)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		result=sqlite3_column_int(m_statement,column);
 		return true;
 	}
@@ -260,7 +271,8 @@ const bool Statement::ResultNull(const int column)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_column_type(m_statement,column)==SQLITE_NULL)
 		{
 			return true;
@@ -280,7 +292,8 @@ const bool Statement::ResultText(const int column, std::string &result)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		const unsigned char *cresult=sqlite3_column_text(m_statement,column);
 		if(cresult)
 		{
@@ -303,7 +316,8 @@ const bool Statement::Step(const bool saveinsertrowid)
 	m_rowreturned=false;
 	if(Valid())
 	{
-		ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+		PThread::Guard g(DB::Instance()->m_mutex);
 		int result=sqlite3_step(m_statement);
 		if(result==SQLITE_OK || result==SQLITE_ROW || result==SQLITE_DONE)
 		{
@@ -313,7 +327,7 @@ const bool Statement::Step(const bool saveinsertrowid)
 			}
 			if(saveinsertrowid)
 			{
-				m_lastinsertrowid=sqlite3_last_insert_rowid(DB::instance()->GetDB());
+				m_lastinsertrowid=sqlite3_last_insert_rowid(DB::Instance()->GetDB());
 			}
 			return true;
 		}
@@ -330,7 +344,8 @@ const bool Statement::Step(const bool saveinsertrowid)
 
 const bool Statement::Valid()
 {
-	ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+	//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
+	PThread::Guard g(DB::Instance()->m_mutex);
 	return m_statement ? true : false ;
 }
 
diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index 689641f..398d8fa 100644
--- a/src/freenet/freenetmasterthread.cpp
+++ b/src/freenet/freenetmasterthread.cpp
@@ -17,7 +17,8 @@
 #include "../../include/freenet/messageinserter.h"
 #include "../../include/freenet/messagelistinserter.h"
 
-#include <zthread/Thread.h>
+//#include <zthread/Thread.h>
+#include "../../include/pthreadwrapper/thread.h"
 
 #ifdef XMEM
 	#include <xmem.h>
@@ -27,22 +28,22 @@ FreenetMasterThread::FreenetMasterThread()
 {
 	std::string fcpport;
 
-	if(Option::instance()->Get("FCPHost",m_fcphost)==false)
+	if(Option::Instance()->Get("FCPHost",m_fcphost)==false)
 	{
 		m_fcphost="localhost";
-		Option::instance()->Set("FCPHost",m_fcphost);
+		Option::Instance()->Set("FCPHost",m_fcphost);
 	}
-	if(Option::instance()->Get("FCPPort",fcpport)==false)
+	if(Option::Instance()->Get("FCPPort",fcpport)==false)
 	{
 		fcpport="9481";
-		Option::instance()->Set("FCPPort",fcpport);
+		Option::Instance()->Set("FCPPort",fcpport);
 	}
 
 	// convert fcp port to long, and make sure it's within the valid port range
 	if(StringFunctions::Convert(fcpport,m_fcpport)==false)
 	{
 		m_fcpport=9481;
-		Option::instance()->Set("FCPPort","9481");
+		Option::Instance()->Set("FCPPort","9481");
 	}
 
 	m_receivednodehello=false;
@@ -163,12 +164,14 @@ void FreenetMasterThread::RegisterPeriodicProcessor(IPeriodicProcessor *obj)
 	m_processors.push_back(obj);
 }
 
-void FreenetMasterThread::run()
+void FreenetMasterThread::Run()
 {
 
 	FCPMessage message;
 	bool done=false;
 
+	m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"FreenetMasterThread::run thread started.");
+
 	Setup();
 
 	do
@@ -181,6 +184,7 @@ void FreenetMasterThread::run()
 				m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"FreenetMasterThread::run could not connect to node.  Waiting 60 seconds.");
 
 				// wait 60 seconds - will then try to connect again
+				/*
 				try
 				{
 					ZThread::Thread::sleep(60000);
@@ -189,6 +193,11 @@ void FreenetMasterThread::run()
 				{
 					done=true;
 				}
+				*/
+				for(int i=0; i<60,!IsCancelled(); i++)
+				{
+					Sleep(1000);
+				}
 			}
 		}
 		// fcp is connected
@@ -215,7 +224,8 @@ void FreenetMasterThread::run()
 			}
 
 		}
-	}while(!ZThread::Thread::interrupted() && done==false);
+//	}while(!ZThread::Thread::interrupted() && done==false);
+	}while(!IsCancelled() && done==false);
 
 	m_fcp.Disconnect();
 
diff --git a/src/freenet/identityinserter.cpp b/src/freenet/identityinserter.cpp
index aa1f4ab..3fabf00 100644
--- a/src/freenet/identityinserter.cpp
+++ b/src/freenet/identityinserter.cpp
@@ -84,10 +84,14 @@ const bool IdentityInserter::HandleMessage(FCPMessage &message)
 			// If this is the case, we will skip updating LastInsertedIdentity so that we can insert this identity again for today
 			DateTime lastdate;
 			lastdate.Set(idparts[4]);
-			if(lastdate.GetDay()!=now.GetDay())
+			if(lastdate.GetDay()==now.GetDay())
 			{
 				m_db->Execute("UPDATE tblLocalIdentity SET InsertingIdentity='false', LastInsertedIdentity='"+now.Format("%Y-%m-%d %H:%M:%S")+"' WHERE LocalIdentityID="+idparts[1]+";");
 			}
+			else
+			{
+				m_db->Execute("UPDATE tblLocalIdentity SET InsertingIdentity='false' WHERE LocalIdentityID="+idparts[1]+";");
+			}
 			m_db->Execute("INSERT INTO tblLocalIdentityInserts(LocalIdentityID,Day,InsertIndex) VALUES("+idparts[1]+",'"+idparts[4]+"',"+idparts[2]+");");
 			m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"IdentityInserter::HandleMessage inserted Identity xml");
 			return true;
@@ -179,7 +183,7 @@ void IdentityInserter::StartInsert(const long localidentityid)
 		}
 		StringFunctions::Convert(index,indexstr);
 
-		Option::instance()->Get("MessageBase",messagebase);
+		Option::Instance()->Get("MessageBase",messagebase);
 
 		if(rs.GetField(0))
 		{
diff --git a/src/freenet/identityintroductioninserter.cpp b/src/freenet/identityintroductioninserter.cpp
index abf1215..3c1fe5f 100644
--- a/src/freenet/identityintroductioninserter.cpp
+++ b/src/freenet/identityintroductioninserter.cpp
@@ -88,7 +88,7 @@ const bool IdentityIntroductionInserter::HandleMessage(FCPMessage &message)
 void IdentityIntroductionInserter::Initialize()
 {
 	m_inserting=false;
-	Option::instance()->Get("MessageBase",m_messagebase);
+	Option::Instance()->Get("MessageBase",m_messagebase);
 }
 
 void IdentityIntroductionInserter::Process()
diff --git a/src/freenet/identityintroductionrequester.cpp b/src/freenet/identityintroductionrequester.cpp
index dc3a120..80a27c2 100644
--- a/src/freenet/identityintroductionrequester.cpp
+++ b/src/freenet/identityintroductionrequester.cpp
@@ -177,7 +177,7 @@ const bool IdentityIntroductionRequester::HandleMessage(FCPMessage &message)
 void IdentityIntroductionRequester::Initialize()
 {
 	std::string tempval="";
-	Option::instance()->Get("MaxIdentityIntroductionRequests",tempval);
+	Option::Instance()->Get("MaxIdentityIntroductionRequests",tempval);
 	StringFunctions::Convert(tempval,m_maxrequests);
 	if(m_maxrequests<1)
 	{
@@ -188,7 +188,7 @@ void IdentityIntroductionRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxIdentityIntroductionRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
-	Option::instance()->Get("MessageBase",m_messagebase);
+	Option::Instance()->Get("MessageBase",m_messagebase);
 	m_tempdate.SetToGMTime();
 }
 
diff --git a/src/freenet/identityrequester.cpp b/src/freenet/identityrequester.cpp
index 9dc58e1..22b4b0b 100644
--- a/src/freenet/identityrequester.cpp
+++ b/src/freenet/identityrequester.cpp
@@ -197,7 +197,7 @@ const bool IdentityRequester::HandleMessage(FCPMessage &message)
 void IdentityRequester::Initialize()
 {
 	std::string tempval="";
-	Option::instance()->Get("MaxIdentityRequests",tempval);
+	Option::Instance()->Get("MaxIdentityRequests",tempval);
 	StringFunctions::Convert(tempval,m_maxrequests);
 	if(m_maxrequests<1)
 	{
@@ -208,7 +208,7 @@ void IdentityRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxIdentityRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
-	Option::instance()->Get("MessageBase",m_messagebase);
+	Option::Instance()->Get("MessageBase",m_messagebase);
 	m_tempdate.SetToGMTime();
 }
 
diff --git a/src/freenet/introductionpuzzleinserter.cpp b/src/freenet/introductionpuzzleinserter.cpp
index 9dca8e0..1b5b64f 100644
--- a/src/freenet/introductionpuzzleinserter.cpp
+++ b/src/freenet/introductionpuzzleinserter.cpp
@@ -223,7 +223,7 @@ void IntroductionPuzzleInserter::StartInsert(const long localidentityid)
 		privatekey=rs2.GetField(0);
 	}
 
-	Option::instance()->Get("MessageBase",messagebase);
+	Option::Instance()->Get("MessageBase",messagebase);
 
 	GenerateCaptcha(encodedpuzzle,solutionstring);
 
diff --git a/src/freenet/introductionpuzzlerequester.cpp b/src/freenet/introductionpuzzlerequester.cpp
index c42e4cb..91c127e 100644
--- a/src/freenet/introductionpuzzlerequester.cpp
+++ b/src/freenet/introductionpuzzlerequester.cpp
@@ -169,7 +169,7 @@ const bool IntroductionPuzzleRequester::HandleMessage(FCPMessage &message)
 void IntroductionPuzzleRequester::Initialize()
 {
 	std::string tempval="";
-	Option::instance()->Get("MaxIntroductionPuzzleRequests",tempval);
+	Option::Instance()->Get("MaxIntroductionPuzzleRequests",tempval);
 	StringFunctions::Convert(tempval,m_maxrequests);
 	if(m_maxrequests<1)
 	{
@@ -180,7 +180,7 @@ void IntroductionPuzzleRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxIntroductionPuzzleRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
-	Option::instance()->Get("MessageBase",m_messagebase);
+	Option::Instance()->Get("MessageBase",m_messagebase);
 	m_tempdate.SetToGMTime();
 }
 
diff --git a/src/freenet/messageinserter.cpp b/src/freenet/messageinserter.cpp
index d28e262..cc7cfd5 100644
--- a/src/freenet/messageinserter.cpp
+++ b/src/freenet/messageinserter.cpp
@@ -53,10 +53,13 @@ const bool MessageInserter::HandlePutFailed(FCPMessage &message)
 
 const bool MessageInserter::HandlePutSuccessful(FCPMessage &message)
 {
+	DateTime date;
+	int localidentityid;
 	int index;
 	std::vector<std::string> idparts;
 	StringFunctions::Split(message["Identifier"],"|",idparts);
 	StringFunctions::Convert(idparts[3],index);
+	StringFunctions::Convert(idparts[2],localidentityid);
 
 	SQLite3DB::Statement st=m_db->Prepare("UPDATE tblMessageInserts SET Day=?, InsertIndex=?, Inserted='true' WHERE MessageUUID=?;");
 	st.Bind(0,idparts[5]);
@@ -64,6 +67,13 @@ const bool MessageInserter::HandlePutSuccessful(FCPMessage &message)
 	st.Bind(2,idparts[1]);
 	st.Step();
 
+	// insert record into temp table so MessageList will be inserted ASAP
+	date.SetToGMTime();
+	st=m_db->Prepare("INSERT INTO tmpMessageListInsert(LocalIdentityID,Date) VALUES(?,?);");
+	st.Bind(0,localidentityid);
+	st.Bind(1,date.Format("%Y-%m-%d"));
+	st.Step();
+
 	RemoveFromInsertList(idparts[1]);
 
 	m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageInserter::HandlePutSuccessful successfully inserted message "+message["Identifier"]);
diff --git a/src/freenet/messagelistinserter.cpp b/src/freenet/messagelistinserter.cpp
index 1e3a92a..b608145 100644
--- a/src/freenet/messagelistinserter.cpp
+++ b/src/freenet/messagelistinserter.cpp
@@ -21,6 +21,7 @@ void MessageListInserter::CheckForNeededInsert()
 	// only do 1 insert at a time
 	if(m_inserting.size()==0)
 	{
+		std::string sql;
 		DateTime now;
 		DateTime previous;
 
@@ -29,8 +30,13 @@ void MessageListInserter::CheckForNeededInsert()
 
 		previous.Add(0,0,0,-m_daysbackward);
 
-		// query for identities that have messages in the past X days and we haven't inserted lists for in the past 30 minutes
-		SQLite3DB::Statement st=m_db->Prepare("SELECT tblLocalIdentity.LocalIdentityID FROM tblLocalIdentity INNER JOIN tblMessageInserts ON tblLocalIdentity.LocalIdentityID=tblMessageInserts.LocalIdentityID WHERE tblMessageInserts.Day>=? AND (tblLocalIdentity.LastInsertedMessageList<=? OR tblLocalIdentity.LastInsertedMessageList IS NULL OR tblLocalIdentity.LastInsertedMessageList='');");
+		// query for identities that have messages in the past X days and (we haven't inserted lists for in the past 30 minutes OR identity has a record in tmpMessageListInsert)
+		sql="SELECT tblLocalIdentity.LocalIdentityID ";
+		sql+="FROM tblLocalIdentity INNER JOIN tblMessageInserts ON tblLocalIdentity.LocalIdentityID=tblMessageInserts.LocalIdentityID ";
+		sql+="WHERE tblMessageInserts.Day>=? AND ((tblLocalIdentity.LastInsertedMessageList<=? OR tblLocalIdentity.LastInsertedMessageList IS NULL OR tblLocalIdentity.LastInsertedMessageList='') OR tblLocalIdentity.LocalIdentityID IN (SELECT LocalIdentityID FROM tmpMessageListInsert)) ";
+		sql+=";";
+
+		SQLite3DB::Statement st=m_db->Prepare(sql);
 		st.Bind(0,previous.Format("%Y-%m-%d"));
 		st.Bind(1,(now-(1.0/48.0)).Format("%Y-%m-%d %H:%M:%S"));
 		st.Step();
@@ -93,8 +99,15 @@ const bool MessageListInserter::HandlePutSuccessful(FCPMessage &message)
 	st.Bind(1,localidentityid);
 	st.Step();
 
+	// delete any record from tmpMessageListInsert
+	st=m_db->Prepare("DELETE FROM tmpMessageListInsert WHERE LocalIdentityID=?;");
+	st.Bind(0,localidentityid);
+	st.Step();
+
 	RemoveFromInsertList(localidentityid);
 
+	m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageListInserter::HandlePutSuccessful successfully inserted MessageList.");
+
 	return true;
 }
 
@@ -104,7 +117,7 @@ void MessageListInserter::Initialize()
 
 	m_fcpuniquename="MessageListInserter";
 	m_daysbackward=0;
-	Option::instance()->Get("MessageListDaysBackward",tempval);
+	Option::Instance()->Get("MessageListDaysBackward",tempval);
 	StringFunctions::Convert(tempval,m_daysbackward);
 }
 
diff --git a/src/freenet/messagelistrequester.cpp b/src/freenet/messagelistrequester.cpp
index 2a13af7..c5ef11c 100644
--- a/src/freenet/messagelistrequester.cpp
+++ b/src/freenet/messagelistrequester.cpp
@@ -139,7 +139,7 @@ void MessageListRequester::Initialize()
 {
 	m_fcpuniquename="MessageListRequester";
 	std::string tempval;
-	Option::instance()->Get("MaxMessageListRequests",tempval);
+	Option::Instance()->Get("MaxMessageListRequests",tempval);
 	StringFunctions::Convert(tempval,m_maxrequests);
 	if(m_maxrequests<1)
 	{
diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index d59a7c0..c2e3a21 100644
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -209,7 +209,7 @@ void MessageRequester::Initialize()
 {
 	m_fcpuniquename="MessageRequester";
 	std::string tempval;
-	Option::instance()->Get("MaxMessageRequests",tempval);
+	Option::Instance()->Get("MaxMessageRequests",tempval);
 	StringFunctions::Convert(tempval,m_maxrequests);
 	if(m_maxrequests<1)
 	{
@@ -220,7 +220,7 @@ void MessageRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxMessageRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
-	Option::instance()->Get("MessageDownloadMaxDaysBackward",tempval);
+	Option::Instance()->Get("MessageDownloadMaxDaysBackward",tempval);
 	StringFunctions::Convert(tempval,m_maxdaysbackward);
 	if(m_maxdaysbackward<0)
 	{
@@ -239,11 +239,18 @@ void MessageRequester::PopulateIDList()
 	std::string val1;
 	std::string val2;
 	std::string val3;
+	std::string sql;
 
 	date.SetToGMTime();
 	date.Add(0,0,0,-m_maxdaysbackward);
 
-	SQLite3DB::Statement st=m_db->Prepare("SELECT tblIdentity.IdentityID,Day,RequestIndex FROM tblMessageRequests INNER JOIN tblIdentity ON tblMessageRequests.IdentityID=tblIdentity.IdentityID WHERE tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') AND FromMessageList='true' AND Found='false' AND Day>='"+date.Format("%Y-%m-%d")+"';");
+	sql="SELECT tblIdentity.IdentityID,Day,RequestIndex ";
+	sql+="FROM tblMessageRequests INNER JOIN tblIdentity ON tblMessageRequests.IdentityID=tblIdentity.IdentityID ";
+	sql+="WHERE tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') AND FromMessageList='true' AND Found='false' AND Day>='"+date.Format("%Y-%m-%d")+"' ";
+	sql+="AND (tblIdentity.PeerMessageTrust IS NULL OR tblIdentity.PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ";
+	sql+=";";
+
+	SQLite3DB::Statement st=m_db->Prepare(sql);
 	st.Step();
 
 	while(st.RowReturned())
@@ -296,4 +303,4 @@ void MessageRequester::StartRequest(const std::string &requestid)
 	
 	m_ids[requestid]=true;
 
-}
\ No newline at end of file
+}
diff --git a/src/freenet/trustlistinserter.cpp b/src/freenet/trustlistinserter.cpp
index 6cd8843..b22453d 100644
--- a/src/freenet/trustlistinserter.cpp
+++ b/src/freenet/trustlistinserter.cpp
@@ -93,7 +93,7 @@ const bool TrustListInserter::HandleMessage(FCPMessage &message)
 
 void TrustListInserter::Initialize()
 {
-	Option::instance()->Get("MessageBase",m_messagebase);
+	Option::Instance()->Get("MessageBase",m_messagebase);
 	m_lastchecked.SetToGMTime();
 }
 
diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index f14fc5b..1d20869 100644
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -205,7 +205,7 @@ const bool TrustListRequester::HandleMessage(FCPMessage &message)
 void TrustListRequester::Initialize()
 {
 	std::string tempval="";
-	Option::instance()->Get("MaxIdentityRequests",tempval);
+	Option::Instance()->Get("MaxIdentityRequests",tempval);
 	StringFunctions::Convert(tempval,m_maxrequests);
 	if(m_maxrequests<1)
 	{
@@ -216,7 +216,7 @@ void TrustListRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxTrustListRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
-	Option::instance()->Get("MessageBase",m_messagebase);
+	Option::Instance()->Get("MessageBase",m_messagebase);
 	m_tempdate.SetToGMTime();
 }
 
@@ -224,11 +224,16 @@ void TrustListRequester::PopulateIDList()
 {
 	DateTime date;
 	int id;
+	std::string sql;
 
 	date.SetToGMTime();
 
 	// select identities we want to query (we've seen them today and they are publishing trust list) - sort by their trust level (descending) with secondary sort on how long ago we saw them (ascending)
-	SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND PublishTrustList='true' AND LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust') ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
+	sql="SELECT IdentityID FROM tblIdentity ";
+	sql+="WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND PublishTrustList='true' AND LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust') AND ( PeerTrustListTrust IS NULL OR PeerTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerTrustListTrust') )";
+	sql+="ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;";
+
+	SQLite3DB::Statement st=m_db->Prepare(sql);
 	st.Step();
 
 	m_ids.clear();
diff --git a/src/global.cpp b/src/global.cpp
index 48c3842..8552db2 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -19,7 +19,7 @@ void SetupDB()
 {
 
 	DateTime date;
-	SQLite3DB::DB *db=SQLite3DB::DB::instance();
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
 
 	db->Open("fms.db3");
 	db->SetBusyTimeout(10000);		// set timeout to 10 seconds
@@ -84,7 +84,7 @@ void SetupDB()
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblIdentity(\
 				IdentityID			INTEGER PRIMARY KEY,\
-				PublicKey			TEXT,\
+				PublicKey			TEXT UNIQUE,\
 				Name				TEXT,\
 				SingleUse			BOOL CHECK(SingleUse IN('true','false')) DEFAULT 'false',\
 				PublishTrustList	BOOL CHECK(PublishTrustList IN('true','false')) DEFAULT 'false',\
@@ -156,7 +156,7 @@ void SetupDB()
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessageReplyTo(\
 				MessageID			INTEGER,\
-				ReplyToMessageUUID	INTEGER,\
+				ReplyToMessageUUID	TEXT,\
 				ReplyOrder			INTEGER\
 				);");
 
@@ -196,20 +196,29 @@ void SetupDB()
 				Inserted			BOOL CHECK(Inserted IN('true','false')) DEFAULT 'false'\
 				);");
 
+	// MessageInserter will insert a record into this temp table which the MessageListInserter will query for and insert a MessageList when needed
+	db->Execute("CREATE TEMPORARY TABLE IF NOT EXISTS tmpMessageListInsert(\
+				LocalIdentityID		INTEGER,\
+				Date				DATETIME\
+				);");
+
 	// low / high / message count for each board
-	db->Execute("CREATE VIEW IF NOT EXISTS vwBoardStats AS \
+	db->Execute("DROP VIEW IF EXISTS vwBoardStats; \
+				CREATE VIEW IF NOT EXISTS vwBoardStats AS \
 				SELECT tblBoard.BoardID AS 'BoardID', IFNULL(MIN(MessageID),0) AS 'LowMessageID', IFNULL(MAX(MessageID),0) AS 'HighMessageID', COUNT(MessageID) AS 'MessageCount' \
 				FROM tblBoard LEFT JOIN tblMessageBoard ON tblBoard.BoardID=tblMessageBoard.BoardID \
-				WHERE MessageID>=0 \
+				WHERE MessageID>=0 OR MessageID IS NULL \
 				GROUP BY tblBoard.BoardID;");
 
 	// calculates peer trust
-	db->Execute("CREATE VIEW IF NOT EXISTS vwCalculatedPeerTrust AS \
+	db->Execute("DROP VIEW IF EXISTS vwCalculatedPeerTrust; \
+				CREATE VIEW IF NOT EXISTS vwCalculatedPeerTrust AS \
 				SELECT TargetIdentityID, \
 				ROUND(SUM(MessageTrust*(LocalMessageTrust/100.0))/SUM(LocalMessageTrust/100.0),0) AS 'PeerMessageTrust', \
 				ROUND(SUM(TrustListTrust*(LocalTrustListTrust/100.0))/SUM(LocalTrustListTrust/100.0),0) AS 'PeerTrustListTrust' \
 				FROM tblPeerTrust INNER JOIN tblIdentity ON tblPeerTrust.IdentityID=tblIdentity.IdentityID \
 				WHERE LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust') \
+				AND ( PeerTrustListTrust IS NULL OR PeerTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerTrustListTrust') ) \
 				GROUP BY TargetIdentityID;");
 
 	// update PeerTrustLevel when deleting a record from tblPeerTrust
@@ -279,6 +288,10 @@ void SetupDB()
 	db->Execute("DELETE FROM tblIntroductionPuzzleInserts WHERE Day<='"+date.Format("%Y-%m-%d")+"';");
 	db->Execute("DELETE FROM tblIntroductionPuzzleRequests WHERE Day<='"+date.Format("%Y-%m-%d")+"';");
 
+	// insert SomeDude's public key
+	date.SetToGMTime();
+//	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded) VALUES('SSK@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw,iXez4j3qCpd596TxXiJgZyTq9o-CElEuJxm~jNNZAuA,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"');");
+
 }
 
 void SetupDefaultOptions()
@@ -286,7 +299,7 @@ void SetupDefaultOptions()
 	// OptionValue should always be inserted as a string, even if the option really isn't a string - just to keep the field data type consistent
 
 	std::ostringstream tempstr;	// must set tempstr to "" between db inserts
-	SQLite3DB::DB *db=SQLite3DB::DB::instance();
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
 	SQLite3DB::Statement st=db->Prepare("INSERT INTO tblOption(Option,OptionValue,OptionDescription) VALUES(?,?,?);");
 
 	// LogLevel
@@ -394,12 +407,24 @@ void SetupDefaultOptions()
 	st.Step();
 	st.Reset();
 
+	st.Bind(0,"MinPeerMessageTrust");
+	st.Bind(1,"25");
+	st.Bind(2,"Specifies a peer message trust level that a peer must have before its messages will be downloaded.");
+	st.Step();
+	st.Reset();
+
 	st.Bind(0,"MinLocalTrustListTrust");
 	st.Bind(1,"50");
 	st.Bind(2,"Specifies a local trust list trust level that a peer must have before its trust list will be included in the weighted average.  Any peers below this number will be excluded from the results.");
 	st.Step();
 	st.Reset();
 
+	st.Bind(0,"MinPeerTrustListTrust");
+	st.Bind(1,"25");
+	st.Bind(2,"Specifies a peer trust list trust level that a peer must have before its trust list will be included in the weighted average.  Any peers below this number will be excluded from the results.");
+	st.Step();
+	st.Reset();
+
 	st.Bind(0,"MessageDownloadMaxDaysBackward");
 	st.Bind(1,"3");
 	st.Bind(2,"The maximum number of days backward that messages will be downloaded from each identity");
@@ -422,23 +447,23 @@ void SetupLogFile()
 
 	date.SetToGMTime();
 
-	LogFile::instance()->SetFileName("fms-"+date.Format("%Y-%m-%d")+".log");
-	LogFile::instance()->OpenFile();
-	LogFile::instance()->SetWriteNewLine(true);
-	LogFile::instance()->SetWriteDate(true);
-	LogFile::instance()->SetWriteLogLevel(true);
+	LogFile::Instance()->SetFileName("fms-"+date.Format("%Y-%m-%d")+".log");
+	LogFile::Instance()->OpenFile();
+	LogFile::Instance()->SetWriteNewLine(true);
+	LogFile::Instance()->SetWriteDate(true);
+	LogFile::Instance()->SetWriteLogLevel(true);
 
-	if(Option::instance()->Get("LogLevel",configval)==false)
+	if(Option::Instance()->Get("LogLevel",configval)==false)
 	{
 		configval="4";
-		Option::instance()->Set("LogLevel",configval);
+		Option::Instance()->Set("LogLevel",configval);
 	}
 	if(StringFunctions::Convert(configval,loglevel)==false)
 	{
 		loglevel=LogFile::LOGLEVEL_DEBUG;
-		Option::instance()->Set("LogLevel",loglevel);
+		Option::Instance()->Set("LogLevel",loglevel);
 	}
-	LogFile::instance()->SetLogLevel((LogFile::LogLevel)loglevel);
+	LogFile::Instance()->SetLogLevel((LogFile::LogLevel)loglevel);
 }
 
 void SetupNetwork()
@@ -456,12 +481,12 @@ void ShutdownNetwork()
 #endif
 }
 
-void ShutdownThreads(std::vector<ZThread::Thread *> &threads)
+void ShutdownThreads(std::vector<PThread::Thread *> &threads)
 {
-	std::vector<ZThread::Thread *>::iterator i;
+	std::vector<PThread::Thread *>::iterator i;
 	for(i=threads.begin(); i!=threads.end(); i++)
 	{
-		if((*i)->wait(1)==false)
+/*		if((*i)->wait(1)==false)
 		{
 			try
 			{
@@ -471,12 +496,15 @@ void ShutdownThreads(std::vector<ZThread::Thread *> &threads)
 			{
 			}
 		}
+		*/
+		(*i)->Cancel();
 	}
 
 	for(i=threads.begin(); i!=threads.end(); i++)
 	{
-		LogFile::instance()->WriteLog(LogFile::LOGLEVEL_DEBUG,"ShutdownThreads waiting for thread to exit.");
-		(*i)->wait();
+		LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_DEBUG,"ShutdownThreads waiting for thread to exit.");
+		//(*i)->wait();
+		(*i)->Join();
 		delete (*i);
 	}
 
@@ -484,32 +512,32 @@ void ShutdownThreads(std::vector<ZThread::Thread *> &threads)
 
 }
 
-void StartThreads(std::vector<ZThread::Thread *> &threads)
+void StartThreads(std::vector<PThread::Thread *> &threads)
 {
 	std::string startfreenet;
 	std::string startnntp;
 
-	if(Option::instance()->Get("StartFreenetUpdater",startfreenet)==false)
+	if(Option::Instance()->Get("StartFreenetUpdater",startfreenet)==false)
 	{
 		startfreenet="true";
-		Option::instance()->Set("StartFreenetUpdater","true");
+		Option::Instance()->Set("StartFreenetUpdater","true");
 	}
 
-	if(Option::instance()->Get("StartNNTP",startnntp)==false)
+	if(Option::Instance()->Get("StartNNTP",startnntp)==false)
 	{
 		startnntp="true";
-		Option::instance()->Set("StartNNTP","true");
+		Option::Instance()->Set("StartNNTP","true");
 	}
 
 	if(startfreenet=="true")
 	{
-		ZThread::Thread *t=new ZThread::Thread(new FreenetMasterThread());
+		PThread::Thread *t=new PThread::Thread(new FreenetMasterThread());
 		threads.push_back(t);
 	}
 
 	if(startnntp=="true")
 	{
-		ZThread::Thread *t=new ZThread::Thread(new NNTPListener());
+		PThread::Thread *t=new PThread::Thread(new NNTPListener());
 		threads.push_back(t);
 	}
 
diff --git a/src/logfile.cpp b/src/logfile.cpp
index ab5b86f..7e632f9 100644
--- a/src/logfile.cpp
+++ b/src/logfile.cpp
@@ -36,7 +36,8 @@ LogFile::~LogFile()
 
 bool LogFile::CloseFile()
 {
-	ZThread::Guard<ZThread::Mutex> g(m_logmutex);
+	//ZThread::Guard<ZThread::Mutex> g(m_logmutex);
+	PThread::Guard g(m_logmutex);
 
 	if(m_fileptr)
 	{
@@ -51,7 +52,8 @@ bool LogFile::OpenFile()
 {
 	CloseFile();
 
-	ZThread::Guard<ZThread::Mutex> g(m_logmutex);
+	//ZThread::Guard<ZThread::Mutex> g(m_logmutex);
+	PThread::Guard g(m_logmutex);
 
 	m_fileptr=fopen(m_filename.c_str(),"a+b");
 
@@ -91,7 +93,8 @@ void LogFile::WriteLog(const char *format, ...)
 	
 	if(m_fileptr)
 	{
-		ZThread::Guard<ZThread::Mutex> g(m_logmutex);
+		//ZThread::Guard<ZThread::Mutex> g(m_logmutex);
+		PThread::Guard g(m_logmutex);
 		if(m_writedate)
 		{
 			WriteDate();
@@ -117,7 +120,8 @@ void LogFile::WriteLog(const std::string &text)
 	
 	if(m_fileptr)
 	{
-		ZThread::Guard<ZThread::Mutex> g(m_logmutex);
+		//ZThread::Guard<ZThread::Mutex> g(m_logmutex);
+		PThread::Guard g(m_logmutex);
 		if(m_writedate)
 		{
 			WriteDate();	
@@ -146,7 +150,8 @@ void LogFile::WriteLog(const LogLevel level, const char *format, ...)
 		
 		if(m_fileptr)
 		{
-			ZThread::Guard<ZThread::Mutex> g(m_logmutex);
+			//ZThread::Guard<ZThread::Mutex> g(m_logmutex);
+			PThread::Guard g(m_logmutex);
 			if(m_writedate)
 			{
 				WriteDate();	
@@ -178,7 +183,8 @@ void LogFile::WriteLog(const LogLevel level, const std::string &text)
 		
 		if(m_fileptr)
 		{
-			ZThread::Guard<ZThread::Mutex> g(m_logmutex);
+			//ZThread::Guard<ZThread::Mutex> g(m_logmutex);
+			PThread::Guard g(m_logmutex);
 			if(m_writedate)
 			{
 				WriteDate();	
@@ -227,7 +233,8 @@ void LogFile::WriteLogLevel(LogLevel level)
 
 void LogFile::WriteNewLine()
 {
-	ZThread::Guard<ZThread::Mutex> g(m_logmutex);
+	//ZThread::Guard<ZThread::Mutex> g(m_logmutex);
+	PThread::Guard g(m_logmutex);
 
 	if(m_fileptr)
 	{
diff --git a/src/main.cpp b/src/main.cpp
index 069cb90..3e135a0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,7 +14,7 @@ int main()
 		xmem_disable_print();
 	#endif
 
-	std::vector<ZThread::Thread *> threads;
+	std::vector<PThread::Thread *> threads;
 
 	srand(time(NULL));
 
@@ -26,22 +26,23 @@ int main()
 
 	SetupNetwork();
 
-	LogFile::instance()->WriteLog(LogFile::LOGLEVEL_INFO,"FMS startup v"FMS_VERSION);
+	LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_INFO,"FMS startup v"FMS_VERSION);
 
 
 	StartThreads(threads);
 
 
-	ZThread::Thread commandthread(new CommandThread());
-	commandthread.wait();
+	//ZThread::Thread commandthread(new CommandThread());
+	PThread::Thread commandthread(new CommandThread());
+	commandthread.Join();
 
 
 	ShutdownThreads(threads);
 
 	ShutdownNetwork();
 
-	LogFile::instance()->WriteLog(LogFile::LOGLEVEL_INFO,"FMS shutdown");
-	LogFile::instance()->WriteNewLine();
+	LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_INFO,"FMS shutdown");
+	LogFile::Instance()->WriteNewLine();
 
 	return 0;
 }
diff --git a/src/message.cpp b/src/message.cpp
index c15b530..f4d3a95 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -179,10 +179,10 @@ const bool Message::Load(const std::string &messageuuid)
 
 const bool Message::LoadNext(const long messageid, const long boardid)
 {
-	std::string sql="SELECT MessageID FROM tblMessage WHERE MessageID>?";
+	std::string sql="SELECT tblMessage.MessageID FROM tblMessage INNER JOIN tblMessageBoard ON tblMessage.MessageID=tblMessageBoard.MessageID WHERE tblMessage.MessageID>?";
 	if(boardid!=-1)
 	{
-		sql+=" AND BoardID=?";
+		sql+=" AND tblMessageBoard.BoardID=?";
 	}
 	sql+=";";
 
@@ -209,12 +209,12 @@ const bool Message::LoadNext(const long messageid, const long boardid)
 
 const bool Message::LoadPrevious(const long messageid, const long boardid)
 {
-	std::string sql="SELECT MessageID FROM tblMessage WHERE MessageID<?";
+	std::string sql="SELECT tblMessage.MessageID FROM tblMessage INNER JOIN tblMessageBoard ON tblMessage.MessageID=tblMessageBoard.MessageID WHERE tblMessage.MessageID<?";
 	if(boardid!=-1)
 	{
-		sql+=" AND BoardID=?";
+		sql+=" AND tblMessageBoard.BoardID=?";
 	}
-	sql+=";";
+	sql+=" ORDER BY tblMessage.MessageID DESC;";
 
 	SQLite3DB::Statement st=m_db->Prepare(sql);
 
diff --git a/src/nntp/nntpconnection.cpp b/src/nntp/nntpconnection.cpp
index d677c8f..0ccef18 100644
--- a/src/nntp/nntpconnection.cpp
+++ b/src/nntp/nntpconnection.cpp
@@ -7,7 +7,10 @@
 #include "../../include/messagelist.h"
 #include "../../include/option.h"
 
-#include <zthread/Thread.h>
+#include <algorithm>
+
+//#include <zthread/Thread.h>
+#include "../../include/pthreadwrapper/thread.h"
 
 #ifdef XMEM
 	#include <xmem.h>
@@ -26,7 +29,7 @@ NNTPConnection::NNTPConnection(SOCKET sock)
 	m_status.m_messageid=-1;
 	m_status.m_mode=MODE_NONE;
 
-	Option::instance()->Get("NNTPAllowPost",tempval);
+	Option::Instance()->Get("NNTPAllowPost",tempval);
 	if(tempval=="true")
 	{
 		m_status.m_allowpost=true;
@@ -230,7 +233,7 @@ const bool NNTPConnection::HandleLastCommand(const NNTPCommand &command)
 		{
 			Message mess;
 
-			if(mess.Load(m_status.m_messageid,m_status.m_boardid))
+			if(mess.LoadPrevious(m_status.m_messageid,m_status.m_boardid))
 			{
 				std::ostringstream tempstr;
 
@@ -583,7 +586,7 @@ const bool NNTPConnection::HandleNextCommand(const NNTPCommand &command)
 		{
 			Message mess;
 
-			if(mess.Load(m_status.m_messageid,m_status.m_boardid))
+			if(mess.LoadNext(m_status.m_messageid,m_status.m_boardid))
 			{
 				std::ostringstream tempstr;
 
@@ -862,7 +865,7 @@ const bool NNTPConnection::HandleQuitCommand(const NNTPCommand &command)
 	return true;
 }
 
-void NNTPConnection::run()
+void NNTPConnection::Run()
 {
 	struct timeval tv;
 	fd_set writefs,readfs;
@@ -908,15 +911,16 @@ void NNTPConnection::run()
 				SocketSend();
 			}
 		}
-		else if(rval==-1)
+		else if(rval==SOCKET_ERROR)
 		{
 			m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"NNTPConnection::run select returned -1 : "+GetSocketErrorMessage());	
 		}
 
-	}while(!Disconnected() && !ZThread::Thread::interrupted());
-	
+//	}while(!Disconnected() && !ZThread::Thread::interrupted());
+	}while(!Disconnected() && !IsCancelled());
+
 	Disconnect();
-	
+
 }
 
 void NNTPConnection::SendArticleOverInfo(Message &message)
diff --git a/src/nntp/nntplistener.cpp b/src/nntp/nntplistener.cpp
index 01b008d..26f68bc 100644
--- a/src/nntp/nntplistener.cpp
+++ b/src/nntp/nntplistener.cpp
@@ -27,7 +27,7 @@ NNTPListener::~NNTPListener()
 
 }
 
-void NNTPListener::run()
+void NNTPListener::Run()
 {
 	int rval;
 	fd_set readfs;
@@ -35,6 +35,8 @@ void NNTPListener::run()
 	std::vector<SOCKET>::iterator listeni;
 	SOCKET highsocket;
 
+	LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_DEBUG,"NNTPListener::run thread started.");
+
 	StartListen();
 
 	do
@@ -69,17 +71,34 @@ void NNTPListener::run()
 				{
 					SOCKET newsock;
 					struct sockaddr_storage addr;
-					int addrlen=sizeof(addr);
+					socklen_t addrlen=sizeof(addr);
 					newsock=accept((*listeni),(struct sockaddr *)&addr,&addrlen);
-					LogFile::instance()->WriteLog(LogFile::LOGLEVEL_INFO,"NNTPListener::run NNTP client connected");
-					m_connections.execute(new NNTPConnection(newsock));
+					LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_INFO,"NNTPListener::run NNTP client connected");
+					//m_connections.execute(new NNTPConnection(newsock));
+					m_connectionthreads.push_back(new PThread::Thread(new NNTPConnection(newsock)));
 				}
 			}
 		}
 
-	}while(!ZThread::Thread::interrupted() && m_listensockets.size()>0);
+		// check for any non-running connection threads that we can delete
+		for(std::vector<PThread::Thread *>::iterator i=m_connectionthreads.begin(); i!=m_connectionthreads.end(); )
+		{
+			if((*i)->IsRunning()==false)
+			{
+				delete (*i);
+				i=m_connectionthreads.erase(i);
+			}
+			if(i!=m_connectionthreads.end())
+			{
+				i++;
+			}
+		}
+
+	//}while(!ZThread::Thread::interrupted() && m_listensockets.size()>0);
+	}while(!IsCancelled() && m_listensockets.size()>0);
 
 	// see if any threads are still running - just calling interrupt without check would cause assert in debug mode
+	/*
 	if(m_connections.wait(1)==false)
 	{
 		LogFile::instance()->WriteLog(LogFile::LOGLEVEL_DEBUG,"NNTPListener::run interrupting connection threads and waiting 60 seconds for exit.");
@@ -91,11 +110,22 @@ void NNTPListener::run()
 		{
 			LogFile::instance()->WriteLog(LogFile::LOGLEVEL_DEBUG,"NNTPListener::run caught unhandled exception.");
 		}
-		if(m_connections.wait(60)==false)
+		if(m_connections.wait(60000)==false)
 		{
 			LogFile::instance()->WriteLog(LogFile::LOGLEVEL_DEBUG,"NNTPListener::run connection threads did not exit after 60 seconds.");
 		}
 	}
+	*/
+	for(std::vector<PThread::Thread *>::iterator i=m_connectionthreads.begin(); i!=m_connectionthreads.end(); i++)
+	{
+		if((*i)->IsRunning())
+		{
+			LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_DEBUG,"NNTPListener::Run waiting for connection thread to exit.");
+			(*i)->Cancel();
+			(*i)->Join();
+		}
+		delete (*i);
+	}
 
 	for(listeni=m_listensockets.begin(); listeni!=m_listensockets.end(); listeni++)
 	{
@@ -115,15 +145,15 @@ void NNTPListener::StartListen()
 	std::string bindaddresses;
 	std::vector<std::string> listenaddresses;
 	std::string nntpport;
-	if(Option::instance()->Get("NNTPListenPort",nntpport)==false)
+	if(Option::Instance()->Get("NNTPListenPort",nntpport)==false)
 	{
 		nntpport="1119";
-		Option::instance()->Set("NNTPListenPort",nntpport);
+		Option::Instance()->Set("NNTPListenPort",nntpport);
 	}
-	if(Option::instance()->Get("NNTPBindAddresses",bindaddresses)==false)
+	if(Option::Instance()->Get("NNTPBindAddresses",bindaddresses)==false)
 	{
 		bindaddresses="127.0.0.1";
-		Option::instance()->Set("NNTPBindAddresses",bindaddresses);
+		Option::Instance()->Set("NNTPBindAddresses",bindaddresses);
 	}
 	StringFunctions::Split(bindaddresses,",",listenaddresses);
 	
@@ -150,12 +180,12 @@ void NNTPListener::StartListen()
 					{
 						if(listen(sock,10)==0)
 						{
-							LogFile::instance()->WriteLog(LogFile::LOGLEVEL_INFO,"NNTPListener::StartListen started listening at "+(*i)+":"+nntpport);
+							LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_INFO,"NNTPListener::StartListen started listening at "+(*i)+":"+nntpport);
 							m_listensockets.push_back(sock);
 						}
 						else
 						{
-							LogFile::instance()->WriteLog(LogFile::LOGLEVEL_ERROR,"NNTPListener::StartListen socket listen failed");
+							LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_ERROR,"NNTPListener::StartListen socket listen failed");
 							#ifdef _WIN32
 							closesocket(sock);
 							#else
@@ -165,7 +195,7 @@ void NNTPListener::StartListen()
 					}
 					else
 					{
-						LogFile::instance()->WriteLog(LogFile::LOGLEVEL_ERROR,"NNTPListener::StartListen socket bind failed");
+						LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_ERROR,"NNTPListener::StartListen socket bind failed");
 						#ifdef _WIN32
 						closesocket(sock);
 						#else
@@ -175,7 +205,7 @@ void NNTPListener::StartListen()
 				}
 				else
 				{
-					LogFile::instance()->WriteLog(LogFile::LOGLEVEL_ERROR,"NNTPListener::StartListen couldn't create socket");
+					LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_ERROR,"NNTPListener::StartListen couldn't create socket");
 				}
 			}
 		}
@@ -186,6 +216,6 @@ void NNTPListener::StartListen()
 	}
 	if(m_listensockets.size()==0)
 	{
-		LogFile::instance()->WriteLog(LogFile::LOGLEVEL_FATAL,"NNTPListener::StartListen couldn't start listening on any sockets");
+		LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_FATAL,"NNTPListener::StartListen couldn't start listening on any sockets");
 	}
 }
diff --git a/src/option.cpp b/src/option.cpp
index 61025a3..b79e90c 100644
--- a/src/option.cpp
+++ b/src/option.cpp
@@ -7,7 +7,7 @@
 
 const bool Option::Get(const std::string &option, std::string &value)
 {
-	SQLite3DB::Statement st=SQLite3DB::DB::instance()->Prepare("SELECT OptionValue FROM tblOption WHERE Option=?;");
+	SQLite3DB::Statement st=SQLite3DB::DB::Instance()->Prepare("SELECT OptionValue FROM tblOption WHERE Option=?;");
 	st.Bind(0,option);
 	st.Step();
 	if(st.RowReturned())
diff --git a/src/pthreadwrapper/guard.cpp b/src/pthreadwrapper/guard.cpp
new file mode 100644
index 0000000..81e616d
--- /dev/null
+++ b/src/pthreadwrapper/guard.cpp
@@ -0,0 +1,30 @@
+#include "../../include/pthreadwrapper/guard.h"
+#include "../../include/pthreadwrapper/mutex.h"
+
+#ifdef XMEM
+	#include <xmem.h>
+#endif
+
+namespace PThread
+{
+
+Guard::Guard()
+{
+	m_mutex=0;
+}
+
+Guard::Guard(Mutex &mutex)
+{
+	m_mutex=&mutex;
+	m_mutex->Acquire();	
+}
+
+Guard::~Guard()
+{
+	if(m_mutex)
+	{
+		m_mutex->Release();	
+	}
+}
+
+}	// namespace
diff --git a/src/pthreadwrapper/mutex.cpp b/src/pthreadwrapper/mutex.cpp
new file mode 100644
index 0000000..ca554b1
--- /dev/null
+++ b/src/pthreadwrapper/mutex.cpp
@@ -0,0 +1,42 @@
+#include "../../include/pthreadwrapper/mutex.h"
+#include <exception>
+
+#ifdef XMEM
+	#include <xmem.h>
+#endif
+
+namespace PThread
+{
+
+Mutex::Mutex()
+{
+	pthread_mutexattr_init(&m_attr);
+	pthread_mutexattr_settype(&m_attr,PTHREAD_MUTEX_ERRORCHECK);
+	pthread_mutex_init(&m_mutex,&m_attr);
+}
+
+Mutex::~Mutex()
+{
+	pthread_mutex_destroy(&m_mutex);
+	pthread_mutexattr_destroy(&m_attr);
+}
+
+void Mutex::Acquire() throw(std::exception)
+{
+	int rval=0;
+	if((rval=pthread_mutex_lock(&m_mutex))!=0)
+	{
+		// deadlock - throw exception
+		if(rval==EDEADLK)
+		{
+			throw std::exception("Mutex would deadlock!");
+		}
+	}
+}
+
+void Mutex::Release()
+{
+	pthread_mutex_unlock(&m_mutex);
+}
+
+}	// namespace
diff --git a/src/pthreadwrapper/runnable.cpp b/src/pthreadwrapper/runnable.cpp
new file mode 100644
index 0000000..aae9347
--- /dev/null
+++ b/src/pthreadwrapper/runnable.cpp
@@ -0,0 +1,30 @@
+#include "../../include/pthreadwrapper/runnable.h"
+
+#ifdef XMEM
+	#include <xmem.h>
+#endif
+
+namespace PThread
+{
+
+const bool Runnable::IsCancelled()
+{
+	if(m_thread)
+	{
+		return m_thread->IsCancelled();
+	}
+	else
+	{
+		return false;
+	}
+}
+
+void Runnable::Sleep(const long ms)
+{
+	if(m_thread)
+	{
+		m_thread->Sleep(ms);
+	}
+}
+
+}	// namespace
diff --git a/src/pthreadwrapper/thread.cpp b/src/pthreadwrapper/thread.cpp
new file mode 100644
index 0000000..466dd5c
--- /dev/null
+++ b/src/pthreadwrapper/thread.cpp
@@ -0,0 +1,97 @@
+#include "../../include/pthreadwrapper/thread.h"
+
+#include <sys/timeb.h>
+
+#ifdef XMEM
+	#include <xmem.h>
+#endif
+
+namespace PThread
+{
+
+Thread::Thread()
+{
+	m_running=false;
+	m_cancelled=false;
+	m_runnable=0;
+}
+
+Thread::Thread(Runnable *runnable)
+{
+	m_running=false;
+	m_cancelled=false;
+	m_runnable=runnable;
+	if(m_runnable)
+	{
+		m_runnable->m_thread=this;
+		Start();
+	}
+}
+
+Thread::~Thread()
+{
+	Cancel();
+	Join();
+	if(m_runnable)
+	{
+		delete m_runnable;
+	}
+}
+
+void Thread::Cancel()
+{
+	if(m_running)
+	{
+		m_cancelled=true;
+	}
+}
+
+void *Thread::EntryPoint(void *pthis)
+{
+	if(pthis)
+	{
+		((Thread *)pthis)->m_runnable->Run();
+		((Thread *)pthis)->m_running=false;
+		((Thread *)pthis)->m_cancelled=false;
+	}
+	return NULL;
+}
+
+void Thread::Join()
+{
+	if(m_running)
+	{
+		pthread_join(m_thread,NULL);
+	}
+}
+
+void Thread::Sleep(const long ms)
+{
+	if(m_running)
+	{
+		pthread_cond_t c;
+		pthread_mutex_t m;
+		timespec t;
+		timeb tb;
+
+		pthread_mutex_init(&m,NULL);
+		pthread_cond_init(&c,NULL);
+
+		ftime(&tb);
+
+		t.tv_sec=tb.time+(ms/1000);
+		t.tv_nsec=((1000000L)*(long)tb.millitm)+((1000000L)*(ms%1000));
+
+		pthread_mutex_lock(&m);
+		pthread_cond_timedwait(&c,&m,&t);
+		pthread_mutex_unlock(&m);
+	}
+}
+
+void Thread::Start()
+{
+	m_running=true;
+	pthread_create(&m_thread,NULL,Thread::EntryPoint,this);
+}
+
+}	// namespace
diff --git a/zthread-gcc4.patch b/zthread-gcc4.patch
deleted file mode 100644
index 9c3ecf6..0000000
--- a/zthread-gcc4.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -ru ZThread-2.3.2-old/include/zthread/Guard.h ZThread-2.3.2/include/zthread/Guard.h
---- ZThread-2.3.2-old/include/zthread/Guard.h	2005-03-12 21:10:09.000000000 -0500
-+++ ZThread-2.3.2/include/zthread/Guard.h	2006-09-10 14:10:08.000000000 -0400
-@@ -491,7 +491,7 @@
-     
-   try {
-     
--    if(!isDisabled())
-+    if(!LockHolder<LockType>::isDisabled())
-       LockingPolicy::destroyScope(*this);
-     
-   } catch (...) { /* ignore */ }  
-diff -ru ZThread-2.3.2-old/src/MutexImpl.h ZThread-2.3.2/src/MutexImpl.h
---- ZThread-2.3.2-old/src/MutexImpl.h	2005-03-12 22:59:15.000000000 -0500
-+++ ZThread-2.3.2/src/MutexImpl.h	2006-09-10 14:13:31.000000000 -0400
-@@ -153,7 +153,7 @@
- 
-       _owner = self;
- 
--      ownerAcquired(self);
-+      Behavior::ownerAcquired(self);
-       
-     }
- 
-@@ -164,7 +164,7 @@
-       _waiters.insert(self);
-       m.acquire();
- 
--      waiterArrived(self);
-+      Behavior::waiterArrived(self);
- 
-       {        
-       
-@@ -173,7 +173,7 @@
-       
-       }
- 
--      waiterDeparted(self);
-+      Behavior::waiterDeparted(self);
- 
-       m.release();
-         
-@@ -192,7 +192,7 @@
-           assert(_owner == 0);
-           _owner = self;    
- 
--          ownerAcquired(self);
-+          Behavior::ownerAcquired(self);
- 
-           break;
-         
-@@ -236,7 +236,7 @@
- 
-       _owner = self;
- 
--      ownerAcquired(self);
-+      Behavior::ownerAcquired(self);
-       
-     }
- 
-@@ -253,7 +253,7 @@
-       
-         m.acquire();
- 
--        waiterArrived(self);
-+        Behavior::waiterArrived(self);
-       
-         {
-         
-@@ -262,7 +262,7 @@
-         
-         }
- 
--        waiterDeparted(self);
-+        Behavior::waiterDeparted(self);
-       
-         m.release();
-         
-@@ -284,7 +284,7 @@
-           assert(0 == _owner);
-           _owner = self;
- 
--          ownerAcquired(self);
-+          Behavior::ownerAcquired(self);
-         
-           break;
-         
-@@ -326,7 +326,7 @@
- 
-     _owner = 0;
- 
--    ownerReleased(impl);
-+    Behavior::ownerReleased(impl);
-   
-     // Try to find a waiter with a backoff & retry scheme
-     for(;;) {