Make the main code and exception handling simpler.

[virt-top.git] / virt-top / virt_top_main.ml

diff --git a/virt-top/virt_top_main.ml b/virt-top/virt_top_main.ml
index ba98e7e..e8c4425 100644 (file)
--- a/virt-top/virt_top_main.ml
+++ b/virt-top/virt_top_main.ml
@@ -1,5 +1,5 @@
 (* 'top'-like tool for libvirt domains.
-   (C) Copyright 2007 Richard W.M. Jones, Red Hat Inc.
+   (C) Copyright 2007-2009 Richard W.M. Jones, Red Hat Inc.
    http://libvirt.org/
 
    This program is free software; you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 
 open Curses
 
+open Virt_top_gettext.Gettext
 open Virt_top
 
 (* Note: make sure we catch any exceptions and clean up the display.
@@ -29,24 +30,43 @@ open Virt_top
  * that all allocated resources are being counted properly (by running
  * the program under --debug ...).
  *)
-let error =
-  let ((_, _, script_mode, _, _, _, _) as setup) = start_up () in
 
+let () = Printexc.record_backtrace true
+
+let ((_, _, script_mode, _, stream_mode, _, _, _) as setup) =
+  try start_up ()
+  with
+  | Failure msg ->
+      prerr_endline msg;
+      Printexc.print_backtrace stderr;
+      exit 1
+  | exn ->
+      prerr_endline (s_ "Error" ^ ": " ^ Printexc.to_string exn);
+      Printexc.print_backtrace stderr;
+      exit 1
+
+let () =
   try
     main_loop setup;
-    if not script_mode then endwin ();
-    false
+    if not script_mode && not stream_mode then endwin ();
+    Gc.compact ();
+    exit 0
   with
   | Libvirt.Virterror err ->
-      if not script_mode then endwin ();
+      if not script_mode && not stream_mode then endwin ();
       prerr_endline (Libvirt.Virterror.to_string err);
-      true
+      Printexc.print_backtrace stderr;
+      Gc.compact ();
+      exit 1
+  | Failure msg ->
+      if not script_mode && not stream_mode then endwin ();
+      prerr_endline msg;
+      Printexc.print_backtrace stderr;
+      Gc.compact ();
+      exit 1
   | exn ->
-      if not script_mode then endwin ();
-      prerr_endline ("Error: " ^ Printexc.to_string exn);
-      true
-
-let () =
-  Gc.compact (); (* See note above. *)
-
-  exit (if error then 1 else 0)
+      if not script_mode && not stream_mode then endwin ();
+      prerr_endline (s_ "Error" ^ ": " ^ Printexc.to_string exn);
+      Printexc.print_backtrace stderr;
+      Gc.compact ();
+      exit 1