Changeset 8894

Timestamp:

06/17/11 16:16:02 (2 years ago)

Author:

walt

Message:

updated perf counter test program

Files:

• branches/Orange-Branch/test/common/misc/test-perf-counter.c (modified) (3 diffs)

branches/Orange-Branch/test/common/misc/test-perf-counter.c

@@ -227 +227 @@
     unsigned int history_size;
     int ret;
-    int64_t** stat_matrix;
-    uint64_t* start_time_array_ms;
-    uint64_t* interval_array_ms;
+    int64_t* stat_matrix;
     int i,j;
 
@@ -256 +254 @@
 
     /* allocate storage for results */
-    stat_matrix = malloc(key_count*sizeof(int64_t*));
-    for(i=0; i<key_count; i++)
-    {
-        stat_matrix[i] = malloc(history_size*sizeof(int64_t));
-        assert(stat_matrix[i]);
-    }
-    start_time_array_ms = malloc(history_size*sizeof(uint64_t));
-    assert(start_time_array_ms);
-    interval_array_ms = malloc(history_size*sizeof(uint64_t));
-    assert(interval_array_ms);
+    stat_matrix = malloc(history_size * (key_count + 2) * sizeof(int64_t*));
 
     /* retrieve values from perf counter api */
-    PINT_perf_retrieve(
-       pc,
-       stat_matrix,
-       start_time_array_ms,
-       interval_array_ms,
-       key_count,
-       history_size);
+    PINT_perf_retrieve(pc,
+                       stat_matrix,
+                       key_count,
+                       history_size);
 
     printf("===================\n");
 
     /* print times (column headings) */
-    printf("First start time (ms): %llu\n", llu(start_time_array_ms[0]));
+    printf("First start time (ms): %llu\n", llu(stat_matrix[key_count]));
     printf("%24.24s: ", "Interval size (ms)");
     for(i=0; i<history_size; i++)
     {
-        printf("%llu\t", llu(interval_array_ms[i]));
+        printf("%llu\t", llu(stat_matrix[(i*(key_count+2))+key_count+1]));
     }
     printf("\n");
@@ -294 +280 @@
         for(j=0; j<history_size; j++)
         {
-            printf("%lld\t", lld(stat_matrix[i][j]));
+            printf("%lld\t", lld(stat_matrix[(i*(key_count+2))+j]));
         }
         printf("\n");