Fixed threading issue

Author: jackbrookes

Assets/UXF/Scripts/FileIOManager.cs

@@ -30,6 +30,8 @@ public class FileIOManager : MonoBehaviour
 
         bool quitting = false;
 
+        public static System.Action doNothing = () => { };
+
         void Awake()
         {
             Begin();
@@ -40,6 +42,7 @@ public void Begin()
             if (t != null && t.IsAlive)
                 throw new ThreadStateException("Cannot Begin. FileIOManager thread has already been started!");
 
+            quitting = false;
             t = new Thread(Worker);
             t.Start();
         }
@@ -147,16 +150,8 @@ public void WriteTrials(List<OrderedResultDict> dataDict, string[] headers, stri
 
             for (int i = 1; i <= dataDict.Count; i++)
             {
-                try
-                {
-                    dataDict[i - 1].Values.CopyTo(row, 0);
-                    csvRows[i] = string.Join(",", row.Select(v => v.ToString()).ToArray());
-                }
-                catch (System.NullReferenceException)
-                {
-                    
-                }              
-                
+                dataDict[i - 1].Values.CopyTo(row, 0);
+                csvRows[i] = string.Join(",", row.Select(v => System.Convert.ToString(v)).ToArray());
             }
 
             File.WriteAllLines(fpath, csvRows);
@@ -223,6 +218,8 @@ public void End()
             if (debug)
                 Debug.Log("Joining FileIOManagerThread");
             quitting = true;
+
+            bq.Enqueue(doNothing); // ensures bq breaks from foreach loop
             t.Join();
         }
 

Assets/UXF/Scripts/Tests/Editor/TestFileIOManager.cs

@@ -68,6 +68,26 @@ public void WriteManyFiles()
                 System.IO.File.Delete(file);
             }
         }
+
+
+        [Test]
+        public void EarlyExit()
+        {
+            fileIOManager.Begin();
+            fileIOManager.End();
+			
+			Assert.Throws<System.InvalidOperationException>(
+				() => {
+                    fileIOManager.ManageInWorker(() => Debug.Log("Code enqueued after FileIOManager ended"));
+				}
+			);
+
+            fileIOManager.Begin();
+            fileIOManager.ManageInWorker(() => Debug.Log("Code enqueued after FileIOManager re-opened"));
+            fileIOManager.End();
+
+        }
+
     }
 
 }

Assets/UXF/Scripts/Tests/Editor/TestTrials.cs

@@ -36,13 +36,16 @@ public void SetUp()
                 session
             );
 
+            sessionLogger.Initialise();
+
             fileIOManager.debug = true;
             fileIOManager.Begin();
 
             string experimentName = "unit_test";
             string ppid = "test_trials";
             session.Begin(experimentName, ppid, "example_output");
             session.customHeaders.Add("observation");
+            session.customHeaders.Add("null_observation");
 
 			// generate trials
 			session.CreateBlock(2);
@@ -65,9 +68,10 @@ public void RunTrials()
             {
                 trial.Begin();
                 trial.result["observation"] = ++i;
+                trial.result["null_observation"] = null;
 
                 Assert.Throws<KeyNotFoundException>(
-                    delegate { trial.result["other_observation"] = "something"; }
+                    delegate { trial.result["not_customheader_observation"] = "something"; }
                 );
 
                 Assert.AreSame(trial, session.currentTrial);