equal
deleted
inserted
replaced
228 } |
228 } |
229 } |
229 } |
230 |
230 |
231 val rc = |
231 val rc = |
232 try { join() } |
232 try { join() } |
233 catch { case Exn.Interrupt() => terminate(); Process_Result.interrupt_rc } |
233 catch { case Exn.Interrupt() => terminate(); Process_Result.RC.interrupt } |
234 |
234 |
235 watchdog_thread.foreach(_.cancel()) |
235 watchdog_thread.foreach(_.cancel()) |
236 |
236 |
237 in.join |
237 in.join |
238 out_lines.join |
238 out_lines.join |
239 err_lines.join |
239 err_lines.join |
240 |
240 |
241 if (strict && rc == Process_Result.interrupt_rc) throw Exn.Interrupt() |
241 if (strict && rc == Process_Result.RC.interrupt) throw Exn.Interrupt() |
242 |
242 |
243 Process_Result(rc, out_lines.join, err_lines.join, get_timing) |
243 Process_Result(rc, out_lines.join, err_lines.join, get_timing) |
244 } |
244 } |
245 } |
245 } |
246 |
246 |