From noreply at svn.ci.uchicago.edu Mon Nov 3 17:13:33 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Mon, 3 Nov 2008 17:13:33 -0600 (CST)
Subject: [Swift-commit] r2320 - in log-processing: bin libexec
Message-ID: <20081103231333.743A8228135@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-03 17:13:30 -0600 (Mon, 03 Nov 2008)
New Revision: 2320
Modified:
log-processing/bin/swift-plot-log
log-processing/libexec/makefile
Log:
build in a temporary directory; this keeps temp files out of initial pwd of swift-plot-log and allows multiple invocations to be run at once witout conflict
Modified: log-processing/bin/swift-plot-log
===================================================================
--- log-processing/bin/swift-plot-log 2008-11-03 22:50:43 UTC (rev 2319)
+++ log-processing/bin/swift-plot-log 2008-11-03 23:13:30 UTC (rev 2320)
@@ -1,5 +1,9 @@
#!/bin/bash
+ORIGDIR=$(pwd)
+WORKINGDIR=$(mktemp /tmp/swift-plot-log-XXXXXXXXXXXXXXXX)
+
+
# $1 should be the pathname of the log file to plot
LOG_CODE_HOME="`dirname $0`/../libexec/"
@@ -23,6 +27,8 @@
echo Log is in directory $LOG_DIRECTORY
echo Log basename is $LOG_FILE_BASE
+cd $WORKINGDIR
+
MAKEENV="-f ${LOG_CODE_HOME}/makefile -I ${LOG_CODE_HOME}"
MAKETARGETS=""
@@ -33,6 +39,8 @@
MAKETARGETS="webpage.info"
fi
-make $MAKEENV SDL=$LOG_FILE_BASE LOG=$LOG_FILE_PATH clean webpage.kara webpage.weights karatasks.JOB_SUBMISSION.Queue.transitions karatasks.JOB_SUBMISSION.Queue.event $MAKETARGETS webpage distribute
+make $MAKEENV REPORTDIR=${ORIGDIR}/report-${LOG_FILE_BASE} LOG=$LOG_FILE_PATH clean webpage.kara webpage.weights karatasks.JOB_SUBMISSION.Queue.transitions karatasks.JOB_SUBMISSION.Queue.event $MAKETARGETS webpage distribute
# mv report-$LOG_FILE_BASE $LOG_DIRECTORY/
+
+rm -r $WORKINGDIR
Modified: log-processing/libexec/makefile
===================================================================
--- log-processing/libexec/makefile 2008-11-03 22:50:43 UTC (rev 2319)
+++ log-processing/libexec/makefile 2008-11-03 23:13:30 UTC (rev 2320)
@@ -12,8 +12,8 @@
rm -f *.tmp log *.transitions tmp-*
distribute:
- mkdir -p report-$(SDL)
- cp *.event *.html *.png report-$(SDL)
+ mkdir -p $(SDL)
+ cp *.event *.html *.png $(SDL)
clean:
rm -f start-times.data kickstart-times.data start-time.tmp end-time.tmp threads.list tasks.list log *.data *.shifted *.png *.event *.coloured-event *.total *.tmp *.transitions *.last karatasks-type-counts.txt index.html *.lastsummary execstages.plot total.plot colour.plot jobs-sites.table jobs.retrycount.summary kickstart.stats execution-counts.txt site-duration.txt jobs.retrycount sp.plot karatasks.coloured-sorted-event *.cedps *.stats t.inf *.seenstates tmp-* clusterstats trname-summary sites-list.data.nm info-md5sums pse2d-tmp.eip karajan.html falkon.html execute2.html info.html execute.html kickstart.html scheduler.html assorted.html
From noreply at svn.ci.uchicago.edu Mon Nov 3 17:28:45 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Mon, 3 Nov 2008 17:28:45 -0600 (CST)
Subject: [Swift-commit] r2321 - log-processing/libexec
Message-ID: <20081103232845.8ED97228135@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-03 17:28:45 -0600 (Mon, 03 Nov 2008)
New Revision: 2321
Modified:
log-processing/libexec/kickstarts-to-event
Log:
slightly less voluminous output in kickstart processing
Modified: log-processing/libexec/kickstarts-to-event
===================================================================
--- log-processing/libexec/kickstarts-to-event 2008-11-03 23:13:30 UTC (rev 2320)
+++ log-processing/libexec/kickstarts-to-event 2008-11-03 23:28:45 UTC (rev 2321)
@@ -1,8 +1,6 @@
#!/bin/bash
while read t d id rest; do
- echo processing job $id >&2
- echo record=$(find ${KDIR} -name ${id}-kickstart.xml) >&2
record=$(find ${KDIR} -name ${id}-kickstart.xml)
if [ "X$record" != "X" ] && [ -f $record ] ; then
@@ -12,11 +10,12 @@
DURATION=$(grep "&2
else
- echo bad record $record >&2
+ echo Bad kickstart record $record >&2
fi
else
- echo no record for $id >&2
+ echo No kickstart record for $id >&2
fi
done < execute2.event
From noreply at svn.ci.uchicago.edu Mon Nov 3 17:53:34 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Mon, 3 Nov 2008 17:53:34 -0600 (CST)
Subject: [Swift-commit] r2322 - log-processing/bin
Message-ID: <20081103235334.172E12281A3@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-03 17:53:33 -0600 (Mon, 03 Nov 2008)
New Revision: 2322
Modified:
log-processing/bin/swift-plot-log
Log:
previous commit used incorrect variable name for report target location - this fixes
Modified: log-processing/bin/swift-plot-log
===================================================================
--- log-processing/bin/swift-plot-log 2008-11-03 23:28:45 UTC (rev 2321)
+++ log-processing/bin/swift-plot-log 2008-11-03 23:53:33 UTC (rev 2322)
@@ -39,7 +39,7 @@
MAKETARGETS="webpage.info"
fi
-make $MAKEENV REPORTDIR=${ORIGDIR}/report-${LOG_FILE_BASE} LOG=$LOG_FILE_PATH clean webpage.kara webpage.weights karatasks.JOB_SUBMISSION.Queue.transitions karatasks.JOB_SUBMISSION.Queue.event $MAKETARGETS webpage distribute
+make $MAKEENV SDL=${ORIGDIR}/report-${LOG_FILE_BASE} LOG=$LOG_FILE_PATH clean webpage.kara webpage.weights karatasks.JOB_SUBMISSION.Queue.transitions karatasks.JOB_SUBMISSION.Queue.event $MAKETARGETS webpage distribute
# mv report-$LOG_FILE_BASE $LOG_DIRECTORY/
From noreply at svn.ci.uchicago.edu Tue Nov 4 14:54:54 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Tue, 4 Nov 2008 14:54:54 -0600 (CST)
Subject: [Swift-commit] r2323 - trunk
Message-ID: <20081104205454.216E222817C@www.ci.uchicago.edu>
Author: hategan
Date: 2008-11-04 14:54:53 -0600 (Tue, 04 Nov 2008)
New Revision: 2323
Modified:
trunk/dependencies.xml
Log:
build coasters automatically; this time in the right place
Modified: trunk/dependencies.xml
===================================================================
--- trunk/dependencies.xml 2008-11-03 23:53:33 UTC (rev 2322)
+++ trunk/dependencies.xml 2008-11-04 20:54:53 UTC (rev 2323)
@@ -10,8 +10,13 @@
+
+
+
+
+
+
-
@@ -21,11 +26,6 @@
-
-
-
-
-
From noreply at svn.ci.uchicago.edu Wed Nov 5 02:04:05 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Wed, 5 Nov 2008 02:04:05 -0600 (CST)
Subject: [Swift-commit] r2324 - trunk
Message-ID: <20081105080405.5E29C22817C@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-05 02:04:04 -0600 (Wed, 05 Nov 2008)
New Revision: 2324
Modified:
trunk/dependencies.xml
Log:
do not always build provider-wonky - that provider needs checking out separately
Modified: trunk/dependencies.xml
===================================================================
--- trunk/dependencies.xml 2008-11-04 20:54:53 UTC (rev 2323)
+++ trunk/dependencies.xml 2008-11-05 08:04:04 UTC (rev 2324)
@@ -11,9 +11,6 @@
-
-
-
From noreply at svn.ci.uchicago.edu Wed Nov 5 12:43:54 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Wed, 5 Nov 2008 12:43:54 -0600 (CST)
Subject: [Swift-commit] r2325 - trunk/tests/language-behaviour
Message-ID: <20081105184354.681CF22803A@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-05 12:43:53 -0600 (Wed, 05 Nov 2008)
New Revision: 2325
Modified:
trunk/tests/language-behaviour/run
Log:
output name of failed test
Modified: trunk/tests/language-behaviour/run
===================================================================
--- trunk/tests/language-behaviour/run 2008-11-05 08:04:04 UTC (rev 2324)
+++ trunk/tests/language-behaviour/run 2008-11-05 18:43:53 UTC (rev 2325)
@@ -42,7 +42,7 @@
else
echo Running test $t
swift ${SWIFT_TEST_PARAMS} ${t}.swift
- if [ "$?" -ne "0" ]; then echo "SWIFT RETURN CODE NON-ZERO"; exit 1; fi
+ if [ "$?" -ne "0" ]; then echo "SWIFT RETURN CODE NON-ZERO - test $testfn"; exit 1; fi
echo expecting $EXPECTEDS
fi
@@ -64,7 +64,7 @@
exit $?
fi
else
- echo "OUTPUT DIFFERS"
+ echo "OUTPUT DIFFERS - test $testfn"
exit 1
fi
fi
From noreply at svn.ci.uchicago.edu Wed Nov 5 16:33:57 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Wed, 5 Nov 2008 16:33:57 -0600 (CST)
Subject: [Swift-commit] r2326 - SwiftApps/SIDGrid/uchicago_tools
Message-ID: <20081105223357.D12F7228159@www.ci.uchicago.edu>
Author: skenny
Date: 2008-11-05 16:33:57 -0600 (Wed, 05 Nov 2008)
New Revision: 2326
Added:
SwiftApps/SIDGrid/uchicago_tools/ca_update.sh
Log:
quick and dirty cert update for cnari
Added: SwiftApps/SIDGrid/uchicago_tools/ca_update.sh
===================================================================
--- SwiftApps/SIDGrid/uchicago_tools/ca_update.sh (rev 0)
+++ SwiftApps/SIDGrid/uchicago_tools/ca_update.sh 2008-11-05 22:33:57 UTC (rev 2326)
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+export CNARI=/disks/ci-gpfs/fmri/cnari
+mv $CNARI/swift/ca $CNARI/swift/ca_old
+mkdir $CNARI/swift/ca
+echo "ncsa mercury"
+scp login-hg.ncsa.teragrid.org:/etc/grid-security/certificates/* $CNARI/swift/ca
+echo "ncsa done......."
+echo "ranger"
+scp tg457040 at tg-login.ranger.tacc.teragrid.org:/etc/grid-security/certificates/* $CNARI/swift/ca
+echo "ranger done....."
+echo "bigred"
+scp tg-skenn at login.bigred.iu.teragrid.org:/etc/grid-security/certificates/* $CNARI/swift/ca
+echo "bigred done......"
+echo "lonestar"
+scp tg457040 at tg-login.lonestar.tacc.teragrid.org:/etc/grid-security/certificates/* $CNARI/swift/ca
+echo "lonestar done...."
+echo "ucanl32"
+scp tg-viz-login.uc.teragrid.org:/etc/grid-security/certificates/* $CNARI/swift/ca
+echo "ucanl32 done...."
Property changes on: SwiftApps/SIDGrid/uchicago_tools/ca_update.sh
___________________________________________________________________
Name: svn:executable
+ *
From noreply at svn.ci.uchicago.edu Tue Nov 11 12:25:41 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Tue, 11 Nov 2008 12:25:41 -0600 (CST)
Subject: [Swift-commit] r2327 - trunk
Message-ID: <20081111182541.97C05228135@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-11 12:25:39 -0600 (Tue, 11 Nov 2008)
New Revision: 2327
Modified:
trunk/CHANGES.txt
Log:
add svn version info for 0.6 and 0.7 swift releases
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2008-11-05 22:33:57 UTC (rev 2326)
+++ trunk/CHANGES.txt 2008-11-11 18:25:39 UTC (rev 2327)
@@ -1,3 +1,9 @@
+(11/11/08)
+*** Swift 0.7 built from Swift SVN r2318 and cog SVN r2255
+
+(15/08/08)
+*** Swift 0.6 built from Swift SVN r2177 and cog SVN r2127
+
(06/06/08)
*** SWIFT_JOBDIR_PATH environment variable can be use in profiles (or
anywhere else that will get it to the worker script) to cause the
From noreply at svn.ci.uchicago.edu Tue Nov 11 12:42:29 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Tue, 11 Nov 2008 12:42:29 -0600 (CST)
Subject: [Swift-commit] r2328 - trunk
Message-ID: <20081111184229.543B2228135@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-11 12:42:28 -0600 (Tue, 11 Nov 2008)
New Revision: 2328
Modified:
trunk/CHANGES.txt
Log:
fix date into middle-field-least-significant format
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2008-11-11 18:25:39 UTC (rev 2327)
+++ trunk/CHANGES.txt 2008-11-11 18:42:28 UTC (rev 2328)
@@ -1,7 +1,7 @@
(11/11/08)
*** Swift 0.7 built from Swift SVN r2318 and cog SVN r2255
-(15/08/08)
+(08/15/08)
*** Swift 0.6 built from Swift SVN r2177 and cog SVN r2127
(06/06/08)
From noreply at svn.ci.uchicago.edu Tue Nov 11 13:29:03 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Tue, 11 Nov 2008 13:29:03 -0600 (CST)
Subject: [Swift-commit] r2329 - trunk/docs
Message-ID: <20081111192903.9D9AD2281E0@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-11 13:29:03 -0600 (Tue, 11 Nov 2008)
New Revision: 2329
Modified:
trunk/docs/userguide.xml
Log:
change userguide to use new app syntax
Modified: trunk/docs/userguide.xml
===================================================================
--- trunk/docs/userguide.xml 2008-11-11 18:42:28 UTC (rev 2328)
+++ trunk/docs/userguide.xml 2008-11-11 19:29:03 UTC (rev 2329)
@@ -288,10 +288,8 @@
for myproc1 can be:
-(binaryfile bf) myproc1 (int i, string s="foo") {
- app {
- myapp1 i s @filename(bf);
- }
+app (binaryfile bf) myproc1 (int i, string s="foo") {
+ myapp1 i s @filename(bf);
}
From noreply at svn.ci.uchicago.edu Tue Nov 11 13:38:25 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Tue, 11 Nov 2008 13:38:25 -0600 (CST)
Subject: [Swift-commit] r2330 - trunk/docs
Message-ID: <20081111193825.6F563228135@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-11 13:38:24 -0600 (Tue, 11 Nov 2008)
New Revision: 2330
Modified:
trunk/docs/userguide.xml
Log:
fix formatting error
Modified: trunk/docs/userguide.xml
===================================================================
--- trunk/docs/userguide.xml 2008-11-11 19:29:03 UTC (rev 2329)
+++ trunk/docs/userguide.xml 2008-11-11 19:38:24 UTC (rev 2330)
@@ -2522,10 +2522,12 @@
For additional ssh configuration information, see the ssh execution
provider documentation below.
+
Filesystem access using CoG coasters can be
also be specified using the <filesystem> element. More detail about
configuring that can be found in the CoG
coasters section.
+ Execution method specification
From noreply at svn.ci.uchicago.edu Tue Nov 11 14:36:12 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Tue, 11 Nov 2008 14:36:12 -0600 (CST)
Subject: [Swift-commit] r2331 - trunk/docs
Message-ID: <20081111203612.D66842281C5@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-11 14:36:12 -0600 (Tue, 11 Nov 2008)
New Revision: 2331
Modified:
trunk/docs/userguide.xml
Log:
more element IDs
Modified: trunk/docs/userguide.xml
===================================================================
--- trunk/docs/userguide.xml 2008-11-11 19:38:24 UTC (rev 2330)
+++ trunk/docs/userguide.xml 2008-11-11 20:36:12 UTC (rev 2331)
@@ -225,7 +225,7 @@
-
+ Procedures
Datasets are operated on by procedures, which take input in the form of
@@ -280,7 +280,7 @@
-Atomic procedures
+Atomic procedures
The body of an atomic procedure specifies how to invoke an
external executable program or Web Service, and how logical data
@@ -302,7 +302,7 @@
-Compound procedures
+Compound procedures
A compound procedure contains a set of calls to other procedures. Shared
variables in the body of a compound procedure specify data dependencies
From noreply at svn.ci.uchicago.edu Tue Nov 11 15:00:01 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Tue, 11 Nov 2008 15:00:01 -0600 (CST)
Subject: [Swift-commit] r2332 - www/downloads
Message-ID: <20081111210001.715E022817C@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-11 15:00:00 -0600 (Tue, 11 Nov 2008)
New Revision: 2332
Added:
www/downloads/release-notes-0.7.txt
Modified:
www/downloads/index.php
Log:
0.7 release
Modified: www/downloads/index.php
===================================================================
--- www/downloads/index.php 2008-11-11 20:36:12 UTC (rev 2331)
+++ www/downloads/index.php 2008-11-11 21:00:00 UTC (rev 2332)
@@ -27,11 +27,11 @@
DOWNLOADS
Latest Release
-
Swift 0.6 - 2008/08/25
-
Swift v0.6 is a development release intended to release functionality
-and fixes that have gone in to trunk since v0.5.
-[vdsk-0.6.tar.gz]
-[release-notes-0.6.txt]
+
Swift 0.7 - 2008/11/11
+
Swift v0.7 is a development release intended to release functionality
+and fixes that have gone in to trunk since v0.7.
+[vdsk-0.7.tar.gz]
+[release-notes-0.7.txt]
As an alternative to the above traditional Swift packaging, Swift can be
@@ -41,12 +41,12 @@
There are two installation targets:
-The first will install Swift from the above tarball:
+The first will install Swift alongside an existing VDT installation
-The second will install Swift from the above tarball, as well as a number
+The second will install Swift as well as a number
of supporting packages from the VDT software release to support use of the
DOE CA and use of VOMS. (These packages are also available in a regular OSG or
VDT installation):
@@ -55,6 +55,7 @@
+
Nightly Builds and Tests
@@ -115,6 +116,24 @@
Historical releases
+
Swift 0.6 - 2008/08/25
+
Swift v0.6 is a development release intended to release functionality
+and fixes that have gone in to trunk since v0.5.
+[vdsk-0.6.tar.gz]
+[release-notes-0.6.txt]
+
+
+As an alternative to the above traditional Swift packaging, Swift can be
+downloaded and installed using
+pacman, a package
+manager commonly used on the Open Science Grid.
+
+
+This will install Swift alongside an existing VDT installation:
+
Swift v0.5 is a development release intended to release functionality
and fixes that have gone in to trunk since v0.4.
Added: www/downloads/release-notes-0.7.txt
===================================================================
--- www/downloads/release-notes-0.7.txt (rev 0)
+++ www/downloads/release-notes-0.7.txt 2008-11-11 21:00:00 UTC (rev 2332)
@@ -0,0 +1,52 @@
+These are the release notes for Swift 0.7
+
+More information about Swift can be found at http://www.ci.uchicago.edu/swift/
+
+Swift 0.7 is built from Swift SVN r2318 and cog SVN r2255.
+
+The following are significant changes since Swift 0.6 was released.
+
+Language changes:
+* readData2 procedure allows reading of data from a file in a format similar
+ to that used by the external mapper. This can sometimes be easier and more
+ expressive than using the plain readData format. See:
+ http://www.ci.uchicago.edu/swift/guides/userguide/procedures.php#procedure.readdata2
+* Empty statements are no longer allowed in SwiftScript programs.
+* A simpler syntax has been introduced for application procedures. The
+ previous syntax will continue to work for a number of future releases.
+ The new syntax is shown here:
+ http://www.ci.uchicago.edu/swift/guides/userguide/language.php#procedures.atomic
+
+Coasters:
+* Coasters can now transfer files. This can be used when there are a
+ large number of small files to transfer during a run. See:
+ http://www.ci.uchicago.edu/swift/guides/userguide/coasters.php
+* A large amount of testing and bugfixing on the coaster code should make
+ runs with coasters substantially more reliable.
+
+Configuration changes:
+* Swift will find executables on the remote system $PATH if no explicit
+ path is specified for an application executable in tc.data
+* Configuration files in the ~/.vdl2 directory are now ignored. Previously,
+ attempting to use a ~/.vdl2 configuration file would give an error message.
+
+Replication:
+* The expected queue time for the first job executed is now guestimated for
+ replication purposes, so that job can be replicated if necessary.
+ Previously, the first job would never be replicated as there was
+ insufficient information to estimate its expected queue time.
+
+Minor bugfixes:
+* Uninitialised state was missing from list of known states in runtime
+ ticker, causing it to appear at the end of status list rather than
+ its more natural position at the start.
+* The stageout destination directory is created using the same destination
+ host and provider as the actual stageout transfer. Previously, the
+ stageout directory was always created locally, which was incorrect
+ when using remote stageout URLs.
+* Better walltime handling to work with more LRM backends in GRAM
+
+Packaging:
+* Swift is now available in VDT-friendly pacman form to facilitate use
+ alongside the OSG software stack.
+
From noreply at svn.ci.uchicago.edu Wed Nov 12 13:28:15 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Wed, 12 Nov 2008 13:28:15 -0600 (CST)
Subject: [Swift-commit] r2333 - trunk/examples
Message-ID: <20081112192815.9198E228198@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-12 13:28:14 -0600 (Wed, 12 Nov 2008)
New Revision: 2333
Modified:
trunk/examples/first.swift
Log:
new app syntax for first.swift
Modified: trunk/examples/first.swift
===================================================================
--- trunk/examples/first.swift 2008-11-11 21:00:00 UTC (rev 2332)
+++ trunk/examples/first.swift 2008-11-12 19:28:14 UTC (rev 2333)
@@ -1,9 +1,7 @@
type messagefile {}
-(messagefile t) greeting() {
- app {
- echo "Hello, world!" stdout=@filename(t);
- }
+app (messagefile t) greeting() {
+ echo "Hello, world!" stdout=@filename(t);
}
messagefile outfile <"hello.txt">;
From noreply at svn.ci.uchicago.edu Wed Nov 12 13:43:10 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Wed, 12 Nov 2008 13:43:10 -0600 (CST)
Subject: [Swift-commit] r2334 - trunk/examples
Message-ID: <20081112194310.0805F228198@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-12 13:43:09 -0600 (Wed, 12 Nov 2008)
New Revision: 2334
Modified:
trunk/examples/first.swift
Log:
newer marker type syntax for first.swift
Modified: trunk/examples/first.swift
===================================================================
--- trunk/examples/first.swift 2008-11-12 19:28:14 UTC (rev 2333)
+++ trunk/examples/first.swift 2008-11-12 19:43:09 UTC (rev 2334)
@@ -1,4 +1,4 @@
-type messagefile {}
+type messagefile;
app (messagefile t) greeting() {
echo "Hello, world!" stdout=@filename(t);
From noreply at svn.ci.uchicago.edu Fri Nov 14 13:26:11 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Fri, 14 Nov 2008 13:26:11 -0600 (CST)
Subject: [Swift-commit] r2335 - log-processing/bin
Message-ID: <20081114192611.05ECE2281C5@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-14 13:26:10 -0600 (Fri, 14 Nov 2008)
New Revision: 2335
Modified:
log-processing/bin/swift-plot-log
Log:
fix working directory creation
Modified: log-processing/bin/swift-plot-log
===================================================================
--- log-processing/bin/swift-plot-log 2008-11-12 19:43:09 UTC (rev 2334)
+++ log-processing/bin/swift-plot-log 2008-11-14 19:26:10 UTC (rev 2335)
@@ -1,7 +1,7 @@
#!/bin/bash
ORIGDIR=$(pwd)
-WORKINGDIR=$(mktemp /tmp/swift-plot-log-XXXXXXXXXXXXXXXX)
+WORKINGDIR=$(mktemp -d /tmp/swift-plot-log-XXXXXXXXXXXXXXXX)
# $1 should be the pathname of the log file to plot
@@ -28,6 +28,7 @@
echo Log basename is $LOG_FILE_BASE
cd $WORKINGDIR
+echo Now in directory $(pwd)
MAKEENV="-f ${LOG_CODE_HOME}/makefile -I ${LOG_CODE_HOME}"
MAKETARGETS=""
@@ -39,8 +40,9 @@
MAKETARGETS="webpage.info"
fi
-make $MAKEENV SDL=${ORIGDIR}/report-${LOG_FILE_BASE} LOG=$LOG_FILE_PATH clean webpage.kara webpage.weights karatasks.JOB_SUBMISSION.Queue.transitions karatasks.JOB_SUBMISSION.Queue.event $MAKETARGETS webpage distribute
+make $MAKEENV SDL=${ORIGDIR}/report-${LOG_FILE_BASE} LOG=$LOG_FILE_PATH clean webpage.kara webpage.weights karatasks.JOB_SUBMISSION.Queue.transitions karatasks.JOB_SUBMISSION.Queue.event karatasks.JOB_SUBMISSION.eip $MAKETARGETS webpage distribute
# mv report-$LOG_FILE_BASE $LOG_DIRECTORY/
-rm -r $WORKINGDIR
+# rm -r $WORKINGDIR
+echo not removing $WORKINGDIR
From noreply at svn.ci.uchicago.edu Fri Nov 14 15:17:10 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Fri, 14 Nov 2008 15:17:10 -0600 (CST)
Subject: [Swift-commit] r2336 - SwiftApps/SIDGrid/config
Message-ID: <20081114211710.B3CD622817C@www.ci.uchicago.edu>
Author: skenny
Date: 2008-11-14 15:17:10 -0600 (Fri, 14 Nov 2008)
New Revision: 2336
Modified:
SwiftApps/SIDGrid/config/tc.data
Log:
fixed walltime for ucanl64
Modified: SwiftApps/SIDGrid/config/tc.data
===================================================================
--- SwiftApps/SIDGrid/config/tc.data 2008-11-14 19:26:10 UTC (rev 2335)
+++ SwiftApps/SIDGrid/config/tc.data 2008-11-14 21:17:10 UTC (rev 2336)
@@ -865,7 +865,7 @@
ANLUCTERAGRID64 Xphace /soft/community/SIDGrid/usr/bin/Xphace INSTALLED INTEL64::LINUX GLOBUS::maxwalltime=240;env::PATHPREFIX=/soft/community/SIDGrid/usr/bin,LD_LIBRARY_PATH=/soft/community/SIDGrid/usr/lib
ANLUCTERAGRID64 Mediator /soft/community/SIDGrid/scripts/Mediator.py INSTALLED INTEL64::LINUX GLOBUS::maxwalltime=300,host_types=ia64-compute
ANLUCTERAGRID64 echo /bin/echo INSTALLED INTEL64::LINUX null
-ANLUCTERAGRID64 RInvoke /soft/community/SIDGrid/scripts/RInvoke.sh INSTALLED INTEL64::LINUX null
+ANLUCTERAGRID64 RInvoke /soft/community/SIDGrid/scripts/RInvoke.sh INSTALLED INTEL64::LINUX GLOBUS::maxwalltime=300,host_types=ia64-compute
ANLUCTERAGRID64 env /bin/env INSTALLED INTEL64::LINUX null
####-----------------UCTERAPORT-----------------------------
From noreply at svn.ci.uchicago.edu Sat Nov 15 16:28:13 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Sat, 15 Nov 2008 16:28:13 -0600 (CST)
Subject: [Swift-commit] r2337 - trunk/tests/language-behaviour
Message-ID: <20081115222813.2D8222281CA@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-15 16:28:12 -0600 (Sat, 15 Nov 2008)
New Revision: 2337
Added:
trunk/tests/language-behaviour/088-sequential-assign.swift
Log:
test for sequential assignment through several variables
Added: trunk/tests/language-behaviour/088-sequential-assign.swift
===================================================================
--- trunk/tests/language-behaviour/088-sequential-assign.swift (rev 0)
+++ trunk/tests/language-behaviour/088-sequential-assign.swift 2008-11-15 22:28:12 UTC (rev 2337)
@@ -0,0 +1,8 @@
+int a;
+int b;
+int c;
+trace(c);
+c=b;
+b=a;
+a=8645;
+
From noreply at svn.ci.uchicago.edu Sat Nov 15 17:20:07 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Sat, 15 Nov 2008 17:20:07 -0600 (CST)
Subject: [Swift-commit] r2338 - SwiftApps/adem-osg
Message-ID: <20081115232007.3B8292281C5@www.ci.uchicago.edu>
Author: houzx
Date: 2008-11-15 17:20:06 -0600 (Sat, 15 Nov 2008)
New Revision: 2338
Removed:
SwiftApps/adem-osg/bin/
Log:
Deleting the old
From noreply at svn.ci.uchicago.edu Sat Nov 15 17:20:34 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Sat, 15 Nov 2008 17:20:34 -0600 (CST)
Subject: [Swift-commit] r2339 - SwiftApps/adem-osg
Message-ID: <20081115232034.F20C92281C5@www.ci.uchicago.edu>
Author: houzx
Date: 2008-11-15 17:20:34 -0600 (Sat, 15 Nov 2008)
New Revision: 2339
Removed:
SwiftApps/adem-osg/swift-execution-example/
Log:
Deleting the old
From noreply at svn.ci.uchicago.edu Tue Nov 18 14:11:09 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Tue, 18 Nov 2008 14:11:09 -0600 (CST)
Subject: [Swift-commit] r2342 - trunk/libexec
Message-ID: <20081118201109.285C7228197@www.ci.uchicago.edu>
Author: hategan
Date: 2008-11-18 14:11:08 -0600 (Tue, 18 Nov 2008)
New Revision: 2342
Modified:
trunk/libexec/vdl-int.k
Log:
prevent annoying wrapper error
Modified: trunk/libexec/vdl-int.k
===================================================================
--- trunk/libexec/vdl-int.k 2008-11-15 23:22:11 UTC (rev 2341)
+++ trunk/libexec/vdl-int.k 2008-11-18 20:11:08 UTC (rev 2342)
@@ -452,7 +452,8 @@
outs := transferStandardFiles(rhost, tmpdir, jobid, stdout, stderr)
- discard(transferWrapperLog(rhost, wfdir, jobid, jobdir))
+ discard(maybe(transferWrapperLog(rhost, wfdir, jobid, jobdir)))
+
kickstartRec := if(
kickstart == "" ""
else(
From noreply at svn.ci.uchicago.edu Tue Nov 18 14:16:19 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Tue, 18 Nov 2008 14:16:19 -0600 (CST)
Subject: [Swift-commit] r2343 - trunk/src/org/griphyn/vdl/karajan
Message-ID: <20081118201619.A7519228181@www.ci.uchicago.edu>
Author: hategan
Date: 2008-11-18 14:16:19 -0600 (Tue, 18 Nov 2008)
New Revision: 2343
Modified:
trunk/src/org/griphyn/vdl/karajan/InHook.java
Log:
fixed in hook error when started with nohup
Modified: trunk/src/org/griphyn/vdl/karajan/InHook.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/InHook.java 2008-11-18 20:11:08 UTC (rev 2342)
+++ trunk/src/org/griphyn/vdl/karajan/InHook.java 2008-11-18 20:16:19 UTC (rev 2343)
@@ -54,6 +54,9 @@
Thread.sleep(250);
}
}
+ catch (IOException e) {
+ return;
+ }
catch (Exception e) {
e.printStackTrace();
}
From noreply at svn.ci.uchicago.edu Sun Nov 23 19:27:17 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Sun, 23 Nov 2008 19:27:17 -0600 (CST)
Subject: [Swift-commit] r2344 - trunk/src/org/griphyn/vdl/karajan/lib
Message-ID: <20081124012717.C2D42228154@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-23 19:27:16 -0600 (Sun, 23 Nov 2008)
New Revision: 2344
Modified:
trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java
Log:
do not wrap FutureNotYetAvailable exceptions in an ExecutionException - when argument processing needs to wait on a future, the code was previously failing. This does not occur in HEAD at the moment, but does in some development code that I have.
Modified: trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java 2008-11-18 20:16:19 UTC (rev 2343)
+++ trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java 2008-11-24 01:27:16 UTC (rev 2344)
@@ -45,7 +45,10 @@
}
return null;
}
- catch (Exception e) {
+ catch (FutureNotYetAvailable fnya) {
+ throw fnya;
+ }
+ catch (Exception e) { // TODO tighten this
throw new ExecutionException(e);
}
}
From noreply at svn.ci.uchicago.edu Sun Nov 23 21:03:19 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Sun, 23 Nov 2008 21:03:19 -0600 (CST)
Subject: [Swift-commit] r2345 - trunk/src/org/griphyn/vdl/karajan/lib
Message-ID: <20081124030319.1A2772281A0@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-23 21:03:18 -0600 (Sun, 23 Nov 2008)
New Revision: 2345
Modified:
trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java
Log:
missing import in r2344
Modified: trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java 2008-11-24 01:27:16 UTC (rev 2344)
+++ trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java 2008-11-24 03:03:18 UTC (rev 2345)
@@ -8,6 +8,7 @@
import org.globus.cog.karajan.arguments.Arg;
import org.globus.cog.karajan.stack.VariableStack;
import org.globus.cog.karajan.workflow.ExecutionException;
+import org.globus.cog.karajan.workflow.futures.FutureNotYetAvailable;
import org.griphyn.vdl.mapping.DSHandle;
import org.griphyn.vdl.mapping.Path;
From noreply at svn.ci.uchicago.edu Wed Nov 26 13:31:46 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Wed, 26 Nov 2008 13:31:46 -0600 (CST)
Subject: [Swift-commit] r2346 - in trunk: libexec
src/org/griphyn/vdl/karajan/lib
Message-ID: <20081126193146.C96BB22814F@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-26 13:31:44 -0600 (Wed, 26 Nov 2008)
New Revision: 2346
Removed:
trunk/src/org/griphyn/vdl/karajan/lib/FileNames.java
Modified:
trunk/libexec/vdl-lib.xml
Log:
@filenames is only used as a SwiftScript-invoked function, not as part of the
internal library. This commit removes the internal library version of
filenames, leaving the SwiftScript-exposed version in place.
Modified: trunk/libexec/vdl-lib.xml
===================================================================
--- trunk/libexec/vdl-lib.xml 2008-11-24 03:03:18 UTC (rev 2345)
+++ trunk/libexec/vdl-lib.xml 2008-11-26 19:31:44 UTC (rev 2346)
@@ -36,8 +36,6 @@
-
-
Deleted: trunk/src/org/griphyn/vdl/karajan/lib/FileNames.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/FileNames.java 2008-11-24 03:03:18 UTC (rev 2345)
+++ trunk/src/org/griphyn/vdl/karajan/lib/FileNames.java 2008-11-26 19:31:44 UTC (rev 2346)
@@ -1,22 +0,0 @@
-/*
- * Created on Dec 26, 2006
- */
-package org.griphyn.vdl.karajan.lib;
-
-import org.globus.cog.karajan.arguments.Arg;
-import org.globus.cog.karajan.stack.VariableStack;
-import org.globus.cog.karajan.workflow.ExecutionException;
-
-public class FileNames extends VDLFunction {
- static {
- setArguments(FileNames.class, new Arg[] { PA_VAR });
- }
-
- public Object function(VariableStack stack) throws ExecutionException {
- String[] f = filename(stack);
- for (int i = 0; i < f.length; i++) {
- f[i] = relativize(f[i]);
- }
- return f;
- }
-}
From noreply at svn.ci.uchicago.edu Wed Nov 26 13:38:20 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Wed, 26 Nov 2008 13:38:20 -0600 (CST)
Subject: [Swift-commit] r2347 - in trunk: libexec
src/org/griphyn/vdl/karajan/lib
Message-ID: <20081126193820.BE936228035@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-26 13:38:19 -0600 (Wed, 26 Nov 2008)
New Revision: 2347
Removed:
trunk/src/org/griphyn/vdl/karajan/lib/FileSet.java
Modified:
trunk/libexec/vdl-lib.xml
Log:
FileSet library function is unused so remove.
Modified: trunk/libexec/vdl-lib.xml
===================================================================
--- trunk/libexec/vdl-lib.xml 2008-11-26 19:31:44 UTC (rev 2346)
+++ trunk/libexec/vdl-lib.xml 2008-11-26 19:38:19 UTC (rev 2347)
@@ -47,7 +47,6 @@
-
Deleted: trunk/src/org/griphyn/vdl/karajan/lib/FileSet.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/FileSet.java 2008-11-26 19:31:44 UTC (rev 2346)
+++ trunk/src/org/griphyn/vdl/karajan/lib/FileSet.java 2008-11-26 19:38:19 UTC (rev 2347)
@@ -1,31 +0,0 @@
-/*
- * Created on Dec 26, 2006
- */
-package org.griphyn.vdl.karajan.lib;
-
-import org.globus.cog.karajan.arguments.Arg;
-import org.globus.cog.karajan.stack.VariableStack;
-import org.globus.cog.karajan.workflow.ExecutionException;
-import org.globus.cog.karajan.workflow.futures.FutureNotYetAvailable;
-import org.griphyn.vdl.mapping.DSHandle;
-import org.griphyn.vdl.mapping.HandleOpenException;
-import org.griphyn.vdl.mapping.InvalidPathException;
-
-public class FileSet extends VDLFunction {
- static {
- setArguments(FileSet.class, new Arg[] { PA_VAR, OA_PATH });
- }
-
- public Object function(VariableStack stack) throws ExecutionException {
- DSHandle var = (DSHandle) PA_VAR.getValue(stack);
- try {
- return this.leavesFileNames(var.getField(parsePath(OA_PATH.getValue(stack), stack)));
- }
- catch (InvalidPathException e) {
- throw new ExecutionException(e);
- }
- catch (HandleOpenException e) {
- throw new FutureNotYetAvailable(addFutureListener(stack, e.getSource()));
- }
- }
-}
From noreply at svn.ci.uchicago.edu Thu Nov 27 15:44:06 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Thu, 27 Nov 2008 15:44:06 -0600 (CST)
Subject: [Swift-commit] r2348 - trunk/tests/language-behaviour
Message-ID: <20081127214406.81685228154@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-27 15:44:04 -0600 (Thu, 27 Nov 2008)
New Revision: 2348
Added:
trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.real.out.expected
trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.swift
Log:
test of fixed-array-mapper with @filename and filenames in a separate variable
Added: trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.real.out.expected
===================================================================
--- trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.real.out.expected (rev 0)
+++ trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.real.out.expected 2008-11-27 21:44:04 UTC (rev 2348)
@@ -0,0 +1 @@
+q r s t
Added: trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.swift
===================================================================
--- trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.swift (rev 0)
+++ trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.swift 2008-11-27 21:44:04 UTC (rev 2348)
@@ -0,0 +1,19 @@
+type messagefile;
+
+(messagefile t) write(string s) {
+ app {
+ echo s stdout=@filename(t);
+ }
+}
+
+string fns="q r s t";
+
+messagefile outfile[] ;
+messagefile realoutput <"07513-fixed-array-mapper-filename.real.out">;
+
+string fn;
+
+fn = @filename(outfile);
+
+realoutput = write(fn);
+
From noreply at svn.ci.uchicago.edu Thu Nov 27 16:52:03 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Thu, 27 Nov 2008 16:52:03 -0600 (CST)
Subject: [Swift-commit] r2349 - trunk/src/org/griphyn/vdl/karajan/lib
Message-ID: <20081127225203.42BB822814F@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-27 16:52:02 -0600 (Thu, 27 Nov 2008)
New Revision: 2349
Modified:
trunk/src/org/griphyn/vdl/karajan/lib/VDLFunction.java
Log:
remove dead code from filename and tighten up some method signatures on helper methods
Modified: trunk/src/org/griphyn/vdl/karajan/lib/VDLFunction.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/VDLFunction.java 2008-11-27 21:44:04 UTC (rev 2348)
+++ trunk/src/org/griphyn/vdl/karajan/lib/VDLFunction.java 2008-11-27 22:52:02 UTC (rev 2349)
@@ -173,40 +173,16 @@
public static final String[] EMPTY_STRING_ARRAY = new String[0];
- /**
- * Given a field (or Collection of fields) on the stack, returns the
- * filename(s) that are mapped that field(s).
- */
public String[] filename(VariableStack stack) throws ExecutionException {
- Object ovar = PA_VAR.getValue(stack);
- if (ovar instanceof DSHandle) {
- try {
- return filename((DSHandle) ovar);
- }
- catch (HandleOpenException e) {
- throw new FutureNotYetAvailable(addFutureListener(stack, e.getSource()));
- }
+ DSHandle ovar = (DSHandle)PA_VAR.getValue(stack);
+ try {
+ return filename(ovar);
}
- else if (ovar instanceof Collection) {
- return filename((Collection) ovar);
+ catch (HandleOpenException e) {
+ throw new FutureNotYetAvailable(addFutureListener(stack, e.getSource()));
}
- else {
- return new String[0];
- }
- }
+ }
- public String[] filename(Collection vars) throws ExecutionException {
- // assume here that the Collection is all DSHandles
- Iterator iterator = vars.iterator();
- ArrayList out = new ArrayList();
- while (iterator.hasNext()) {
- DSHandle h = (DSHandle) iterator.next();
- String filename = leafFileName(h);
- out.add(filename);
- }
- return (String[]) out.toArray(EMPTY_STRING_ARRAY);
- }
-
public String[] filename(DSHandle var) throws ExecutionException, HandleOpenException {
try {
if (var.getType().isArray()) {
@@ -221,7 +197,7 @@
}
}
- public String[] leavesFileNames(DSHandle var) throws ExecutionException, HandleOpenException {
+ private String[] leavesFileNames(DSHandle var) throws ExecutionException, HandleOpenException {
List l = new ArrayList();
Iterator i;
try {
@@ -292,7 +268,7 @@
}
}
- public String leafFileName(DSHandle var) throws ExecutionException {
+ private String leafFileName(DSHandle var) throws ExecutionException {
if (Types.STRING.equals(var.getType())) {
return relativize(String.valueOf(var.getValue()));
}
@@ -394,17 +370,6 @@
}
}
- protected String getFileName(VariableStack stack) throws ExecutionException {
- DSHandle var = (DSHandle) PA_VAR.getValue(stack);
- try {
- Path path = parsePath(PA_PATH.getValue(stack), stack);
- return leafFileName(var.getField(path));
- }
- catch (InvalidPathException e) {
- throw new ExecutionException(e);
- }
- }
-
protected boolean compatible(Type expectedType, Type actualType) {
if (expectedType.equals(Types.FLOAT)) {
if (actualType.equals(Types.FLOAT) || actualType.equals(Types.INT)) {
From noreply at svn.ci.uchicago.edu Thu Nov 27 17:26:40 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Thu, 27 Nov 2008 17:26:40 -0600 (CST)
Subject: [Swift-commit] r2350 - trunk/src/org/griphyn/vdl/karajan
Message-ID: <20081127232640.D2F2F228154@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-27 17:26:40 -0600 (Thu, 27 Nov 2008)
New Revision: 2350
Modified:
trunk/src/org/griphyn/vdl/karajan/WrapperMap.java
Log:
throw an exception where some code is not yet implemented
Modified: trunk/src/org/griphyn/vdl/karajan/WrapperMap.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/WrapperMap.java 2008-11-27 22:52:02 UTC (rev 2349)
+++ trunk/src/org/griphyn/vdl/karajan/WrapperMap.java 2008-11-27 23:26:40 UTC (rev 2350)
@@ -78,6 +78,7 @@
FutureWrappers fws = (FutureWrappers) map.get(source);
// TODO
+ throw new RuntimeException("not implemented");
}
public synchronized void markAsAvailable(DSHandle handle, Object key) {
From noreply at svn.ci.uchicago.edu Fri Nov 28 00:52:56 2008
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Fri, 28 Nov 2008 00:52:56 -0600 (CST)
Subject: [Swift-commit] r2351 - trunk/src/org/griphyn/vdl/karajan/lib
Message-ID: <20081128065256.BC7A62281A0@www.ci.uchicago.edu>
Author: benc
Date: 2008-11-28 00:52:55 -0600 (Fri, 28 Nov 2008)
New Revision: 2351
Modified:
trunk/src/org/griphyn/vdl/karajan/lib/FringePaths.java
Log:
lock root of datasets when getting fringe paths - this will be needed in a future commit to prevent a race condition
Modified: trunk/src/org/griphyn/vdl/karajan/lib/FringePaths.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/FringePaths.java 2008-11-27 23:26:40 UTC (rev 2350)
+++ trunk/src/org/griphyn/vdl/karajan/lib/FringePaths.java 2008-11-28 06:52:55 UTC (rev 2351)
@@ -24,16 +24,22 @@
public Object function(VariableStack stack) throws ExecutionException {
DSHandle var = (DSHandle) PA_VAR.getValue(stack);
+ DSHandle root = var.getRoot();
try {
var = var.getField(parsePath(OA_PATH.getValue(stack), stack));
- Collection c = var.getFringePaths();
+ Collection c;
+ synchronized(root) {
+ c = var.getFringePaths();
+ }
return c;
}
catch (InvalidPathException e) {
throw new ExecutionException(e);
}
catch (HandleOpenException e) {
- throw new FutureNotYetAvailable(addFutureListener(stack, e.getSource()));
+ synchronized(root) {
+ throw new FutureNotYetAvailable(addFutureListener(stack, e.getSource()));
+ }
}
}
}