Merge pull request #17 from cmorty/Cooja_automation
Cooja automation related patches.
This commit is contained in:
commit
6a7435e0ba
|
@ -29,22 +29,63 @@
|
|||
package se.sics.cooja;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
|
||||
import java.util.Collections;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
/**
|
||||
* COOJA Project.
|
||||
*
|
||||
* @author Fredrik Osterlind
|
||||
* @author Moritz Strübe
|
||||
*/
|
||||
public class COOJAProject {
|
||||
private static Logger logger = Logger.getLogger(COOJAProject.class);
|
||||
|
||||
|
||||
public static File[] sarchProjects(File folder){
|
||||
return sarchProjects(folder, 3);
|
||||
}
|
||||
|
||||
public static File[] sarchProjects(File folder, int depth){
|
||||
if(depth == 0){
|
||||
return null;
|
||||
}
|
||||
depth--;
|
||||
ArrayList<File> dirs = new ArrayList<File>();
|
||||
|
||||
if(!folder.isDirectory()){
|
||||
logger.warn("Project directorys: " + folder.getPath() + "is not a Folder" );
|
||||
return null;
|
||||
}
|
||||
File[] files = folder.listFiles();
|
||||
for(File subf : files){
|
||||
if(subf.getName().charAt(0) == '.') continue;
|
||||
if(subf.isDirectory()){
|
||||
File[] newf = sarchProjects(subf, depth);
|
||||
if(newf != null){
|
||||
Collections.addAll(dirs, newf);
|
||||
}
|
||||
}
|
||||
if(subf.getName().equals(GUI.PROJECT_CONFIG_FILENAME)){
|
||||
try{
|
||||
dirs.add(folder);
|
||||
} catch(Exception e){
|
||||
logger.error("Somthing odd happend", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
return dirs.toArray(new File[0]);
|
||||
|
||||
}
|
||||
|
||||
|
||||
public File dir = null;
|
||||
public File configFile = null;
|
||||
public ProjectConfig config = null;
|
||||
|
||||
|
||||
public COOJAProject(File dir) {
|
||||
try {
|
||||
this.dir = dir;
|
||||
|
|
|
@ -60,13 +60,16 @@ import java.io.InputStream;
|
|||
import java.io.OutputStream;
|
||||
import java.io.PrintStream;
|
||||
import java.io.StringReader;
|
||||
import java.lang.reflect.Array;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.net.URL;
|
||||
import java.net.URLClassLoader;
|
||||
import java.security.AccessControlException;
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Comparator;
|
||||
import java.util.Enumeration;
|
||||
import java.util.List;
|
||||
import java.util.Observable;
|
||||
|
@ -244,7 +247,8 @@ public class GUI extends Observable {
|
|||
public static Properties currentExternalToolsSettings;
|
||||
|
||||
private static final String externalToolsSettingNames[] = new String[] {
|
||||
"PATH_CONTIKI", "PATH_COOJA_CORE_RELATIVE",
|
||||
"PATH_CONTIKI", "PATH_COOJA_CORE_RELATIVE","PATH_COOJA","PATH_APPS",
|
||||
"PATH_APPSEARCH",
|
||||
|
||||
"PATH_MAKE",
|
||||
"PATH_SHELL",
|
||||
|
@ -424,6 +428,20 @@ public class GUI extends Observable {
|
|||
}
|
||||
}
|
||||
|
||||
//Scan for projects
|
||||
String searchProjectDirs = getExternalToolsSetting("PATH_APPSEARCH", null);
|
||||
if (searchProjectDirs != null && searchProjectDirs.length() > 0) {
|
||||
String[] arr = searchProjectDirs.split(";");
|
||||
for (String d : arr) {
|
||||
File searchDir = restorePortablePath(new File(d));
|
||||
File[] projects = COOJAProject.sarchProjects(searchDir, 3);
|
||||
if(projects == null) continue;
|
||||
for(File p : projects){
|
||||
currentProjects.add(new COOJAProject(p));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Parse current extension configuration */
|
||||
try {
|
||||
reparseProjectConfig();
|
||||
|
@ -2772,12 +2790,8 @@ public class GUI extends Observable {
|
|||
* New value
|
||||
*/
|
||||
public static void setExternalToolsSetting(String name, String newVal) {
|
||||
if (specifiedContikiPath != null && "PATH_CONTIKI".equals(name)) {
|
||||
specifiedContikiPath = newVal;
|
||||
} else {
|
||||
currentExternalToolsSettings.setProperty(name, newVal);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Load external tools settings from default file.
|
||||
|
@ -3227,13 +3241,13 @@ public class GUI extends Observable {
|
|||
logger.fatal("Error: " + e.getMessage(), e);
|
||||
System.exit(1);
|
||||
}
|
||||
sim.setSpeedLimit(null);
|
||||
sim.startSimulation();
|
||||
} else {
|
||||
logger.fatal("No test editor controlling simulation, aborting");
|
||||
System.exit(1);
|
||||
}
|
||||
}
|
||||
sim.setSpeedLimit(null);
|
||||
sim.startSimulation();
|
||||
|
||||
} else if (args.length > 0 && args[0].startsWith("-applet")) {
|
||||
|
||||
|
@ -4122,23 +4136,44 @@ public class GUI extends Observable {
|
|||
return file;
|
||||
}
|
||||
|
||||
private final static String PATH_CONTIKI_IDENTIFIER = "[CONTIKI_DIR]";
|
||||
private final static String[][] PATH_IDENTIFIER = {
|
||||
{"[CONTIKI_DIR]","PATH_CONTIKI",""},
|
||||
{"[COOJA_DIR]","PATH_COOJA","/tools/cooja"},
|
||||
{"[APPS_DIR]","PATH_APPS","/tools/cooja/apps"}
|
||||
};
|
||||
|
||||
private File createContikiRelativePath(File file) {
|
||||
try {
|
||||
File contikiPath = new File(GUI.getExternalToolsSetting("PATH_CONTIKI", null));
|
||||
String contikiCanonical = contikiPath.getCanonicalPath();
|
||||
|
||||
int elem = PATH_IDENTIFIER.length;
|
||||
File path[] = new File [elem];
|
||||
String canonicals[] = new String[elem];
|
||||
int match = -1;
|
||||
int mlength = 0;
|
||||
String fileCanonical = file.getCanonicalPath();
|
||||
if (!fileCanonical.startsWith(contikiCanonical)) {
|
||||
/* File is not in a Contiki subdirectory */
|
||||
/*logger.info("File is not in a Contiki subdirectory: " + file.getAbsolutePath());*/
|
||||
return null;
|
||||
|
||||
//No so nice, but goes along with GUI.getExternalToolsSetting
|
||||
String defp = GUI.getExternalToolsSetting("PATH_CONTIKI", null);
|
||||
|
||||
|
||||
for(int i = 0; i < elem; i++){
|
||||
path[i] = new File(GUI.getExternalToolsSetting(PATH_IDENTIFIER[i][1], defp + PATH_IDENTIFIER[i][2]));
|
||||
canonicals[i] = path[i].getCanonicalPath();
|
||||
if (fileCanonical.startsWith(canonicals[i])){
|
||||
if(mlength < canonicals[i].length()){
|
||||
mlength = canonicals[i].length();
|
||||
match = i;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if(match == -1) return null;
|
||||
|
||||
|
||||
/* Replace Contiki's canonical path with Contiki identifier */
|
||||
String portablePath = fileCanonical.replaceFirst(
|
||||
java.util.regex.Matcher.quoteReplacement(contikiCanonical),
|
||||
java.util.regex.Matcher.quoteReplacement(PATH_CONTIKI_IDENTIFIER));
|
||||
java.util.regex.Matcher.quoteReplacement(canonicals[match]),
|
||||
java.util.regex.Matcher.quoteReplacement(PATH_IDENTIFIER[match][0]));
|
||||
File portable = new File(portablePath);
|
||||
|
||||
/* Verify conversion */
|
||||
|
@ -4154,17 +4189,43 @@ public class GUI extends Observable {
|
|||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private File restoreContikiRelativePath(File portable) {
|
||||
int elem = PATH_IDENTIFIER.length;
|
||||
File path = null;
|
||||
String canonical = null;
|
||||
|
||||
try {
|
||||
File contikiPath = new File(GUI.getExternalToolsSetting("PATH_CONTIKI", null));
|
||||
String contikiCanonical = contikiPath.getCanonicalPath();
|
||||
|
||||
String portablePath = portable.getPath();
|
||||
if (!portablePath.startsWith(PATH_CONTIKI_IDENTIFIER)) {
|
||||
return null;
|
||||
|
||||
int i = 0;
|
||||
//logger.info("PPATH: " + portablePath);
|
||||
|
||||
for(; i < elem; i++){
|
||||
if (portablePath.startsWith(PATH_IDENTIFIER[i][0])) break;
|
||||
|
||||
}
|
||||
|
||||
File absolute = new File(portablePath.replace(PATH_CONTIKI_IDENTIFIER, contikiCanonical));
|
||||
|
||||
if(i == elem) return null;
|
||||
//logger.info("Found: " + PATH_IDENTIFIER[i][0]);
|
||||
|
||||
//No so nice, but goes along with GUI.getExternalToolsSetting
|
||||
String defp = GUI.getExternalToolsSetting("PATH_CONTIKI", null);
|
||||
path = new File(GUI.getExternalToolsSetting(PATH_IDENTIFIER[i][1], defp + PATH_IDENTIFIER[i][2]));
|
||||
|
||||
//logger.info("Config: " + PATH_IDENTIFIER[i][1] + ", " + defp + PATH_IDENTIFIER[i][2] + " = " + path.toString());
|
||||
canonical = path.getCanonicalPath();
|
||||
|
||||
|
||||
File absolute = new File(portablePath.replace(PATH_IDENTIFIER[i][0], canonical));
|
||||
if(!absolute.exists()){
|
||||
logger.warn("Replaced " + portable + " with " + absolute.toString() + " (default: "+ defp + PATH_IDENTIFIER[i][2] +"), but could not find it. This does not have to be an error, as the file might be created later.");
|
||||
}
|
||||
|
||||
|
||||
return absolute;
|
||||
} catch (IOException e) {
|
||||
return null;
|
||||
|
@ -4623,3 +4684,4 @@ public class GUI extends Observable {
|
|||
};
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -237,7 +237,7 @@ public class ProjectConfig {
|
|||
public boolean appendConfigFile(File propertyFile)
|
||||
throws FileNotFoundException, IOException {
|
||||
if (!propertyFile.exists()) {
|
||||
logger.warn("Trying to import non-existant project configuration");
|
||||
logger.warn("Trying to import non-existant project configuration: " + propertyFile.toString());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -59,6 +59,7 @@ public class Simulation extends Observable implements Runnable {
|
|||
/*private static long EVENT_COUNTER = 0;*/
|
||||
|
||||
private Vector<Mote> motes = new Vector<Mote>();
|
||||
private Vector<Mote> motesUninit = new Vector<Mote>();
|
||||
|
||||
private Vector<MoteType> moteTypes = new Vector<MoteType>();
|
||||
|
||||
|
@ -819,6 +820,7 @@ public class Simulation extends Observable implements Runnable {
|
|||
}
|
||||
|
||||
motes.add(mote);
|
||||
motesUninit.remove(mote);
|
||||
currentRadioMedium.registerMote(mote, Simulation.this);
|
||||
|
||||
/* Notify mote interfaces that node was added */
|
||||
|
@ -838,6 +840,9 @@ public class Simulation extends Observable implements Runnable {
|
|||
/* Add mote from simulation thread */
|
||||
invokeSimulationThread(addMote);
|
||||
}
|
||||
//Add to list of uninitialized motes
|
||||
motesUninit.add(mote);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -868,6 +873,24 @@ public class Simulation extends Observable implements Runnable {
|
|||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns uninitialised simulation mote with with given ID.
|
||||
*
|
||||
* @param id ID
|
||||
* @return Mote or null
|
||||
* @see Mote#getID()
|
||||
*/
|
||||
public Mote getMoteWithIDUninit(int id) {
|
||||
for (Mote m: motesUninit) {
|
||||
if (m.getID() == id) {
|
||||
return m;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Returns number of motes in this simulation.
|
||||
*
|
||||
|
@ -888,6 +911,16 @@ public class Simulation extends Observable implements Runnable {
|
|||
return arr;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns uninitialised motes
|
||||
*
|
||||
* @return Motes
|
||||
*/
|
||||
public Mote[] getMotesUninit() {
|
||||
return motesUninit.toArray(new Mote[motesUninit.size()]);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns all mote types in simulation.
|
||||
*
|
||||
|
@ -1071,9 +1104,6 @@ public class Simulation extends Observable implements Runnable {
|
|||
* @return True if simulation is runnable
|
||||
*/
|
||||
public boolean isRunnable() {
|
||||
if (motes.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
return isRunning || hasPollRequests || eventQueue.peekFirst() != null;
|
||||
}
|
||||
|
||||
|
|
|
@ -339,6 +339,7 @@ public class LogScriptEngine {
|
|||
engine.put("global", hash);
|
||||
engine.put("sim", simulation);
|
||||
engine.put("gui", simulation.getGUI());
|
||||
engine.put("msg", new String(""));
|
||||
|
||||
scriptMote = new ScriptMote();
|
||||
engine.put("node", scriptMote);
|
||||
|
|
|
@ -672,8 +672,6 @@ public class ScriptRunner extends VisPlugin {
|
|||
} catch (Exception e) {
|
||||
logger.fatal("Error: " + e.getMessage(), e);
|
||||
}
|
||||
simulation.setSpeedLimit(null);
|
||||
simulation.startSimulation();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue