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

	* maps/map.test: Add size test.
	* pmaps/pmap.test: Add size test.

5 files changed, 190 insertions, 0 deletions

diff --git a/runtime/tests/ChangeLog b/runtime/tests/ChangeLog
index b9315fb2..a3401404 100644
--- a/runtime/tests/ChangeLog
+++ b/runtime/tests/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-08  Martin Hunt  <hunt@redhat.com>
+
+	* maps/map.test: Add size test.
+	* pmaps/pmap.test: Add size test.
+
 2005-12-07  Martin Hunt  <hunt@redhat.com>
 
 	* agg/agg.test: Adjust results to match
diff --git a/runtime/tests/maps/map.test b/runtime/tests/maps/map.test
index d8083d5c..51feca41 100644
--- a/runtime/tests/maps/map.test
+++ b/runtime/tests/maps/map.test
@@ -988,6 +988,11 @@ Nicosia is the capitol of Cyprus and the nerd population is -1
 }
 
 
+test size {Test of _stp_map_size()} -setup {
+        exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test size.c
+} -body {
+	exec ./test
+} -result {}
 
 catch {exec rm test}
 
diff --git a/runtime/tests/maps/size.c b/runtime/tests/maps/size.c
new file mode 100644
index 00000000..2fb2575c
--- /dev/null
+++ b/runtime/tests/maps/size.c
@@ -0,0 +1,103 @@
+#include "runtime.h"
+
+/* test of _stp_map_size() */
+#define VALUE_TYPE INT64
+#define KEY1_TYPE INT64
+#include "map-gen.c"
+
+#include "map.c"
+
+#define check(map,num)				\
+  {                                             \
+    int size = _stp_map_size(map);		\
+    if (size != num)				\
+      printf("ERROR at line %d: expected size %d and got %d instead.\n", __LINE__, num, size); \
+  }
+
+int main ()
+{
+  MAP map = _stp_map_new_ii(4);
+  int64_t x;
+
+  check (map, 0);
+
+  /* map[1] = 2 */
+  _stp_map_set_ii(map, 1, 2);
+  check (map, 1);
+
+  /* map[3] = 4 */
+  _stp_map_set_ii(map, 3, 4);
+  check (map,2);
+
+  /* now try to confuse things */
+  /* These won't do anything useful, but shouldn't crash */
+  _stp_map_set_ii(0,1,100);
+  _stp_map_set_ii(map,0,0);
+  _stp_map_set_ii(map,100,0);  
+  check (map,2);
+
+  /* map[5] = 6 */
+  _stp_map_set_ii(map, 5, 6);
+  check (map,3);
+
+  /* set wrap */
+  map->wrap = 1;
+  /* add 4 new entries, pushing the others out */
+  int i, res;
+  for (i = 6; i < 10; i++) {
+      res = _stp_map_set_ii (map, i, 100 + i);
+      if (res)
+	printf("WARNING: During wrap test, got result of %d when expected 0\n", res);
+  }
+  check (map,4);
+
+  /* turn off wrap and repeat */
+  map->wrap = 0;
+  for (i = 16; i < 20; i++) {
+      res = _stp_map_set_ii (map, i, 100 + i);
+      if (res != -1)
+	printf("WARNING: During wrap test, got result of %d when expected -1\n", res);
+  }
+  check (map,4);
+  
+  map->wrap = 1;
+
+  /* 5, 382, 526, and 903 all hash to the same value (23) */
+  /* use them to test the hash chain */
+  _stp_map_set_ii (map, 5, 1005);
+  _stp_map_set_ii (map, 382, 1382);
+  _stp_map_set_ii (map, 526, 1526);
+  _stp_map_set_ii (map, 903, 1903);
+  check (map,4);
+
+  /* now delete all 4 nodes, one by one */
+  _stp_map_set_ii (map, 382, 0);
+  check (map,3);
+
+  _stp_map_set_ii (map, 5, 0);
+  check (map,2);
+
+  _stp_map_set_ii (map, 903, 0);
+  check (map,1);
+
+  _stp_map_set_ii (map, 526, 0);
+  check (map,0);
+
+  /* finally check clearing the map */
+  _stp_map_clear(map);
+  check (map,0);
+
+  map->wrap = 0;
+  for (i = 33; i < 99; i+=11)
+    _stp_map_set_ii (map, i, 100*i+i);
+  check (map,4);
+
+  _stp_map_clear(map);
+  check (map,0);
+
+  _stp_map_set_ii (map, 1970, 1799); 
+  check (map,1);
+
+  _stp_map_del (map);
+  return 0;
+}
diff --git a/runtime/tests/pmaps/pmap.test b/runtime/tests/pmaps/pmap.test
index 04fbb208..fb5c3d0d 100644
--- a/runtime/tests/pmaps/pmap.test
+++ b/runtime/tests/pmaps/pmap.test
@@ -667,6 +667,11 @@ map[4]  Sum = 8
 }
 
 
+test size {Test _stp_pmap_size()} -setup {
+        exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test size.c
+} -body {
+	exec ./test
+} -result {}
 
 catch {exec rm test}
 
diff --git a/runtime/tests/pmaps/size.c b/runtime/tests/pmaps/size.c
new file mode 100644
index 00000000..be8b4590
--- /dev/null
+++ b/runtime/tests/pmaps/size.c
@@ -0,0 +1,72 @@
+#include "runtime.h"
+
+/* test of _stp_pmap_size() */
+
+/* It's not clear this would ever be used in the systemtap language. 
+   It would be useful as an array of counters. */
+
+#define VALUE_TYPE INT64
+#define KEY1_TYPE INT64
+#include "pmap-gen.c"
+
+#include "map.c"
+
+#define check(map,num)                          \
+  {                                             \
+    int size = _stp_pmap_size(map);              \
+    if (size != num)							\
+      printf("ERROR at line %d: expected size %d and got %d instead.\n", __LINE__, num, size); \
+  }
+
+int main ()
+{
+  PMAP map = _stp_pmap_new_ii(8);
+  int64_t x;
+
+  check(map,0);
+
+  /* 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 */
+  /* different values are stored in each cpu */
+  for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
+    _stp_pmap_add_ii(map, 1, _processor_number);
+    _stp_pmap_add_ii(map, 2, 10 *_processor_number + 1);
+    _stp_pmap_add_ii(map, 3, _processor_number * _processor_number);
+    _stp_pmap_add_ii(map, 4, 1);
+  }  
+  _processor_number = 0;
+
+  check(map,4*NR_CPUS-2);
+
+  _stp_pmap_add_ii(map, 1, 1);
+  _stp_pmap_add_ii(map, 3, 1);
+  check(map,4*NR_CPUS);  
+
+  _stp_pmap_add_ii(map, 5, 100);
+  check(map,4*NR_CPUS+1);
+
+  _processor_number = 1;
+  _stp_pmap_add_ii(map, 5, 100);
+  check(map,4*NR_CPUS+2);
+
+  _stp_pmap_set_ii(map, 5, 0);
+  check(map,4*NR_CPUS+1);
+
+  _processor_number = 0;
+  _stp_pmap_set_ii(map, 5, 0);
+  check(map,4*NR_CPUS);
+
+  for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
+    _stp_pmap_set_ii(map, 1, 0);
+    _stp_pmap_set_ii(map, 2, 0);
+    _stp_pmap_set_ii(map, 3, 0);
+    _stp_pmap_set_ii(map, 4, 0);
+  }  
+  _processor_number = 0;
+  check(map,0);
+
+  _stp_pmap_del (map);
+  return 0;
+}
+