Skip to content

V
vdt-plugin
Commit 9d3c3811 authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

more editing, added console script timeout and connected Eclipse 

pattern matching
parent 992d3ccf
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 29 deletions
src/com/elphel/vdt/core/launching/LaunchCore.java
View file @ 9d3c3811
......@@ -328,10 +328,12 @@ public class LaunchCore {
launch.setAttribute(DebugPlugin.ATTR_CAPTURE_OUTPUT, null);
DebugPlugin.getDefault().getLaunchManager().addLaunch(launch);
VDTRunner runner = VDTLaunchUtil.getRunner();
int numItem=configuration.getBuildStep();
runner.run(configuration,
VDTRunner.renderProcessLabel(configuration.getToolName()), // toolname + (date)
launch,
null);
null,
numItem);
} // launch()
......
src/com/elphel/vdt/core/launching/VDTConsoleRunner.java
View file @ 9d3c3811
......@@ -19,6 +19,8 @@ package com.elphel.vdt.core.launching;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
import org.eclipse.debug.internal.ui.views.console.ProcessConsole;
import org.eclipse.core.runtime.CoreException;
......@@ -49,6 +51,7 @@ import com.elphel.vdt.core.tools.contexts.BuildParamsItem;
import com.elphel.vdt.ui.MessageUI;
import com.elphel.vdt.veditor.VerilogPlugin;
import com.elphel.vdt.veditor.preference.PreferenceStrings;
import com.sun.net.ssl.internal.www.protocol.https.Handler;
public class VDTConsoleRunner{
private final VDTRunnerConfiguration runConfig;
......@@ -67,7 +70,8 @@ public class VDTConsoleRunner{
public VDTConsoleRunner (VDTRunnerConfiguration runConfig){
this.runConfig=runConfig;
}
private BuildParamsItem getParser( String parserName){
/*
* private BuildParamsItem getParser( String parserName){
if (parserName==null) return null;
BuildParamsItem[] buildParamsItems = runConfig.getArgumentsItemsArray(); // uses already calculated
if (buildParamsItems==null) return null;
......@@ -77,6 +81,19 @@ public class VDTConsoleRunner{
}
return null;
}
*/
private int getParserIndex( String parserName){
if (parserName==null) return -1;
BuildParamsItem[] buildParamsItems = runConfig.getArgumentsItemsArray(); // uses already calculated
if (buildParamsItems==null) return -1;
for (int i=0;i<buildParamsItems.length;i++){
if (parserName.equals(buildParamsItems[i].getNameAsParser()))
return i;
}
return -1;
}
public IOConsole runConsole(String consolePrefix
, ILaunch launch
......@@ -124,9 +141,12 @@ public class VDTConsoleRunner{
process=((ProcessConsole)iCons).getProcess();
// IStreamsProxy consoleInStreamProxy= process.getStreamsProxy();
consoleInStreamProxy= process.getStreamsProxy();
BuildParamsItem stderrParser=getParser(buildParamsItem.getStderr()); // re-parses all - why?
BuildParamsItem stdoutParser=getParser(buildParamsItem.getStdout());
int stderrParserIndex=getParserIndex(buildParamsItem.getStderr());
int stdoutParserIndex=getParserIndex(buildParamsItem.getStdout());
BuildParamsItem stderrParser=(stderrParserIndex>=0)?runConfig.getArgumentsItemsArray()[stderrParserIndex]:null;
BuildParamsItem stdoutParser=(stdoutParserIndex>=0)?runConfig.getArgumentsItemsArray()[stdoutParserIndex]:null;
// BuildParamsItem stderrParser=getParser(buildParamsItem.getStderr()); // re-parses all - why?
// BuildParamsItem stdoutParser=getParser(buildParamsItem.getStdout());
System.out.println("Using parser for stderr: "+((stderrParser!=null)?stderrParser.getNameAsParser():"none")); // actually may be the same as stdout
System.out.println("Using parser for stdout: "+((stdoutParser!=null)?stdoutParser.getNameAsParser():"none"));
......@@ -145,7 +165,8 @@ public class VDTConsoleRunner{
processOut=runner.run(runConfig,
"OUT for "+iCons.getName(),
launch,
null); //monitor);
null, //monitor
stdoutParserIndex);
stdoutStreamProxy= processOut.getStreamsProxy();
//TODO: Add error parsers
}
......@@ -160,7 +181,8 @@ public class VDTConsoleRunner{
processErr=runner.run(runConfig,
"ERR for "+iCons.getName(),
launch,
null); //monitor);
null, //monitor);
stderrParserIndex);
stderrStreamProxy= processErr.getStreamsProxy();
//TODO: Add error parsers
}
......@@ -218,21 +240,33 @@ public class VDTConsoleRunner{
};
consoleOutStreamMonitor.addListener((IStreamListener) outputListener );
}
outStream.setColor(new Color(null, 128, 128, 255));
outStream.setColor(new Color(null, 128, 128, 255));
try {
for (int i=0;i<arguments.length;i++){
if (VerilogPlugin.getPreferenceBoolean(PreferenceStrings.LOCAL_ECHO)) {
outStream.write(arguments[i]+"\n"); // writes to console itself
}
consoleInStreamProxy.write(arguments[i]+"\n");
if (VerilogPlugin.getPreferenceBoolean(PreferenceStrings.LOCAL_ECHO)) {
outStream.write(arguments[i]+"\n"); // writes to console itself
}
consoleInStreamProxy.write(arguments[i]+"\n");
}
} catch (IOException e) {
System.out.println("Can not write to outStream of console "+iCons.getName());
}
return iCons;
int timeout=buildParamsItem.getTimeout();
if ((timeout==0) && (buildParamsItem.getPrompt()==null)) timeout=1;// should specify at least one of timeout or prompt
if (timeout>0){
System.out.println("Setting timeout "+timeout);
final int fTimeout = timeout;
new Timer().schedule(new TimerTask() {
@Override
public void run() {
System.out.println(">>Timeout<<");
finishConsolescript();
}
}, fTimeout*1000);
}
return iCons;
}
// TODO: remove unneeded global vars
......
src/com/elphel/vdt/core/launching/VDTRunner.java
View file @ 9d3c3811
......@@ -26,6 +26,8 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
import org.eclipse.debug.internal.ui.views.console.ProcessConsole;
//import org.eclipse.core.resources.IProject;
......@@ -36,6 +38,7 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
......@@ -78,6 +81,8 @@ import com.elphel.vdt.veditor.preference.PreferenceStrings;
//import com.elphel.vdt.core.Utils;
import org.eclipse.ui.console.IConsoleListener;
......@@ -137,7 +142,9 @@ public class VDTRunner {
// renderProcessLabel(runConfig.getToolName()), // toolname + (date)
runConfig.getOriginalConsoleName(),
launch,
monitor);
monitor,
numItem
);
//Andrey: if there is a single item - launch asynchronously, if more - verify queue is empty
// will not change
......@@ -148,6 +155,8 @@ public class VDTRunner {
runningBuilds.removeConfiguration(consoleName);
return;
}
if (numItem<(argumentsItemsArray.length-1)){ // Not for the last
// IConsoleManager man = ConsolePlugin.getDefault().getConsoleManager(); // debugging
// IConsole[] consoles=(IConsole[]) man.getConsoles();
......@@ -191,6 +200,23 @@ public class VDTRunner {
iCons.firePropertyChange(fiCons,"org.eclipse.jface.text", consoleName, fConsoleName);
}
System.out.println("return - waiting to be awaken");
int timeout=argumentsItemsArray[numItem].getTimeout();
if (timeout>0){
final int fTimeout = timeout;
final IProcess fProcess=process;
new Timer().schedule(new TimerTask() {
@Override
public void run() {
System.out.println(">>Timeout<<");
try {
fProcess.terminate();
} catch (DebugException e) {
System.out.println("Failed to terminate preocess on "+fConsoleName);
}
}
}, fTimeout*1000);
}
return;
}
......@@ -256,15 +282,16 @@ public class VDTRunner {
public IProcess run( VDTRunnerConfiguration configuration
, String consoleLabel
, ILaunch launch
, IProgressMonitor monitor
, IProgressMonitor monitor
, int numItem
) throws CoreException
{
if (monitor == null) {
monitor = new NullProgressMonitor();
}
int numItem=configuration.getBuildStep();
// BuildParamsItem buildParamsItem= VDTLaunchUtil.getArguments(configuration.getConfiguration())[numItem];
BuildParamsItem buildParamsItem = configuration.getArgumentsItemsArray()[numItem]; // uses already calculated
// int numItem=configuration.getBuildStep();
BuildParamsItem buildParamsItem = configuration.getArgumentsItemsArray()[numItem]; // uses already calculated
String patternErrors= combinePatterns(buildParamsItem.getErrors(), configuration.getPatternErrors()) ;
String patternWarnings=combinePatterns(buildParamsItem.getWarnings(),configuration.getPatternWarnings()) ;
String patternInfo= combinePatterns(buildParamsItem.getInfo(), configuration.getPatternInfo()) ;
......
src/com/elphel/vdt/core/tools/config/xml/CommandLinesNodeReader.java
View file @ 9d3c3811
......@@ -67,6 +67,7 @@ public class CommandLinesNodeReader extends AbstractConditionNodeReader {
String stderr = XMLConfig.getAttributeValue(node, XMLConfig.CONTEXT_LINEBLOCK_STDERR_ATTR);
String stdout = XMLConfig.getAttributeValue(node, XMLConfig.CONTEXT_LINEBLOCK_STDOUT_ATTR);
String timeout = XMLConfig.getAttributeValue(node, XMLConfig.CONTEXT_LINEBLOCK_TIMEOUT_ATTR);
if(name == null)
throw new ConfigException("Unnamed lines block definition in context '" +
......@@ -92,6 +93,7 @@ public class CommandLinesNodeReader extends AbstractConditionNodeReader {
interrupt,
stderr,
stdout,
timeout,
lines,
deleteLines,
insertLines);
......
src/com/elphel/vdt/core/tools/config/xml/XMLConfig.java
View file @ 9d3c3811
......@@ -135,6 +135,7 @@ public class XMLConfig extends Config {
static final String CONTEXT_LINEBLOCK_INTERRUPT_ATTR ="interrupt";
static final String CONTEXT_LINEBLOCK_STDERR_ATTR = "stderr";
static final String CONTEXT_LINEBLOCK_STDOUT_ATTR = "stdout";
static final String CONTEXT_LINEBLOCK_TIMEOUT_ATTR = "timeout";
static final String CONTEXT_STRINGS_DELETE_TAG = "delete";
static final String CONTEXT_STRINGS_INSERT_TAG = "insert";
......
src/com/elphel/vdt/core/tools/contexts/BuildParamsItem.java
View file @ 9d3c3811
......@@ -36,7 +36,7 @@ public class BuildParamsItem implements Cloneable{
private String stdout; // name of the command to (command line block) to launch in a separate process/console
// and connect to stderr of the terminal session
private int timeout; // timeout for console tasks, in seconds
public BuildParamsItem (
String [] params,
......@@ -49,7 +49,8 @@ public class BuildParamsItem implements Cloneable{
String prompt,
String interrupt,
String stderr,
String stdout
String stdout,
int timeout
) {
this.consoleName=consoleName;
this.params=params; // no need to clone?
......@@ -62,6 +63,7 @@ public class BuildParamsItem implements Cloneable{
this.interrupt=interrupt;
this.stderr=stderr;
this.stdout=stdout;
this.timeout=timeout;
}
public BuildParamsItem (BuildParamsItem item){
......@@ -76,7 +78,8 @@ public class BuildParamsItem implements Cloneable{
item.prompt,
item.interrupt,
item.stderr,
item.stdout
item.stdout,
item.timeout
);
}
......@@ -135,4 +138,5 @@ public class BuildParamsItem implements Cloneable{
public String getInterrupt() { return interrupt; }
public String getStderr() { return stderr; }
public String getStdout() { return stdout; }
public int getTimeout() { return timeout; }
}
src/com/elphel/vdt/core/tools/contexts/Context.java
View file @ 9d3c3811
......@@ -216,6 +216,12 @@ public abstract class Context {
String stderr=commandLinesBlock.getStderr();
String stdout=commandLinesBlock.getStdout();
String prompt=buildSimpleString(commandLinesBlock.getPrompt()); // evaluate string
String sTimeout=buildSimpleString(commandLinesBlock.getTimeout());
int timeout=0;
try{
timeout=Integer.parseInt(sTimeout);
} catch(Exception e){
}
prompt=commandLinesBlock.parseCntrl(prompt); // replace control character codes (\n,\t,\x)
prompt=commandLinesBlock.applyMark(prompt); // remove mark sequence
String interrupt=commandLinesBlock.getInterrupt();
......@@ -247,7 +253,9 @@ public abstract class Context {
prompt,
interrupt,
stderr,
stdout)
stdout,
timeout
)
);
} else { // processing command file
if(workingDirectory != null)
......@@ -282,7 +290,9 @@ public abstract class Context {
prompt,
interrupt,
stderr,
stdout)
stdout,
timeout
)
);
}
......@@ -310,13 +320,18 @@ public abstract class Context {
return processor.process(paramStringTemplate);
}
// recognizes parameter name (just %name), or simple generators
protected String buildSimpleString(String stringTemplate)
throws ToolException
{
if (stringTemplate==null) return null;
Parameter parName=findParam(stringTemplate);
if (parName!=null){
return parName.getValue().get(0).trim(); // get parameter
}
FormatProcessor processor = new FormatProcessor(new Recognizer[] {
new SimpleGeneratorRecognizer(),
// new RepeaterRecognizer()
new RepeaterRecognizer()
// new ContextParamRecognizer(this),
// new ContextParamRepeaterRecognizer(this)
});
......@@ -325,9 +340,7 @@ public abstract class Context {
if (result.size()==0) return "";
return result.get(0);
}
protected void initControlInterface() throws ConfigException {
if(controlInterfaceName != null) {
controlInterface = config.findControlInterface(controlInterfaceName);
......
src/com/elphel/vdt/core/tools/params/CommandLinesBlock.java
View file @ 9d3c3811
......@@ -50,6 +50,7 @@ public class CommandLinesBlock extends UpdateableStringsContainer
// If both are specified and pointing to the same command block - two instances/consoles will be launched.
// if only stdout - both stdout and stdin of a session will go to the same process/console
private String interrupt; // send this to remote terminal to interrupt execution (parses use \xNN)
private String timeout; // timeout for console tasks, in seconds
public CommandLinesBlock(String contextName,
......@@ -65,6 +66,7 @@ public class CommandLinesBlock extends UpdateableStringsContainer
String interrupt,
String stderr,
String stdout,
String timeout,
ConditionalStringsList lines,
ConditionalStringsList deleteLines,
List<NamedConditionalStringsList> insertLines)
......@@ -84,6 +86,7 @@ public class CommandLinesBlock extends UpdateableStringsContainer
this.interrupt=interrupt;
this.stderr=stderr;
this.stdout=stdout;
this.timeout=timeout;
if(this.separator != null) {
// separator = separator.replace("\\n", "\n");
......@@ -136,6 +139,7 @@ public class CommandLinesBlock extends UpdateableStringsContainer
block.interrupt,
block.stderr,
block.stdout,
block.timeout,
block.strings != null?
(ConditionalStringsList)block.strings.clone() : null,
block.deleteStrings != null?
......@@ -205,6 +209,7 @@ public class CommandLinesBlock extends UpdateableStringsContainer
public String getInterrupt() { return prompt; }
public String getStderr() { return stderr; }
public String getStdout() { return stdout; }
public String getTimeout() { return timeout; }
public boolean isEnabled() {
......
tools/SimpleSamples/Remote.xml
View file @ 9d3c3811
......@@ -90,10 +90,16 @@
<parameter id="python_console_name" default="RemotePython"
type="String" format="CopyValue" visible="false" />
<parameter id="Timeout" label="Script timeout(sec)" type="Cardinal"
format="CopyValue" default="10" readonly="false" visible="true" />
<input>
<group name="General">
"RemoteCommand"
"Timeout"
</group>
</input>
......@@ -111,7 +117,8 @@
mark="``"
sep="\n"
prompt="@@FINISH@@"
stdout="parser_001">
stdout="parser_001"
timeout="Timeout">
"%RemoteCommand"
"print '@@FINISH@@'"
"``"`" <!-- two new lines should generate a pair of prompts from the remote -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment