$ mkdir swift-0.94
$ cd swift-0.94
- $ svn co https://cogkit.svn.sourceforge.net/svnroot/cogkit/branches/4.1.10/src/cog
+ $ svn co https://svn.code.sf.net/p/cogkit/svn/branches/4.1.10/src/cog
$ cd cog/modules
$ svn co https://svn.ci.uchicago.edu/svn/vdl2/branches/release-0.94 swift
$ cd swift
@@ -87,7 +87,7 @@
$ mkdir swift-devel
$ cd swift-devel
- $ svn co https://cogkit.svn.sourceforge.net/svnroot/cogkit/trunk/current/src/cog
+ $ svn co https://svn.code.sf.net/p/cogkit/svn/trunk/src/cog
$ cd cog/modules
$ svn co https://svn.ci.uchicago.edu/svn/vdl2/trunk swift
$ cd swift
Modified: www/inc/about_sidebar.php
===================================================================
--- www/inc/about_sidebar.php 2013-07-25 16:06:13 UTC (rev 6663)
+++ www/inc/about_sidebar.php 2013-07-25 18:45:06 UTC (rev 6664)
@@ -7,7 +7,7 @@
Dan Katz
David Kelly
Ketan Maheshwari
-
Jon Monette
+
Yadu N Babuji
Mike Wilde
Justin Wozniak
Zhao Zhang
@@ -19,6 +19,7 @@
Ben Clifford
Allan Espinosa
Sarah Kenny
+
Jon Monette
Veronika Nefedova
Tibi Stef-Praun
Yong Zhao
From davidk at ci.uchicago.edu Thu Jul 25 14:27:47 2013
From: davidk at ci.uchicago.edu (davidk at ci.uchicago.edu)
Date: Thu, 25 Jul 2013 14:27:47 -0500 (CDT)
Subject: [Swift-commit] r6665 - in branches/release-0.94/tests: . sites
Message-ID: <20130725192747.EF72C187CC1@svn.ci.uchicago.edu>
Author: davidk
Date: 2013-07-25 14:27:47 -0500 (Thu, 25 Jul 2013)
New Revision: 6665
Removed:
branches/release-0.94/tests/addtests.html
branches/release-0.94/tests/array_index.swift
branches/release-0.94/tests/meta.sh
branches/release-0.94/tests/providers
branches/release-0.94/tests/sites/beagle/
branches/release-0.94/tests/sites/crow/
branches/release-0.94/tests/sites/fusion/
branches/release-0.94/tests/sites/ibicluster/
branches/release-0.94/tests/sites/intrepid/
branches/release-0.94/tests/sites/local-coasters/
branches/release-0.94/tests/sites/local/
branches/release-0.94/tests/sites/mcs/
branches/release-0.94/tests/sites/osg/
branches/release-0.94/tests/sites/surveyor/
branches/release-0.94/tests/sites/uc3/
branches/release-0.94/tests/sitetester
Modified:
branches/release-0.94/tests/USAGENOTES.txt
Log:
Removing the old site tests to make room for the new automated site tester
Modified: branches/release-0.94/tests/USAGENOTES.txt
===================================================================
--- branches/release-0.94/tests/USAGENOTES.txt 2013-07-25 18:45:06 UTC (rev 6664)
+++ branches/release-0.94/tests/USAGENOTES.txt 2013-07-25 19:27:47 UTC (rev 6665)
@@ -252,12 +252,3 @@
- *run-suite.sh*:
a. Wrapper for *suite.sh*.
b. Env variables set may be customized by user.
-
-- *meta.sh*:
- a. Wrapper for *run-suite.sh*.
- b. used to execute _run-suite/suite.sh_ from a remote site using *ssh*.
-
-.Example usage:
-*********************************************************************************************
- meta.sh login.pads.ci.uchicago.edu /home/skenny/swift_runs/tests sites/pads-pbs-coasters.sh
-*********************************************************************************************
Deleted: branches/release-0.94/tests/addtests.html
===================================================================
--- branches/release-0.94/tests/addtests.html 2013-07-25 18:45:06 UTC (rev 6664)
+++ branches/release-0.94/tests/addtests.html 2013-07-25 19:27:47 UTC (rev 6665)
@@ -1,10 +0,0 @@
-
-
-
How to add new tests
-
-
-
The tests are automatically run from the tests directory in vdsk.
-Any file with a .dtm extension in there will be considered a test and executed
-on the next run.
-
-
Deleted: branches/release-0.94/tests/array_index.swift
===================================================================
--- branches/release-0.94/tests/array_index.swift 2013-07-25 18:45:06 UTC (rev 6664)
+++ branches/release-0.94/tests/array_index.swift 2013-07-25 19:27:47 UTC (rev 6665)
@@ -1,12 +0,0 @@
-type file {}
-
-
-(file t) echo_array (string s[]) {
- app {
- echo s[0] s[1] s[2] stdout=@filename(t);
- }
-}
-
-string greetings[] = ["how","are","you"];
-file hw = echo(greetings);
-
Deleted: branches/release-0.94/tests/meta.sh
===================================================================
--- branches/release-0.94/tests/meta.sh 2013-07-25 18:45:06 UTC (rev 6664)
+++ branches/release-0.94/tests/meta.sh 2013-07-25 19:27:47 UTC (rev 6665)
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# runs run-suite.sh (wrapper for suite.sh) on a given site based on login
-
-SITE_LOGIN=$1 # e.g. login.pads.ci.uchicago.edu
-
-DIR=$2 # e.g., /home/skenny/swift_runs/tests
-
-TEST=$3 # e.g. sites/pads-pbs-coasters.sh
-
-# run test and retrieve results
-
-RUNDIR=run-$( date +"%Y-%m-%d" )
-
-ssh $SITE_LOGIN $DIR/run-suite.sh $DIR/$TEST
-scp -r $SITE_LOGIN:$RUNDIR .
-
-exit 0
Deleted: branches/release-0.94/tests/providers
===================================================================
--- branches/release-0.94/tests/providers 2013-07-25 18:45:06 UTC (rev 6664)
+++ branches/release-0.94/tests/providers 2013-07-25 19:27:47 UTC (rev 6665)
@@ -1 +0,0 @@
-link sites
\ No newline at end of file
Deleted: branches/release-0.94/tests/sitetester
===================================================================
--- branches/release-0.94/tests/sitetester 2013-07-25 18:45:06 UTC (rev 6664)
+++ branches/release-0.94/tests/sitetester 2013-07-25 19:27:47 UTC (rev 6665)
@@ -1,59 +0,0 @@
-#!/usr/bin/env python
-
-import commands
-import os
-
-# the workdir for a given site needs to exist on the site you're testing
-# and should contain run-suite & suite.sh
-# this script will ssh onto the site, pass run-suite the necesary variables
-# for running suite.sh
-
-class Site:
-
- def __init__(self,login,logtype,workdir,queue,project):
- self.login = login
- self.logintype = logtype
- self.workdir = workdir
- self.queue = queue
- self.project = project
-
- def testSite(self,cogv,swiftv,test_type):
- cmdline = self.logintype+" "+self.login+" "+self.workdir+"/run-suite.sh "+self.workdir+"/"+test_type+" "+self.workdir+" "+self.queue+" "+self.project+" "+cogv+" "+swiftv
- print "running......"+cmdline
- res = commands.getoutput(cmdline)
- print res
- cmdline2 = "scp -r "+s+":"+rundir+" ."
- res2 = commands.getoutput(cmdline)
-
-
-
-
-#---------------------main--------------------------------------------------------
-
-sites = []
-
-s_logins = ['skenny at login2.pads.ci.uchicago.edu','login-abe.ncsa.teragrid.org','login1-qb.loni-lsu.teragrid.org']
-logintype = ['ssh','gsissh','gsissh']
-workdirs = ['/home/skenny/swift_runs/tests','/u/ac/skenny/swift_runs/tests','/home/skenny/swift_runs/tests']
-queues = ['short','debug','workq']
-projects = ['CI-IBN000039','TG-DBS080004N','TG-DBS080004N']
-
-test_type = "groups/local-pbs-coasters.sh"
-cogv = 'branches/4.1.8'
-swiftv = 'branches/release-0.92'
-
-rundir = commands.getoutput('date +\"%Y-%m-%d\"')
-rundir = "run-"+rundir
-
-for idx,s in enumerate(s_logins):
- sites.append(Site(s,logintype[idx],workdirs[idx],queues[idx],projects[idx]))
-
-# loop over all or run single
-
-sites[1].testSite(cogv,swiftv,test_type)
-sites[2].testSite(cogv,swiftv,test_type)
-
-
-
-
-
From davidk at ci.uchicago.edu Thu Jul 25 15:01:32 2013
From: davidk at ci.uchicago.edu (davidk at ci.uchicago.edu)
Date: Thu, 25 Jul 2013 15:01:32 -0500 (CDT)
Subject: [Swift-commit] r6667 - in branches/release-0.94/tests: . groups
sites stress/remote_sanity
Message-ID: <20130725200132.3230E187CC1@svn.ci.uchicago.edu>
Author: davidk
Date: 2013-07-25 15:01:31 -0500 (Thu, 25 Jul 2013)
New Revision: 6667
Added:
branches/release-0.94/tests/groups/group-sites.sh
branches/release-0.94/tests/sites/beagle/
branches/release-0.94/tests/sites/mac-frisbee/
branches/release-0.94/tests/sites/mcs/
branches/release-0.94/tests/sites/midway/
branches/release-0.94/tests/sites/uc3/
Removed:
branches/release-0.94/tests/groups/group-remote-sanity.sh
branches/release-0.94/tests/stress/remote_sanity/beagle/
branches/release-0.94/tests/stress/remote_sanity/mac-frisbee/
branches/release-0.94/tests/stress/remote_sanity/mcs/
branches/release-0.94/tests/stress/remote_sanity/midway/
branches/release-0.94/tests/stress/remote_sanity/uc3/
Modified:
branches/release-0.94/tests/README
branches/release-0.94/tests/groups/group-daily-remote.sh
branches/release-0.94/tests/user_env.sh
Log:
Adding new site tests from stress/ to sites/
Modified: branches/release-0.94/tests/README
===================================================================
--- branches/release-0.94/tests/README 2013-07-25 19:28:59 UTC (rev 6666)
+++ branches/release-0.94/tests/README 2013-07-25 20:01:31 UTC (rev 6667)
@@ -1,7 +1,7 @@
USAGENOTES contains instructions on how to operate the test suite.
It is an asciidoc document, in order to properly build it run the following command:
-$ asciidoc -a toc USAGENOTES
-It will generate an HTML file called USAGENOTES.
+$ asciidoc -a toc USAGENOTES.txt
+It will generate an HTML file called USAGENOTES.html.
Warning:
asciidoc must be installed.
Modified: branches/release-0.94/tests/groups/group-daily-remote.sh
===================================================================
--- branches/release-0.94/tests/groups/group-daily-remote.sh 2013-07-25 19:28:59 UTC (rev 6666)
+++ branches/release-0.94/tests/groups/group-daily-remote.sh 2013-07-25 20:01:31 UTC (rev 6667)
@@ -1,13 +1,13 @@
# GROUPLIST definition to run all local tests
-GROUPLIST=( # Remote sanity test-group
- $TESTDIR/stress/remote_sanity/beagle \
- $TESTDIR/stress/remote_sanity/mcs \
- $TESTDIR/stress/remote_sanity/midway \
- $TESTDIR/stress/remote_sanity/uc3 \
+GROUPLIST=( # Site testing test-group
+ $TESTDIR/sites/beagle \
+ $TESTDIR/sites/mcs \
+ $TESTDIR/sites/midway \
+ $TESTDIR/sites/uc3 \
# Frisbee will fail due to Bug 1030
- #TESTDIR/stress/remote_sanity/mac-frisbee \
+ #TESTDIR/sites/mac-frisbee \
# Remote-cluster IO tests
$TESTDIR/stress/IO/beagle \
Deleted: branches/release-0.94/tests/groups/group-remote-sanity.sh
===================================================================
--- branches/release-0.94/tests/groups/group-remote-sanity.sh 2013-07-25 19:28:59 UTC (rev 6666)
+++ branches/release-0.94/tests/groups/group-remote-sanity.sh 2013-07-25 20:01:31 UTC (rev 6667)
@@ -1,12 +0,0 @@
-
-# GROUPLIST definition to run all local tests
-
-GROUPLIST=(
- $TESTDIR/stress/remote_sanity/beagle \
- $TESTDIR/stress/remote_sanity/mcs \
- $TESTDIR/stress/remote_sanity/midway \
- $TESTDIR/stress/remote_sanity/uc3 \
- $TESTDIR/stress/remote_sanity/mac-frisbee \
- )
-
-checkvars WORK
Copied: branches/release-0.94/tests/groups/group-sites.sh (from rev 6664, branches/release-0.94/tests/groups/group-remote-sanity.sh)
===================================================================
--- branches/release-0.94/tests/groups/group-sites.sh (rev 0)
+++ branches/release-0.94/tests/groups/group-sites.sh 2013-07-25 20:01:31 UTC (rev 6667)
@@ -0,0 +1,12 @@
+
+# GROUPLIST definition to run all local tests
+
+GROUPLIST=(
+ $TESTDIR/sites/beagle \
+ $TESTDIR/sites/mcs \
+ $TESTDIR/sites/midway \
+ $TESTDIR/sites/uc3 \
+ $TESTDIR/sites/mac-frisbee \
+ )
+
+checkvars WORK
Modified: branches/release-0.94/tests/user_env.sh
===================================================================
--- branches/release-0.94/tests/user_env.sh 2013-07-25 19:28:59 UTC (rev 6666)
+++ branches/release-0.94/tests/user_env.sh 2013-07-25 20:01:31 UTC (rev 6667)
@@ -3,8 +3,8 @@
export MCS_USERNAME=""
export UC3_USERNAME=""
-if [ "midway001" == "midway001" ]
+if [ $( hostname ) == "midway001" ]
then
export GLOBUS_HOSTNAME=swift.rcc.uchicago.edu
export GLOBUS_TCP_PORT_RANGE=50000,51000
-fi;
\ No newline at end of file
+fi;
From hategan at ci.uchicago.edu Thu Jul 25 18:34:55 2013
From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu)
Date: Thu, 25 Jul 2013 18:34:55 -0500 (CDT)
Subject: [Swift-commit] r6668 - in
trunk/src/org/griphyn/vdl/karajan/monitor: items monitors/swing
Message-ID: <20130725233455.C9D19187CC1@svn.ci.uchicago.edu>
Author: hategan
Date: 2013-07-25 18:34:55 -0500 (Thu, 25 Jul 2013)
New Revision: 6668
Modified:
trunk/src/org/griphyn/vdl/karajan/monitor/items/SummaryItem.java
trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/GraphPanel.java
trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/GraphsPanel.java
trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/GridView.java
Log:
now with customizable dividers and layout persistence
Modified: trunk/src/org/griphyn/vdl/karajan/monitor/items/SummaryItem.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/monitor/items/SummaryItem.java 2013-07-25 20:01:31 UTC (rev 6667)
+++ trunk/src/org/griphyn/vdl/karajan/monitor/items/SummaryItem.java 2013-07-25 23:34:55 UTC (rev 6668)
@@ -63,6 +63,15 @@
public static final State[] STATES = State.values();
+ public static State getStateByKey(String key) {
+ for (State s : STATES) {
+ if (s.getName().equals(key)) {
+ return s;
+ }
+ }
+ return null;
+ }
+
private Map
counts;
private int status;
Modified: trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/GraphPanel.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/GraphPanel.java 2013-07-25 20:01:31 UTC (rev 6667)
+++ trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/GraphPanel.java 2013-07-25 23:34:55 UTC (rev 6668)
@@ -11,6 +11,7 @@
import java.awt.BorderLayout;
import java.awt.Color;
+import java.awt.Component;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -18,6 +19,7 @@
import java.util.Date;
import java.util.List;
import java.util.TimerTask;
+import java.util.prefs.Preferences;
import javax.swing.JButton;
import javax.swing.JColorChooser;
@@ -43,13 +45,15 @@
public class GraphPanel extends JPanel {
private SystemState state;
- private JFreeChart states;
+ private JFreeChart chart;
private final List enabled;
private TimeSeriesCollection col;
private JPanel legend;
+ private GraphsPanel gp;
- public GraphPanel(SystemState state) {
+ public GraphPanel(SystemState state, GraphsPanel gp) {
this.state = state;
+ this.gp = gp;
this.setLayout(new BorderLayout());
enabled = new ArrayList();
createChart();
@@ -67,9 +71,9 @@
TimeSeries ts = new TimeSeries(s.getName());
col.addSeries(ts);
}
- states = ChartFactory.createTimeSeriesChart(null, "Time", "Count", col, false, true, false);
- ChartPanel cp = new ChartPanel(states);
- XYPlot plot = (XYPlot) states.getPlot();
+ chart = ChartFactory.createTimeSeriesChart(null, "Time", "Count", col, false, true, false);
+ ChartPanel cp = new ChartPanel(chart);
+ XYPlot plot = (XYPlot) chart.getPlot();
plot.setBackgroundPaint(UIManager.getColor("TextField.background"));
NumberAxis rangeAxis = (NumberAxis) plot.getRangeAxis();
rangeAxis.setStandardTickUnits(NumberAxis.createIntegerTickUnits());
@@ -89,7 +93,7 @@
private void rebuildLegend() {
legend.removeAll();
for (int i = 0; i < enabled.size(); i++) {
- makeLegendEntry(legend, states, enabled.get(i).getShortName(), i);
+ makeLegendEntry(legend, chart, enabled.get(i).getShortName(), i);
}
legend.add(new JLabel());
legend.add(new JLabel());
@@ -102,7 +106,7 @@
}
});
- legend.add(newb);
+ legend.add(newb);
}
protected void displayAddPopup(JButton src) {
@@ -143,6 +147,7 @@
col.removeSeries(series);
rebuildLegend();
repaint();
+ gp.saveLayout();
}
protected void displaySeriesPopup(final JFreeChart chart, final String label, final int series, final ColorButton button) {
@@ -173,7 +178,22 @@
Color newColor = JColorChooser.showDialog(this, "Pick a color for " + label, color);
button.setColor(newColor);
((XYPlot) chart.getPlot()).getRenderer().setSeriesPaint(series, newColor);
+ gp.saveLayout();
}
+
+ public void setColor(State s, Color color) {
+ int series = enabled.indexOf(s);
+ ((XYPlot) chart.getPlot()).getRenderer().setSeriesPaint(series, color);
+ int i = 0;
+ for (Component c : legend.getComponents()) {
+ if (c instanceof JButton) {
+ i++;
+ if (i == series + 1) {
+ ((ColorButton) c).setColor(color);
+ }
+ }
+ }
+ }
private void update() {
SummaryItem summary = (SummaryItem) state.getItemByID(SummaryItem.ID, StatefulItemClass.WORKFLOW);
@@ -185,12 +205,50 @@
ts.add(new Second(new Date()), summary.getCount(s));
}
}
+
+ public void enable(State s) {
+ enable(s, true);
+ }
- public void enable(State s) {
+ public void enable(State s, boolean save) {
TimeSeries ts = new TimeSeries(s.getName());
col.addSeries(ts);
enabled.add(s);
rebuildLegend();
repaint();
+ if (save) {
+ gp.saveLayout();
+ }
}
+
+ public void store(Preferences p) {
+ p.putInt("enabledCount", enabled.size());
+ for (int i = 0; i < enabled.size(); i++) {
+ Preferences gp = p.node("series" + i);
+ gp.put("key", enabled.get(i).getName());
+ Color color = (Color) chart.getPlot().getLegendItems().get(i).getLinePaint();
+ gp.putInt("color.r", color.getRed());
+ gp.putInt("color.g", color.getGreen());
+ gp.putInt("color.b", color.getBlue());
+ }
+ }
+
+ public static GraphPanel load(Preferences p, SystemState state, GraphsPanel gps) {
+ GraphPanel g = new GraphPanel(state, gps);
+ int ec = p.getInt("enabledCount", 0);
+ for (int i = 0; i < ec; i++) {
+ Preferences gp = p.node("series" + i);
+ String key = gp.get("key", null);
+ if (key == null) {
+ throw new RuntimeException("Null series key");
+ }
+ int cr = gp.getInt("color.r", 255);
+ int cg = gp.getInt("color.g", 0);
+ int cb = gp.getInt("color.b", 0);
+ SummaryItem.State s = SummaryItem.getStateByKey(key);
+ g.enable(s, false);
+ g.setColor(s, new Color(cr, cg, cb));
+ }
+ return g;
+ }
}
Modified: trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/GraphsPanel.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/GraphsPanel.java 2013-07-25 20:01:31 UTC (rev 6667)
+++ trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/GraphsPanel.java 2013-07-25 23:34:55 UTC (rev 6668)
@@ -15,8 +15,8 @@
import java.awt.event.ActionListener;
import java.awt.image.BufferedImage;
import java.net.URL;
-import java.util.Deque;
import java.util.LinkedList;
+import java.util.prefs.Preferences;
import javax.imageio.ImageIO;
import javax.swing.ImageIcon;
@@ -78,15 +78,14 @@
private SystemState state;
- private int rows, columns;
private JPanel toolBar;
private JPopupMenu layoutPopup;
- private Deque graphs;
+ private LinkedList graphs;
private GridView grid;
public GraphsPanel(SystemState state) {
this.state = state;
- this.graphs = new LinkedList();
+ this.graphs = new LinkedList();
setLayout(new BorderLayout());
toolBar = new JPanel();
@@ -108,12 +107,7 @@
grid = new GridView();
add(grid, BorderLayout.CENTER);
- GraphPanel gp = new GraphPanel(state);
- gp.enable(SummaryItem.State.ACTIVE);
- gp.enable(SummaryItem.State.STAGE_IN);
- gp.enable(SummaryItem.State.STAGE_OUT);
- graphs.add(gp);
- grid.add(gp);
+ loadLayout();
}
private void makeLayoutPopup() {
@@ -147,7 +141,7 @@
grid.setLayout(t.copy());
int count = grid.getCellCount();
while (count > graphs.size()) {
- GraphPanel gp = new GraphPanel(state);
+ GraphPanel gp = new GraphPanel(state, this);
graphs.add(gp);
grid.add(gp);
}
@@ -155,8 +149,69 @@
JComponent gp = graphs.removeLast();
grid.remove(gp);
}
+
+ saveLayout();
}
+ void saveLayout() {
+ /*
+ * Stored are:
+ * - the layout itself
+ * - the graph count and what's being graphed in each
+ * - the graph colors
+ */
+ try {
+ Preferences prefs = Preferences.userNodeForPackage(GraphsPanel.class);
+ Preferences layout = prefs.node("layout");
+ grid.getTree().store(layout);
+ prefs.putInt("graphCount", graphs.size());
+ for (int i = 0; i < graphs.size(); i++) {
+ Preferences gp = prefs.node("graph" + i);
+ graphs.get(i).store(gp);
+ }
+ }
+ catch (Exception e) {
+ System.err.println("Failed to save layout: " + e);
+ }
+ }
+
+ private void loadLayout() {
+ grid.clear();
+ graphs.clear();
+ try {
+ Preferences prefs = Preferences.userNodeForPackage(GraphsPanel.class);
+ if (prefs.nodeExists("layout")) {
+ grid.setLayout(GridView.Tree.load(prefs.node("layout")));
+ int gc = prefs.getInt("graphCount", 0);
+ for (int i = 0; i < gc; i++) {
+ GraphPanel gp = GraphPanel.load(prefs.node("graph" + i), state, this);
+ graphs.add(gp);
+ grid.add(gp);
+ }
+ }
+ else {
+ setDefaultLayout();
+ }
+ }
+ catch (Exception e) {
+ System.err.println("Failed to load layout: " + e + ". Using default.");
+ setDefaultLayout();
+ }
+ }
+
+ private void setDefaultLayout() {
+ grid.clear();
+ graphs.clear();
+ grid.setLayout(new Tree());
+ GraphPanel gp = new GraphPanel(state, this);
+ gp.enable(SummaryItem.State.ACTIVE);
+ gp.enable(SummaryItem.State.STAGE_IN);
+ gp.enable(SummaryItem.State.STAGE_OUT);
+ graphs.add(gp);
+ grid.add(gp);
+ saveLayout();
+ }
+
protected void displayLayoutPopup(JButton src) {
layoutPopup.show(src, 6, 6);
}
Modified: trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/GridView.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/GridView.java 2013-07-25 20:01:31 UTC (rev 6667)
+++ trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/GridView.java 2013-07-25 23:34:55 UTC (rev 6668)
@@ -11,41 +11,84 @@
import java.awt.BasicStroke;
import java.awt.Component;
+import java.awt.Cursor;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Stroke;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.prefs.BackingStoreException;
+import java.util.prefs.Preferences;
import javax.swing.ImageIcon;
+import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.UIManager;
public class GridView extends JPanel {
public static final int DIVIDER_SIZE = 10;
+ public static final Cursor H_RESIZE_CURSOR = Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR);
+ public static final Cursor V_RESIZE_CURSOR = Cursor.getPredefinedCursor(Cursor.S_RESIZE_CURSOR);
- private GridView.Tree tree;
+ public static final Stroke DIVIDER_STROKE = new BasicStroke(1, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND, 0,
+ new float[] {5.0f}, 0f);
+ private Tree tree;
+ private List dividers;
+ private int cellCount, dividerIndex;
+
public GridView() {
- tree = new Tree();
+ dividers = new ArrayList();
+ setLayout(new Tree());
}
public void setLayout(Tree t) {
this.tree = t;
- revalidate();
+ cellCount = this.tree.cellCount();
+ validate();
+ repaint();
}
+ public void clear() {
+ tree = null;
+ removeAll();
+ }
+
+ public Tree getTree() {
+ return tree;
+ }
+
public int getCellCount() {
- return tree.cellCount();
+ return cellCount;
}
@Override
- public void doLayout() {
+ public synchronized void doLayout() {
+ dividerIndex = 0;
layout(tree, 0, 0, getWidth(), getHeight(), 0);
+ while (dividers.size() > dividerIndex + 1) {
+ Divider d = dividers.get(dividers.size() - 1);
+ dividers.remove(dividers.size() - 1);
+ remove(d);
+ }
}
+
+ @Override
+ public synchronized Component add(Component comp) {
+ // add before dividers
+ return super.add(comp, getComponentCount() - dividers.size());
+ }
private int layout(GridView.Tree t, int x, int y, int w, int h, int index) {
+ if (t == null) {
+ return index;
+ }
if (t.splitType == Tree.NONE) {
- if (getComponentCount() > index) {
+ if (cellCount > index) {
Component c = getComponent(index);
c.setSize(w, h);
c.setLocation(x, y);
@@ -53,52 +96,41 @@
return index + 1;
}
else if (t.splitType == Tree.V) {
- int h1 = (int) (t.splitPosition * h) - DIVIDER_SIZE / 2;
- int h2 = h - h1 - DIVIDER_SIZE;
- index = layout(t.first, x, y, w, h1, index);
- return layout(t.second, x, y + h1 + DIVIDER_SIZE, w, h2, index);
+ int h1 = (int) (t.splitPosition * h);
+ int h2 = h - h1;
+ setDivider(Tree.V, x, y + h1 - DIVIDER_SIZE / 2, w, DIVIDER_SIZE, h, t);
+ index = layout(t.first, x, y, w, h1 - DIVIDER_SIZE / 2, index);
+ return layout(t.second, x, y + h1 + DIVIDER_SIZE / 2, w, h2, index);
}
else if (t.splitType == Tree.H) {
- int w1 = (int) (t.splitPosition * w) - DIVIDER_SIZE / 2;
- int w2 = w - w1 - DIVIDER_SIZE;
- index = layout(t.first, x, y, w1, h, index);
- return layout(t.second, x + w1 + DIVIDER_SIZE, y, w2, h, index);
+ int w1 = (int) (t.splitPosition * w);
+ int w2 = w - w1;
+ setDivider(Tree.H, x + w1 - DIVIDER_SIZE / 2, y, DIVIDER_SIZE, h, w, t);
+ index = layout(t.first, x, y, w1 - DIVIDER_SIZE / 2, h, index);
+ return layout(t.second, x + w1 + DIVIDER_SIZE / 2, y, w2, h, index);
}
return index;
}
- private final Stroke DIVIDER_STROKE = new BasicStroke(1, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND, 0,
- new float[] {5.0f}, 0f);
-
-
- @Override
- public void paint(Graphics g) {
- super.paint(g);
- Graphics2D g2 = (Graphics2D) g;
- g2.setColor(UIManager.getColor("Table.gridColor"));
- g2.setStroke(DIVIDER_STROKE);
- paintDivider(g, tree, 0, 0, getWidth(), getHeight());
- }
-
- private void paintDivider(Graphics g, Tree t, int x, int y, int w, int h) {
- if (t == null || t.splitType == Tree.NONE) {
+ private void setDivider(int dir, int x, int y, int w, int h, int range, Tree t) {
+ if (dividers.size() <= dividerIndex) {
+ Divider d = new Divider(dir, x, y, w, h, range, t);
+ dividers.add(d);
+ super.add(d);
}
- else if (t.splitType == Tree.V) {
- int h1 = (int) (t.splitPosition * h);
- g.drawLine(x, y + h1, x + w, y + h1);
- paintDivider(g, t.first, x, y, w, h1 - DIVIDER_SIZE / 2);
- paintDivider(g, t.second, x, y + h1 + DIVIDER_SIZE / 2, w, h1 - DIVIDER_SIZE / 2);
+ else {
+ Divider d = dividers.get(dividerIndex);
+ d.set(dir, x, y, w, h, range, t);
+ d.validate();
}
- else if (t.splitType == Tree.H) {
- int w1 = (int) (t.splitPosition * w);
- g.drawLine(x + w1, y, x + w1, y + h);
- paintDivider(g, t.first, x, y, w1 - DIVIDER_SIZE / 2, h);
- paintDivider(g, t.second, x + w1 + DIVIDER_SIZE / 2, y, w1 - DIVIDER_SIZE / 2, h);
- }
+ dividerIndex++;
}
-
-
+ private void addDivider(Divider divider) {
+ dividers.add(divider);
+ this.add(divider);
+ }
+
public static class Tree {
public static final int NONE = 0;
public static final int H = 1;
@@ -162,6 +194,30 @@
return t.copy();
}
}
+
+ public void store(Preferences p) {
+ p.putInt("splitType", splitType);
+ p.putDouble("splitPosition", splitPosition);
+ if (first != null) {
+ Preferences p1 = p.node("first");
+ first.store(p1);
+ }
+ if (second != null) {
+ Preferences p2 = p.node("second");
+ second.store(p2);
+ }
+ }
+
+ public static Tree load(Preferences p) throws BackingStoreException {
+ Tree tree = new Tree();
+ tree.splitType = p.getInt("splitType", H);
+ tree.splitPosition = p.getDouble("splitPosition", 0.5);
+ if (tree.splitType != NONE) {
+ tree.first = load(p.node("first"));
+ tree.second = load(p.node("second"));
+ }
+ return tree;
+ }
}
private static class TreeIcon extends ImageIcon {
@@ -209,4 +265,123 @@
}
}
}
+
+ private static class Divider extends JComponent implements MouseListener, MouseMotionListener {
+ private int type, range;
+ private Tree tree;
+ private boolean dragging;
+ private int vd;
+
+ public Divider(int type, int x, int y, int w, int h, int range, Tree tree) {
+ this.type = type;
+ this.tree = tree;
+ this.range = range;
+ this.setLocation(x, y);
+ this.setSize(w, h);
+ if (type == Tree.H) {
+ this.setCursor(H_RESIZE_CURSOR);
+ }
+ else {
+ this.setCursor(V_RESIZE_CURSOR);
+ }
+ addMouseListener(this);
+ addMouseMotionListener(this);
+ }
+
+ public void set(int dir, int x, int y, int w, int h, int range, Tree t) {
+ this.type = dir;
+ this.tree = t;
+ this.range = range;
+ setLocation(x, y);
+ setSize(w, h);
+ if (type == Tree.H) {
+ this.setCursor(H_RESIZE_CURSOR);
+ }
+ else {
+ this.setCursor(V_RESIZE_CURSOR);
+ }
+ }
+
+ public void paintComponent(Graphics g) {
+ Graphics2D g2 = (Graphics2D) g;
+
+ if (dragging) {
+ g2.setColor(UIManager.getColor("Separator.highlight"));
+ }
+ else {
+ g2.setColor(UIManager.getColor("Separator.foreground"));
+ }
+ //g2.setColor(Color.BLACK);
+ g2.setStroke(DIVIDER_STROKE);
+ if (type == Tree.H) {
+ int w2 = getWidth() / 2;
+ g.drawLine(w2, 0, w2, getHeight());
+ }
+ else {
+ int h2 = getHeight() / 2;
+ g.drawLine(0, h2, getWidth(), h2);
+ }
+ }
+
+ @Override
+ public void mouseDragged(MouseEvent e) {
+ int v;
+ if (type == Tree.V) {
+ v = e.getYOnScreen() - vd;
+ }
+ else {
+ v = e.getXOnScreen() - vd;
+ }
+
+ if (v < 0) {
+ v = 0;
+ }
+ if (v > range) {
+ v = range;
+ }
+ double pos = (double) v / range;
+ tree.splitPosition = pos;
+ getParent().revalidate();
+ getParent().repaint();
+ }
+
+ @Override
+ public void mouseMoved(MouseEvent e) {
+ if (dragging) {
+ mouseDragged(e);
+ }
+ }
+
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ }
+
+ @Override
+ public void mousePressed(MouseEvent e) {
+ dragging = true;
+ if (type == Tree.H) {
+ int w2 = getX() + getWidth() / 2;
+ vd = e.getXOnScreen() - w2;
+ }
+ else {
+ int h2 = getY() + getHeight() / 2;
+ vd = e.getYOnScreen() - h2;
+ }
+ repaint();
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent e) {
+ dragging = false;
+ repaint();
+ }
+
+ @Override
+ public void mouseEntered(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseExited(MouseEvent e) {
+ }
+ }
}
\ No newline at end of file
From yadunandb at ci.uchicago.edu Fri Jul 26 17:33:16 2013
From: yadunandb at ci.uchicago.edu (yadunandb at ci.uchicago.edu)
Date: Fri, 26 Jul 2013 17:33:16 -0500 (CDT)
Subject: [Swift-commit] r6669 -
branches/release-0.94/tests/stress/IO/bagOnodes
Message-ID: <20130726223316.02309187CC1@svn.ci.uchicago.edu>
Author: yadunandb
Date: 2013-07-26 17:33:15 -0500 (Fri, 26 Jul 2013)
New Revision: 6669
Modified:
branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remote1x1.check.sh
branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remote1x2.check.sh
branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remoteNx1.check.sh
branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remoteNx2.check.sh
branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remote1x1.check.sh
branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remote1x2.check.sh
branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remoteNx1.check.sh
branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remoteNx2.check.sh
Log:
Minor changes
Modified: branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remote1x1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remote1x1.check.sh 2013-07-25 23:34:55 UTC (rev 6668)
+++ branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remote1x1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
@@ -1,4 +1,17 @@
-#!/bin/bash
+
+#!/bin/bash
+
echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ for dead in `ps axf -u $USER | grep HeapDumpOnOutOfMemoryError | grep -o ^[0-9]*`
+ do
+ kill -9 $dead
+ done
+else
+ echo "No"
+fi
+
Modified: branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remote1x2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remote1x2.check.sh 2013-07-25 23:34:55 UTC (rev 6668)
+++ branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remote1x2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+#!/bin/bash
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remoteNx1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remoteNx1.check.sh 2013-07-25 23:34:55 UTC (rev 6668)
+++ branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remoteNx1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
@@ -1,4 +1,17 @@
-#!/bin/bash
+
+#!/bin/bash
+
echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ for dead in `ps axf -u $USER | grep HeapDumpOnOutOfMemoryError | grep -o ^[0-9]*`
+ do
+ kill -9 $dead
+ done
+else
+ echo "No"
+fi
+
Modified: branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remoteNx2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remoteNx2.check.sh 2013-07-25 23:34:55 UTC (rev 6668)
+++ branches/release-0.94/tests/stress/IO/bagOnodes/stage_from_remoteNx2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+#!/bin/bash
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remote1x1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remote1x1.check.sh 2013-07-25 23:34:55 UTC (rev 6668)
+++ branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remote1x1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
@@ -1,4 +1,17 @@
-#!/bin/bash
+
+#!/bin/bash
+
echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ for dead in `ps axf -u $USER | grep HeapDumpOnOutOfMemoryError | grep -o ^[0-9]*`
+ do
+ kill -9 $dead
+ done
+else
+ echo "No"
+fi
+
Modified: branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remote1x2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remote1x2.check.sh 2013-07-25 23:34:55 UTC (rev 6668)
+++ branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remote1x2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+#!/bin/bash
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remoteNx1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remoteNx1.check.sh 2013-07-25 23:34:55 UTC (rev 6668)
+++ branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remoteNx1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
@@ -1,4 +1,17 @@
-#!/bin/bash
+
+#!/bin/bash
+
echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ for dead in `ps axf -u $USER | grep HeapDumpOnOutOfMemoryError | grep -o ^[0-9]*`
+ do
+ kill -9 $dead
+ done
+else
+ echo "No"
+fi
+
Modified: branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remoteNx2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remoteNx2.check.sh 2013-07-25 23:34:55 UTC (rev 6668)
+++ branches/release-0.94/tests/stress/IO/bagOnodes/stage_to_remoteNx2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+#!/bin/bash
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
From yadunandb at ci.uchicago.edu Fri Jul 26 17:35:20 2013
From: yadunandb at ci.uchicago.edu (yadunandb at ci.uchicago.edu)
Date: Fri, 26 Jul 2013 17:35:20 -0500 (CDT)
Subject: [Swift-commit] r6670 - in branches/release-0.94/tests/stress/IO:
beagle multiple uc3
Message-ID: <20130726223520.07879187CC1@svn.ci.uchicago.edu>
Author: yadunandb
Date: 2013-07-26 17:35:19 -0500 (Fri, 26 Jul 2013)
New Revision: 6670
Removed:
branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.setup.sh
branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.source.sh
branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.swift
branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.timeout
Modified:
branches/release-0.94/tests/stress/IO/beagle/stage_from_remote1x1.check.sh
branches/release-0.94/tests/stress/IO/beagle/stage_from_remote1x2.check.sh
branches/release-0.94/tests/stress/IO/beagle/stage_from_remoteNx1.check.sh
branches/release-0.94/tests/stress/IO/beagle/stage_from_remoteNx2.check.sh
branches/release-0.94/tests/stress/IO/beagle/stage_to_remote1x1.check.sh
branches/release-0.94/tests/stress/IO/beagle/stage_to_remote1x2.check.sh
branches/release-0.94/tests/stress/IO/beagle/stage_to_remoteNx1.check.sh
branches/release-0.94/tests/stress/IO/beagle/stage_to_remoteNx2.check.sh
branches/release-0.94/tests/stress/IO/multiple/stage_from_remote1x1.check.sh
branches/release-0.94/tests/stress/IO/multiple/stage_from_remote1x2.check.sh
branches/release-0.94/tests/stress/IO/multiple/stage_from_remoteNx1.check.sh
branches/release-0.94/tests/stress/IO/multiple/stage_from_remoteNx2.check.sh
branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x1.check.sh
branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x2.check.sh
branches/release-0.94/tests/stress/IO/multiple/stage_to_remoteNx1.check.sh
branches/release-0.94/tests/stress/IO/multiple/stage_to_remoteNx2.check.sh
branches/release-0.94/tests/stress/IO/uc3/stage_from_remote1x1.check.sh
branches/release-0.94/tests/stress/IO/uc3/stage_from_remote1x2.check.sh
branches/release-0.94/tests/stress/IO/uc3/stage_from_remoteNx1.check.sh
branches/release-0.94/tests/stress/IO/uc3/stage_from_remoteNx2.check.sh
branches/release-0.94/tests/stress/IO/uc3/stage_to_remote1x1.check.sh
branches/release-0.94/tests/stress/IO/uc3/stage_to_remote1x2.check.sh
branches/release-0.94/tests/stress/IO/uc3/stage_to_remoteNx1.check.sh
branches/release-0.94/tests/stress/IO/uc3/stage_to_remoteNx2.check.sh
Log:
Changed the stress levels and remove x3 test series from IO tests
Modified: branches/release-0.94/tests/stress/IO/beagle/stage_from_remote1x1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/beagle/stage_from_remote1x1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/beagle/stage_from_remote1x1.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
+#!/bin/bash
+
rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/beagle/stage_from_remote1x2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/beagle/stage_from_remote1x2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/beagle/stage_from_remote1x2.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
+#!/bin/bash
+
rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/beagle/stage_from_remoteNx1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/beagle/stage_from_remoteNx1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/beagle/stage_from_remoteNx1.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
+#!/bin/bash
+
rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/beagle/stage_from_remoteNx2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/beagle/stage_from_remoteNx2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/beagle/stage_from_remoteNx2.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
+#!/bin/bash
+
rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/beagle/stage_to_remote1x1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/beagle/stage_to_remote1x1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/beagle/stage_to_remote1x1.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
+#!/bin/bash
+
rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/beagle/stage_to_remote1x2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/beagle/stage_to_remote1x2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/beagle/stage_to_remote1x2.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
+#!/bin/bash
+
rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/beagle/stage_to_remoteNx1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/beagle/stage_to_remoteNx1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/beagle/stage_to_remoteNx1.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
+#!/bin/bash
+
rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/beagle/stage_to_remoteNx2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/beagle/stage_to_remoteNx2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/beagle/stage_to_remoteNx2.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
+#!/bin/bash
+
rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/multiple/stage_from_remote1x1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/multiple/stage_from_remote1x1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/multiple/stage_from_remote1x1.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,17 @@
-#!/bin/bash
+
+#!/bin/bash
+
echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ for dead in `ps axf -u $USER | grep HeapDumpOnOutOfMemoryError | grep -o ^[0-9]*`
+ do
+ kill -9 $dead
+ done
+else
+ echo "No"
+fi
+
Modified: branches/release-0.94/tests/stress/IO/multiple/stage_from_remote1x2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/multiple/stage_from_remote1x2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/multiple/stage_from_remote1x2.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+#!/bin/bash
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/multiple/stage_from_remoteNx1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/multiple/stage_from_remoteNx1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/multiple/stage_from_remoteNx1.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,17 @@
-#!/bin/bash
+
+#!/bin/bash
+
echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ for dead in `ps axf -u $USER | grep HeapDumpOnOutOfMemoryError | grep -o ^[0-9]*`
+ do
+ kill -9 $dead
+ done
+else
+ echo "No"
+fi
+
Modified: branches/release-0.94/tests/stress/IO/multiple/stage_from_remoteNx2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/multiple/stage_from_remoteNx2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/multiple/stage_from_remoteNx2.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+#!/bin/bash
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x1.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,17 @@
-#!/bin/bash
+
+#!/bin/bash
+
echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ for dead in `ps axf -u $USER | grep HeapDumpOnOutOfMemoryError | grep -o ^[0-9]*`
+ do
+ kill -9 $dead
+ done
+else
+ echo "No"
+fi
+
Modified: branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x2.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+#!/bin/bash
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Deleted: branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.setup.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.setup.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.setup.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-if [[ -z $MIDWAY_USERNAME ]]
-then
- echo "Remote username not provided. Skipping sites configs"
-else
- ls *xml
- cat sites.xml | sed "s/{mid.USER}/$MIDWAY_USERNAME/" > tmp && mv tmp\
- sites.xml
-fi
-if [[ -z $UC3_USERNAME ]]
-then
- echo "Remote username not provided. Skipping sites configs"
-else
- ls *xml
- cat sites.xml | sed "s/{uc3.USER}/$UC3_USERNAME/" > tmp && mv tmp si\
-tes.xml
-fi
-if [[ -z $BEAGLE_USERNAME ]]
-then
- echo "Remote username not provided. Skipping sites configs"
-else
- ls *xml
- cat sites.xml | sed "s/{beagle.USER}/$BEAGLE_USERNAME/" > tmp && mv \
-tmp sites.xml
-fi
-
-ARGS_FILE=${0%.setup.sh}.args
-
-case $STRESS in
- *)
- FILES=500
- LOOPS=0
- ;;
-esac
-
-
-dd if=/dev/zero of=dummy bs=1024 count=0 seek=$((1024*FILES))
-echo "-loops=$LOOPS" > $ARGS_FILE
-
-cat <<'EOF' > wrapper.sh
-#!/bin/bash
-ARG1=$1
-ls | grep "$1" &> /dev/null
-if [ $? == 0 ]
-then
- echo "Hey this is wrapper and the $1 exists as a file";
- ls -lah;
-else
- echo "Doinks! the file we need isn't here";
- ls -lah
-fi
-cat $ARG1 > $ARG1.test
-if [ $? == 0 ]
-then
- echo "The cat worked! ";
-else
- echo "The cat failed ";
-fi
-
-rm $ARG1 $ARG1.test
-echo "Residual files cleaned up"
-EOF
Deleted: branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.source.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.source.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.source.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,6 +0,0 @@
-#!/bin/bash
-if [ "midway001" == "midway001" ]
-then
- export GLOBUS_HOSTNAME=swift.rcc.uchicago.edu
- export GLOBUS_TCP_PORT_RANGE=50000,51000
-fi;
Deleted: branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.swift
===================================================================
--- branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.swift 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.swift 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,17 +0,0 @@
-type file;
-
-file package <"dummy">;
-file script <"wrapper.sh">;
-int loop = @toInt(@arg("loops","0"));
-
-app (file out, file err) remote_driver (file run, file tar)
-{
- bash @run @filename(tar) stdout=@filename(out) stderr=@filename(err);
-}
-
-file driver_out[] ;
-file driver_err[] ;
-
-foreach item,i in [0:loop] {
- (driver_out[i], driver_err[i]) = remote_driver(script, package);
-}
\ No newline at end of file
Deleted: branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.timeout
===================================================================
--- branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.timeout 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/multiple/stage_to_remote1x3.timeout 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1 +0,0 @@
-600
Modified: branches/release-0.94/tests/stress/IO/multiple/stage_to_remoteNx1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/multiple/stage_to_remoteNx1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/multiple/stage_to_remoteNx1.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,17 @@
-#!/bin/bash
+
+#!/bin/bash
+
echo "Cleaning up"
rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ for dead in `ps axf -u $USER | grep HeapDumpOnOutOfMemoryError | grep -o ^[0-9]*`
+ do
+ kill -9 $dead
+ done
+else
+ echo "No"
+fi
+
Modified: branches/release-0.94/tests/stress/IO/multiple/stage_to_remoteNx2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/multiple/stage_to_remoteNx2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/multiple/stage_to_remoteNx2.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
+#!/bin/bash
+
rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/uc3/stage_from_remote1x1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/uc3/stage_from_remote1x1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/uc3/stage_from_remote1x1.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,17 @@
-#!/bin/bash
+
+#!/bin/bash
+
echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ for dead in `ps axf -u $USER | grep HeapDumpOnOutOfMemoryError | grep -o ^[0-9]*`
+ do
+ kill -9 $dead
+ done
+else
+ echo "No"
+fi
+
Modified: branches/release-0.94/tests/stress/IO/uc3/stage_from_remote1x2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/uc3/stage_from_remote1x2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/uc3/stage_from_remote1x2.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+#!/bin/bash
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/uc3/stage_from_remoteNx1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/uc3/stage_from_remoteNx1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/uc3/stage_from_remoteNx1.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,17 @@
-#!/bin/bash
+
+#!/bin/bash
+
echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ for dead in `ps axf -u $USER | grep HeapDumpOnOutOfMemoryError | grep -o ^[0-9]*`
+ do
+ kill -9 $dead
+ done
+else
+ echo "No"
+fi
+
Modified: branches/release-0.94/tests/stress/IO/uc3/stage_from_remoteNx2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/uc3/stage_from_remoteNx2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/uc3/stage_from_remoteNx2.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+#!/bin/bash
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/uc3/stage_to_remote1x1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/uc3/stage_to_remote1x1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/uc3/stage_to_remote1x1.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,17 @@
-#!/bin/bash
+
+#!/bin/bash
+
echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ for dead in `ps axf -u $USER | grep HeapDumpOnOutOfMemoryError | grep -o ^[0-9]*`
+ do
+ kill -9 $dead
+ done
+else
+ echo "No"
+fi
+
Modified: branches/release-0.94/tests/stress/IO/uc3/stage_to_remote1x2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/uc3/stage_to_remote1x2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/uc3/stage_to_remote1x2.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+#!/bin/bash
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
Modified: branches/release-0.94/tests/stress/IO/uc3/stage_to_remoteNx1.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/uc3/stage_to_remoteNx1.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/uc3/stage_to_remoteNx1.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,17 @@
-#!/bin/bash
+
+#!/bin/bash
+
echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ for dead in `ps axf -u $USER | grep HeapDumpOnOutOfMemoryError | grep -o ^[0-9]*`
+ do
+ kill -9 $dead
+ done
+else
+ echo "No"
+fi
+
Modified: branches/release-0.94/tests/stress/IO/uc3/stage_to_remoteNx2.check.sh
===================================================================
--- branches/release-0.94/tests/stress/IO/uc3/stage_to_remoteNx2.check.sh 2013-07-26 22:33:15 UTC (rev 6669)
+++ branches/release-0.94/tests/stress/IO/uc3/stage_to_remoteNx2.check.sh 2013-07-26 22:35:19 UTC (rev 6670)
@@ -1,4 +1,19 @@
-#!/bin/bash
-echo "Cleaning up"
-rm -rf "dummy" driver*.out &> /dev/null
+#!/bin/bash
+rm -rf "dummy" *.out &> /dev/null
+if [ "$KILL_JAVA" == "true" ];
+then
+ echo "Killing Java.."
+ killall -u $USER java -9
+fi
+
+IN=`grep "PerformanceDiagnosticInputStream\ \[IN\]" $BASE*log | tail -n 1`
+MEM=`grep "PerformanceDiagnosticInputStream\ \[MEM\]" $BASE*log`
+OUT=`grep "PerformanceDiagnosticOutputStream\ \[OUT\]" $BASE*log | tail -n 1`
+
+echo "====="
+echo "IN : $IN"
+echo "MEM : $MEM"
+echo "OUT : $OUT"
+echo "====="
+
From hategan at ci.uchicago.edu Fri Jul 26 19:27:09 2013
From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu)
Date: Fri, 26 Jul 2013 19:27:09 -0500 (CDT)
Subject: [Swift-commit] r6671 - trunk
Message-ID: <20130727002709.BF567187CC1@svn.ci.uchicago.edu>
Author: hategan
Date: 2013-07-26 19:27:09 -0500 (Fri, 26 Jul 2013)
New Revision: 6671
Modified:
trunk/project.properties
Log:
forgot to add jfreechart jars to library dependencies
Modified: trunk/project.properties
===================================================================
--- trunk/project.properties 2013-07-26 22:35:19 UTC (rev 6670)
+++ trunk/project.properties 2013-07-27 00:27:09 UTC (rev 6671)
@@ -8,4 +8,4 @@
# stable branch should be a change of version number)
version = svn
project = Swift workflow system
-lib.deps = antlr*.*, jsr173_1.0_api.*, resolver.*, stringtemplate.*, vdldefinitions.*, xbean.*, xbean_xpath.*, jug*.*, jaxrpc*.*, jline*.jar
+lib.deps = antlr*.*, jsr173_1.0_api.*, resolver.*, stringtemplate.*, vdldefinitions.*, xbean.*, xbean_xpath.*, jug*.*, jaxrpc*.*, jline*.jar, jfreechart*.jar, jcommon*.jar
From hategan at ci.uchicago.edu Sat Jul 27 13:18:12 2013
From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu)
Date: Sat, 27 Jul 2013 13:18:12 -0500 (CDT)
Subject: [Swift-commit] r6672 -
trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing
Message-ID: <20130727181812.BB3469D0CA@svn.ci.uchicago.edu>
Author: hategan
Date: 2013-07-27 13:18:11 -0500 (Sat, 27 Jul 2013)
New Revision: 6672
Modified:
trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/SummaryPanel.java
Log:
fixed zero counts on summary progress bars
Modified: trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/SummaryPanel.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/SummaryPanel.java 2013-07-27 00:27:09 UTC (rev 6671)
+++ trunk/src/org/griphyn/vdl/karajan/monitor/monitors/swing/SummaryPanel.java 2013-07-27 18:18:11 UTC (rev 6672)
@@ -143,7 +143,7 @@
if (summary != null) {
Map counts = summary.getCounts(state);
for (int i = 0; i < SummaryItem.STATES.length; i++) {
- Integer v = counts.get(SummaryItem.STATES[i]);
+ Integer v = counts.get(SummaryItem.STATES[i].getName());
if (v != null) {
if (v > maxCount) {
maxCount = v;
From hategan at ci.uchicago.edu Sun Jul 28 23:35:49 2013
From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu)
Date: Sun, 28 Jul 2013 23:35:49 -0500 (CDT)
Subject: [Swift-commit] r6673 - in trunk/src/org/griphyn/vdl: karajan/lib
karajan/lib/swiftscript mapping
Message-ID: <20130729043549.E225A9CC90@svn.ci.uchicago.edu>
Author: hategan
Date: 2013-07-28 23:35:49 -0500 (Sun, 28 Jul 2013)
New Revision: 6673
Modified:
trunk/src/org/griphyn/vdl/karajan/lib/AppStageins.java
trunk/src/org/griphyn/vdl/karajan/lib/AppStageouts.java
trunk/src/org/griphyn/vdl/karajan/lib/FileCopier.java
trunk/src/org/griphyn/vdl/karajan/lib/InFileDirs.java
trunk/src/org/griphyn/vdl/karajan/lib/OutFileDirs.java
trunk/src/org/griphyn/vdl/karajan/lib/PathUtils.java
trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Misc.java
trunk/src/org/griphyn/vdl/mapping/AbsFile.java
Log:
removed the use of java.net.(URI|URL) for parsing and use a custom based thing in cog since there are problems with URIs and spaces and URLs and path-only strings
Modified: trunk/src/org/griphyn/vdl/karajan/lib/AppStageins.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/AppStageins.java 2013-07-27 18:18:11 UTC (rev 6672)
+++ trunk/src/org/griphyn/vdl/karajan/lib/AppStageins.java 2013-07-29 04:35:49 UTC (rev 6673)
@@ -79,8 +79,8 @@
if (protocol.equals("file")) {
protocol = stagingMethod;
}
- String path = file.getDir().equals("") ?
- file.getName() : file.getDir() + "/" + file.getName();
+ String path = file.getDirectory() == null ?
+ file.getName() : file.getDirectory() + "/" + file.getName();
String relpath = path.startsWith("/") ? path.substring(1) : path;
if (logger.isDebugEnabled()) {
logger.debug("will stage in: " + relpath + " via: " + protocol);
Modified: trunk/src/org/griphyn/vdl/karajan/lib/AppStageouts.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/AppStageouts.java 2013-07-27 18:18:11 UTC (rev 6672)
+++ trunk/src/org/griphyn/vdl/karajan/lib/AppStageouts.java 2013-07-29 04:35:49 UTC (rev 6673)
@@ -73,7 +73,7 @@
if (protocol.equals("file")) {
protocol = stagingMethod;
}
- String path = file.getDir().equals("") ? file.getName() : file.getDir()
+ String path = file.getDirectory() == null ? file.getName() : file.getDirectory()
+ "/" + file.getName();
String relpath = path.startsWith("/") ? path.substring(1) : path;
cr_stageout.append(stack,
Modified: trunk/src/org/griphyn/vdl/karajan/lib/FileCopier.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/FileCopier.java 2013-07-27 18:18:11 UTC (rev 6672)
+++ trunk/src/org/griphyn/vdl/karajan/lib/FileCopier.java 2013-07-29 04:35:49 UTC (rev 6673)
@@ -50,9 +50,9 @@
AbsFile fsrc = (AbsFile) src;
AbsFile fdst = (AbsFile) dst;
FileTransferSpecification fts = new FileTransferSpecificationImpl();
- fts.setDestinationDirectory(fdst.getDir());
+ fts.setDestinationDirectory(fdst.getDirectory());
fts.setDestinationFile(fdst.getName());
- fts.setSourceDirectory(fsrc.getDir());
+ fts.setSourceDirectory(fsrc.getDirectory());
fts.setSourceFile(fsrc.getName());
fts.setThirdPartyIfPossible(true);
task = new FileTransferTask();
Modified: trunk/src/org/griphyn/vdl/karajan/lib/InFileDirs.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/InFileDirs.java 2013-07-27 18:18:11 UTC (rev 6672)
+++ trunk/src/org/griphyn/vdl/karajan/lib/InFileDirs.java 2013-07-29 04:35:49 UTC (rev 6673)
@@ -50,14 +50,16 @@
Channel