diff --git a/tools.descartes.pmx.console/src/tools/descartes/pmx/console/PMXCommandLine.java b/tools.descartes.pmx.console/src/tools/descartes/pmx/console/PMXCommandLine.java index 462a3d6e6c587f522468fb0a47348e6430dceb13..519bf202926a4f53834540dae290f54ae580438b 100644 --- a/tools.descartes.pmx.console/src/tools/descartes/pmx/console/PMXCommandLine.java +++ b/tools.descartes.pmx.console/src/tools/descartes/pmx/console/PMXCommandLine.java @@ -293,12 +293,13 @@ public class PMXCommandLine { } } - private static void initFileLogging(String path, String logFileName, Layout layout) { + private static void initFileLogging(String directory, String logFileName, Layout layout) { try { // add logging to file //new File(outputDir).isDirectory()?(outputDir):(outputDir+ File.separator) - log.info("logging to file "+path + logFileName); - FileAppender fileAppender = new FileAppender(layout, logFileName, false); + String path = directory + File.separator + logFileName; + log.info("logging to file " + path); + FileAppender fileAppender = new FileAppender(layout, path, false); BasicConfigurator.configure(fileAppender); } catch (Exception ex) { log.error("Error during inialization of logging"); diff --git a/tools.descartes.pmx/src/tools/descartes/pmx/filter/util/PerformanceModelCreator.java b/tools.descartes.pmx/src/tools/descartes/pmx/filter/util/PerformanceModelCreator.java index a62abe250bffd7404327f8c04e685bd26a7f0e9b..c213cdb55a65c893107e2dcd640e09e32ea7d8bb 100644 --- a/tools.descartes.pmx/src/tools/descartes/pmx/filter/util/PerformanceModelCreator.java +++ b/tools.descartes.pmx/src/tools/descartes/pmx/filter/util/PerformanceModelCreator.java @@ -29,6 +29,8 @@ package tools.descartes.pmx.filter.util; import java.util.Collection; import java.util.HashMap; +import org.apache.log4j.Logger; + import kieker.common.util.signature.Signature; import kieker.tools.traceAnalysis.systemModel.AllocationComponent; import kieker.tools.traceAnalysis.systemModel.AssemblyComponent; @@ -39,8 +41,7 @@ import kieker.tools.traceAnalysis.systemModel.repository.SystemModelRepository; import tools.descartes.pmx.builder.IModelBuilder; public class PerformanceModelCreator { - // private static final Logger log = Logger - // .getLogger(PerformanceModelCreator.class); + private static final Logger log = Logger.getLogger(PerformanceModelCreator.class); // public static void createPerformanceModel(SystemModelRepository // systemModel, IModelBuilder builder) { @@ -100,7 +101,15 @@ public class PerformanceModelCreator { final Collection<ExecutionContainer> executionContainers = systemModel .getExecutionEnvironmentFactory().getExecutionContainers(); for (ExecutionContainer container : executionContainers) { - builder.addHost(container.getName(), numCores.get(container.getName())); + int numberOfCores =0; + try{ + numberOfCores = numCores.get(container.getName()); + }catch (Exception e) { + log.error("could not find number of cores for " + container.getName()); + log.info("assumed numberOfCores = 2"); + numberOfCores = 2; + } + builder.addHost(container.getName(), numberOfCores); } }