# HG changeset patch
# User Nina Engelhardt <nengel@mailbox.tu-berlin.de>
# Date 1324388576 -3600
# Node ID 23bcca1c3687887568658f95698aeb23503b6ca7
# Parent  bde026832af7043ec159d59dc31f493b0f7194f8
added units to plugin ucc recording

diff -r bde026832af7 -r 23bcca1c3687 SSR.h
--- a/SSR.h	Mon Dec 19 17:15:10 2011 +0100
+++ b/SSR.h	Tue Dec 20 14:42:56 2011 +0100
@@ -106,8 +106,7 @@
    SSRTrans         transactionStrucs[NUM_STRUCS_IN_SEM_ENV];
    
    #ifdef OBSERVE_UCC
-   Unit*** unitcollection;
-   PrivDynArrayInfo* unitcollectionInfo;
+   ListOfArrays* unitList;
    ListOfArrays* ctlDependenciesList;
    ListOfArrays* commDependenciesList;
    //NtoN structure?
diff -r bde026832af7 -r 23bcca1c3687 SSR_PluginFns.c
--- a/SSR_PluginFns.c	Mon Dec 19 17:15:10 2011 +0100
+++ b/SSR_PluginFns.c	Tue Dec 20 14:42:56 2011 +0100
@@ -191,7 +191,7 @@
     }
    #endif
    //========================================================================
-   
+
    return newPr;
  }
 
@@ -236,6 +236,10 @@
    saveLowTimeStampCountInto(lastRecord->unblocked_timestamp);
    #endif
    #ifdef OBSERVE_UCC
+   Unit newu;
+   newu.vp = procr->procrID;
+   newu.task = procr->numTimesScheduled + 1;
+   addToListOfArrays(Unit,newu,semEnv->unitList);
    Dependency newd;
    newd.from_vp = procr->procrID;
    newd.from_task = procr->numTimesScheduled;
diff -r bde026832af7 -r 23bcca1c3687 SSR_lib.c
--- a/SSR_lib.c	Mon Dec 19 17:15:10 2011 +0100
+++ b/SSR_lib.c	Tue Dec 20 14:42:56 2011 +0100
@@ -211,6 +211,7 @@
    
    #ifdef OBSERVE_UCC
    //TODO: set up unit recording structure
+   semanticEnv->unitList = makeListOfArrays(sizeof(Unit),128);
    semanticEnv->ctlDependenciesList = makeListOfArrays(sizeof(Dependency),128);
    semanticEnv->commDependenciesList = makeListOfArrays(sizeof(Dependency),128);
    //TODO: set up N:N recording structure
@@ -280,6 +281,7 @@
         //set_dot_file(output);
         //FIXME:  first line still depends on counters being enabled, replace w/ unit struct!
         //forAllInDynArrayDo(_VMSMasterEnv->counter_history_array_info, &print_dot_node_info );
+        forAllInListOfArraysDo(semanticEnv->unitList, &print_unit_to_file);
         forAllInListOfArraysDo( semanticEnv->commDependenciesList, &print_comm_dependency_to_file );
         forAllInListOfArraysDo( semanticEnv->ctlDependenciesList, &print_ctl_dependency_to_file );
         //fprintf(output,"}\n");
diff -r bde026832af7 -r 23bcca1c3687 dependency.c
--- a/dependency.c	Mon Dec 19 17:15:10 2011 +0100
+++ b/dependency.c	Tue Dec 20 14:42:56 2011 +0100
@@ -30,3 +30,8 @@
     Dependency* dep = (Dependency*) _dep;
     fprintf(dependency_file,"VP_%d_%d -> VP_%d_%d;\n",dep->from_vp,dep->from_task,dep->to_vp,dep->to_task);
 }
+
+void print_unit_to_file(void* _unit){
+    Unit* unit = (Unit*) _unit;
+    fprintf(dependency_file,"unit,%d,%d\n",unit->vp,unit->task);
+}
\ No newline at end of file
diff -r bde026832af7 -r 23bcca1c3687 dependency.h
--- a/dependency.h	Mon Dec 19 17:15:10 2011 +0100
+++ b/dependency.h	Tue Dec 20 14:42:56 2011 +0100
@@ -35,5 +35,6 @@
 
 void print_dependency_to_file(void* dep);
 
+void print_unit_to_file(void* unit);
 #endif	/* DEPENDENCY_H */