Projects information

Chunk

Conflicting content
final static int CACHE_FLUSH = -51; final static int CACHE_DUMP = -53; <<<<<<< HEAD /** * Set to false for the WCET analysis, true for measurement */ ======= >>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c final static boolean MEASURE_CACHE = false; static int ts, te, to;

Conflicting content

    final static int CACHE_FLUSH = -51;
    final static int CACHE_DUMP = -53;

<<<<<<< HEAD
	/**
	 * Set to false for the WCET analysis, true for measurement
	 */
=======
>>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c
	final static boolean MEASURE_CACHE = false;
	static int ts, te, to;

Solution content
final static int CACHE_FLUSH = -51; final static int CACHE_DUMP = -53; final static boolean MEASURE_CACHE = false; static int ts, te, to;

File
StartBenchUdpIp.java

Developer's decision
Version 2

Kind of conflict
Comment

Chunk

Conflicting content
if (valmax) max = val; } <<<<<<< HEAD if (Config.MEASURE) { System.out.print("min: "); System.out.println(min); } if (Config.MEASURE) { System.out.print("max: "); System.out.println(max); } ======= if (Config.MEASURE) System.out.println(min); if (Config.MEASURE) System.out.println(max); >>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c } static void invoke() {

Conflicting content

			if (valmax) max = val;
		}
<<<<<<< HEAD
		if (Config.MEASURE) { System.out.print("min: "); System.out.println(min); }
		if (Config.MEASURE) { System.out.print("max: "); System.out.println(max); }
=======
		if (Config.MEASURE) System.out.println(min);
		if (Config.MEASURE) System.out.println(max);
>>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c
	}
	
	static void invoke() {

Solution content
if (valmax) max = val; } if (Config.MEASURE) { System.out.print("min: "); System.out.println(min); } if (Config.MEASURE) { System.out.print("max: "); System.out.println(max); } } static void invoke() {

Solution content

			if (valmax) max = val;
		}
		if (Config.MEASURE) { System.out.print("min: "); System.out.println(min); }
		if (Config.MEASURE) { System.out.print("max: "); System.out.println(max); }
	}
	
	static void invoke() {

File
StartBenchUdpIp.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content
public class StartKfl { <<<<<<< HEAD /** * Set to false for the WCET analysis, true for Config.MEASUREment */ ======= >>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c static int ts, te, to;

Solution content
public class StartKfl { static int ts, te, to;

File
StartKfl.java

Developer's decision
Version 2

Kind of conflict
Comment

Chunk

Conflicting content
if (valmax) max = val; } <<<<<<< HEAD if (Config.MEASURE) { System.out.print("min: "); System.out.println(min); } if (Config.MEASURE) { System.out.print("max: "); System.out.println(max); } ======= if (Config.MEASURE) System.out.println(min); if (Config.MEASURE) System.out.println(max); >>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c } static void invoke() {

Conflicting content

			if (valmax) max = val;
		}
<<<<<<< HEAD
		if (Config.MEASURE) { System.out.print("min: "); System.out.println(min); }
		if (Config.MEASURE) { System.out.print("max: "); System.out.println(max); }
=======
		if (Config.MEASURE) System.out.println(min);
		if (Config.MEASURE) System.out.println(max);
>>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c
	}
	
	static void invoke() {

Solution content
if (valmax) max = val; } if (Config.MEASURE) { System.out.print("min: "); System.out.println(min); } if (Config.MEASURE) { System.out.print("max: "); System.out.println(max); } } static void invoke() {

Solution content

			if (valmax) max = val;
		}
		if (Config.MEASURE) { System.out.print("min: "); System.out.println(min); }
		if (Config.MEASURE) { System.out.print("max: "); System.out.println(max); }
	}
	
	static void invoke() {

File
StartKfl.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content
final static int CACHE_FLUSH = -51; final static int CACHE_DUMP = -53; <<<<<<< HEAD /** * Set to false for the WCET analysis, true for measurement */ ======= >>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c final static boolean MEASURE_CACHE = false; private static LiftControl ctrl;

Conflicting content

    final static int CACHE_FLUSH = -51;
    final static int CACHE_DUMP = -53;

<<<<<<< HEAD
	/**
	 * Set to false for the WCET analysis, true for measurement
	 */
=======
>>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c
	final static boolean MEASURE_CACHE = false;

	private static LiftControl ctrl;

Solution content
final static int CACHE_FLUSH = -51; final static int CACHE_DUMP = -53; final static boolean MEASURE_CACHE = false; private static LiftControl ctrl;

File
StartLift.java

Developer's decision
Version 2

Kind of conflict
Comment

Chunk

Conflicting content
if (valmax) max = val; } <<<<<<< HEAD if (Config.MEASURE) { System.out.print("min: "); System.out.println(min); System.out.print("max: "); System.out.println(max); } ======= System.out.println("Hello World!"); if (Config.MEASURE) System.out.println(min); if (Config.MEASURE) System.out.println(max); >>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c } static void invoke() {

Conflicting content

			if (valmax) max = val;
		}
