# HG changeset patch
# User Merten Sach <msach@mailbox.tu-berlin.de>
# Date 1324039744 -3600
# Node ID bef7a9083bd4f8b1fa4e171a36383e78a5f475d5
# Parent  662089f010bbe57e8771f393a53ffdcc1255dfea
Timestamp counters removed

diff -r 662089f010bb -r bef7a9083bd4 src/Application/main.c
--- a/src/Application/main.c	Fri Dec 09 15:28:12 2011 +0100
+++ b/src/Application/main.c	Fri Dec 16 13:49:04 2011 +0100
@@ -179,50 +179,46 @@
    
    int cpuid = sched_getcpu();
    
-   measurement_t startWorkload, endWorkload;
+   measurement_t startWorkload, endWorkload, startWorkload2, endWorkload2;
    uint64 numCycles;
-   TSCountLowHigh startTask, endTask, endSync1, endSync2;
    for(o=0; o < outer_iters; o++)
     {
        
           saveCyclesAndInstrs(cpuid,startWorkload.cycles);
-//          saveTSCLowHigh(startTask);
        
-      //workload
+      //workltask
       for(i=0; i < inner_iters; i++)
        {
          workspace1 += (workspace1 + 32)/2;
          workspace2 += (workspace2 + 23.2)/1.4;
        }
       
-//          saveTSCLowHigh(endTask);
-//          numCycles = endTask.longVal - startTask.longVal;
           saveCyclesAndInstrs(cpuid,endWorkload.cycles);
           numCycles = endWorkload.cycles - startWorkload.cycles;
-
           //sanity check (400K is about 20K iters)
           if( numCycles < 400000 ) {totalWorkCycles += numCycles; numGoodTasks++;}
           else                     {totalBadCycles  += numCycles; }
 
       //mutex access often causes switch to different Slave VP
       VPThread__mutex_lock(privateMutex, animatingPr);
+      
 /*
-          saveTSCLowHigh(endSync1);
-          numCycles = endSync1.longVal - endTask.longVal;
+          saveCyclesAndInstrs(cpuid,startWorkload2.cycles);
+      //Task
+      for(i=0; i < inner_iters; i++)
+       {
+         workspace1 += (workspace1 + 32)/2;
+         workspace2 += (workspace2 + 23.2)/1.4;
+       }
+      
+          saveCyclesAndInstrs(cpuid,endWorkload2.cycles);
+          numCycles = endWorkload2.cycles - startWorkload2.cycles;
           //sanity check (400K is about 20K iters)
-          if( numCycles < 400000 ) {totalSyncCycles += numCycles; numGoodSyncs++;}
-          else                     totalBadSyncCycles  += numCycles;
+          if( numCycles < 400000 ) {totalWorkCycles += numCycles; numGoodTasks++;}
+          else                     {totalBadCycles  += numCycles; }
+      
 */
-      
       VPThread__mutex_unlock(privateMutex, animatingPr);
-/*
-          saveTSCLowHigh(endSync2);
-          numCycles = endSync2.longVal - endSync1.longVal;
-          //sanity check (400K is about 20K iters)
-          if( numCycles < 400000 ) {totalSyncCycles += numCycles; numGoodSyncs++;}
-          else                     totalBadSyncCycles  += numCycles;
-*/
-
     }
 
    params->totalWorkCycles = totalWorkCycles;