From c25aef220dad27552e31c46cf1afa3ac8d20d137 Mon Sep 17 00:00:00 2001 From: Martin Flehmig Date: Thu, 20 Nov 2014 10:12:40 +0000 Subject: [PATCH] Indent git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23467 f25d12d1-65f4-0310-ae8a-bbce733d8d8e --- Compiler/BackEnd/HpcOmScheduler.mo | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Compiler/BackEnd/HpcOmScheduler.mo b/Compiler/BackEnd/HpcOmScheduler.mo index fe50ceba0f0..4b116f99709 100644 --- a/Compiler/BackEnd/HpcOmScheduler.mo +++ b/Compiler/BackEnd/HpcOmScheduler.mo @@ -271,27 +271,30 @@ public function createRandomSchedule "function createListSchedule protected HpcOmTaskGraph.TaskGraph taskGraphT; array> inComps; - list> nodeList_refCount; //List of nodes which are ready to schedule + list> nodeList_refCount; //List of nodes which are ready to schedule list nodeList; list rootNodes; array threadReadyTimes; - array> allCalcTasks; + array> allCalcTasks; array> threadTasks; array commCosts; HpcOmSimCode.Schedule tmpSchedule; algorithm - HpcOmTaskGraph.TASKGRAPHMETA(commCosts=commCosts,inComps=inComps) := iTaskGraphMeta; - taskGraphT := BackendDAEUtil.transposeMatrix(iTaskGraph,arrayLength(iTaskGraph)); + HpcOmTaskGraph.TASKGRAPHMETA(commCosts=commCosts, inComps=inComps) := iTaskGraphMeta; + taskGraphT := BackendDAEUtil.transposeMatrix(iTaskGraph, arrayLength(iTaskGraph)); rootNodes := HpcOmTaskGraph.getRootNodes(iTaskGraph); - allCalcTasks := convertTaskGraphToTasks(taskGraphT,iTaskGraphMeta,convertNodeToTask); + allCalcTasks := convertTaskGraphToTasks(taskGraphT, iTaskGraphMeta, convertNodeToTask); nodeList_refCount := List.map1(rootNodes, getTaskByIndex, allCalcTasks); nodeList := List.map(nodeList_refCount, Util.tuple21); nodeList := List.sort(nodeList, compareTasksByWeighting); //MF level - threadReadyTimes := arrayCreate(iNumberOfThreads,0.0); - threadTasks := arrayCreate(iNumberOfThreads,{}); - tmpSchedule := HpcOmSimCode.THREADSCHEDULE(threadTasks,{},{},allCalcTasks); - (tmpSchedule,_) := createRandomSchedule1(nodeList,threadReadyTimes, iTaskGraph, taskGraphT, commCosts, inComps, iSccSimEqMapping, iSimVarMapping, getLocksByPredecessorList, iNumberOfThreads, tmpSchedule); - tmpSchedule := addSuccessorLocksToSchedule(iTaskGraph,addReleaseLocksToSchedule,commCosts,inComps,iSimVarMapping,tmpSchedule); + threadReadyTimes := arrayCreate(iNumberOfThreads ,0.0); + threadTasks := arrayCreate(iNumberOfThreads, {}); + tmpSchedule := HpcOmSimCode.THREADSCHEDULE(threadTasks, {}, {}, allCalcTasks); + (tmpSchedule,_) := createRandomSchedule1(nodeList, threadReadyTimes, iTaskGraph, taskGraphT, commCosts, inComps, + iSccSimEqMapping, iSimVarMapping, getLocksByPredecessorList, iNumberOfThreads, + tmpSchedule); + tmpSchedule := addSuccessorLocksToSchedule(iTaskGraph, addReleaseLocksToSchedule, commCosts, inComps, iSimVarMapping, + tmpSchedule); //printSchedule(tmpSchedule); oSchedule := tmpSchedule; end createRandomSchedule; @@ -353,7 +356,7 @@ algorithm (oSchedule,oThreadReadyTimes) := matchcontinue(iNodeList,iThreadReadyTimes, iTaskGraph, iTaskGraphT, iCommCosts, iCompTaskMapping, iSccSimEqMapping, iSimVarMapping, iLockWithPredecessorHandler, iNumberOfThreads, iSchedule) case((head as HpcOmSimCode.CALCTASK(weighting=weighting,index=index,calcTime=calcTime,eqIdc=(eqIdc as firstEq::_)))::rest - ,_,_,_,_,_,_,_,_,_,HpcOmSimCode.THREADSCHEDULE(threadTasks=allThreadTasks, outgoingDepTasks=outgoingDepTasks,allCalcTasks=allCalcTasks)) + ,_,_,_,_,_,_,_,_,_,HpcOmSimCode.THREADSCHEDULE(threadTasks=allThreadTasks, outgoingDepTasks=outgoingDepTasks, allCalcTasks=allCalcTasks)) equation //Get all predecessors (childs) (predecessors, _) = getSuccessorsByTask(head, iTaskGraphT, allCalcTasks);