Feature/console mode

src/main/java/net/atomique/ksar/AllParser.java

@@ -20,6 +20,32 @@
 
 public abstract class AllParser {
 
+  protected String sarStartDate = null;
+  protected String sarEndDate = null;
+
+  protected LocalDateTime startofgraph = null;
+  protected LocalDateTime endofgraph = null;
+  protected TreeSet<LocalDateTime> DateSamples = new TreeSet<LocalDateTime>();
+  protected int firstdatacolumn = 0;
+
+  abstract public String getInfo();
+
+  abstract public void parse_header(String s);
+
+  abstract public void updateUITitle();
+
+  protected kSar mysar = null;
+  protected OSConfig myosconfig = null;
+  protected String ParserName = null;
+
+  protected LocalTime parsetime = null;
+  protected LocalDate parsedate = null;
+
+  protected String currentStat = "NONE";
+  protected String dateFormat = "MM/dd/yy";
+  protected String timeFormat = "HH:mm:ss";
+  protected int timeColumn = 1;
+
   private static final Logger log = LoggerFactory.getLogger(AllParser.class);
   private static final Map<String, String> DATE_FORMAT_REGEXPS = new HashMap<String, String>() {
     {
@@ -87,7 +113,6 @@ public boolean setDate(String s) {
       } else {
         formatter = DateTimeFormatter.ofPattern(dateFormat);
       }
-
       currentDate = LocalDate.parse(s, formatter);
 
       parsedate = currentDate;
@@ -133,30 +158,4 @@ public static String determineDateFormat(String dateString) {
     }
     return null; // Unknown format.
   }
-
-  protected String sarStartDate = null;
-  protected String sarEndDate = null;
-
-  protected LocalDateTime startofgraph = null;
-  protected LocalDateTime endofgraph = null;
-  protected TreeSet<LocalDateTime> DateSamples = new TreeSet<LocalDateTime>();
-  protected int firstdatacolumn = 0;
-
-  abstract public String getInfo();
-
-  abstract public void parse_header(String s);
-
-  abstract public void updateUITitle();
-
-  protected kSar mysar = null;
-  protected OSConfig myosconfig = null;
-  protected String ParserName = null;
-
-  protected LocalTime parsetime = null;
-  protected LocalDate parsedate = null;
-
-  protected String currentStat = "NONE";
-  protected String dateFormat = "MM/dd/yy";
-  protected String timeFormat = "HH:mm:ss";
-  protected int timeColumn = 1;
 }

src/main/java/net/atomique/ksar/GlobalOptions.java

@@ -246,6 +246,54 @@ static void saveHistory() {
 
   }
 
+  public static String getOutCSV() {
+    return outCSV;
+  }
+
+  public static void setOutCSV(String outCSV) {
+    GlobalOptions.outCSV = outCSV;
+  }
+
+  public static String getOutPDF() {
+    return outPDF;
+  }
+
+  public static void setOutPDF(String outPDF) {
+    GlobalOptions.outPDF = outPDF;
+  }
+
+  public static String getOutIMG() {
+    return outIMG;
+  }
+
+  public static void setOutIMG(String outIMG) {
+    GlobalOptions.outIMG = outIMG;
+  }
+
+  public static String getOutTags() {
+    return outTags;
+  }
+
+  public static void setOutTags(String outTags) {
+    GlobalOptions.outTags = outTags;
+  }
+
+  public static int getWidth() {
+    return width;
+  }
+
+  public static void setWidth(int width) {
+    GlobalOptions.width = width;
+  }
+
+  public static int getHeigth() {
+    return heigth;
+  }
+
+  public static void setHeigth(int heigth) {
+    GlobalOptions.heigth = heigth;
+  }
+
   private static Desktop UI = null;
   private static Properties systemprops;
   private static String userhome;
@@ -259,4 +307,10 @@ static void saveHistory() {
   private static String CLfilename = null;
   private static HashMap<String, Class> ParserMap;
   private static boolean firstrun = true;
+  private static String outCSV;
+  private static String outPDF;
+  private static String outIMG;
+  private static String outTags;
+  private static int width = 600;
+  private static int heigth = 400;
 }

src/main/java/net/atomique/ksar/Main.java

@@ -5,7 +5,15 @@
 
 package net.atomique.ksar;
 
+import net.atomique.ksar.export.FileCSV;
+import net.atomique.ksar.export.FilePDF;
+import net.atomique.ksar.export.FilePNG;
+import net.atomique.ksar.graph.Graph;
+import net.atomique.ksar.graph.List;
 import net.atomique.ksar.ui.Desktop;
+import net.atomique.ksar.ui.ParentNodeInfo;
+import net.atomique.ksar.ui.SortedTreeNode;
+import net.atomique.ksar.ui.TreeNodeInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,13 +26,22 @@
 public class Main {
 
   private static final Logger log = LoggerFactory.getLogger(Main.class);
-
+  private static boolean gui = true;
   static Config config = null;
   static GlobalOptions globaloptions = null;
   static ResourceBundle resource = ResourceBundle.getBundle("net/atomique/ksar/Language/Message");
 
   public static void usage() {
-    show_version();
+    log.info("-input : input sar statistics file \n");
+    log.info("-n : toggles nongui mode for exporting\n");
+    log.info("-outputCSV : location of parsed CSV file\n");
+    log.info("-outputPDF : location of output pdf file\n");
+    log.info("-outputIMG : prefix for output images\n");
+    log.info("-width : width for output png charts\n");
+    log.info("-heigth : heigth for output png charts");
+    log.info("-tags : comma separated list of nodes for export. ex: 'CPU all,Load'");
+    log.info("-dateFormat : date time format. Example: MM/DD/YYYY 23:59:59");
+    System.exit(0);
   }
 
   public static void show_version() {
@@ -36,7 +53,8 @@ private static void set_lookandfeel() {
       if (Config.getLandf().equals(laf.getName())) {
         try {
           UIManager.setLookAndFeel(laf.getClassName());
-        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException ex) {
+        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException
+            | UnsupportedLookAndFeelException ex) {
           log.error("lookandfeel Exception", ex);
         }
       }
@@ -78,7 +96,6 @@ public static void main(String[] args) {
     config = Config.getInstance();
     globaloptions = GlobalOptions.getInstance();
 
-
     if (args.length > 0) {
       while (i < args.length && args[i].startsWith("-")) {
         arg = args[i++];
@@ -102,16 +119,183 @@ public static void main(String[] args) {
           }
           continue;
         }
+        if ("-outputCSV".equals(arg)) {
+          // This will be CSV file to export by deafault
+          if (i < args.length) {
+            GlobalOptions.setOutCSV(args[i++]);
+          } else {
+            exit_error(resource.getString("INPUT_REQUIRE_ARG"));
+          }
+          continue;
+        }
+
+        if ("-outputPDF".equals(arg)) {
+          // This will be CSV file to export by deafault
+          if (i < args.length) {
+            GlobalOptions.setOutPDF(args[i++]);
+          } else {
+            exit_error(resource.getString("INPUT_REQUIRE_ARG"));
+          }
+          continue;
+        }
+
+        // prefix for chart image files
+        if ("-outputIMG".equals(arg)) {
+          // This will be CSV file to export by deafault
+          if (i < args.length) {
+            GlobalOptions.setOutIMG(args[i++]);
+          } else {
+            exit_error(resource.getString("INPUT_REQUIRE_ARG"));
+          }
+          continue;
+        }
+
+        // node names for export comma separated
+        if ("-tags".equals(arg)) {
+          // This will be CSV file to export by deafault
+          if (i < args.length) {
+            GlobalOptions.setOutTags(args[i++]);
+          } else {
+            exit_error(resource.getString("INPUT_REQUIRE_ARG"));
+          }
+          continue;
+        }
+
+        if ("-width".equals(arg)) {
+          // This will be CSV file to export by deafault
+          if (i < args.length) {
+            GlobalOptions.setWidth(Integer.parseInt(args[i++]));
+          } else {
+            exit_error(resource.getString("INPUT_REQUIRE_ARG"));
+          }
+          continue;
+        }
+
+        if ("-heigth".equals(arg)) {
+          // This will be CSV file to export by deafault
+          if (i < args.length) {
+            GlobalOptions.setWidth(Integer.parseInt(args[i++]));
+          } else {
+            exit_error(resource.getString("INPUT_REQUIRE_ARG"));
+          }
+          continue;
+        }
+
+        if ("-dateFormat".equals(arg)) {
+          // This will be CSV file to export by deafault
+          if (i < args.length) {
+            Config.setLinuxDateFormat(args[i++]);
+            Config.save();
+          } else {
+            exit_error(resource.getString("INPUT_REQUIRE_ARG"));
+          }
+          continue;
+        }
+
+        if ("-n".equals(arg)) {
+          // This means nongui mode (same as in jmeter)
+          gui = false;
+          continue;
+        }
+
       }
     }
 
-    make_ui();
+    if (gui) {
+      make_ui();
+    } else {
+      nongui();
+    }
 
   }
 
   public static void exit_error(final String message) {
     log.error(message);
     System.exit(1);
+  }
+
+  public static void validateTags(SortedTreeNode node) {
+    int num = node.getChildCount();
+    if (num > 0) {
+      Object obj1 = node.getUserObject();
+      if (obj1 instanceof ParentNodeInfo) {
+        ParentNodeInfo tmpnode = (ParentNodeInfo) obj1;
+        List nodeobj = tmpnode.getNode_object();
+      }
+      for (int i = 0; i < num; i++) {
+        SortedTreeNode l = (SortedTreeNode) node.getChildAt(i);
+        validateTags(l);
+      }
+    } else {
+      Object obj1 = node.getUserObject();
+      if (obj1 instanceof TreeNodeInfo) {
+        TreeNodeInfo tmpnode = (TreeNodeInfo) obj1;
+        Graph nodeobj = tmpnode.getNode_object();
+        nodeobj.printSelected = false;
+        for (String nodename : GlobalOptions.getOutTags().split(",")) {
+          if (nodeobj.getTitle().equals(nodename)) {
+            nodeobj.printSelected = true;
+          }
+        }
+      }
+    }
+  }
+
+  public static void nongui() {
+    kSar ks = new kSar();
+    if (GlobalOptions.getCLfilename() == null) {
+      exit_error("No any input file path specified");
+    }
+    System.out.println("running nongui with " + GlobalOptions.getCLfilename());
+    ks.do_fileread(GlobalOptions.getCLfilename());
+    while (ks.launched_action.isAlive()) {
+      try {
+        Thread.sleep(1);
+      } catch (InterruptedException e) {
+        // TODO Auto-generated catch block
+        e.printStackTrace();
+      }
+    }
+
+    // filter out graph nodes for given tags
+    if (GlobalOptions.getOutTags() != null) {
+      validateTags(ks.graphtree);
+    }
+
+    log.trace("File parsing completed. Starting export");
+    if (GlobalOptions.getOutCSV() != null) {
+      Runnable t = new FileCSV(GlobalOptions.getOutCSV(), ks);
+      Thread th = new Thread(t);
+      th.start();
+      while (th.isAlive()) {
+        try {
+          Thread.sleep(1);
+        } catch (InterruptedException e) {
+          // TODO Auto-generated catch block
+          e.printStackTrace();
+        }
+      }
+      log.trace("CSV Export completed");
+    }
+
+    if (GlobalOptions.getOutPDF() != null) {
+      Runnable t = new FilePDF(GlobalOptions.getOutPDF(), ks);
+      Thread th = new Thread(t);
+      th.start();
+      while (th.isAlive()) {
+        try {
+          Thread.sleep(1);
+        } catch (InterruptedException e) {
+          // TODO Auto-generated catch block
+          e.printStackTrace();
+        }
+      }
+      log.trace("PDF Export completed");
+    }
+    if (GlobalOptions.getOutIMG() != null) {
+      FilePNG.drawCharts(ks.graphtree, ks);
+      log.trace("IMG Export completed");
+    }
 
   }
 }