2005-12-07 Martin Hunt <hunt@redhat.com>

	* pmaps/*.c: Change pmap type from MAP to PMAP.

	* pmaps/pmap.test: Adjust results to match
	the more compact histogram format.

	* maps/map.test: Adjust results to match
	the more compact histogram format.

diff --git a/runtime/tests/ChangeLog b/runtime/tests/ChangeLog
index 5920e626326f0ede5e34b590ce7a39682e9eaf3f..f1c1330a6ee418964b6d86851aa790252a262c40 100644 (file)
--- a/runtime/tests/ChangeLog
+++ b/runtime/tests/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-07  Martin Hunt  <hunt@redhat.com>
+       * pmaps/*.c: Change pmap type from MAP to PMAP.
+       
+       * pmaps/pmap.test: Adjust results to match
+       the more compact histogram format.
+
+       * maps/map.test: Adjust results to match
+       the more compact histogram format.
+
 2005-11-28  Martin Hunt  <hunt@redhat.com>
 
        * pmaps/pmap.test: Add ix_log and ix_none.

diff --git a/runtime/tests/maps/map.test b/runtime/tests/maps/map.test
index 2ac951b9cdcecf221d125bf042ecacc98ff18276..d8083d5c89b65fdb75c141e620bf5f9a0f4affbb 100644 (file)
--- a/runtime/tests/maps/map.test
+++ b/runtime/tests/maps/map.test
@@ -64,7 +64,6 @@ value |-------------------------------------------------- count
    64 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@  8192
   128 |                                                      0
   256 |                                                      0
-  512 |                                                      0
 
 map2[2] = count:1048576  sum:536346624  avg:511  min:0  max:1023
 value |-------------------------------------------------- count
@@ -723,16 +722,11 @@ value |-------------------------------------------------- count
 Bogons per packet for Ohio
 count:20  sum:1000  avg:50  min:50  max:50
 value |-------------------------------------------------- count
-    0 |                                                    0
-   10 |                                                    0
-   20 |                                                    0
    30 |                                                    0
    40 |                                                    0
    50 |@@@@@@@@@@@@@@@@@@@@                               20
    60 |                                                    0
    70 |                                                    0
-   80 |                                                    0
-   90 |                                                    0
 
 Bogons per packet for North Carolina
 count:45  sum:-4200  avg:-93  min:-620  max:100
@@ -759,8 +753,6 @@ value |-------------------------------------------------- count
    50 |@@@                                                  9
    60 |                                                     0
    70 |                                                     0
-   80 |                                                     0
-   90 |                                                     0
 
 
 SORTED BY COUNT

diff --git a/runtime/tests/pmaps/ii.c b/runtime/tests/pmaps/ii.c
index 4b058b2f09a39e08264b1502f72231121264cd24..dfce0a07f75064a61ffdbbd21c27e968acebba65 100644 (file)
--- a/runtime/tests/pmaps/ii.c
+++ b/runtime/tests/pmaps/ii.c
@@ -13,7 +13,7 @@
 
 int main ()
 {
-  MAP map = _stp_pmap_new_ii(4);
+  PMAP map = _stp_pmap_new_ii(4);
   int64_t x;
 
   /* put some data in. _processor_number is a global hack that allows */
@@ -53,9 +53,6 @@ int main ()
   /* print the aggregated data */
   _stp_pmap_print(map,"map[%1d] = %d");
   
- 
-  
- 
   _stp_pmap_del (map);
   return 0;
 }