<<<<<<< HEAD
		if (Config.MEASURE) {
			System.out.print("min: ");
			System.out.println(min);
			System.out.print("max: ");
			System.out.println(max);
		}
=======
            System.out.println("Hello World!");
		if (Config.MEASURE) System.out.println(min);
		if (Config.MEASURE) System.out.println(max);
>>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c
	}
	
	static void invoke() {

Solution content
if (valmax) max = val; } if (Config.MEASURE) { System.out.print("min: "); System.out.println(min); System.out.print("max: "); System.out.println(max); } } static void invoke() {

File
StartLift.java

Developer's decision
Version 1

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content
public class StartLineFollower { <<<<<<< HEAD /** * Set to false for the WCET analysis, true for measurement / ======= >>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c static int ts, te, to; /*

Solution content
public class StartLineFollower { static int ts, te, to; /**

File
StartLineFollower.java

Developer's decision
Version 2

Kind of conflict
Comment

Chunk

Conflicting content
to = te-ts; LineFollower.init(); invoke(); <<<<<<< HEAD if (Config.MEASURE) { System.out.print("max: "); System.out.println(te-ts-to); } ======= if (Config.MEASURE) System.out.println(te-ts-to); >>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c } static void invoke() {

Conflicting content

		to = te-ts;
		LineFollower.init();
		invoke();
<<<<<<< HEAD
		if (Config.MEASURE) { System.out.print("max: "); System.out.println(te-ts-to); }
=======
		if (Config.MEASURE) System.out.println(te-ts-to);
>>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c
	}
	
	static void invoke() {

Solution content
to = te-ts; LineFollower.init(); invoke(); if (Config.MEASURE) { System.out.print("max: "); System.out.println(te-ts-to); } } static void invoke() {

File
StartLineFollower.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content
private boolean run() throws InvalidFlowFactException { /* Initialize */ try { <<<<<<< HEAD wcetTool.setTopLevelLogger(exec.getExecLogger()); exec.info("Loading project"); // TODO: Maybe exec can be replaced by something stefan's framework? wcetTool.initialize(true); MethodInfo largestMethod = wcetTool.getWCETProcessorModel().getMethodCache().checkCache(); ======= project.setTopLevelLogger(exec.getExecLogger()); exec.info("Loading project"); project.initialize(project.getProjectConfig().doLoadLinkInfo(), true); MethodInfo largestMethod = project.getWCETProcessorModel().getMethodCache().checkCache(); >>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c int minWords = MiscUtils.bytesToWords(largestMethod.getCode().getNumberOfBytes()); reportMetric("min-cache-size",largestMethod.getFQMethodName(),minWords); } catch (Exception e) {

Conflicting content

    private boolean run() throws InvalidFlowFactException {
        /* Initialize */
        try {
<<<<<<< HEAD
            wcetTool.setTopLevelLogger(exec.getExecLogger());
            exec.info("Loading project"); // TODO: Maybe exec can be replaced by something stefan's framework?
            wcetTool.initialize(true);
            MethodInfo largestMethod = wcetTool.getWCETProcessorModel().getMethodCache().checkCache();
=======
            project.setTopLevelLogger(exec.getExecLogger());
            exec.info("Loading project");
            project.initialize(project.getProjectConfig().doLoadLinkInfo(), true);
            MethodInfo largestMethod = project.getWCETProcessorModel().getMethodCache().checkCache();
>>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c
            int minWords = MiscUtils.bytesToWords(largestMethod.getCode().getNumberOfBytes());
            reportMetric("min-cache-size",largestMethod.getFQMethodName(),minWords);
        } catch (Exception e) {

Solution content

    private boolean run() throws InvalidFlowFactException {
        /* Initialize */
        try {
            wcetTool.setTopLevelLogger(exec.getExecLogger());
            exec.info("Loading project"); // TODO: Maybe exec can be replaced by something stefan's framework?
            wcetTool.initialize(wcetTool.getProjectConfig().doLoadLinkInfo(), true);
            MethodInfo largestMethod = wcetTool.getWCETProcessorModel().getMethodCache().checkCache();
            int minWords = MiscUtils.bytesToWords(largestMethod.getCode().getNumberOfBytes());
            reportMetric("min-cache-size",largestMethod.getFQMethodName(),minWords);
        } catch (Exception e) {

File
WCETAnalysis.java

Developer's decision
Manual

Kind of conflict
Comment
Method invocation
Variable

Chunk

Conflicting content

                                    " to line " + lineRange.first() + " in " + basicBlock.getMethodInfo());
                        }

<<<<<<< HEAD
		for(Entry entry: nodeCosts.entrySet()) {
			CFGNode n = entry.getKey();
			WcetCost cost = entry.getValue();
			if(sol.getNodeFlow(n) > 0) {
				nodeFlowCostDescrs.put(n,cost.toString());
				BasicBlock basicBlock = n.getBasicBlock();
				/* prototyping */
				if(basicBlock != null) {
					TreeSet lineRange = basicBlock.getSourceLineRange();
					if(lineRange.isEmpty()) {
						logger.error("No source code lines associated with basic block "+basicBlock+" in "+m+" ! ");
                                                continue;
					}
					ClassInfo cli = basicBlock.getClassInfo();
					ClassReport cr = getWCETTool().getReport().getClassReport(cli);
					Long oldCost = (Long) cr.getLineProperty(lineRange.first(), "cost");
					if(oldCost == null) oldCost = 0L;
					long newCost = sol.getNodeFlow(n)*nodeCosts.get(n).getCost();

					if(logger.isTraceEnabled()) {
						logger.trace("Attaching cost "+oldCost + " + " +
								newCost+" ( " + sol.getNodeFlow(n)+ " * " + nodeCosts.get(n).getCost() + " )" +
								" to line "+lineRange.first() + " in " + basicBlock.getMethodInfo());
					}

					cr.addLineProperty(lineRange.first(), "cost", oldCost + newCost);
					for(int i : lineRange) {
						cr.addLineProperty(i, "color", "red");
					}
				}
			} else {
				nodeFlowCostDescrs.put(n, ""+nodeCosts.get(n).getCost());
			}
		}
	}
=======
                        cr.addLineProperty(lineRange.first(), "cost", oldCost + newCost);
                        for (int i : lineRange) {
                            cr.addLineProperty(i, "color", "red");
                        }
                    }
                }
            } else {
                nodeFlowCostDescrs.put(n, "" + nodeCosts.get(n).getCost());
            }
        }
    }
>>>>>>> ad585c276e9e798f96c6833f39d344c56bec0f2c

	@Override
	public WcetCost computeCostOfNode(CFGNode n ,Context ctx) {

Solution content

                                    " to line " + lineRange.first() + " in " + basicBlock.getMethodInfo());
                        }
						cr.addLineProperty(lineRange.first(), "cost", oldCost + newCost);
						for(int i : lineRange) {
							cr.addLineProperty(i, "color", "red");
						}
					}
				}
			}  else {
			    nodeFlowCostDescrs.put(n, ""+nodeCosts.get(n).getCost());
		    }
		}
	}

	@Override
	public WcetCost computeCostOfNode(CFGNode n ,Context ctx) {

File
RecursiveWcetAnalysis.java

Developer's decision
Version 2

Kind of conflict
For statement
Method invocation

Projects >> jop >>5a79002737ed564b55b6c51d216c43636e800c14