[Swift-commit] r5523 - in trunk: . docs docs/cookbook libexec libexec/log-processing resources src/org/griphyn/vdl/karajan src/org/griphyn/vdl/karajan/lib src/org/griphyn/vdl/karajan/lib/cache src/org/griphyn/vdl/mapping tests tests/groups tests/language/working tests/language-behaviour/mappers tests/language-behaviour/math tests/language-behaviour/procedures

hategan at ci.uchicago.edu hategan at ci.uchicago.edu
Sat Jan 28 22:43:38 CST 2012 

Author: hategan
Date: 2012-01-28 22:43:37 -0600 (Sat, 28 Jan 2012)
New Revision: 5523

Added:
   trunk/docs/cookbook/cookbook.txt
   trunk/tests/groups/mcs.sh
   trunk/tests/groups/providers-fusion.sh
   trunk/tests/groups/providers-pads.sh
   trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.timeout
   trunk/tests/language-behaviour/math/006-add.out.expected
   trunk/tests/language-behaviour/math/008-add-multiply.out.expected
   trunk/tests/language-behaviour/math/009-multiply.out.expected
   trunk/tests/language-behaviour/math/010-divide.out.expected
   trunk/tests/language-behaviour/math/011-divide-float.out.expected
   trunk/tests/language-behaviour/math/013-mod.out.expected
   trunk/tests/language-behaviour/math/014-subtract.out.expected
   trunk/tests/language-behaviour/math/0145-unary-subtact.out.expected
   trunk/tests/language-behaviour/math/015-lesseq.out.expected
   trunk/tests/language-behaviour/math/016-greatereq.out.expected
   trunk/tests/language-behaviour/math/017-greater.out.expected
   trunk/tests/language-behaviour/math/018-less.out.expected
   trunk/tests/language-behaviour/math/019-equals.out.expected
   trunk/tests/language-behaviour/math/0191-not-equals.out.expected
   trunk/tests/language-behaviour/math/030-mix-float-int.out.expected
   trunk/tests/language-behaviour/math/031-add-float.out.expected
   trunk/tests/language-behaviour/procedures/tc.template.mix.data
   trunk/tests/language/working/063-filename_extraction.in
   trunk/tests/language/working/063-filename_extraction.out.expected
   trunk/tests/language/working/063-filename_extraction.swift
Removed:
   trunk/tests/language-behaviour/math/006-add.check.sh
   trunk/tests/language-behaviour/math/007-add-in-proc-add.check.sh
   trunk/tests/language-behaviour/math/008-add-multiply.check.sh
   trunk/tests/language-behaviour/math/009-multiply.check.sh
   trunk/tests/language-behaviour/math/010-divide.check.sh
   trunk/tests/language-behaviour/math/011-divide-float.check.sh
   trunk/tests/language-behaviour/math/013-mod.check.sh
   trunk/tests/language-behaviour/math/014-subtract.check.sh
   trunk/tests/language-behaviour/math/0145-unary-subtact.check.sh
   trunk/tests/language-behaviour/math/015-lesseq.check.sh
   trunk/tests/language-behaviour/math/016-greatereq.check.sh
   trunk/tests/language-behaviour/math/017-greater.check.sh
   trunk/tests/language-behaviour/math/018-less.check.sh
   trunk/tests/language-behaviour/math/019-equals.check.sh
   trunk/tests/language-behaviour/math/0191-not-equals.check.sh
   trunk/tests/language-behaviour/math/030-mix-float-int.check.sh
   trunk/tests/language-behaviour/math/031-add-float.check.sh
