[Swift-commit] r3402 - in branches/woz-01: resources src/org/griphyn/vdl/karajan src/org/griphyn/vdl/karajan/lib
noreply at svn.ci.uchicago.edu
noreply at svn.ci.uchicago.edu
Tue Jun 22 14:50:00 CDT 2010
Author: wozniak
Date: 2010-06-22 14:50:00 -0500 (Tue, 22 Jun 2010)
New Revision: 3402
Modified:
branches/woz-01/resources/Karajan.stg
branches/woz-01/src/org/griphyn/vdl/karajan/Loader.java
branches/woz-01/src/org/griphyn/vdl/karajan/lib/PartialCloseDataset.java
branches/woz-01/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java
Log:
More INFO -> DEBUG changes
Modified: branches/woz-01/resources/Karajan.stg
===================================================================
--- branches/woz-01/resources/Karajan.stg 2010-06-22 19:48:18 UTC (rev 3401)
+++ branches/woz-01/resources/Karajan.stg 2010-06-22 19:50:00 UTC (rev 3402)
@@ -2,6 +2,7 @@
// TODO can move progress ticker start into vdl:mains so karajan files
// are smaller
+
program(types,procedures,declarations,statements,constants,buildversion) ::= <<
<project><!-- CACHE ID $buildversion$ -->
<import file="sys.xml"/>
@@ -101,7 +102,7 @@
>>
vdl_execute(outputs,inputs,application,name,line) ::= <<
-<log level="info" message="PROCEDURE line=$line$ thread={#thread} name=$name$"/>
+<log level="debug" message="PROCEDURE line=$line$ thread={#thread} name=$name$"/>
<vdl:execute>
<vdl:tr>$application.exec$</vdl:tr>
$inputs:vdl_stagein();separator="\n"$
@@ -109,7 +110,7 @@
$vdl_arguments(arguments=application.arguments, stdin=application.stdin,stdout=application.stdout,stderr=application.stderr)$
</vdl:execute>
$outputs:vdl_closedataset();separator="\n"$
-<log level="info" message="PROCEDURE_END line=$line$"/>
+<log level="debug" message="PROCEDURE_END line=$line$"/>
>>
vdl_log_input() ::= <<
@@ -213,14 +214,14 @@
<vdl:new type="int" value="{\$\$}"/>
</set>
$endif$
- <log level="info" message="FOREACH_IT_START line=$line$ thread={#thread}"/>
-<log level="info"><string>SCOPE thread={#thread}</string></log>
+ <log level="debug" message="FOREACH_IT_START line=$line$ thread={#thread}"/>
+<log level="debug"><string>SCOPE thread={#thread}</string></log>
$declarations;separator="\n"$
$if(statements)$
$parallel(statements=statements)$
$endif$
- <log level="info" message="FOREACH_IT_END line=$line$ thread={#thread}"/>
+ <log level="debug" message="FOREACH_IT_END line=$line$ thread={#thread}"/>
</vdl:tparallelFor>
>>
@@ -230,7 +231,7 @@
callInternal(func, outputs, inputs) ::= <<
<sequential>
-<log level="info" message="INTERNALPROC_START thread={#thread} name=$func$"/>
+<log level="debug" message="INTERNALPROC_START thread={#thread} name=$func$"/>
<set name="swift#cs"><variable>#thread</variable></set>
<$func$>
<parallel>
@@ -238,7 +239,7 @@
$inputs:callInternal_log_input();separator="\n"$
</parallel>
</$func$>
-<log level="info" message="INTERNALPROC_END thread={#thread}"/>
+<log level="debug" message="INTERNALPROC_END thread={#thread}"/>
</sequential>
>>
@@ -412,12 +413,12 @@
<if>
<vdl:getfieldvalue>$condition$</vdl:getfieldvalue>
<then>
-<log level="info"><string>SCOPE thread={#thread}</string></log>
+<log level="debug"><string>SCOPE thread={#thread}</string></log>
$vthen$
</then>
$if(velse)$
<else>
-<log level="info"><string>SCOPE thread={#thread}</string></log>
+<log level="debug"><string>SCOPE thread={#thread}</string></log>
$velse$
</else>
$endif$
@@ -544,7 +545,7 @@
</vdl:slicearray>
</set>
- <log level="info"><concat>
+ <log level="debug"><concat>
<string>SLICEARRAY thread={#thread} slice=</string>
<vdl:getdatasetprovenanceid var="{swift#slice}" />
<string> member=$memberchild$ array=</string>
Modified: branches/woz-01/src/org/griphyn/vdl/karajan/Loader.java
===================================================================
--- branches/woz-01/src/org/griphyn/vdl/karajan/Loader.java 2010-06-22 19:48:18 UTC (rev 3401)
+++ branches/woz-01/src/org/griphyn/vdl/karajan/Loader.java 2010-06-22 19:50:00 UTC (rev 3402)
@@ -477,6 +477,7 @@
ca.activateOptions();
}
if (ap.isPresent(ARG_TUI)) {
+ System.out.println("TUI");
ma = new MonitorAppender(projectName);
Logger.getRootLogger().addAppender(ma);
Logger.getLogger(Log.class).setLevel(Level.DEBUG);
Modified: branches/woz-01/src/org/griphyn/vdl/karajan/lib/PartialCloseDataset.java
===================================================================
--- branches/woz-01/src/org/griphyn/vdl/karajan/lib/PartialCloseDataset.java 2010-06-22 19:48:18 UTC (rev 3401)
+++ branches/woz-01/src/org/griphyn/vdl/karajan/lib/PartialCloseDataset.java 2010-06-22 19:50:00 UTC (rev 3402)
@@ -32,15 +32,14 @@
boolean hasUnseenToken = false;
DSHandle var = (DSHandle) PA_VAR.getValue(stack);
String statementID = (String) OA_STATEMENTID.getValue(stack);
- if (logger.isInfoEnabled()) {
- logger.info("Partially closing " + var + " for statement " + statementID);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Partially closing " + var +
+ " hash: " + var.hashCode() +
+ " for statement " + statementID);
}
- logger.info("var is "+var);
- logger.info("var hash is "+var.hashCode());
-
if(var.isClosed()) {
- logger.info("variable already closed - skipping partial close processing");
+ logger.debug("variable already closed - skipping partial close processing");
return null;
}
@@ -53,10 +52,10 @@
}
c.add(statementID);
- logger.info("Adding token "+statementID+" with hash "+statementID.hashCode());
+ logger.debug("Adding token "+statementID+" with hash "+statementID.hashCode());
String needToWaitFor = (String) var.getParam("waitfor");
- logger.info("need to wait for "+needToWaitFor);
+ logger.debug("need to wait for "+needToWaitFor);
StringTokenizer stok = new StringTokenizer(needToWaitFor, " ");
while(stok.hasMoreTokens()) {
String s = stok.nextToken();
@@ -66,16 +65,16 @@
// then we have a required element that we have not
// seen yet, so...
hasUnseenToken = true;
- logger.info("Container does not contain token "+s);
+ logger.debug("Container does not contain token "+s);
} else {
- logger.info("Container does contain token "+s);
+ logger.debug("Container does contain token "+s);
}
}
}
logger.info("hasUnseenToken = "+hasUnseenToken);
if(!hasUnseenToken) {
- if(logger.isInfoEnabled()) {
- logger.info("All partial closes for " + var + " have happened. Closing fully.");
+ if(logger.isDebugEnabled()) {
+ logger.debug("All partial closes for " + var + " have happened. Closing fully.");
}
var.closeDeep();
pendingDatasets.remove(var);
Modified: branches/woz-01/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java
===================================================================
--- branches/woz-01/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java 2010-06-22 19:48:18 UTC (rev 3401)
+++ branches/woz-01/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java 2010-06-22 19:50:00 UTC (rev 3402)
@@ -69,7 +69,8 @@
else {
if (leaf instanceof AbstractDataNode) {
AbstractDataNode data = (AbstractDataNode) leaf;
- String name = data.getDisplayableName();
+ String name = data.getDisplayableName() +
+ data.getPathFromRoot();
logger.info("Set: " + name + "=" + value);
}
}
More information about the Swift-commit
mailing list