Timeline: Cancel unresponsive disk_threads.

nonlib/Thread.C

@@ -110,6 +110,13 @@ Thread::detach ( void )
     _thread = 0;
 }
 
+void
+Thread::cancel ( void )
+{
+    pthread_cancel( _thread );
+    _thread = 0;
+}
+
 void
 Thread::join ( void )
 {

nonlib/Thread.H

@@ -52,6 +52,7 @@ public:
     bool clone ( void *(*entry_point)(void *), void *arg );
     void detach ( void );
     void join ( void );
+    void cancel ( void );
     void exit ( void *retval = 0 );
 
 };

timeline/src/Engine/Disk_Stream.C

@@ -155,12 +155,14 @@ Disk_Stream::shutdown ( void )
             
             if ( total_ms > 100 )
             {
-                WARNING("Disk_Stream thread has taken longer than %ims to respond to terminate signal.", total_ms );
+                WARNING("Disk_Stream thread has taken longer than %ims to respond to terminate signal. Canceling", total_ms );
+                _thread.cancel();
                 break;
             }
         }
         
-        _thread.join();
+        if ( ! _terminate )
+            _thread.join();
 
         sem_destroy( &_blocks );