Modified:
   trunk/
   trunk/.classpath
   trunk/.project
   trunk/build.xml
   trunk/docs/build_docs.sh
   trunk/libexec/_swiftwrap
   trunk/libexec/_swiftwrap.staging
   trunk/libexec/log-processing/active-state-transitions
   trunk/libexec/log-processing/add-runid-as-prefix
   trunk/libexec/log-processing/affine-transform
   trunk/libexec/log-processing/aggregate.html.template
   trunk/libexec/log-processing/all-kickstarts-to-event
   trunk/libexec/log-processing/all-logs-active-jobsubmissions-count-graph
   trunk/libexec/log-processing/annotate-karatasks-with-execute2-id
   trunk/libexec/log-processing/assorted.html.template
   trunk/libexec/log-processing/autospace-data
   trunk/libexec/log-processing/b.plot
   trunk/libexec/log-processing/bars
   trunk/libexec/log-processing/cli-finished
   trunk/libexec/log-processing/cli-version
   trunk/libexec/log-processing/cluster-report
   trunk/libexec/log-processing/cluster-stats
   trunk/libexec/log-processing/colour-execute2
   trunk/libexec/log-processing/colour-execute2-by-falkon
   trunk/libexec/log-processing/colour-karatasks
   trunk/libexec/log-processing/colour.plot.template
   trunk/libexec/log-processing/coloured-event-plot
   trunk/libexec/log-processing/combine-execute-start-last-times
   trunk/libexec/log-processing/combine-start-last-times
   trunk/libexec/log-processing/combine-start-last-times-to-event
   trunk/libexec/log-processing/compute-t-inf
   trunk/libexec/log-processing/create-everylog-vs-versions-data
   trunk/libexec/log-processing/duration-histogram.plot
   trunk/libexec/log-processing/duration-of-workflow
   trunk/libexec/log-processing/error-summary
   trunk/libexec/log-processing/event-duration-stats
   trunk/libexec/log-processing/events-in-progress
   trunk/libexec/log-processing/events-in-progress-first-loop.pl
   trunk/libexec/log-processing/events-in-progress-second-loop.pl
   trunk/libexec/log-processing/events-in-progress-third-loop.pl
   trunk/libexec/log-processing/everylog-active-submissions.plot
   trunk/libexec/log-processing/everylog-durations-of-workflows
   trunk/libexec/log-processing/everylog-summary.html
   trunk/libexec/log-processing/everylog-time-cumulative.plot
   trunk/libexec/log-processing/everylog-to-event
   trunk/libexec/log-processing/everylog-version-cumulative.plot
   trunk/libexec/log-processing/everylog-vs-versions
   trunk/libexec/log-processing/everylog-vs-versions.plot
   trunk/libexec/log-processing/everylog.html
   trunk/libexec/log-processing/execstages-plot
   trunk/libexec/log-processing/execstages.plot.template
   trunk/libexec/log-processing/execute.html.template
   trunk/libexec/log-processing/execute.progress
   trunk/libexec/log-processing/execute2-by-falkon.channels
   trunk/libexec/log-processing/execute2-status-from-log
   trunk/libexec/log-processing/execute2-summary-from-log
   trunk/libexec/log-processing/execute2.html.template
   trunk/libexec/log-processing/execution-summaries
   trunk/libexec/log-processing/extract-activity-for-subthreads-of
   trunk/libexec/log-processing/extract-activity-for-task
   trunk/libexec/log-processing/extract-activity-for-thread
   trunk/libexec/log-processing/extract-completed-time-for-run-id
   trunk/libexec/log-processing/extract-end-time
   trunk/libexec/log-processing/extract-execute-start-times
   trunk/libexec/log-processing/extract-failed-time-for-run-id
   trunk/libexec/log-processing/extract-jobid-karajanid-bindings
   trunk/libexec/log-processing/extract-last-time-for-execute
   trunk/libexec/log-processing/extract-start-time
   trunk/libexec/log-processing/extract-start-times
   trunk/libexec/log-processing/falkon-to-event
   trunk/libexec/log-processing/falkon.html.template
   trunk/libexec/log-processing/generate-karatasks-event
   trunk/libexec/log-processing/get-jobid-for-karajanid
   trunk/libexec/log-processing/get-replicationid-for-execute2id
   trunk/libexec/log-processing/get-site-for-run-id
   trunk/libexec/log-processing/get-thread-for-run-id
   trunk/libexec/log-processing/index.html.template
   trunk/libexec/log-processing/info-and-karajan-actives
   trunk/libexec/log-processing/info-and-karajan-actives.2.plot
   trunk/libexec/log-processing/info-and-karajan-actives.plot
   trunk/libexec/log-processing/info-to-md5
   trunk/libexec/log-processing/info-to-transitions
   trunk/libexec/log-processing/info-to-zeroed-transitions
   trunk/libexec/log-processing/info.html.template
   trunk/libexec/log-processing/iso-to-secs
   trunk/libexec/log-processing/karajan.html.template
   trunk/libexec/log-processing/karatasks-coloured.channels
   trunk/libexec/log-processing/karatasks-coloured.channels.nm
   trunk/libexec/log-processing/karatasks-only
   trunk/libexec/log-processing/kickstart.html.template
   trunk/libexec/log-processing/kickstarts-to-event
   trunk/libexec/log-processing/kickstarts-to-plot
   trunk/libexec/log-processing/last-times
   trunk/libexec/log-processing/last-transition-line
   trunk/libexec/log-processing/list-known-tasks
   trunk/libexec/log-processing/list-known-threads
   trunk/libexec/log-processing/log-to-createdirset-transitions
   trunk/libexec/log-processing/log-to-dostagein-transitions
   trunk/libexec/log-processing/log-to-dostageout-transitions
   trunk/libexec/log-processing/log-to-execute-transitions
   trunk/libexec/log-processing/log-to-execute2-transitions
   trunk/libexec/log-processing/log-to-initshareddir-transitions
   trunk/libexec/log-processing/log-to-karatasks-transitions
   trunk/libexec/log-processing/logs-for-all
   trunk/libexec/log-processing/lookup-colour
   trunk/libexec/log-processing/makefile
   trunk/libexec/log-processing/makefile.cluster
   trunk/libexec/log-processing/makefile.errors
   trunk/libexec/log-processing/makefile.falkon
   trunk/libexec/log-processing/makefile.implicit
   trunk/libexec/log-processing/makefile.karatasks
   trunk/libexec/log-processing/makefile.kickstart
   trunk/libexec/log-processing/makefile.webpage
   trunk/libexec/log-processing/max-duration
   trunk/libexec/log-processing/normalise-event-start-time
   trunk/libexec/log-processing/normalise-event-start-time-to-any
   trunk/libexec/log-processing/number-events
   trunk/libexec/log-processing/number-sites-list
   trunk/libexec/log-processing/overview-reports.sh
   trunk/libexec/log-processing/overview.html.template
   trunk/libexec/log-processing/p1.plot
   trunk/libexec/log-processing/per-site-execute2-durations
   trunk/libexec/log-processing/plot-duration-histogram
   trunk/libexec/log-processing/plot-everylogs
   trunk/libexec/log-processing/plot1
   trunk/libexec/log-processing/q.plot
   trunk/libexec/log-processing/queue-state-transitions
   trunk/libexec/log-processing/retrycounts
   trunk/libexec/log-processing/scheduler.html.template
   trunk/libexec/log-processing/sec-to-utc
   trunk/libexec/log-processing/sec-to-utc-day
   trunk/libexec/log-processing/separate-execute-last-summary
   trunk/libexec/log-processing/simple-event-plot
   trunk/libexec/log-processing/slt2.plot
   trunk/libexec/log-processing/sort-preserve
   trunk/libexec/log-processing/sp.plot.template
   trunk/libexec/log-processing/split-start-times-shifted
   trunk/libexec/log-processing/start-last-times-and-kickstart
   trunk/libexec/log-processing/start-last-times-and-kickstart.plot
   trunk/libexec/log-processing/start-last-times.plot
   trunk/libexec/log-processing/start-times.plot
   trunk/libexec/log-processing/sum-tt1.pl
   trunk/libexec/log-processing/swap-and-sort
   trunk/libexec/log-processing/swap-and-sort-and-swap
   trunk/libexec/log-processing/swift-standard-log-to-transition
   trunk/libexec/log-processing/table-jobs-sites
   trunk/libexec/log-processing/task-status-to-transitions
   trunk/libexec/log-processing/tasks-in-cluster
   trunk/libexec/log-processing/tie-url-filenames
   trunk/libexec/log-processing/times-for-all-tasks
   trunk/libexec/log-processing/toolbar.html.template
   trunk/libexec/log-processing/total-event-plot
   trunk/libexec/log-processing/total.plot.template
   trunk/libexec/log-processing/trail
   trunk/libexec/log-processing/trail-freex
   trunk/libexec/log-processing/trail-freex.plot.template
   trunk/libexec/log-processing/trail.plot.template
   trunk/libexec/log-processing/transitions-to-cedps
   trunk/libexec/log-processing/transitions-to-event
   trunk/libexec/log-processing/tscore.sh
   trunk/libexec/log-processing/tscores.plot
   trunk/libexec/log-processing/weights.plot
   trunk/libexec/log-processing/weights.sh
   trunk/libexec/log-processing/whole-workflow-event
   trunk/libexec/log-processing/whole-workflow-time
   trunk/libexec/vdl-int-staging.k
   trunk/libexec/vdl-int.k
   trunk/resources/swiftscript.stg
   trunk/src/org/griphyn/vdl/karajan/DSHandleFutureWrapper.java
   trunk/src/org/griphyn/vdl/karajan/HangChecker.java
   trunk/src/org/griphyn/vdl/karajan/Loader.java
   trunk/src/org/griphyn/vdl/karajan/lib/AppStageouts.java
   trunk/src/org/griphyn/vdl/karajan/lib/RuntimeStats.java
   trunk/src/org/griphyn/vdl/karajan/lib/cache/LRUFileCache.java
   trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java
   trunk/src/org/griphyn/vdl/mapping/ExternalDataNode.java
   trunk/src/org/griphyn/vdl/mapping/RootArrayDataNode.java
   trunk/src/org/griphyn/vdl/mapping/RootDataNode.java
   trunk/tests/suite.sh
