got rid of the last recursive mutexes. abstracted the threading primitives (and switched over to use asio's internal ones).

test/setup_transfer.cpp

@@ -101,18 +101,7 @@ bool print_alerts(libtorrent::session& ses, char const* name
 
 void test_sleep(int millisec)
 {
-	boost::xtime xt;
-	boost::xtime_get(&xt, boost::TIME_UTC);
-	boost::uint64_t nanosec = (millisec % 1000) * 1000000 + xt.nsec;
-	int sec = millisec / 1000;
-	if (nanosec > 1000000000)
-	{
-		nanosec -= 1000000000;
-		sec++;
-	}
-	xt.nsec = nanosec;
-	xt.sec += sec;
-	boost::thread::sleep(xt);
+	libtorrent::sleep(millisec);
 }
 
 void stop_web_server(int port)

test/test_storage.cpp

@@ -37,11 +37,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/alert_types.hpp"
 #include "libtorrent/aux_/session_impl.hpp"
 #include "libtorrent/create_torrent.hpp"
+#include "libtorrent/thread.hpp"
 
 #include <boost/utility.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/convenience.hpp>
-#include <boost/thread/mutex.hpp>
 
 #include "test.hpp"
 #include "setup_transfer.hpp"
@@ -148,8 +148,7 @@ struct test_storage : storage_interface
 	{
 		if (slot == 0 || slot == 5999)
 		{
-			boost::thread::sleep(boost::get_system_time()
-				+ boost::posix_time::seconds(2));
+			sleep(2000);
 			std::cerr << "--- starting ---\n" << std::endl;
 		}
 		return size;
@@ -363,7 +362,7 @@ void run_storage_tests(boost::intrusive_ptr<torrent_info> info
 	boost::shared_ptr<int> dummy(new int);
 	boost::intrusive_ptr<piece_manager> pm = new piece_manager(dummy, info
 		, test_path, fp, io, default_storage_constructor, storage_mode);
-	boost::mutex lock;
+	mutex lock;
 
 	error_code ec;
 	bool done = false;
@@ -564,7 +563,7 @@ void test_check_files(path const& test_path
 	boost::shared_ptr<int> dummy(new int);
 	boost::intrusive_ptr<piece_manager> pm = new piece_manager(dummy, info
 		, test_path, fp, io, default_storage_constructor, storage_mode);
-	boost::mutex lock;
+	mutex lock;
 
 	error_code ec;
 	bool done = false;