Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer

indra/llmessage/aicurl.cpp

@@ -418,6 +418,7 @@ void cleanupCurl(void)
   if (CurlMultiHandle::getTotalMultiHandles() != 0)
 	llwarns << "Not all CurlMultiHandle objects were destroyed!" << llendl;
   AIStateMachine::flush();
+  clearCommandQueue();
   Stats::print();
   ssl_cleanup();
 

indra/llmessage/aicurlperhost.cpp

@@ -56,12 +56,17 @@ PerHostRequestQueuePtr PerHostRequestQueue::instance(std::string const& hostname
 //static
 void PerHostRequestQueue::release(PerHostRequestQueuePtr& instance)
 {
-  if (instance->lastone())
+  if (instance->exactly_two_left())		// Being 'instance' and the one in sInstanceMap.
   {
+	// The viewer can be have left main() we can't access the global sInstanceMap anymore.
+	if (LLApp::isStopped())
+	{
+	  return;
+	}
 	instance_map_wat instance_map_w(sInstanceMap);
-	// It is possible that 'lastone' is not up to date anymore.
+	// It is possible that 'exactly_two_left' is not up to date anymore.
 	// Therefore, recheck the condition now that we have locked sInstanceMap.
-	if (!instance->lastone())
+	if (!instance->exactly_two_left())
 	{
 	  // Some other thread added this host in the meantime.
 	  return;

indra/llmessage/aicurlperhost.h

@@ -118,7 +118,7 @@ class PerHostRequestQueue {
 class RefCountedThreadSafePerHostRequestQueue : public threadsafe_PerHostRequestQueue {
   public:
 	RefCountedThreadSafePerHostRequestQueue(void) : mReferenceCount(0) { }
-	bool lastone(void) const { llassert(mReferenceCount >= 2); return mReferenceCount == 2; }
+	bool exactly_two_left(void) const { return mReferenceCount == 2; }
 
   private:
 	// Used by PerHostRequestQueuePtr. Object is deleted when reference count reaches zero.

indra/llmessage/aicurlprivate.h

@@ -119,6 +119,7 @@ inline CURLMcode check_multi_code(CURLMcode code) { AICurlInterface::Stats::mult
 bool curlThreadIsRunning(void);
 void wakeUpCurlThread(void);
 void stopCurlThread(void);
+void clearCommandQueue(void);
 
 #define DECLARE_SETOPT(param_type) \
 	  CURLcode setopt(CURLoption option, param_type parameter)

indra/llmessage/aicurlthread.cpp

@@ -1065,6 +1065,10 @@ void AICurlThread::wakeup_thread(void)
   DoutEntering(dc::curl, "AICurlThread::wakeup_thread");
   llassert(is_main_thread());
 
+  // If we are already exiting the viewer then return immediately.
+  if (!mRunning)
+	return;
+
   // Try if curl thread is still awake and if so, pass the new commands directly.
   if (mWakeUpMutex.tryLock())
   {
@@ -2148,10 +2152,14 @@ void stopCurlThread(void)
 	  ms_sleep(10);
 	}
 	Dout(dc::curl, "Curl thread" << (curlThreadIsRunning() ? " not" : "") << " stopped after " << ((100 - count) * 10) << "ms.");
-	// Clear the command queue, for a cleaner cleanup.
+  }
+}
+
+void clearCommandQueue(void)
+{
+	// Clear the command queue now in order to avoid the global deinitialization order fiasco.
 	command_queue_wat command_queue_w(command_queue);
 	command_queue_w->clear();
-  }
 }
 
 //-----------------------------------------------------------------------------