Log:
merged 0.93 branch


Property changes on: trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/release-0.93:4761-5122

Modified: trunk/.classpath
===================================================================
--- trunk/.classpath	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/.classpath	2012-01-29 04:43:37 UTC (rev 5523)
@@ -16,11 +16,10 @@
 	<classpathentry kind="lib" path="lib/xbean.jar"/>
 	<classpathentry kind="lib" path="lib/jug-lgpl-2.0.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/util"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/grapheditor"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/abstraction-provider-coaster"/>
 	<classpathentry kind="lib" path="lib/jline-0.9.94.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/util/lib/log4j-1.2.8.jar"/>
-	<classpathentry kind="lib" path="/util/lib/backport-util-concurrent.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/abstraction-provider-local"/>
 	<classpathentry kind="output" path=".build"/>
 </classpath>

Modified: trunk/.project
===================================================================
--- trunk/.project	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/.project	2012-01-29 04:43:37 UTC (rev 5523)
@@ -6,8 +6,13 @@
 		<project>abstraction-common</project>
 		<project>karajan</project>
 	</projects>
-	<buildSpec>
-	</buildSpec>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/build.xml	2012-01-29 04:43:37 UTC (rev 5523)
@@ -92,12 +92,9 @@
 				<include name="chxml"/>
 				<include name="start-coaster-service"/>
 				<include name="stop-coaster-service"/>
-                                <include name="run-worker.sh"/>
-                                <include name="start-grid-service"/>
-			</fileset>
-		</chmod>
-		<chmod perm="+x">
-			<fileset dir="${dist.dir}/bin">
+				<include name="run-worker.sh"/>
+				<include name="start-grid-service"/>
+
 				<include name="foreachsite"/>
 				<include name="gen_gridsites"/>
 				<include name="get_greensites"/>

Modified: trunk/docs/build_docs.sh
===================================================================
--- trunk/docs/build_docs.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/docs/build_docs.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -48,6 +48,8 @@
   exit 1
 fi
 
+INSTALLATION_DIRECTORY=$1
+
 # Create installation directory if needed
 if [ ! -d "$INSTALLATION_DIRECTORY" ]; then
    mkdir $INSTALLATION_DIRECTORY || crash "Unable to create directory $INSTALLATION_DIRECTORY"

Copied: trunk/docs/cookbook/cookbook.txt (from rev 5122, branches/release-0.93/docs/cookbook/cookbook.txt)
===================================================================
--- trunk/docs/cookbook/cookbook.txt	                        (rev 0)
+++ trunk/docs/cookbook/cookbook.txt	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1,16 @@
+Swift Cookbook
+==============
+Swift team <swift-user at ci.uchicago.edu>
+v0.92, March 2011
+
+include::overview[]
+
+include::swift_basics[]
+
+include::coasters[]
+
+include::diverse_infrastructures[]
+
+include::debugging_swift[]
+
+include::log_processing[]

