Previously, the main mount loop was unlocking the thread and then immediately

re-locking it.  In some threads implementations (Linux 2.6), this causes the
mount thread to hog the lock, which causes SetMountThreadState to hang.  Move
the "check and delay" part of the mount thread outside of the lock, so other
threads have opportunity to get the lock.

stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded.cpp

@@ -79,11 +79,20 @@ void MemoryCardDriverThreaded::MountThreadMain()
 
 	while( !m_bShutdownNextUpdate )
 	{      
+		if( !this->MountThreadWaitForUpdate() )
+			continue;
+
 		LockMut( m_mutexPause );	// wait until we're unpaused
 		this->MountThreadDoOneUpdate();
 	}
 }
 
+bool MemoryCardDriverThreaded::MountThreadWaitForUpdate()
+{
+	usleep( 100000 );
+	return true;
+}
+
 bool MemoryCardDriverThreaded::StorageDevicesChanged()
 {
 	CHECKPOINT;

stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded.h

@@ -33,6 +33,7 @@ protected:
 	void StartThread();	// call this in the derived constructor to start the mounting thread
 	void StopThread(); // call this in the derived desstructor to stop the mounting thread
 	virtual void MountThreadDoOneUpdate() = 0;	// this will get called as fast as possible
+	virtual bool MountThreadWaitForUpdate();
 	virtual void Mount( UsbStorageDevice* pDevice, CString sMountPoint ) = 0;
 	bool ShouldDoOsMount() { return m_MountThreadState==detect_and_mount; }
 

stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp

@@ -187,32 +187,29 @@ bool UsbStorageDevicesChanged()
   return bChanged;
 }
 
-void MemoryCardDriverThreaded_Linux::MountThreadDoOneUpdate()
+/* Return true if MountThreadDoOneUpdate should be called. */
+bool MemoryCardDriverThreaded_Linux::MountThreadWaitForUpdate()
 {
-	bool bNeedToDoAnyMounts = false;
+	/* Check if any devices need a write test. */
 	for( unsigned i=0; i<m_vDevicesLastSeen.size(); i++ )
 	{
 		UsbStorageDevice &d = m_vDevicesLastSeen[i];
 		if( d.bNeedsWriteTest )
-		{
+			return true;
-			bNeedToDoAnyMounts = true;
-			break;
-		}
 	}
 
-	if( bNeedToDoAnyMounts )
+	/* Nothing needs a write test.  If no devices have changed, either,
-	{
+	 * delay. */
-		// fall through
+	if( UsbStorageDevicesChanged() )
-	}
+		return true;
-	else
-	{
-	  if( !UsbStorageDevicesChanged() )
-	    {
-	      usleep(1000*300);  // 300 ms
-	      return;
-	    }
-	}
 
+	/* Nothing to do.  Delay, so we don't busy loop. */
+	usleep(1000*300);  // 300 ms
+	return false;
+}
+
+void MemoryCardDriverThreaded_Linux::MountThreadDoOneUpdate()
+{
 	// TRICKY: We're waiting for a change in the USB device list, but 
 	// the usb-storage descriptors take a bit longer to update.  It's more convenient to wait
 	// on the USB device list because the usb-storage descriptors are separate files per 

stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.h

@@ -15,6 +15,7 @@ protected:
 	virtual void Mount( UsbStorageDevice* pDevice, CString sMountPoint );
 	virtual void ResetUsbStorage();
 	virtual void MountThreadDoOneUpdate();
+	virtual bool MountThreadWaitForUpdate();
 
 	vector<UsbStorageDevice> m_vDevicesLastSeen;
 };