2005-10-26 Martin Hunt <hunt@redhat.com>

	* maps/map.test: Update with results for new tests.
	* maps/*2.c: Tests for the new API.
	* maps/ist.c: Renamed isx.c.
	* maps/setadd.c: New test of adding and setting.

1 files changed, 41 insertions, 0 deletions

diff --git a/runtime/tests/maps/isx2.c b/runtime/tests/maps/isx2.c
new file mode 100644
index 00000000..9003f522
--- /dev/null
+++ b/runtime/tests/maps/isx2.c
@@ -0,0 +1,41 @@
+#include "runtime.h"
+
+/* test of maps with keys of int64 and value of stat */
+#define VALUE_TYPE STAT
+#define KEY1_TYPE INT64
+#include "map-gen.c"
+#include "map.c"
+
+int main ()
+{
+  int i, j;
+  MAP map = _stp_map_new_ix (4, HIST_LINEAR, 0, 100, 10 );
+  MAP map2 = _stp_map_new_ix(4, HIST_LOG, 11);
+
+  for (i = 0; i < 100; i++)
+    for (j = 0; j <= i*10 ; j++ )
+      _stp_map_add_ix (map, 3, i);
+
+  for (i = 0; i < 10; i++)
+    for (j = 0; j < 10 ; j++ )
+      _stp_map_add_ix (map, 2, j * i );
+
+  for (i = 0; i < 100; i += 10)
+    for (j = 0; j < i/10 ; j++ )  
+      _stp_map_add_ix (map, 1, i);
+
+  for (i = 0; i < 128; i++)
+    for (j = 0; j < 128 ; j++ )
+      _stp_map_add_ix (map2, 1, i);      
+
+  for (i = 0; i < 1024; i++)
+    for (j = 0; j < 1024 ; j++ )
+      _stp_map_add_ix (map2, 2, i);      
+
+  _stp_map_print (map, "map[%1d] = count:%C  sum:%S  avg:%A  min:%m  max:%M\n%H");
+  _stp_map_print (map2, "map2[%1d] = count:%C  sum:%S  avg:%A  min:%m  max:%M\n%H");
+
+  _stp_map_del (map);
+  _stp_map_del (map2);
+  return 0;
+}