Modified: trunk/libexec/_swiftwrap
===================================================================
--- trunk/libexec/_swiftwrap	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/libexec/_swiftwrap	2012-01-29 04:43:37 UTC (rev 5523)
@@ -58,9 +58,13 @@
 fail() {
 	EC=$1
 	shift
-	if [ "$STATUSMODE" = "files" ]; then
-		echo $@ >"$WFDIR/status/$JOBDIR/${ID}-error"
+	
+	if [ "$STATUSMODE" != "files" ]; then
+		mkdir -p $WFDIR/status/$JOBDIR
 	fi
+	
+	echo $@ >"$WFDIR/status/$JOBDIR/${ID}-error"
+		
 	log $@
 	info
 	if [ "$STATUSMODE" = "files" ]; then
@@ -450,7 +454,7 @@
 		fi
 		"$EXEC" "${CMDARGS[@]}" 1>"$STDOUT" 2>"$STDERR" <"$STDIN"
 	fi
-	checkError $? "Exit code $?"
+	checkError $? "Application $EXEC failed with an exit code of $?"
 else
 	if [ ! -f "$KICKSTART" ]; then
 		log "Kickstart executable ($KICKSTART) not found"
@@ -470,7 +474,7 @@
 		mv -f kickstart.xml "$WFDIR/kickstart/$JOBDIR/$ID-kickstart.xml" 2>&1 >& "$INFO"
 		checkError 254 "Failed to copy Kickstart record to shared directory"
 		if [ "$APPEXIT" != "0" ]; then
-			fail $APPEXIT "Exit code $APPEXIT"
+			fail $APPEXIT "Application $EXEC failed with an exit code of $APPEXIT"
 		fi
 	fi
 fi

Modified: trunk/libexec/_swiftwrap.staging
===================================================================
--- trunk/libexec/_swiftwrap.staging	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/libexec/_swiftwrap.staging	2012-01-29 04:43:37 UTC (rev 5523)
@@ -61,19 +61,11 @@
 fail() {
 	EC=$1
 	shift
-	if [ "$STATUSMODE" = "files" ]; then
-		echo $@ >"$WFDIR/status/$JOBDIR/${ID}-error"
-	fi
+
 	log $@
 	info
-	if [ "$STATUSMODE" = "files" ]; then
-		exit 0
-	else
-		if [ "X$STDERR" != "X" ]; then
-			echo "$@" >>$STDERR
-		fi
-		exit $EC
-	fi
+	echo "$@" >> wrapper.error
+	exit $EC
 }
 
 checkError() {
@@ -308,7 +300,7 @@
 	fi
 	"$EXEC" "${CMDARGS[@]}" 1>"$STDOUT" 2>"$STDERR" <"$STDIN"
 fi
-checkError $? "Exit code $?"
+checkError $? "Application $EXEC failed with an exit code of $?" <<$STDERR
 
 logstate "EXECUTE_DONE"
 log "Job ran successfully"


Property changes on: trunk/libexec/log-processing/active-state-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/add-runid-as-prefix
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/affine-transform
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/aggregate.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/all-kickstarts-to-event
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/all-logs-active-jobsubmissions-count-graph
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/annotate-karatasks-with-execute2-id
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/assorted.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/autospace-data
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/b.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/bars
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/cli-finished
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/cli-version
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/cluster-report
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/cluster-stats
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/colour-execute2
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/colour-execute2-by-falkon
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/colour-karatasks
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/colour.plot.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/coloured-event-plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/combine-execute-start-last-times
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/combine-start-last-times
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/combine-start-last-times-to-event
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/compute-t-inf
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/create-everylog-vs-versions-data
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/duration-histogram.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/duration-of-workflow
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/error-summary
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/event-duration-stats
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/events-in-progress
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/events-in-progress-first-loop.pl
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/events-in-progress-second-loop.pl
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/events-in-progress-third-loop.pl
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/everylog-active-submissions.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/everylog-durations-of-workflows
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/everylog-summary.html
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/everylog-time-cumulative.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/everylog-to-event
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/everylog-version-cumulative.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/everylog-vs-versions
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/everylog-vs-versions.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/everylog.html
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/execstages-plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/execstages.plot.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/execute.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/execute.progress
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/execute2-by-falkon.channels
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/execute2-status-from-log
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/execute2-summary-from-log
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/execute2.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/execution-summaries
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/extract-activity-for-subthreads-of
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/extract-activity-for-task
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/extract-activity-for-thread
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/extract-completed-time-for-run-id
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/extract-end-time
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/extract-execute-start-times
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/extract-failed-time-for-run-id
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/extract-jobid-karajanid-bindings
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/extract-last-time-for-execute
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/extract-start-time
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/extract-start-times
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/falkon-to-event
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/falkon.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/generate-karatasks-event
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/get-jobid-for-karajanid
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/get-replicationid-for-execute2id
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/get-site-for-run-id
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/get-thread-for-run-id
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/index.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/info-and-karajan-actives
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/info-and-karajan-actives.2.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/info-and-karajan-actives.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/info-to-md5
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/info-to-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/info-to-zeroed-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/info.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/iso-to-secs
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/karajan.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/karatasks-coloured.channels
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/karatasks-coloured.channels.nm
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/karatasks-only
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/kickstart.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/kickstarts-to-event
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/kickstarts-to-plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/last-times
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/last-transition-line
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/list-known-tasks
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/list-known-threads
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/log-to-createdirset-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/log-to-dostagein-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/log-to-dostageout-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/log-to-execute-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/log-to-execute2-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/log-to-initshareddir-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/log-to-karatasks-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/logs-for-all
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/lookup-colour
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/makefile
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/makefile.cluster
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/makefile.errors
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/makefile.falkon
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/makefile.implicit
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/makefile.karatasks
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/makefile.kickstart
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/makefile.webpage
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/max-duration
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/normalise-event-start-time
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/normalise-event-start-time-to-any
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/number-events
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/number-sites-list
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/overview-reports.sh
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/overview.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/p1.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/per-site-execute2-durations
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/plot-duration-histogram
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/plot-everylogs
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/plot1
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/q.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/queue-state-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/retrycounts
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/scheduler.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/sec-to-utc
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/sec-to-utc-day
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/separate-execute-last-summary
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/simple-event-plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/slt2.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/sort-preserve
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/sp.plot.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/split-start-times-shifted
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/start-last-times-and-kickstart
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/start-last-times-and-kickstart.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/start-last-times.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/start-times.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/sum-tt1.pl
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/swap-and-sort
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/swap-and-sort-and-swap
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/swift-standard-log-to-transition
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/table-jobs-sites
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/task-status-to-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/tasks-in-cluster
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/tie-url-filenames
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/times-for-all-tasks
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/toolbar.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/total-event-plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/total.plot.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/trail
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/trail-freex
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/trail-freex.plot.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/trail.plot.template
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/transitions-to-cedps
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/transitions-to-event
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/tscore.sh
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/tscores.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/weights.plot
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/weights.sh
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/whole-workflow-event
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/libexec/log-processing/whole-workflow-time
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: trunk/libexec/vdl-int-staging.k
===================================================================
--- trunk/libexec/vdl-int-staging.k	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/libexec/vdl-int-staging.k	2012-01-29 04:43:37 UTC (rev 5523)
@@ -70,7 +70,12 @@
 		element(cleanups, [cleanup]
 			log(LOG:INFO, "START cleanups={cleanup}")
 		)
-
+		
+		element(readErrorFile, [dir, jobid]
+			str:strip(file:read("{dir}/{jobid}.error"))
+			file:remove("{dir}/{jobid}.error")
+		)
+		
 		element(execute2, [tr, optional(arguments, stdin, stdout, stderr), stagein, stageout,  restartout,
 			replicationGroup, replicationChannel]
 			stagein := list(unique(each(stagein)))
@@ -150,6 +155,8 @@
 								mode = WRAPPER_TRANSFER_MODE)
 							//stageOut("{stdout}", "{stagingMethod}://localhost/{ddir}/{stdout}")
 							//stageOut("{stderr}", "{stagingMethod}://localhost/{ddir}/{stderr}")
+							stageOut("wrapper.error", "{stagingMethod}://localhost/{ddir}/{jobid}.error", 
+								mode = STAGING_MODE:IF_PRESENT)
 							appStageouts(jobid, stageout, ".", stagingMethod)
 
 							task:cleanUp(".") //the whole job directory
@@ -163,6 +170,8 @@
 					)
 					catch("^(?!Abort$).*"
 						vdl:setprogress("Failed but can retry")
+						prev := exception
+						exception := try(exception(readErrorFile(ddir, jobid)), prev)
 						log(LOG:DEBUG, "APPLICATION_EXCEPTION jobid={jobid} - Application exception: ", exception)
 
 						throw(

Modified: trunk/libexec/vdl-int.k
===================================================================
--- trunk/libexec/vdl-int.k	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/libexec/vdl-int.k	2012-01-29 04:43:37 UTC (rev 5523)
@@ -45,24 +45,37 @@
 					file:remove("{wfdir}/status/{jobdir}/{jobid}-success", host=rhost)
 					log(LOG:INFO, "SUCCESS jobid={jobid} - Success file found")
 				)
-				if(
-					file:exists("{wfdir}/status/{jobdir}/{jobid}-error", host=rhost) then(
-						log(LOG:INFO, "FAILURE jobid={jobid} - Failure file found")
-						task:transfer(srchost=rhost, srcdir="{wfdir}/status/{jobdir}", srcfile="{jobid}-error")
-						error := parallel(
-							file:remove("{wfdir}/status/{jobdir}/{jobid}-error", host=rhost)
-							sequential(
-								str:strip(file:read("{jobid}-error"))
-								file:remove("{jobid}-error")
-							)
+				sequential(
+					try (
+						msg = checkErrorFile(rhost, wfdir, jobid, jobdir)
+						sequential (
+							log(LOG:INFO, "NO_STATUS_FILE jobid={jobid} - Both status files are missing")
+							throw("No status file was found. Check the shared filesystem on {rhost}")
 						)
-						throw(error)
 					)
-					else (
-						log(LOG:INFO, "NO_STATUS_FILE jobid={jobid} - Both status files are missing")
-						throw("No status file was found. Check the shared filesystem on {rhost}")
+				)
+				throw(checkErrorFile(rhost, wfdir, jobid, tr, jobdir))
+			)
+		)
+		
+		element(checkErrorFile, [rhost, wfdir, jobid, jobdir]
+			if (
+				file:exists("{wfdir}/status/{jobdir}/{jobid}-error", host=rhost) then(
+					log(LOG:INFO, "FAILURE jobid={jobid} - Failure file found")
+					task:transfer(srchost=rhost, srcdir="{wfdir}/status/{jobdir}", srcfile="{jobid}-error")
+					error := parallel(
+						file:remove("{wfdir}/status/{jobdir}/{jobid}-error", host=rhost)
+						sequential(
+							str:strip(file:read("{jobid}-error"))
+							file:remove("{jobid}-error")
+						)
 					)
+					error
 				)
+				else (
+					log(LOG:INFO, "NO_STATUS_FILE jobid={jobid} - Error file missing")
+					throw("No status file was found. Check the shared filesystem on {rhost}")
+				)
 			)
 		)
 
@@ -553,6 +566,9 @@
 					)
 					catch("^(?!Abort$).*"
 						vdl:setprogress("Failed but can retry")
+						prev := exception
+						exception := try(exception(checkErrorFile(rhost, wfdir, jobid, jobdir)), prev)
+						
 						log(LOG:DEBUG, "APPLICATION_EXCEPTION jobid={jobid} - Application exception: ", exception)
 
 						if(matches(exception,".*executable bit.*")


Property changes on: trunk/resources/swiftscript.stg
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: trunk/src/org/griphyn/vdl/karajan/DSHandleFutureWrapper.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/DSHandleFutureWrapper.java	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/src/org/griphyn/vdl/karajan/DSHandleFutureWrapper.java	2012-01-29 04:43:37 UTC (rev 5523)
@@ -24,6 +24,7 @@
 import java.util.List;
 
 import org.globus.cog.karajan.stack.VariableStack;
+import org.globus.cog.karajan.workflow.events.EventBus;
 import org.globus.cog.karajan.workflow.events.EventTargetPair;
 import org.globus.cog.karajan.workflow.futures.FutureEvaluationException;
 import org.globus.cog.karajan.workflow.futures.FutureListener;
@@ -72,9 +73,13 @@
             listeners = null;
         }
         
-        for (ListenerStackPair lsp : l) {
+        for (final ListenerStackPair lsp : l) {
             WaitingThreadsMonitor.removeThread(lsp.stack);
-            lsp.listener.futureModified(this, lsp.stack);
+            EventBus.post(new Runnable() {
+                public void run() {
+                    lsp.listener.futureModified(DSHandleFutureWrapper.this, lsp.stack);
+                } 
+            });
         }
     }
 

Modified: trunk/src/org/griphyn/vdl/karajan/HangChecker.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/HangChecker.java	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/src/org/griphyn/vdl/karajan/HangChecker.java	2012-01-29 04:43:37 UTC (rev 5523)
@@ -23,7 +23,7 @@
 import java.util.TimerTask;
 
 import org.apache.log4j.Logger;
-import org.globus.cog.karajan.scheduler.LateBindingScheduler;
+import org.globus.cog.karajan.scheduler.WeightedHostScoreScheduler;
 import org.globus.cog.karajan.stack.VariableStack;
 import org.globus.cog.karajan.workflow.ExecutionException;
 import org.globus.cog.karajan.workflow.events.EventBus;
@@ -48,11 +48,11 @@
 
     public void run() {
         try {
-            LateBindingScheduler s = (LateBindingScheduler) stack.getGlobal(SchedulerNode.SCHEDULER);
+            WeightedHostScoreScheduler s = (WeightedHostScoreScheduler) stack.getGlobal(SchedulerNode.SCHEDULER);
             if (s != null) {
                 int running = s.getRunning();
-
-                if (running == 0 && EventBus.eventCount == lastEventCount) {
+                boolean allOverloaded = s.allOverloaded();
+                if (running == 0 && EventBus.eventCount == lastEventCount && !allOverloaded) {
                     logger.warn("No events in " + (CHECK_INTERVAL / 1000) + "s.");
                     ByteArrayOutputStream os = new ByteArrayOutputStream();
                     PrintStream ps = new PrintStream(os);

Modified: trunk/src/org/griphyn/vdl/karajan/Loader.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/Loader.java	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/src/org/griphyn/vdl/karajan/Loader.java	2012-01-29 04:43:37 UTC (rev 5523)
@@ -33,6 +33,7 @@
 import java.security.SecureRandom;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.List;
@@ -148,7 +149,10 @@
             boolean provenanceEnabled = VDL2Config.getConfig().getProvenanceLog();
 
             setupLogging(ap, projectName, runID);
-            logger.debug("Max heap: " + Runtime.getRuntime().maxMemory());
+            if (logger.isDebugEnabled()) {
+                logger.debug("arguments: " + Arrays.asList(argv));
+                logger.debug("Max heap: " + Runtime.getRuntime().maxMemory());
+            }
             
             if (ap.isPresent(ARG_CDMFILE)) {
                 loadCDM(ap); 

Modified: trunk/src/org/griphyn/vdl/karajan/lib/AppStageouts.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/AppStageouts.java	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/src/org/griphyn/vdl/karajan/lib/AppStageouts.java	2012-01-29 04:43:37 UTC (rev 5523)
@@ -52,7 +52,7 @@
             List files = TypeUtil.toList(FILES.getValue(stack));
             for (Object f : files) { 
                 List pv = TypeUtil.toList(f);
-                Path p = Path.parse(TypeUtil.toString(pv.get(0)));
+                Path p = (Path) pv.get(0);
                 DSHandle handle = (DSHandle) pv.get(1);
                 ArgUtil.getNamedArguments(stack).add("var", handle.getField(p));
                 AbsFile file = new AbsFile(VDLFunction.filename(stack)[0]);

Modified: trunk/src/org/griphyn/vdl/karajan/lib/RuntimeStats.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/RuntimeStats.java	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/src/org/griphyn/vdl/karajan/lib/RuntimeStats.java	2012-01-29 04:43:37 UTC (rev 5523)
@@ -218,7 +218,7 @@
 				}
 			}
 			finally {
-			    states.release();
+			    states.release(stateIterator);
 			}
 			return summary;
 		}


Property changes on: trunk/src/org/griphyn/vdl/karajan/lib/cache/LRUFileCache.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/release-0.93/src/org/griphyn/vdl/karajan/lib/cache/LRUFileCache.java:5123
   + /branches/release-0.93/src/org/griphyn/vdl/karajan/lib/cache/LRUFileCache.java:4761-5123

Modified: trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java	2012-01-29 04:43:37 UTC (rev 5523)
@@ -471,14 +471,8 @@
                 }
             }
 
-            Mapper m;
+            Mapper m = getActualMapper();
 
-            try {
-                m = this.getMapper();
-            }
-            catch (FutureFault fe) {
-                m = null; // no mapping info if mapper isn't initialised yet
-            }
 
             if (m != null) {
                 // TODO proper type here
@@ -536,12 +530,16 @@
             }
         }
     }
+    
+    protected Mapper getActualMapper() {
+        return null;
+    }
 
     public boolean isClosed() {
         return closed;
     }
 
-    public void closeDeep() {
+    public synchronized void closeDeep() {
         if (!this.closed) {
             closeShallow();
         }

Modified: trunk/src/org/griphyn/vdl/mapping/ExternalDataNode.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/ExternalDataNode.java	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/src/org/griphyn/vdl/mapping/ExternalDataNode.java	2012-01-29 04:43:37 UTC (rev 5523)
@@ -113,7 +113,6 @@
 	    return null;
 	}
 
-    @Override
     public String getParam(String name) {
         if (params == null) {
             return null;

Modified: trunk/src/org/griphyn/vdl/mapping/RootArrayDataNode.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/RootArrayDataNode.java	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/src/org/griphyn/vdl/mapping/RootArrayDataNode.java	2012-01-29 04:43:37 UTC (rev 5523)
@@ -123,6 +123,10 @@
             throw new FutureNotYetAvailable(waitingMapperParam.getFutureWrapper());
         }
 	}
+	
+	protected Mapper getActualMapper() {
+        return mapper;
+    }
 
 	public boolean isArray() {
 		return true;

Modified: trunk/src/org/griphyn/vdl/mapping/RootDataNode.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/RootDataNode.java	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/src/org/griphyn/vdl/mapping/RootDataNode.java	2012-01-29 04:43:37 UTC (rev 5523)
@@ -221,6 +221,10 @@
             throw new FutureNotYetAvailable(waitingMapperParam.getFutureWrapper());
         }
 	}
+	
+	protected Mapper getActualMapper() {
+        return mapper;
+    }
 
 	public boolean isArray() {
 		return false;

Copied: trunk/tests/groups/mcs.sh (from rev 5122, branches/release-0.93/tests/groups/mcs.sh)
===================================================================
--- trunk/tests/groups/mcs.sh	                        (rev 0)
+++ trunk/tests/groups/mcs.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1,6 @@
+# Group for MCS provider test (persistent coasters) 
+
+GROUPLIST=( 
+	    $TESTDIR/providers/persistent-coasters/mcs
+          )
+

Copied: trunk/tests/groups/providers-fusion.sh (from rev 5122, branches/release-0.93/tests/groups/providers-fusion.sh)
===================================================================
--- trunk/tests/groups/providers-fusion.sh	                        (rev 0)
+++ trunk/tests/groups/providers-fusion.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1,6 @@
+
+# GROUPLIST definition of providers that run on PADS
+
+GROUPLIST=( 	    
+	    $TESTDIR/providers/fusion
+)

Copied: trunk/tests/groups/providers-pads.sh (from rev 5122, branches/release-0.93/tests/groups/providers-pads.sh)
===================================================================
--- trunk/tests/groups/providers-pads.sh	                        (rev 0)
+++ trunk/tests/groups/providers-pads.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1,7 @@
+
+# GROUPLIST definition of providers that run on PADS
+
+GROUPLIST=( 	    
+	    $TESTDIR/providers/PADS/coasters \
+	    $TESTDIR/providers/PADS/pbs \
+)

Copied: trunk/tests/language/working/063-filename_extraction.in (from rev 5122, branches/release-0.93/tests/language/working/063-filename_extraction.in)
===================================================================
--- trunk/tests/language/working/063-filename_extraction.in	                        (rev 0)
+++ trunk/tests/language/working/063-filename_extraction.in	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+testing swift filename extraction

Copied: trunk/tests/language/working/063-filename_extraction.out.expected (from rev 5122, branches/release-0.93/tests/language/working/063-filename_extraction.out.expected)
===================================================================
--- trunk/tests/language/working/063-filename_extraction.out.expected	                        (rev 0)
+++ trunk/tests/language/working/063-filename_extraction.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+testing swift filename extraction

Copied: trunk/tests/language/working/063-filename_extraction.swift (from rev 5122, branches/release-0.93/tests/language/working/063-filename_extraction.swift)
===================================================================
--- trunk/tests/language/working/063-filename_extraction.swift	                        (rev 0)
+++ trunk/tests/language/working/063-filename_extraction.swift	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1,10 @@
+type logfile;
+
+app (logfile fout) cat(logfile fin) { 
+    cat stdin=@fin stdout=@fout;
+}
+
+logfile infile <"063-filename_extraction.in">;
+logfile outfile <"063-filename_extraction.out">;
+
+outfile = cat(infile);

Copied: trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.timeout (from rev 5122, branches/release-0.93/tests/language-behaviour/mappers/0756-ext-mapper-slow.timeout)
===================================================================
--- trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.timeout	                        (rev 0)
+++ trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.timeout	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+60
\ No newline at end of file

Deleted: trunk/tests/language-behaviour/math/006-add.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/006-add.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/006-add.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,8 +0,0 @@
-#!/bin/bash
-set -x
-(cat 006-add.out | grep 135) || exit 1
-exit 0
-#!/bin/bash
-set -x
-cat 006-add.out | grep || exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/006-add.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/006-add.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/006-add.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/006-add.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+135

Deleted: trunk/tests/language-behaviour/math/007-add-in-proc-add.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/007-add-in-proc-add.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/007-add-in-proc-add.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 007-add-in-proc-add.out | grep 189|| exit 1
-exit 0

Deleted: trunk/tests/language-behaviour/math/008-add-multiply.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/008-add-multiply.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/008-add-multiply.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 008-add-multiply.out | grep 8|| exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/008-add-multiply.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/008-add-multiply.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/008-add-multiply.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/008-add-multiply.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+8

Deleted: trunk/tests/language-behaviour/math/009-multiply.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/009-multiply.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/009-multiply.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 009-multiply.out | grep 42|| exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/009-multiply.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/009-multiply.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/009-multiply.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/009-multiply.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+42

Deleted: trunk/tests/language-behaviour/math/010-divide.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/010-divide.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/010-divide.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 010-divide.out | grep 33|| exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/010-divide.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/010-divide.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/010-divide.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/010-divide.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+33

Deleted: trunk/tests/language-behaviour/math/011-divide-float.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/011-divide-float.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/011-divide-float.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 011-divide-float.out | grep 0.3333333333333333|| exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/011-divide-float.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/011-divide-float.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/011-divide-float.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/011-divide-float.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+0.3333333333333333

Deleted: trunk/tests/language-behaviour/math/013-mod.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/013-mod.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/013-mod.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 013-mod.out | grep 19|| exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/013-mod.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/013-mod.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/013-mod.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/013-mod.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+19

Deleted: trunk/tests/language-behaviour/math/014-subtract.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/014-subtract.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/014-subtract.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 014-subtract.out | grep '\-37'|| exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/014-subtract.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/014-subtract.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/014-subtract.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/014-subtract.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+-37

Deleted: trunk/tests/language-behaviour/math/0145-unary-subtact.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/0145-unary-subtact.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/0145-unary-subtact.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 0145-unary-subtact.out | grep '\-989929'|| exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/0145-unary-subtact.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/0145-unary-subtact.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/0145-unary-subtact.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/0145-unary-subtact.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+-989929

Deleted: trunk/tests/language-behaviour/math/015-lesseq.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/015-lesseq.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/015-lesseq.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 015-lesseq.out | grep true|| exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/015-lesseq.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/015-lesseq.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/015-lesseq.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/015-lesseq.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+true

Deleted: trunk/tests/language-behaviour/math/016-greatereq.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/016-greatereq.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/016-greatereq.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 016-greatereq.out | grep false|| exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/016-greatereq.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/016-greatereq.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/016-greatereq.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/016-greatereq.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+false

Deleted: trunk/tests/language-behaviour/math/017-greater.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/017-greater.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/017-greater.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 017-greater.out | grep false|| exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/017-greater.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/017-greater.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/017-greater.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/017-greater.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+false

Deleted: trunk/tests/language-behaviour/math/018-less.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/018-less.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/018-less.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 018-less.out | grep true|| exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/018-less.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/018-less.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/018-less.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/018-less.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+true

Deleted: trunk/tests/language-behaviour/math/019-equals.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/019-equals.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/019-equals.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 019-equals.out | grep false|| exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/019-equals.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/019-equals.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/019-equals.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/019-equals.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+false

Deleted: trunk/tests/language-behaviour/math/0191-not-equals.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/0191-not-equals.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/0191-not-equals.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 0191-not-equals.out | grep true || exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/0191-not-equals.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/0191-not-equals.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/0191-not-equals.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/0191-not-equals.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+true

Deleted: trunk/tests/language-behaviour/math/030-mix-float-int.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/030-mix-float-int.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/030-mix-float-int.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 030-mix-float-int.out | grep 54.3|| exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/030-mix-float-int.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/030-mix-float-int.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/030-mix-float-int.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/030-mix-float-int.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+54.3

Deleted: trunk/tests/language-behaviour/math/031-add-float.check.sh
===================================================================
--- trunk/tests/language-behaviour/math/031-add-float.check.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/language-behaviour/math/031-add-float.check.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-cat 031-add-float.out | grep 135.3|| exit 1
-exit 0

Copied: trunk/tests/language-behaviour/math/031-add-float.out.expected (from rev 5122, branches/release-0.93/tests/language-behaviour/math/031-add-float.out.expected)
===================================================================
--- trunk/tests/language-behaviour/math/031-add-float.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/math/031-add-float.out.expected	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1 @@
+135.3

Copied: trunk/tests/language-behaviour/procedures/tc.template.mix.data (from rev 5122, branches/release-0.93/tests/language-behaviour/procedures/tc.template.mix.data)
===================================================================
--- trunk/tests/language-behaviour/procedures/tc.template.mix.data	                        (rev 0)
+++ trunk/tests/language-behaviour/procedures/tc.template.mix.data	2012-01-29 04:43:37 UTC (rev 5523)
@@ -0,0 +1,2 @@
+
+localhost	sleep				/bin/sleep         INSTALLED	INTEL32::LINUX	null

Modified: trunk/tests/suite.sh
===================================================================
--- trunk/tests/suite.sh	2012-01-28 21:10:59 UTC (rev 5522)
+++ trunk/tests/suite.sh	2012-01-29 04:43:37 UTC (rev 5523)
@@ -375,20 +375,20 @@
 		fi
 	else
 		if [ "$TYPE" == "test" ]; then
-	    	# WIDTH=$( width "$LABEL" )
-	    	if [ "$RESULT" == "Passed" ]; then
-	      		html_td class "success" width 25 title "$CMD"
-                        html_a_href "$TESTNAMEDIR/$OUTPUT" "$LABEL"
-	      	elif [ "$RESULT" == "None" ]; then
-	      		html_td width 25
-		   	html "  "
-   			html_~td
-	    	else
-	      		echo -e "${RED}FAILED${GRAY}"
-                        cat $RUNDIR/$OUTPUT < /dev/null
-	      		html_td class "failure" width 25 title "$CMD"
-                        html_a_href "$TESTNAMEDIR/$OUTPUT" "$LABEL"	    	
-                fi
+			# WIDTH=$( width "$LABEL" )
+			if [ "$RESULT" == "Passed" ]; then
+				html_td class "success" width 25 title "$CMD"
+				html_a_href "$TESTNAMEDIR/$OUTPUT" "$LABEL"
+			elif [ "$RESULT" == "None" ]; then
+				html_td width 25
+				html "  "
+				html_~td
+			else
+				echo -e "${RED}FAILED${GRAY}"
+				cat $RUNDIR/$OUTPUT < /dev/null
+				html_td class "failure" width 25 title "$CMD"
+				html_a_href "$TESTNAMEDIR/$OUTPUT" "$LABEL"
+			fi
 	    	html_~td
 	  	elif [ "$TYPE" == "package" ]; then
 	    	BINPACKAGE=$2
@@ -479,19 +479,6 @@
 	fi
 }
 
-# Create test output_*.txt file and copy to stdout.txt
-# Rename to copy_output?
-# TEST_LOG = test log
-test_log() {
-  TEST_LOG="output_$LOGCOUNT.txt"
-  banner "$LASTCMD" $RUNDIR/$TEST_LOG
-  if [ -f $OUTPUT ]; then
-    cp $OUTPUT $RUNDIR/$TEST_LOG 2>>$LOG
-    cp $OUTPUT $RUNDIR/stdout.txt
-  fi
-  let "LOGCOUNT=$LOGCOUNT+1"
-}
-
 stars() {
   for i in {1..120}
   do
@@ -597,8 +584,13 @@
   fi
 
   RESULT=$( result )
+<<<<<<< .working
   output_report test $SEQ "$LASTCMD" $RESULT $OUTPUT
+=======
+>>>>>>> .merge-right.r5122
 
+  output_report test $SEQ "$LASTCMD" $RESULT $OUTPUT
+
   check_bailout
 
   let "SEQ=$SEQ+1"
@@ -720,7 +712,6 @@
 	NAME=$2
 
 	RESULT="None"
-
 	if [ -f "$GROUP/$NAME.in" ]; then
 		echo "Copying input: $NAME.in"
 		cp -v $GROUP/$NAME.in . 2>&1 >> $OUTPUT
@@ -887,7 +878,7 @@
    html_~td
   fi
 
-   OUTPUT=$NAME.stdout
+  OUTPUT=$NAME.stdout
 
   if [ -x $GROUP/$SHELLSCRIPT ]; then
     script_exec $SHELLSCRIPT "X"
@@ -1048,7 +1039,7 @@
 	PIECES=""
 	while [ "$G" != "$CRTDIR" ]; do
 		PIECE=`basename $G`
-		PIECES="$PIECE $PIECES"
+		PIECES="$PIECE/$PIECES"
 		G=`dirname $G`
 	done
 	echo $PIECES
@@ -1235,6 +1226,7 @@
 fi
 SWIFT_HOME=$TOPDIR/cog/modules/swift/dist/swift-svn
 OUTPUT=compile.stdout
+OUTPUT=build.stdout
 if [ $BUILD_PACKAGE = "1" ]; then
   build_package
 fi

More information about the Swift-commit mailing list