diff --git a/runtime/tests/pmaps/ii2.c b/runtime/tests/pmaps/ii2.c
index ecded8c18582f15506caf520105881707d608b0c..0a28ad870d562938c01146782f0f343690a27046 100644 (file)
--- a/runtime/tests/pmaps/ii2.c
+++ b/runtime/tests/pmaps/ii2.c
@@ -17,7 +17,7 @@
 int main ()
 {
   MAP map = _stp_map_new_ii(4);
-  MAP pmap = _stp_pmap_new_ii(4);
+  PMAP pmap = _stp_pmap_new_ii(4);
   int64_t x;
 
   /* put some data in. _processor_number is a global hack that allows */

diff --git a/runtime/tests/pmaps/ii3.c b/runtime/tests/pmaps/ii3.c
index 560de4cd492fc2c92b1d117c06b58751030a79b6..e2dee7a676f651a80b472c64b21487de2bfc8491 100644 (file)
--- a/runtime/tests/pmaps/ii3.c
+++ b/runtime/tests/pmaps/ii3.c
@@ -13,7 +13,7 @@
 
 int main ()
 {
-  MAP map = _stp_pmap_new_ii(4);
+  PMAP map = _stp_pmap_new_ii(4);
   int i;
 
   /* put some data in. _processor_number is a global hack that allows */

diff --git a/runtime/tests/pmaps/is.c b/runtime/tests/pmaps/is.c
index 64c12460cca085a9140660d67e5d83eef1a7898f..a97d8b0b6a6509cfd0f3660be43fe0783d10c631 100644 (file)
--- a/runtime/tests/pmaps/is.c
+++ b/runtime/tests/pmaps/is.c
@@ -13,7 +13,7 @@
 
 int main ()
 {
-  MAP map = _stp_pmap_new_is(4);
+  PMAP map = _stp_pmap_new_is(4);
   char *x;
   char buf[32];
 

diff --git a/runtime/tests/pmaps/ix.c b/runtime/tests/pmaps/ix.c
index 2c79c3d10f94883ae11be859045808206755da15..0eba2d54ae256f950b8e788a8c165f64e8378c56 100644 (file)
--- a/runtime/tests/pmaps/ix.c
+++ b/runtime/tests/pmaps/ix.c
@@ -10,7 +10,7 @@
 
 int main ()
 {
-  MAP map = _stp_pmap_new_ix(4, HIST_LINEAR, 0, 100, 10);
+  PMAP map = _stp_pmap_new_ix(4, HIST_LINEAR, 0, 100, 10);
   int64_t x;
 
   /* put some data in. _processor_number is a global hack that allows */

diff --git a/runtime/tests/pmaps/ix2.c b/runtime/tests/pmaps/ix2.c
index 6016bf533b282157617d9f48e114513809737af6..638e5226173f5d03410676e04a92a50353a43b06 100644 (file)
--- a/runtime/tests/pmaps/ix2.c
+++ b/runtime/tests/pmaps/ix2.c
@@ -10,7 +10,7 @@
 
 int main ()
 {
-  MAP map = _stp_pmap_new_ix(4, HIST_LINEAR, 0, 100, 10);
+  PMAP map = _stp_pmap_new_ix(4, HIST_LINEAR, 0, 100, 10);
   int i;
 
   /* put some data in. _processor_number is a global hack that allows */

diff --git a/runtime/tests/pmaps/ix_log.c b/runtime/tests/pmaps/ix_log.c
index da644d8def243e2774689d608810316eb655596c..4f3c5503a20f983e983f097dc38d7ee8f4ea04a0 100644 (file)
--- a/runtime/tests/pmaps/ix_log.c
+++ b/runtime/tests/pmaps/ix_log.c
@@ -11,7 +11,7 @@
 
 int main ()
 {
-  MAP map = _stp_pmap_new_ix(4, HIST_LOG, 5);
+  PMAP map = _stp_pmap_new_ix(4, HIST_LOG, 5);
   int64_t x;
 
   /* put some data in. _processor_number is a global hack that allows */

diff --git a/runtime/tests/pmaps/ix_none.c b/runtime/tests/pmaps/ix_none.c
index c8ab6cbcbebf8ea4327eb3274bac31e9ef579f48..440b0069aec77f6f827bd3160de00f4bae452f14 100644 (file)
--- a/runtime/tests/pmaps/ix_none.c
+++ b/runtime/tests/pmaps/ix_none.c
@@ -11,7 +11,7 @@
 
 int main ()
 {
-  MAP map = _stp_pmap_new_ix(4, HIST_NONE);
+  PMAP map = _stp_pmap_new_ix(4, HIST_NONE);
   int64_t x;
 
   /* put some data in. _processor_number is a global hack that allows */

diff --git a/runtime/tests/pmaps/map_format.c b/runtime/tests/pmaps/map_format.c
index e6c6d9f659725154f96d04a64a5bed2d6ed3e06f..b27506e014808bbda8c73807b80bb95cd75ad406 100644 (file)
--- a/runtime/tests/pmaps/map_format.c
+++ b/runtime/tests/pmaps/map_format.c
@@ -30,7 +30,7 @@ void inc_cpu(void)
 
 int main ()
 {
-  MAP mapiis = _stp_pmap_new_iiss(4);
+  PMAP mapiis = _stp_pmap_new_iiss(4);
   _processor_number = 0;
   _stp_pmap_set_iiss (mapiis, 1,2,"Ohio", "Columbus" );
   _stp_pmap_set_iiss (mapiis, 3,4,"California", "Sacramento" );
@@ -44,7 +44,7 @@ int main ()
   /* very bad string.  don't crash */
   _stp_pmap_print (mapiis, "%s -> mapiis %1s %2s %3d %4d");
 
-  MAP mapss = _stp_pmap_new_ssi(4);
+  PMAP mapss = _stp_pmap_new_ssi(4);
   _stp_pmap_set_ssi (mapss, "Riga", "Latvia", 0x0000c0dedbad0000LL);
   _stp_pmap_set_ssi (mapss, "Sofia", "Bulgaria", 0xdeadf00d12345678LL);
   _stp_pmap_set_ssi (mapss, "Valletta", "Malta", 1);
@@ -53,7 +53,7 @@ int main ()
   _stp_pmap_print (mapss, "The capitol of %1s is %2s and the nerd population is %x");
   _stp_pmap_print (mapss, "The capitol of %1s is %2s and the nerd population is %X");
 
-  MAP mapssx = _stp_pmap_new_ssx (4, HIST_LINEAR, 0, 100, 10 );
+  PMAP mapssx = _stp_pmap_new_ssx (4, HIST_LINEAR, 0, 100, 10 );
   int i,j;
 
   for (i = 0; i < 100; i++)

diff --git a/runtime/tests/pmaps/pmap.test b/runtime/tests/pmaps/pmap.test
index 71f94e56c377bb487f79466206daa487ec776b58..04fbb20865b6242d5e7b049e20cfd7a19130fcad 100644 (file)
--- a/runtime/tests/pmaps/pmap.test
+++ b/runtime/tests/pmaps/pmap.test
@@ -249,26 +249,12 @@ value |-------------------------------------------------- count
     0 |@@@@@@@@                                           8
    10 |                                                   0
    20 |                                                   0
-   30 |                                                   0
-   40 |                                                   0
-   50 |                                                   0
-   60 |                                                   0
-   70 |                                                   0
-   80 |                                                   0
-   90 |                                                   0
 
 map[1] = count:8  sum:28  avg:3  min:0  max:7
 value |-------------------------------------------------- count
     0 |@@@@@@@@                                           8
    10 |                                                   0
    20 |                                                   0
-   30 |                                                   0
-   40 |                                                   0
-   50 |                                                   0
-   60 |                                                   0
-   70 |                                                   0
-   80 |                                                   0
-   90 |                                                   0
 
 map[3] = count:8  sum:140  avg:17  min:0  max:49
 value |-------------------------------------------------- count
@@ -279,9 +265,6 @@ value |-------------------------------------------------- count
    40 |@                                                  1
    50 |                                                   0
    60 |                                                   0
-   70 |                                                   0
-   80 |                                                   0
-   90 |                                                   0
 
 }
 
@@ -351,7 +334,6 @@ value |-------------------------------------------------- count
     1 |@@@@@@@@                                           8
     2 |                                                   0
     4 |                                                   0
-    8 |                                                   0
 
 map[1] = count:8  sum:28  avg:3  min:0  max:7
 value |-------------------------------------------------- count
@@ -633,26 +615,12 @@ value |-------------------------------------------------- count
     0 |@@@@@@@@                                           8
    10 |                                                   0
    20 |                                                   0
-   30 |                                                   0
-   40 |                                                   0
-   50 |                                                   0
-   60 |                                                   0
-   70 |                                                   0
-   80 |                                                   0
-   90 |                                                   0
 
 map[1] = count:8  sum:28  avg:3  min:0  max:7
 value |-------------------------------------------------- count
     0 |@@@@@@@@                                           8
    10 |                                                   0
    20 |                                                   0
-   30 |                                                   0
-   40 |                                                   0
-   50 |                                                   0
-   60 |                                                   0
-   70 |                                                   0
-   80 |                                                   0
-   90 |                                                   0
 
 map[3] = count:8  sum:140  avg:17  min:0  max:49
 value |-------------------------------------------------- count
@@ -663,9 +631,6 @@ value |-------------------------------------------------- count
    40 |@                                                  1
    50 |                                                   0
    60 |                                                   0
-   70 |                                                   0
-   80 |                                                   0
-   90 |                                                   0
 
 
 map[1]  Sum = 28
@@ -678,26 +643,12 @@ value |-------------------------------------------------- count
     0 |@@@@@@@@                                           8
    10 |                                                   0
    20 |                                                   0
-   30 |                                                   0
-   40 |                                                   0
-   50 |                                                   0
-   60 |                                                   0
-   70 |                                                   0
-   80 |                                                   0
-   90 |                                                   0
 
 map[1] = count:8  sum:28  avg:3  min:0  max:7
 value |-------------------------------------------------- count
     0 |@@@@@@@@                                           8
    10 |                                                   0
    20 |                                                   0
-   30 |                                                   0
-   40 |                                                   0
-   50 |                                                   0
-   60 |                                                   0
-   70 |                                                   0
-   80 |                                                   0
-   90 |                                                   0
 
 map[3] = count:8  sum:140  avg:17  min:0  max:49
 value |-------------------------------------------------- count
@@ -708,9 +659,6 @@ value |-------------------------------------------------- count
    40 |@                                                  1
    50 |                                                   0
    60 |                                                   0
-   70 |                                                   0
-   80 |                                                   0
-   90 |                                                   0
 
 
 map[1]  Sum = 28

diff --git a/runtime/tests/pmaps/si.c b/runtime/tests/pmaps/si.c
index 49eb3cafbe2a4d2dced290fa23a9b794be42231b..8b05da74b4545a03677546fe11109274ac3f634a 100644 (file)
--- a/runtime/tests/pmaps/si.c
+++ b/runtime/tests/pmaps/si.c
@@ -13,9 +13,12 @@
 
 int main ()
 {
-  MAP map = _stp_pmap_new_si(4);
+  PMAP map = _stp_pmap_new_si(4);
   int64_t x;
 
+  if (!map)
+    return -1;
+
   /* put some data in. _processor_number is a global hack that allows */
   /* us to set the current emulated cpu number for our userspace tests. */
   /* Note that we set values based on the cpu number just to show that */