Try to get some more correct curl init into the unit testing.

3 files changed, 116 insertions, 1 deletions

diff --git a/indra/llcorehttp/tests/llcorehttp_test.cpp b/indra/llcorehttp/tests/llcorehttp_test.cpp
index 92f16be8fd..da811adb19 100644
--- a/indra/llcorehttp/tests/llcorehttp_test.cpp
+++ b/indra/llcorehttp/tests/llcorehttp_test.cpp
@@ -24,15 +24,18 @@
  * $/LicenseInfo$
  */
 
+#include "llcorehttp_test.h"
 
 #include <iostream>
 
 // These are not the right way in viewer for some reason:
 // #include <tut/tut.hpp>
 // #include <tut/tut_reporter.hpp>
+// This works:
 #include "../test/lltut.h"
 
 #include <curl/curl.h>
+#include <openssl/crypto.h>
 
 // Pull in each of the test sets
 #include "test_httpstatus.hpp"
@@ -43,7 +46,10 @@
 #include "test_bufferarray.hpp"
 #include "test_httprequestqueue.hpp"
 
-#if 0
+unsigned long ssl_thread_id_callback(void);
+void ssl_locking_callback(int mode, int type, const char * file, int line);
+
+#if 0	// lltut provides main
 
 namespace tut
 {
@@ -65,4 +71,74 @@ int main()
 	curl_global_cleanup();
 }
 
+#endif // 0
+
+int ssl_mutex_count(0);
+LLCoreInt::HttpMutex ** ssl_mutex_list = NULL;
+
+void init_curl()
+{
+	curl_global_init(CURL_GLOBAL_ALL);
+
+	ssl_mutex_count = CRYPTO_num_locks();
+	if (ssl_mutex_count > 0)
+	{
+		ssl_mutex_list = new LLCoreInt::HttpMutex * [ssl_mutex_count];
+		
+		for (int i(0); i < ssl_mutex_count; ++i)
+		{
+			ssl_mutex_list[i] = new LLCoreInt::HttpMutex;
+		}
+
+		CRYPTO_set_locking_callback(ssl_locking_callback);
+		CRYPTO_set_id_callback(ssl_thread_id_callback);
+	}
+}
+
+
+void term_curl()
+{
+	CRYPTO_set_locking_callback(NULL);
+	for (int i(0); i < ssl_mutex_count; ++i)
+	{
+		delete ssl_mutex_list[i];
+	}
+	delete [] ssl_mutex_list;
+}
+
+
+unsigned long ssl_thread_id_callback(void)
+{
+#if defined(WIN32)
+	return (unsigned long) GetCurrentThread();
+#else
+	return (unsigned long) pthread_self();
+#endif
+}
+
+
+void ssl_locking_callback(int mode, int type, const char * /* file */, int /* line */)
+{
+	if (type >= 0 && type < ssl_mutex_count)
+	{
+		if (mode & CRYPTO_LOCK)
+		{
+			ssl_mutex_list[type]->lock();
+		}
+		else
+		{
+			ssl_mutex_list[type]->unlock();
+		}
+	}
+}
+
+
+#if defined(WIN32)
+
+int getopt(int argc, char * const argv[], const char *optstring)
+{
+	return -1;
+}
+
 #endif
+
diff --git a/indra/llcorehttp/tests/llcorehttp_test.h b/indra/llcorehttp/tests/llcorehttp_test.h
new file mode 100644
index 0000000000..941cb457d3
--- /dev/null
+++ b/indra/llcorehttp/tests/llcorehttp_test.h
@@ -0,0 +1,34 @@
+/** 
+ * @file llcorehttp_test.h
+ * @brief Main test runner
+ *
+ * $LicenseInfo:firstyear=2012&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2012, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+
+#ifndef _LLCOREHTTP_TEST_H_
+#define	_LLCOREHTTP_TEST_H_
+
+extern void init_curl();
+extern void term_curl();
+
+#endif	// _LLCOREHTTP_TEST_H_
diff --git a/indra/llcorehttp/tests/test_httprequest.hpp b/indra/llcorehttp/tests/test_httprequest.hpp
index ab25a2eb1a..a77a36c96e 100644
--- a/indra/llcorehttp/tests/test_httprequest.hpp
+++ b/indra/llcorehttp/tests/test_httprequest.hpp
@@ -35,6 +35,7 @@
 #include <curl/curl.h>
 
 #include "test_allocator.h"
+#include "llcorehttp_test.h"
 
 
 using namespace LLCoreInt;
@@ -334,6 +335,8 @@ void HttpRequestTestObjectType::test<4>()
 template <> template <>
 void HttpRequestTestObjectType::test<5>()
 {
+	init_curl();
+	
 	set_test_name("HttpRequest GET + Stop execution");
 
 	// Handler can be stack-allocated *if* there are no dangling
@@ -416,6 +419,8 @@ void HttpRequestTestObjectType::test<5>()
 	ensure("Two handler calls on the way out", 2 == mHandlerCalls);
 	// printf("Old mem:  %d, New mem:  %d\n", mMemTotal, GetMemTotal());
 	ensure("Memory usage back to that at entry", mMemTotal == GetMemTotal());
+
+	term_curl();
 }
 
 }  // end namespace tut