Changeset 191 for branches/eraser6/Manager/DirectExecutor.cs

Timestamp:

3/10/2008 9:21:52 AM (5 years ago)

Author:

lowjoel

Message:

Handle FatalExceptions? in the DirectExecutor? thread.

File:

• branches/eraser6/Manager/DirectExecutor.cs (modified) (2 diffs)

branches/eraser6/Manager/DirectExecutor.cs

@@ -115 +115 @@
                 if (task != null)
                 {
-                    //Run the task
-                    foreach (Task.ErasureTarget target in task.Entries)
                     try
                     {
-                        if (target is Task.UnusedSpace)
-                            EraseUnusedSpace(task, (Task.UnusedSpace)target);
-                        else if (target is Task.FilesystemObject)
-                            EraseFilesystemObject(task, (Task.FilesystemObject)target);
-                        else
-                            throw new ArgumentException("Unknown erasure target.");
+                        //Run the task
+                        foreach (Task.ErasureTarget target in task.Entries)
+                            try
+                            {
+                                if (target is Task.UnusedSpace)
+                                    EraseUnusedSpace(task, (Task.UnusedSpace)target);
+                                else if (target is Task.FilesystemObject)
+                                    EraseFilesystemObject(task, (Task.FilesystemObject)target);
+                                else
+                                    throw new ArgumentException("Unknown erasure target.");
+                            }
+                            catch (FatalException)
+                            {
+                                throw;
+                            }
+                            catch (Exception e)
+                            {
+                                task.LogEntry(new LogEntry(e.Message, LogLevel.ERROR));
+                            }
                     }
-                    catch (Exception e)
+                    catch (FatalException e)
                     {
-                        task.LogEntry(new LogEntry(e.Message, LogLevel.ERROR));
+                        task.LogEntry(new LogEntry(e.Message, LogLevel.FATAL));
                     }
 
@@ -193 +204 @@
                     8, FileOptions.WriteThrough))
                 {
-                    target.Method.Erase(strm, null,
+                    target.Method.Erase(strm, PRNGManager.GetInstance(Globals.Settings.ActivePRNG),
                         delegate(uint currentProgress, uint currentPass)
                         {