summaryrefslogtreecommitdiffstats
path: root/runtime/tests
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/tests')
-rw-r--r--runtime/tests/ChangeLog112
-rw-r--r--runtime/tests/Makefile3
-rw-r--r--runtime/tests/README7
-rw-r--r--runtime/tests/agg/Makefile5
-rw-r--r--runtime/tests/agg/agg.test169
-rw-r--r--runtime/tests/agg/all.tcl4
-rw-r--r--runtime/tests/agg/count.c72
-rw-r--r--runtime/tests/agg/stats.c62
-rw-r--r--runtime/tests/all.tcl12
-rw-r--r--runtime/tests/maps/Makefile5
-rw-r--r--runtime/tests/maps/README4
-rw-r--r--runtime/tests/maps/all.tcl5
-rw-r--r--runtime/tests/maps/ii.c96
-rw-r--r--runtime/tests/maps/iiiiii.c36
-rw-r--r--runtime/tests/maps/iiss.c45
-rw-r--r--runtime/tests/maps/is.c119
-rw-r--r--runtime/tests/maps/issii.c34
-rw-r--r--runtime/tests/maps/isx.c41
-rw-r--r--runtime/tests/maps/map.test999
-rw-r--r--runtime/tests/maps/map_format.c72
-rw-r--r--runtime/tests/maps/setadd.c245
-rw-r--r--runtime/tests/maps/si.c125
-rw-r--r--runtime/tests/maps/size.c103
-rw-r--r--runtime/tests/maps/sort.c105
-rw-r--r--runtime/tests/maps/sort2.c105
-rw-r--r--runtime/tests/maps/sort_stat.c90
-rw-r--r--runtime/tests/maps/ssssss.c37
-rw-r--r--runtime/tests/math/Makefile5
-rw-r--r--runtime/tests/math/all.tcl4
-rw-r--r--runtime/tests/math/div64.c182
-rw-r--r--runtime/tests/math/math.test19
-rw-r--r--runtime/tests/pmaps/Makefile5
-rw-r--r--runtime/tests/pmaps/all.tcl5
-rw-r--r--runtime/tests/pmaps/ii.c59
-rw-r--r--runtime/tests/pmaps/ii2.c48
-rw-r--r--runtime/tests/pmaps/ii3.c59
-rw-r--r--runtime/tests/pmaps/is.c67
-rw-r--r--runtime/tests/pmaps/ix.c61
-rw-r--r--runtime/tests/pmaps/ix2.c64
-rw-r--r--runtime/tests/pmaps/ix_log.c62
-rw-r--r--runtime/tests/pmaps/ix_none.c62
-rw-r--r--runtime/tests/pmaps/map_format.c92
-rw-r--r--runtime/tests/pmaps/pmap.test678
-rw-r--r--runtime/tests/pmaps/si.c62
-rw-r--r--runtime/tests/pmaps/size.c72
-rw-r--r--runtime/tests/string/Makefile5
-rw-r--r--runtime/tests/string/all.tcl4
-rw-r--r--runtime/tests/string/print_cstr.c56
-rw-r--r--runtime/tests/string/printf_A.c56
-rw-r--r--runtime/tests/string/printf_B.c37
-rw-r--r--runtime/tests/string/string.test89
-rw-r--r--runtime/tests/string/string1.c44
-rw-r--r--runtime/tests/string/string2.c68
-rw-r--r--runtime/tests/string/string3.c45
54 files changed, 0 insertions, 4722 deletions
diff --git a/runtime/tests/ChangeLog b/runtime/tests/ChangeLog
deleted file mode 100644
index 38634d0f..00000000
--- a/runtime/tests/ChangeLog
+++ /dev/null
@@ -1,112 +0,0 @@
-2006-01-25 Martin Hunt <hunt@redhat.com>
-
- * agg/stats.c (main): Delete Stats when done.
-
-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
- the more compact histogram format.
-
- * 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.
- * pmaps/ix_log.c: Test log histograms.
- * pmaps/ix_none.c: Test no histograms.
-
-2005-11-10 Martin Hunt <hunt@redhat.com>
- * pmaps/ix2.c: New test. Test _stp_pmap_get_*().
- * pmaps/iii3.c: New test. Test _stp_pmap_get_*().
- * pmaps/pmap.test: Update.
-
-2005-11-10 Martin Hunt <hunt@redhat.com>
- * pmaps/ii2.c: New test of maps and pmaps with the same keysym.
- * pmaps/pmap.test: Update.
-
-2005-11-09 Martin Hunt <hunt@redhat.com>
-
- * maps/sort2.c: New file.
- * maps/sort_stat.c: New file.
- * maps/map.test: Update
-
-2005-11-08 Martin Hunt <hunt@redhat.com>
-
- * maps/map.test: Remove old map API tests.
- * maps/ii2.c: Renamed ii.c.
- * maps/iiss2.c: Renamed iiss.c.
- * maps/is2.c: Renamed is.c.
- * maps/issii2.c: Renamed issii.c.
- * maps/isx2.c: Renamed isx.c.
- * maps/map_format2.c: Renamed map_format.c.
- * maps/si2.c: Renamed si.c.
- * maps/keys.c: Deleted
- * maps/test_list_int64.c: Deleted.
- * maps/test_list_string.c: Deleted.
- * maps/sort.c: Update to use new map API.
-
-2005-11-08 Martin Hunt <hunt@redhat.com>
-
- * pmaps/*: Add new pmaps tests.
-
-2005-10-28 Martin Hunt <hunt@redhat.com>
- * maps/keys.c: New file. Tests specific to _stp_key_get_*().
-
- * maps/iiss2.c (main): Add some comments to make clear expected
- results.
- * maps/is2.c (main): _stp_map_get_*s() now returns "" instead
- of NULL when lookup fails. _stp_map_set_*s() now deletes a node
- when setting to "" (as well as NULL).
- * maps/setadd.c (main): Ditto.
- * maps/map.test: update results.
-
-2005-10-26 Martin Hunt <hunt@redhat.com>
-
- * maps/map.test: Add results for iiiiii and ssssss.
- * maps/iiiiii.c: New file.
- * maps/ssssss.c: New file.
-
-2005-10-26 Martin Hunt <hunt@redhat.com>
-
- * maps/map.test: Add results for issii2.
-
-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.
-
-2005-09-23 Martin Hunt <hunt@redhat.com>
-
- * maps/map.test: Add sort results.
- * maps/sort.c: New test.
-
-2005-09-14 Martin Hunt <hunt@redhat.com>
-
- * maps/ii.c (main): Add test for _stp_map_clear().
- * maps/map.test: Update results.
-
-2005-09-12 Martin Hunt <hunt@redhat.com>
-
- * math/div64.c (main): Set the expected result for LLONG_MIN/-1 to
- be LLONG_MIN (overflow) instead of 0.
-
-2005-09-09 Martin Hunt <hunt@redhat.com>
-
- * math/div64.c (main): Fixes for running on 64-bit hardware.
-
- * README: Update.
- * math/div64.c: New file. 64-bit division tests.
-
diff --git a/runtime/tests/Makefile b/runtime/tests/Makefile
deleted file mode 100644
index 4e744d25..00000000
--- a/runtime/tests/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-tests:
- tclsh all.tcl
-
diff --git a/runtime/tests/README b/runtime/tests/README
deleted file mode 100644
index 000f1017..00000000
--- a/runtime/tests/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory contains the user-levels tests.
-
-Before running these for the first time,
-> cd ../user
-> ./recreate_links
-
-To run the test here, just type "make".
diff --git a/runtime/tests/agg/Makefile b/runtime/tests/agg/Makefile
deleted file mode 100644
index c396c132..00000000
--- a/runtime/tests/agg/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-default: tests
-
-tests:
- tclsh all.tcl
-
diff --git a/runtime/tests/agg/agg.test b/runtime/tests/agg/agg.test
deleted file mode 100644
index 2d56f031..00000000
--- a/runtime/tests/agg/agg.test
+++ /dev/null
@@ -1,169 +0,0 @@
-package require tcltest
-namespace import -force tcltest::*
-
-cd $tcltest::testsDirectory
-
-set CFLAGS "-Os"
-set KPATH "/lib/modules/[exec uname -r]/build/include"
-set MPATH "/lib/modules/[exec uname -r]/build/include/asm/mach-default"
-set PATH "../../user"
-
-test Counter {Counter Test} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test count.c
-} -body {
- exec ./test
-} -result {cnt1[0] = 1
-cnt2[0] = 10
-cnt1[1] = 2
-cnt2[1] = 11
-cnt1[2] = 3
-cnt2[2] = 12
-cnt1[3] = 4
-cnt2[3] = 13
-cnt1[4] = 5
-cnt2[4] = 14
-cnt1[5] = 6
-cnt2[5] = 15
-cnt1[6] = 7
-cnt2[6] = 16
-cnt1[7] = 8
-cnt2[7] = 17
-cnt1 = 36
-cnt2 = 108
---------------------
-cnt1[0] = 2
-cnt2[0] = 20
-cnt1[1] = 4
-cnt2[1] = 22
-cnt1[2] = 6
-cnt2[2] = 24
-cnt1[3] = 8
-cnt2[3] = 26
-cnt1[4] = 10
-cnt2[4] = 28
-cnt1[5] = 12
-cnt2[5] = 30
-cnt1[6] = 14
-cnt2[6] = 32
-cnt1[7] = 16
-cnt2[7] = 34
-cnt1 = 72
-cnt2 = 216
---------------------
-cnt1 = 140
-cnt2 = 784
-cnt1 = 0
-cnt2 = 0
---------------------
-cnt1[0] = 0
-cnt2[0] = 0
-cnt1[1] = 1
-cnt2[1] = 1
-cnt1[2] = 4
-cnt2[2] = 8
-cnt1[3] = 9
-cnt2[3] = 27
-cnt1[4] = 16
-cnt2[4] = 64
-cnt1[5] = 25
-cnt2[5] = 125
-cnt1[6] = 36
-cnt2[6] = 216
-cnt1[7] = 49
-cnt2[7] = 343
-cnt1 = 140
-cnt2 = 784}
-
-test Stats {Stats Test} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test stats.c
-} -body {
- exec ./test
-} -result {st1[0] = count: 1 sum:1
-st2[0] = count: 1 sum:10
-st3[0] = count: 1 sum:100
-st1[1] = count: 1 sum:2
-st2[1] = count: 1 sum:11
-st3[1] = count: 1 sum:101
-st1[2] = count: 1 sum:3
-st2[2] = count: 1 sum:12
-st3[2] = count: 1 sum:102
-st1[3] = count: 1 sum:4
-st2[3] = count: 1 sum:13
-st3[3] = count: 1 sum:103
-st1[4] = count: 1 sum:5
-st2[4] = count: 1 sum:14
-st3[4] = count: 1 sum:104
-st1[5] = count: 1 sum:6
-st2[5] = count: 1 sum:15
-st3[5] = count: 1 sum:105
-st1[6] = count: 1 sum:7
-st2[6] = count: 1 sum:16
-st3[6] = count: 1 sum:106
-st1[7] = count: 1 sum:8
-st2[7] = count: 1 sum:17
-st3[7] = count: 1 sum:107
---------------------
-CPU: 0 Count: 1 Sum: 1
-CPU: 1 Count: 1 Sum: 2
-CPU: 2 Count: 1 Sum: 3
-CPU: 3 Count: 1 Sum: 4
-CPU: 4 Count: 1 Sum: 5
-CPU: 5 Count: 1 Sum: 6
-CPU: 6 Count: 1 Sum: 7
-CPU: 7 Count: 1 Sum: 8
-CPU: 0 Count: 1 Sum: 10
-CPU: 1 Count: 1 Sum: 11
-CPU: 2 Count: 1 Sum: 12
-CPU: 3 Count: 1 Sum: 13
-CPU: 4 Count: 1 Sum: 14
-CPU: 5 Count: 1 Sum: 15
-CPU: 6 Count: 1 Sum: 16
-CPU: 7 Count: 1 Sum: 17
-CPU: 0 Count: 1 Sum: 100
-CPU: 1 Count: 1 Sum: 101
-CPU: 2 Count: 1 Sum: 102
-CPU: 3 Count: 1 Sum: 103
-CPU: 4 Count: 1 Sum: 104
-CPU: 5 Count: 1 Sum: 105
-CPU: 6 Count: 1 Sum: 106
-CPU: 7 Count: 1 Sum: 107
---------------------
-Count: 8 Sum: 36
-Count: 8 Sum: 108
-Count: 8 Sum: 828
---------------------
-count:8 sum:36 avg:4 min:1 max:8
-
-count:8 sum:108 avg:13 min:10 max:17
-value |-------------------------------------------------- count
- 2 | 0
- 4 | 0
- 8 |@@@@@@ 6
- 16 |@@ 2
- 32 | 0
-
-count:8 sum:828 avg:103 min:100 max:107
-value |-------------------------------------------------- count
- 85 | 0
- 90 | 0
- 95 |@@@@@@@@ 8
-
-count:0 sum:0 avg:0 min:0 max:0
-
-count:0 sum:0 avg:0 min:0 max:0
-value |-------------------------------------------------- count
- 0 | 0
- 1 | 0
- 2 | 0
-
-count:0 sum:0 avg:0 min:0 max:0
-value |-------------------------------------------------- count
- 0 | 0
- 5 | 0
- 10 | 0
-}
-
-
-exec rm test
-
-cleanupTests
diff --git a/runtime/tests/agg/all.tcl b/runtime/tests/agg/all.tcl
deleted file mode 100644
index 23757202..00000000
--- a/runtime/tests/agg/all.tcl
+++ /dev/null
@@ -1,4 +0,0 @@
-package require tcltest
-namespace import -force tcltest::*
-tcltest::testsDirectory [file dir [info script]]
-tcltest::runAllTests
diff --git a/runtime/tests/agg/count.c b/runtime/tests/agg/count.c
deleted file mode 100644
index 8e674d1e..00000000
--- a/runtime/tests/agg/count.c
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "runtime.h"
-
-/* test of Counters */
-#include "counter.c"
-
-int main ()
-{
- int i;
- Counter cnt1 = _stp_counter_init();
- Counter cnt2 = _stp_counter_init();
-
- /* testing _stp_counter_add(). These will only be correct if _stp_counter_init() */
- /* set all values to 0 and add works properly. */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- _stp_counter_add (cnt1, _processor_number + 1);
- _stp_counter_add (cnt2, _processor_number + 10);
- }
-
- /* testing _stp_counter_get_cpu() */
- for (i = 0; i < NR_CPUS; i++) {
- printf ("cnt1[%d] = %lld\n", i, _stp_counter_get_cpu(cnt1, i, 0));
- printf ("cnt2[%d] = %lld\n", i, _stp_counter_get_cpu(cnt2, i, 0));
- }
-
- /* testing _stp_counter_get() */
- printf ("cnt1 = %d\n", _stp_counter_get(cnt1, 0));
- printf ("cnt2 = %d\n", _stp_counter_get(cnt2, 0));
- printf ("--------------------\n");
-
- /* testing _stp_counter_add() */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- _stp_counter_add (cnt1, _processor_number + 1);
- _stp_counter_add (cnt2, _processor_number + 10);
- }
-
- for (i = 0; i < NR_CPUS; i++) {
- printf ("cnt1[%d] = %lld\n", i, _stp_counter_get_cpu(cnt1, i, 0));
- printf ("cnt2[%d] = %lld\n", i, _stp_counter_get_cpu(cnt2, i, 0));
- }
- printf ("cnt1 = %d\n", _stp_counter_get(cnt1, 1));
- printf ("cnt2 = %d\n", _stp_counter_get(cnt2, 1));
-
- printf ("--------------------\n");
-
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- _stp_counter_add (cnt1, _processor_number * _processor_number);
- _stp_counter_add (cnt2, _processor_number * _processor_number * _processor_number);
- }
-
- printf ("cnt1 = %d\n", _stp_counter_get(cnt1, 1));
- printf ("cnt2 = %d\n", _stp_counter_get(cnt2, 1));
- printf ("cnt1 = %d\n", _stp_counter_get(cnt1, 0));
- printf ("cnt2 = %d\n", _stp_counter_get(cnt2, 0));
- printf ("--------------------\n");
-
-
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- _stp_counter_add (cnt1, _processor_number * _processor_number);
- _stp_counter_add (cnt2, _processor_number * _processor_number * _processor_number);
- }
-
- for (i = 0; i < NR_CPUS; i++) {
- printf ("cnt1[%d] = %lld\n", i, _stp_counter_get_cpu(cnt1, i, 0));
- printf ("cnt2[%d] = %lld\n", i, _stp_counter_get_cpu(cnt2, i, 0));
- }
- printf ("cnt1 = %d\n", _stp_counter_get(cnt1, 0));
- printf ("cnt2 = %d\n", _stp_counter_get(cnt2, 0));
-
- _stp_counter_free (cnt1);
- _stp_counter_free (cnt2);
- return 0;
-}
diff --git a/runtime/tests/agg/stats.c b/runtime/tests/agg/stats.c
deleted file mode 100644
index 58fb9d41..00000000
--- a/runtime/tests/agg/stats.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "runtime.h"
-
-/* test of Stats */
-#include "stat.c"
-
-int main ()
-{
- int i;
- struct stat_data *st;
- Stat st1 = _stp_stat_init(HIST_NONE);
- Stat st2 = _stp_stat_init(HIST_LOG, 7);
- Stat st3 = _stp_stat_init(HIST_LINEAR, 0, 100, 5);
-
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- _stp_stat_add (st1, _processor_number + 1);
- _stp_stat_add (st2, _processor_number + 10);
- _stp_stat_add (st3, _processor_number + 100);
- }
- _processor_number = 0;
-
- /* this is for internal testing only. Not recommended */
- for (i = 0; i < NR_CPUS; i++) {
- st = _stp_stat_get_cpu(st1, i);
- printf ("st1[%d] = count: %lld sum:%lld\n", i, st->count, st->sum);
- STAT_UNLOCK(st1);
- st = _stp_stat_get_cpu(st2, i);
- printf ("st2[%d] = count: %lld sum:%lld\n", i, st->count, st->sum);
- STAT_UNLOCK(st2);
- st = _stp_stat_get_cpu(st3, i);
- printf ("st3[%d] = count: %lld sum:%lld\n", i, st->count, st->sum);
- STAT_UNLOCK(st3);
- }
- _stp_printf ("--------------------\n");
-
- /* normal way to print per-cpu stats */
- _stp_stat_print_cpu (st1, "CPU: %c\tCount: %C\tSum: %S", 0);
- _stp_stat_print_cpu (st2, "CPU: %c\tCount: %C\tSum: %S", 0);
- _stp_stat_print_cpu (st3, "CPU: %c\tCount: %C\tSum: %S", 0);
- printf ("--------------------\n");
-
- /* basic aggregated stats */
- _stp_stat_print (st1, "Count: %C\tSum: %S", 0);
- _stp_stat_print (st2, "Count: %C\tSum: %S", 0);
- _stp_stat_print (st3, "Count: %C\tSum: %S", 0);
- printf ("--------------------\n");
-
- /* now print full stats */
- _stp_stat_print (st1, "count:%C sum:%S avg:%A min:%m max:%M\n%H", 1);
- _stp_stat_print (st2, "count:%C sum:%S avg:%A min:%m max:%M\n%H", 1);
- _stp_stat_print (st3, "count:%C sum:%S avg:%A min:%m max:%M\n%H", 1);
-
- /* and print again, after they were cleared */
- _stp_stat_print (st1, "count:%C sum:%S avg:%A min:%m max:%M\n%H", 1);
- _stp_stat_print (st2, "count:%C sum:%S avg:%A min:%m max:%M\n%H", 1);
- _stp_stat_print (st3, "count:%C sum:%S avg:%A min:%m max:%M\n%H", 1);
-
- _stp_print_flush();
- _stp_stat_del(st1);
- _stp_stat_del(st2);
- _stp_stat_del(st3);
- return 0;
-}
diff --git a/runtime/tests/all.tcl b/runtime/tests/all.tcl
deleted file mode 100644
index f820c588..00000000
--- a/runtime/tests/all.tcl
+++ /dev/null
@@ -1,12 +0,0 @@
-package require tcltest
-namespace import -force tcltest::*
-
-puts "Running all SystemTap tests"
-
-#puts [tcltest::configure]
-#puts [tcltest::configure -file]
-
-
-tcltest::runAllTests
-
-puts "All tests completed"
diff --git a/runtime/tests/maps/Makefile b/runtime/tests/maps/Makefile
deleted file mode 100644
index c396c132..00000000
--- a/runtime/tests/maps/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-default: tests
-
-tests:
- tclsh all.tcl
-
diff --git a/runtime/tests/maps/README b/runtime/tests/maps/README
deleted file mode 100644
index 3ff31703..00000000
--- a/runtime/tests/maps/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Read ../README first!
-
-The *.c files test associative arrays (maps). "make tests" to run.
-
diff --git a/runtime/tests/maps/all.tcl b/runtime/tests/maps/all.tcl
deleted file mode 100644
index c0b38a0e..00000000
--- a/runtime/tests/maps/all.tcl
+++ /dev/null
@@ -1,5 +0,0 @@
-package require tcltest
-namespace import -force tcltest::*
-tcltest::testsDirectory [file dir [info script]]
-tcltest::runAllTests
-
diff --git a/runtime/tests/maps/ii.c b/runtime/tests/maps/ii.c
deleted file mode 100644
index 51b0d766..00000000
--- a/runtime/tests/maps/ii.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#include "runtime.h"
-
-/* test of maps with keys of int64 and value of int64 */
-#define VALUE_TYPE INT64
-#define KEY1_TYPE INT64
-#include "map-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- MAP map = _stp_map_new_ii(4);
- int64_t x;
-
- dbug("Hello World\n");
-
- /* map[1] = 2 */
- _stp_map_set_ii(map, 1, 2);
- x = _stp_map_get_ii(map, 1);
- printf ("map[1]=%lld\n", x);
-
- /* map[3] = 4 */
- _stp_map_set_ii(map, 3, 4);
- _stp_map_print(map,"map[%1d] = %d");
-
- /* 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);
- _stp_map_print(map,"map[%1d] = %d");
-
- /* check that unset values are 0 */
- printf ("%lld (should be 0)\n", _stp_map_get_ii(map, 5));
-
- /* map[5] = 6 */
- _stp_map_set_ii(map, 5, 6);
- _stp_map_print(map,"map[%1d] = %d");
-
- /* 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);
- }
- _stp_map_print(map,"map[%1d] = %d");
-
- /* 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);
- }
-
- 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);
- _stp_map_print(map,"map[%1d] = %d");
-
-
- /* now delete all 4 nodes, one by one */
- _stp_map_set_ii (map, 382, 0);
- _stp_map_print(map,"map[%1d] = %d");
-
- _stp_map_set_ii (map, 5, 0);
- _stp_map_print(map,"map[%1d] = %d");
-
- _stp_map_set_ii (map, 903, 0);
- _stp_map_print(map,"map[%1d] = %d");
-
- _stp_map_set_ii (map, 526, 0);
- _stp_map_print(map,"map[%1d] = %d");
-
- /* finally check clearing the map */
- for (i = 33; i < 77; i+=11)
- _stp_map_set_ii (map, i, 100*i+i);
-
- _stp_map_print(map,"map[%1d] = %d");
-
- _stp_map_clear(map);
- _stp_map_print(map,"map[%1d] = %d");
- _stp_map_set_ii (map, 1970, 1799);
- _stp_map_print(map,"map[%1d] = %d");
-
- _stp_map_del (map);
- return 0;
-}
diff --git a/runtime/tests/maps/iiiiii.c b/runtime/tests/maps/iiiiii.c
deleted file mode 100644
index a5eeef70..00000000
--- a/runtime/tests/maps/iiiiii.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "runtime.h"
-
-/* test of maps with 5 keys of int64 and value of int64 */
-#define VALUE_TYPE INT64
-#define KEY1_TYPE INT64
-#define KEY2_TYPE INT64
-#define KEY3_TYPE INT64
-#define KEY4_TYPE INT64
-#define KEY5_TYPE INT64
-#include "map-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- struct map_node *ptr;
- MAP map = _stp_map_new_iiiiii(4);
-
- _stp_map_set_iiiiii (map,1,2,3,4,5, 10);
- _stp_map_set_iiiiii (map,10,20,30,40,50, 100);
- _stp_map_set_iiiiii (map,-1,-2,-3,-4,-5, -10);
- _stp_map_set_iiiiii (map,100,200,300,400,500, 1000);
-
- foreach (map, ptr)
- printf ("map[%lld, %lld, %lld, %lld, %lld] = %lld\n",
- _stp_key_get_int64(ptr,1),
- _stp_key_get_int64(ptr,2),
- _stp_key_get_int64(ptr,3),
- _stp_key_get_int64(ptr,4),
- _stp_key_get_int64(ptr,5),
- _stp_get_int64(ptr));
-
- _stp_map_print(map,"%1d - %2d - %3d - %4d - %5d *** %d");
- _stp_map_del (map);
- return 0;
-}
diff --git a/runtime/tests/maps/iiss.c b/runtime/tests/maps/iiss.c
deleted file mode 100644
index 96369d56..00000000
--- a/runtime/tests/maps/iiss.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "runtime.h"
-
-/* test of maps with keys of int64,int64,string and value of string */
-#define VALUE_TYPE STRING
-#define KEY1_TYPE INT64
-#define KEY2_TYPE INT64
-#define KEY3_TYPE STRING
-#include "map-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- MAP map = _stp_map_new_iiss(4);
- map->wrap = 1;
-
- _stp_map_set_iiss (map, 1,2,"Ohio", "Columbus" );
- _stp_map_set_iiss (map, 3,4,"California", "Sacramento" );
- _stp_map_set_iiss (map, 5,6,"Washington", "Seattle" );
- _stp_map_set_iiss (map, 7,8,"Oregon", "Salem" );
- _stp_map_print (map, "map[%1d, %2d, %3s] = %s");
-
- _stp_map_set_iiss (map, -9,-10,"Nevada", "Carson City" );
- _stp_map_print (map, "map[%1d, %2d, %3s] = %s");
-
- _stp_map_set_iiss (map, 5,6,"Washington", "Olymp" );
- _stp_map_print (map, "map[%1d, %2d, %3s] = %s");
-
- _stp_map_add_iiss (map, 5,6,"Washington", "is" );
- _stp_map_print (map, "map[%1d, %2d, %3s] = %s");
-
- _stp_map_set_iiss (map, 5,6,"Washington", "Olympia" );
- _stp_map_print (map, "map[%1d, %2d, %3s] = %s");
-
- /* delete */
- _stp_map_set_iiss (map, -9,-10,"Nevada", 0);
- _stp_map_print (map, "map[%1d, %2d, %3s] = %s");
-
- /* should add nothing */
- _stp_map_set_iiss(map, 0,0,"", "");
- _stp_map_print (map, "map[%1d, %2d, %3s] = %s");
-
- _stp_map_del (map);
- return 0;
-}
diff --git a/runtime/tests/maps/is.c b/runtime/tests/maps/is.c
deleted file mode 100644
index 3008f702..00000000
--- a/runtime/tests/maps/is.c
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "runtime.h"
-
-/* test of maps with keys of int64 and value of string */
-#define KEY1_TYPE INT64
-#define VALUE_TYPE STRING
-#include "map-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- MAP map = _stp_map_new_is(4);
- map->wrap = 1;
-
- /* map[1] = one */
- _stp_map_set_is (map, 1, "one");
-
- printf ("map[1]=%s\n", _stp_map_get_is(map,1));
- _stp_map_print(map,"map[%1d] = %s");
-
- /* map[3] = "three" */
- _stp_map_set_is (map, 3, "three");
- _stp_map_print(map,"map[%1d] = %s");
-
- /* now try to confuse things */
- /* These won't do anything useful, but shouldn't crash */
- _stp_map_set_is(0,1,"foobar");
- _stp_map_set_is(map,0,0);
- _stp_map_set_is(map,100,0);
- _stp_map_print(map,"map[%1d] = %s");
-
- /* create and delete a key */
- _stp_map_set_is (map, 1024, "2048");
- _stp_map_set_is (map, 1024, 0);
- _stp_map_print(map,"map[%1d] = %s");
-
- /* create and delete a key again*/
- _stp_map_set_is (map, 1024, "2048");
- _stp_map_print(map,"map[%1d] = %s");
- _stp_map_set_is (map, 1024, 0);
- _stp_map_print(map,"map[%1d] = %s");
-
-
- /* check that unset values are "" */
- if (*_stp_map_get_is(map, 5))
- printf("ERROR: unset key has nonempty value\n");
-
- /* map[5] = "five" */
- _stp_map_set_is (map, 5, "five");
- _stp_map_print(map,"map[%1d] = %s");
-
- /* test empty string (should delete)*/
- _stp_map_set_is (map, 5, "");
- _stp_map_print(map,"map[%1d] = %s");
-
-
- /* add 4 new entries, pushing the others out */
- int i;
- for (i = 6; i < 10; i++)
- {
- char buf[32];
- sprintf(buf, "value of %d", i);
- _stp_map_set_is (map, i, buf);
- }
- _stp_map_print(map,"map[%1d] = %s");
-
- /* 5, 382, 526, and 903 all hash to the same value (23) */
- /* use them to test the hash chain */
- _stp_map_set_is (map, 5, "1005");
- _stp_map_set_is (map, 382, "1382");
- _stp_map_set_is (map, 526, "1526");
- _stp_map_set_is (map, 903, "1903");
-
- _stp_map_print(map,"map[%1d] = %s");
-
- /* now delete all 4 nodes, one by one */
- _stp_map_set_is (map, 382, 0);
- _stp_map_print(map,"map[%1d] = %s");
-
- _stp_map_set_is (map, 5, 0);
- _stp_map_print(map,"map[%1d] = %s");
-
- _stp_map_set_is (map, 903, 0);
- _stp_map_print(map,"map[%1d] = %s");
-
- _stp_map_set_is (map, 526, 0);
- _stp_map_print(map,"map[%1d] = %s");
-
- /* test overflow errors */
- map->wrap = 0;
- for (i = 6; i < 10; i++)
- {
- char buf[32];
- sprintf(buf, "value of %d", i);
- _stp_map_set_is (map, i, buf);
- }
-
- for (i = 6; i < 10; i++)
- {
- char buf[32];
- int res;
- sprintf(buf, "new value of %d", i);
- res = _stp_map_set_is (map, i, buf);
- if (res)
- printf("WARNING: During wrap test, got result of %d when expected 0\n", res);
- }
- for (i = 16; i < 20; i++)
- {
- char buf[32];
- int res;
- sprintf(buf, "BAD value of %d", i);
- res = _stp_map_set_is (map, i, buf);
- if (res != -1)
- printf("WARNING: During wrap test, got result of %d when expected -1\n", res);
- }
- _stp_map_print(map,"map[%1d] = %s");
- _stp_map_del (map);
- return 0;
-}
diff --git a/runtime/tests/maps/issii.c b/runtime/tests/maps/issii.c
deleted file mode 100644
index 4861428a..00000000
--- a/runtime/tests/maps/issii.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "runtime.h"
-
-/* test of maps with keys of int64,string.string.int64 and value of int64 */
-#define VALUE_TYPE INT64
-#define KEY1_TYPE INT64
-#define KEY2_TYPE STRING
-#define KEY3_TYPE STRING
-#define KEY4_TYPE INT64
-#include "map-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- struct map_node *ptr;
- MAP map = _stp_map_new_issii(4);
-
- _stp_map_set_issii (map, 1, "Boston", "MA", 1970, 5224303 );
- _stp_map_set_issii (map, 2, "Boston", "MA", 2000, 6057826 );
- _stp_map_set_issii (map, 3, "Chicago", "IL", 2000, 8272768 );
-
- foreach (map, ptr)
- printf ("map[%lld, %s, %s, %lld] = %lld\n",
- key1int(ptr),
- key2str(ptr),
- _stp_key_get_str(ptr,3),
- _stp_key_get_int64(ptr,4),
- _stp_get_int64(ptr));
-
-
- _stp_map_print(map,"%1d. The population of %2s, %3s in %4d was %d");
- _stp_map_del (map);
- return 0;
-}
diff --git a/runtime/tests/maps/isx.c b/runtime/tests/maps/isx.c
deleted file mode 100644
index 9003f522..00000000
--- a/runtime/tests/maps/isx.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#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;
-}
diff --git a/runtime/tests/maps/map.test b/runtime/tests/maps/map.test
deleted file mode 100644
index 51feca41..00000000
--- a/runtime/tests/maps/map.test
+++ /dev/null
@@ -1,999 +0,0 @@
-package require tcltest
-namespace import -force tcltest::*
-
-cd $tcltest::testsDirectory
-
-set CFLAGS "-Os"
-set KPATH "/lib/modules/[exec uname -r]/build/include"
-set MPATH "/lib/modules/[exec uname -r]/build/include/asm/mach-default"
-set PATH "../../user"
-
-test isx {Test of int64 keys and stat values} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test isx.c
-} -body {
- exec ./test
-} -result {map[3] = count:49600 sum:3288450 avg:66 min:0 max:99
-value |-------------------------------------------------- count
- 0 |@@ 460
- 10 |@@@@@@@ 1460
- 20 |@@@@@@@@@@@@ 2460
- 30 |@@@@@@@@@@@@@@@@@@ 3460
- 40 |@@@@@@@@@@@@@@@@@@@@@@@ 4460
- 50 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 5460
- 60 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 6460
- 70 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 7460
- 80 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 8460
- 90 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 9460
-
-map[2] = count:100 sum:2025 avg:20 min:0 max:81
-value |-------------------------------------------------- count
- 0 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 42
- 10 |@@@@@@@@@@@@@@@@@ 17
- 20 |@@@@@@@@@@@@@ 13
- 30 |@@@@@@@@@ 9
- 40 |@@@@@@@@@ 9
- 50 |@@@@ 4
- 60 |@@@ 3
- 70 |@@ 2
- 80 |@ 1
- 90 | 0
-
-map[1] = count:45 sum:2850 avg:63 min:10 max:90
-value |-------------------------------------------------- count
- 0 | 0
- 10 |@ 1
- 20 |@@ 2
- 30 |@@@ 3
- 40 |@@@@ 4
- 50 |@@@@@ 5
- 60 |@@@@@@ 6
- 70 |@@@@@@@ 7
- 80 |@@@@@@@@ 8
- 90 |@@@@@@@@@ 9
-
-
-map2[1] = count:16384 sum:1040384 avg:63 min:0 max:127
-value |-------------------------------------------------- count
- 0 | 128
- 1 | 128
- 2 |@ 256
- 4 |@@@ 512
- 8 |@@@@@@ 1024
- 16 |@@@@@@@@@@@@ 2048
- 32 |@@@@@@@@@@@@@@@@@@@@@@@@ 4096
- 64 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 8192
- 128 | 0
- 256 | 0
-
-map2[2] = count:1048576 sum:536346624 avg:511 min:0 max:1023
-value |-------------------------------------------------- count
- 0 | 1024
- 1 | 1024
- 2 | 2048
- 4 | 4096
- 8 | 8192
- 16 |@ 16384
- 32 |@@@ 32768
- 64 |@@@@@@ 65536
- 128 |@@@@@@@@@@@@ 131072
- 256 |@@@@@@@@@@@@@@@@@@@@@@@@ 262144
- 512 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 524288
-
-}
-
-
-test map_format {Torture test of map formatting} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test map_format.c
-} -body {
- exec ./test
-} -result {Columbus -> mapiis 1 2 Ohio
-Sacramento -> mapiis 3 4 California
-Olympia -> mapiis 5 6 Washington
-Salem -> mapiis 7 8 Oregon
-
-Columbus % Ohio
-Sacramento % California
-Olympia % Washington
-Salem % Oregon
-
-Columbus -> mapiis
-Sacramento -> mapiis
-Olympia -> mapiis
-Salem -> mapiis
-
-The capitol of Riga is Latvia and the nerd population is 212063400820736
-The capitol of Sofia is Bulgaria and the nerd population is -2400999087387945352
-The capitol of Valletta is Malta and the nerd population is 1
-The capitol of Nicosia is Cyprus and the nerd population is -1
-
-The capitol of Riga is Latvia and the nerd population is c0dedbad0000
-The capitol of Sofia is Bulgaria and the nerd population is deadf00d12345678
-The capitol of Valletta is Malta and the nerd population is 1
-The capitol of Nicosia is Cyprus and the nerd population is ffffffffffffffff
-
-The capitol of Riga is Latvia and the nerd population is C0DEDBAD0000
-The capitol of Sofia is Bulgaria and the nerd population is DEADF00D12345678
-The capitol of Valletta is Malta and the nerd population is 1
-The capitol of Nicosia is Cyprus and the nerd population is FFFFFFFFFFFFFFFF
-
-Bogons per packet for Riga
-count:49600 sum:3288450 avg:66 min:0 max:99
-value |-------------------------------------------------- count
- 0 |@@ 460
- 10 |@@@@@@@ 1460
- 20 |@@@@@@@@@@@@ 2460
- 30 |@@@@@@@@@@@@@@@@@@ 3460
- 40 |@@@@@@@@@@@@@@@@@@@@@@@ 4460
- 50 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 5460
- 60 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 6460
- 70 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 7460
- 80 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 8460
- 90 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 9460
-
-Bogons per packet for Sofia
-count:100 sum:2025 avg:20 min:0 max:81
-value |-------------------------------------------------- count
- 0 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 42
- 10 |@@@@@@@@@@@@@@@@@ 17
- 20 |@@@@@@@@@@@@@ 13
- 30 |@@@@@@@@@ 9
- 40 |@@@@@@@@@ 9
- 50 |@@@@ 4
- 60 |@@@ 3
- 70 |@@ 2
- 80 |@ 1
- 90 | 0
-
-Bogons per packet for Valletta
-count:45 sum:2850 avg:63 min:10 max:90
-value |-------------------------------------------------- count
- 0 | 0
- 10 |@ 1
- 20 |@@ 2
- 30 |@@@ 3
- 40 |@@@@ 4
- 50 |@@@@@ 5
- 60 |@@@@@@ 6
- 70 |@@@@@@@ 7
- 80 |@@@@@@@@ 8
- 90 |@@@@@@@@@ 9
-
-
-49600 was the count for Riga, Latvia
-100 was the count for Sofia, Bulgaria
-45 was the count for Valletta, Malta
-
-mapsst[ Riga, Latvia] = 322D82
-mapsst[ Sofia, Bulgaria] = 7E9
-mapsst[ Valletta, Malta] = B22}
-
-test map_issii {Test of int64,string,string,int64 keys and int64 values} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test issii.c
-} -body {
- exec ./test
-} -result {map[1, Boston, MA, 1970] = 5224303
-map[2, Boston, MA, 2000] = 6057826
-map[3, Chicago, IL, 2000] = 8272768
-1. The population of Boston, MA in 1970 was 5224303
-2. The population of Boston, MA in 2000 was 6057826
-3. The population of Chicago, IL in 2000 was 8272768
-}
-
-test map_sort {Test of sorting} -setup {
- puts "gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test sort.c"
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test sort.c
-} -body {
- exec ./test
-} -result {sorting from A-Z on value
-Boston -> 5 5 Massachusetts
-Carson City -> 7 8 Nevada
-Columbus -> 1 2 Ohio
-Des Moines -> 8 8 Iowa
-Montpelier -> 2 2 Vermont
-Olympia -> 5 6 Washington
-Raleigh -> -1 9 North Carolina
-Sacramento -> 3 4 California
-Salem -> 7 8 Oregon
-Santa Fe -> 1 4 New Mexico
-
-
-sorting from Z-A on value
-Santa Fe -> 1 4 New Mexico
-Salem -> 7 8 Oregon
-Sacramento -> 3 4 California
-Raleigh -> -1 9 North Carolina
-Olympia -> 5 6 Washington
-Montpelier -> 2 2 Vermont
-Des Moines -> 8 8 Iowa
-Columbus -> 1 2 Ohio
-Carson City -> 7 8 Nevada
-Boston -> 5 5 Massachusetts
-
-
-sorting from low to high on key 1
--1 9 North Carolina -> Raleigh
-1 4 New Mexico -> Santa Fe
-1 2 Ohio -> Columbus
-2 2 Vermont -> Montpelier
-3 4 California -> Sacramento
-5 6 Washington -> Olympia
-5 5 Massachusetts -> Boston
-7 8 Oregon -> Salem
-7 8 Nevada -> Carson City
-8 8 Iowa -> Des Moines
-
-
-sorting from high to low on key 1
-8 8 Iowa -> Des Moines
-7 8 Oregon -> Salem
-7 8 Nevada -> Carson City
-5 6 Washington -> Olympia
-5 5 Massachusetts -> Boston
-3 4 California -> Sacramento
-2 2 Vermont -> Montpelier
-1 4 New Mexico -> Santa Fe
-1 2 Ohio -> Columbus
--1 9 North Carolina -> Raleigh
-
-
-sorting from low to high on key 2
-2 2 Vermont -> Montpelier
-1 2 Ohio -> Columbus
-3 4 California -> Sacramento
-1 4 New Mexico -> Santa Fe
-5 5 Massachusetts -> Boston
-5 6 Washington -> Olympia
-8 8 Iowa -> Des Moines
-7 8 Oregon -> Salem
-7 8 Nevada -> Carson City
--1 9 North Carolina -> Raleigh
-
-
-sorting from high to low on key 2
--1 9 North Carolina -> Raleigh
-8 8 Iowa -> Des Moines
-7 8 Oregon -> Salem
-7 8 Nevada -> Carson City
-5 6 Washington -> Olympia
-5 5 Massachusetts -> Boston
-3 4 California -> Sacramento
-1 4 New Mexico -> Santa Fe
-2 2 Vermont -> Montpelier
-1 2 Ohio -> Columbus
-
-
-sorting from low to high on key 3
-California 3 4 -> Sacramento
-Iowa 8 8 -> Des Moines
-Massachusetts 5 5 -> Boston
-Nevada 7 8 -> Carson City
-New Mexico 1 4 -> Santa Fe
-North Carolina -1 9 -> Raleigh
-Ohio 1 2 -> Columbus
-Oregon 7 8 -> Salem
-Vermont 2 2 -> Montpelier
-Washington 5 6 -> Olympia
-
-
-sorting from high to low on key 3
-Washington 5 6 -> Olympia
-Vermont 2 2 -> Montpelier
-Oregon 7 8 -> Salem
-Ohio 1 2 -> Columbus
-North Carolina -1 9 -> Raleigh
-New Mexico 1 4 -> Santa Fe
-Nevada 7 8 -> Carson City
-Massachusetts 5 5 -> Boston
-Iowa 8 8 -> Des Moines
-California 3 4 -> Sacramento
-
-
-top 3 alphabetical by value
-Boston -> 5 5 Massachusetts
-Carson City -> 7 8 Nevada
-Columbus -> 1 2 Ohio
-
-
-bottom 2 alphabetical by value
-Santa Fe -> 1 4 New Mexico
-Salem -> 7 8 Oregon
-
-
-top 5 sorted by key 1
-8 8 Iowa -> Des Moines
-7 8 Oregon -> Salem
-7 8 Nevada -> Carson City
-5 6 Washington -> Olympia
-5 5 Massachusetts -> Boston
-
-
-bottom 5 sorted by key 1
--1 9 North Carolina -> Raleigh
-1 4 New Mexico -> Santa Fe
-1 2 Ohio -> Columbus
-2 2 Vermont -> Montpelier
-3 4 California -> Sacramento
-
-sorted by population from low to high
-Nicosia is the capitol of Cyprus and the nerd population is -1
-Valletta is the capitol of Malta and the nerd population is 1
-Riga is the capitol of Latvia and the nerd population is 135786
-Sofia is the capitol of Bulgaria and the nerd population is 138740
-
-sorted by population from high to low
-Sofia is the capitol of Bulgaria and the nerd population is 138740
-Riga is the capitol of Latvia and the nerd population is 135786
-Valletta is the capitol of Malta and the nerd population is 1
-Nicosia is the capitol of Cyprus and the nerd population is -1
-}
-
-test ii {Test of int64 keys and int64 values} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test ii.c
-} -body {
- exec ./test
-} -result {map[1]=2
-map[1] = 2
-map[3] = 4
-
-map[1] = 2
-map[3] = 4
-
-0 (should be 0)
-map[1] = 2
-map[3] = 4
-map[5] = 6
-
-map[6] = 106
-map[7] = 107
-map[8] = 108
-map[9] = 109
-
-map[5] = 1005
-map[382] = 1382
-map[526] = 1526
-map[903] = 1903
-
-map[5] = 1005
-map[526] = 1526
-map[903] = 1903
-
-map[526] = 1526
-map[903] = 1903
-
-map[526] = 1526
-
-
-map[33] = 3333
-map[44] = 4444
-map[55] = 5555
-map[66] = 6666
-
-
-map[1970] = 1799
-}
-
-test is {Test of int64 keys and string values} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test is.c
-} -body {
- exec ./test
-} -result {map[1]=one
-map[1] = one
-
-map[1] = one
-map[3] = three
-
-map[1] = one
-map[3] = three
-
-map[1] = one
-map[3] = three
-
-map[1] = one
-map[3] = three
-map[1024] = 2048
-
-map[1] = one
-map[3] = three
-
-map[1] = one
-map[3] = three
-map[5] = five
-
-map[1] = one
-map[3] = three
-
-map[6] = value of 6
-map[7] = value of 7
-map[8] = value of 8
-map[9] = value of 9
-
-map[5] = 1005
-map[382] = 1382
-map[526] = 1526
-map[903] = 1903
-
-map[5] = 1005
-map[526] = 1526
-map[903] = 1903
-
-map[526] = 1526
-map[903] = 1903
-
-map[526] = 1526
-
-
-map[6] = new value of 6
-map[7] = new value of 7
-map[8] = new value of 8
-map[9] = new value of 9
-}
-
-test si {Test of string keys and int64 values} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test si.c
-} -body {
- exec ./test
-} -result {map[Ohio]=1
-map[Ohio] = 1
-
-map[Ohio] = 1
-map[Washington] = 2
-
-map[Ohio] = 1
-map[Washington] = 2
-
-map[Ohio] = 1
-map[Washington] = 2
-map[1024] = 2048
-
-map[Ohio] = 1
-map[Washington] = 2
-
-map[Ohio] = 1
-map[Washington] = 2
-map[1024] = 2048
-
-map[Ohio] = 1
-map[Washington] = 2
-
-map[Ohio] = 1
-map[Washington] = 2
-map[California] = 3
-
-map[Ohio] = 1
-map[Washington] = 2
-map[California] = 3
-map[] = 7777
-
-map[Ohio] = 1
-map[Washington] = 2
-map[California] = 3
-map[] = 8888
-
-map[Ohio] = 1
-map[Washington] = 2
-map[California] = 3
-
-map[String 6] = 106
-map[String 7] = 107
-map[String 8] = 108
-map[String 9] = 109
-
-map[String 6] = 106
-map[String 7] = 107
-map[String 8] = 108
-map[String 9] = 109
-
-map[String 6] = 6106
-map[String 7] = 7107
-map[String 8] = 8108
-map[String 9] = 9109
-
-map[String 6] = 6
-map[String 7] = 7
-map[String 8] = 8
-map[String 9] = 9
-
-}
-
-test iiss {Test of int64,int64,string keys and string values} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test iiss.c
-} -body {
- exec ./test
-} -result {map[1, 2, Ohio] = Columbus
-map[3, 4, California] = Sacramento
-map[5, 6, Washington] = Seattle
-map[7, 8, Oregon] = Salem
-
-map[3, 4, California] = Sacramento
-map[5, 6, Washington] = Seattle
-map[7, 8, Oregon] = Salem
-map[-9, -10, Nevada] = Carson City
-
-map[3, 4, California] = Sacramento
-map[5, 6, Washington] = Olymp
-map[7, 8, Oregon] = Salem
-map[-9, -10, Nevada] = Carson City
-
-map[3, 4, California] = Sacramento
-map[5, 6, Washington] = Olympis
-map[7, 8, Oregon] = Salem
-map[-9, -10, Nevada] = Carson City
-
-map[3, 4, California] = Sacramento
-map[5, 6, Washington] = Olympia
-map[7, 8, Oregon] = Salem
-map[-9, -10, Nevada] = Carson City
-
-map[3, 4, California] = Sacramento
-map[5, 6, Washington] = Olympia
-map[7, 8, Oregon] = Salem
-
-map[3, 4, California] = Sacramento
-map[5, 6, Washington] = Olympia
-map[7, 8, Oregon] = Salem
-}
-
-test setadd {Test of setting and adding values} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test setadd.c
-} -body {
- exec ./test
-} -result {mapi[1] = 1
-mapi[2] = 4
-mapi[3] = 9
-mapi[4] = 16
-
-maps[1] = value of 1
-maps[2] = value of 2
-maps[3] = value of 3
-maps[4] = value of 4
-
-mapx[1] = count:1 sum:1 avg:1 min:1 max:1
-mapx[2] = count:1 sum:2 avg:2 min:2 max:2
-mapx[3] = count:1 sum:3 avg:3 min:3 max:3
-mapx[4] = count:1 sum:4 avg:4 min:4 max:4
-
-mapi[1] = 2
-mapi[2] = 8
-mapi[3] = 18
-mapi[4] = 32
-
-maps[1] = value of 1*****
-maps[2] = value of 2*****
-maps[3] = value of 3*****
-maps[4] = value of 4*****
-
-mapx[1] = count:2 sum:3 avg:1 min:1 max:2
-mapx[2] = count:2 sum:6 avg:3 min:2 max:4
-mapx[3] = count:2 sum:9 avg:4 min:3 max:6
-mapx[4] = count:2 sum:12 avg:6 min:4 max:8
-
-Adding 0
-mapi[1] = 2
-mapi[2] = 8
-mapi[3] = 18
-mapi[4] = 32
-
-maps[1] = value of 1*****
-maps[2] = value of 2*****
-maps[3] = value of 3*****
-maps[4] = value of 4*****
-
-maps[1] = value of 1*****
-maps[2] = value of 2*****
-maps[3] = value of 3*****
-maps[4] = value of 4*****
-
-mapx[1] = count:3 sum:3 avg:1 min:0 max:2
-mapx[2] = count:3 sum:6 avg:2 min:0 max:4
-mapx[3] = count:3 sum:9 avg:3 min:0 max:6
-mapx[4] = count:3 sum:12 avg:4 min:0 max:8
-
-Add 'X' to strings
-maps[1] = value of 1*****X
-maps[2] = value of 2*****X
-maps[3] = value of 3*****X
-maps[4] = value of 4*****X
-
-setting everything to 0
-
-
-
-
-Adding 0
-
-
-
-mapx[1] = count:1 sum:0 avg:0 min:0 max:0
-mapx[2] = count:1 sum:0 avg:0 min:0 max:0
-mapx[3] = count:1 sum:0 avg:0 min:0 max:0
-mapx[4] = count:1 sum:0 avg:0 min:0 max:0
-
-setting everything to -1
-mapi[1] = -1
-mapi[2] = -1
-mapi[3] = -1
-mapi[4] = -1
-
-mapx[1] = count:1 sum:-1 avg:-1 min:-1 max:-1
-mapx[2] = count:1 sum:-1 avg:-1 min:-1 max:-1
-mapx[3] = count:1 sum:-1 avg:-1 min:-1 max:-1
-mapx[4] = count:1 sum:-1 avg:-1 min:-1 max:-1
-
-adding -1
-mapi[1] = -2
-mapi[2] = -2
-mapi[3] = -2
-mapi[4] = -2
-
-mapx[1] = count:2 sum:-2 avg:-1 min:-1 max:-1
-mapx[2] = count:2 sum:-2 avg:-1 min:-1 max:-1
-mapx[3] = count:2 sum:-2 avg:-1 min:-1 max:-1
-mapx[4] = count:2 sum:-2 avg:-1 min:-1 max:-1
-}
-
-test iiiiii {Test of 5 int keys and an int value} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test iiiiii.c
-} -body {
- exec ./test
-} -result {map[1, 2, 3, 4, 5] = 10
-map[10, 20, 30, 40, 50] = 100
-map[-1, -2, -3, -4, -5] = -10
-map[100, 200, 300, 400, 500] = 1000
-1 - 2 - 3 - 4 - 5 *** 10
-10 - 20 - 30 - 40 - 50 *** 100
--1 - -2 - -3 - -4 - -5 *** -10
-100 - 200 - 300 - 400 - 500 *** 1000
-}
-
-test ssssss {Test of 5 string keys and a string value} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test ssssss.c
-} -body {
- exec ./test
-} -result {map[1ABC, 2ABC, 3ABC, 4ABC, 5ABC] = 666
-map[1QRS, 2QRS, 3QRS, 4QRS, 5QRS] = 777
-map[1abc, 2abc, 3abc, 4abc, 5abc] = 888
-map[1XYZ, 2XYZ, 3XYZ, 4XYZ, 5XYZ] = 999
-1ABC and 2ABC and 3ABC and 4ABC and 5ABC ---> 666
-1QRS and 2QRS and 3QRS and 4QRS and 5QRS ---> 777
-1abc and 2abc and 3abc and 4abc and 5abc ---> 888
-1XYZ and 2XYZ and 3XYZ and 4XYZ and 5XYZ ---> 999
-}
-
-test sort_stat {Test of sorting stats} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test sort_stat.c
-} -body {
- exec ./test
-} -result {Bogons per packet for California
-count:49600 sum:3288450 avg:66 min:0 max:99
-value |-------------------------------------------------- count
- 0 |@@ 460
- 10 |@@@@@@@ 1460
- 20 |@@@@@@@@@@@@ 2460
- 30 |@@@@@@@@@@@@@@@@@@ 3460
- 40 |@@@@@@@@@@@@@@@@@@@@@@@ 4460
- 50 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 5460
- 60 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 6460
- 70 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 7460
- 80 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 8460
- 90 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 9460
-
-Bogons per packet for Washington
-count:100 sum:2025 avg:20 min:0 max:81
-value |-------------------------------------------------- count
- 0 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 42
- 10 |@@@@@@@@@@@@@@@@@ 17
- 20 |@@@@@@@@@@@@@ 13
- 30 |@@@@@@@@@ 9
- 40 |@@@@@@@@@ 9
- 50 |@@@@ 4
- 60 |@@@ 3
- 70 |@@ 2
- 80 |@ 1
- 90 | 0
-
-Bogons per packet for Oregon
-count:90 sum:5700 avg:63 min:10 max:90
-value |-------------------------------------------------- count
- 0 | 0
- 10 |@@ 2
- 20 |@@@@ 4
- 30 |@@@@@@ 6
- 40 |@@@@@@@@ 8
- 50 |@@@@@@@@@@ 10
- 60 |@@@@@@@@@@@@ 12
- 70 |@@@@@@@@@@@@@@ 14
- 80 |@@@@@@@@@@@@@@@@ 16
- 90 |@@@@@@@@@@@@@@@@@@ 18
-
-Bogons per packet for Nevada
-count:45 sum:2970 avg:66 min:10 max:98
-value |-------------------------------------------------- count
- 0 | 0
- 10 |@ 1
- 20 |@@ 2
- 30 |@@@ 3
- 40 |@@@@ 4
- 50 |@@@@@ 5
- 60 |@@@@@@ 6
- 70 |@@@@@@@ 7
- 80 |@@@@@@@@ 8
- 90 |@@@@@@@@@ 9
-
-Bogons per packet for Ohio
-count:20 sum:1000 avg:50 min:50 max:50
-value |-------------------------------------------------- count
- 30 | 0
- 40 | 0
- 50 |@@@@@@@@@@@@@@@@@@@@ 20
- 60 | 0
- 70 | 0
-
-Bogons per packet for North Carolina
-count:45 sum:-4200 avg:-93 min:-620 max:100
-value |-------------------------------------------------- count
- 0 |@@@@@@@@@@@@@@@@@@@@@@@@@@ 26
- 10 |@ 1
- 20 |@@ 2
- 30 |@ 1
- 40 |@@ 2
- 50 |@ 1
- 60 |@ 1
- 70 |@ 1
- 80 |@ 1
- 90 |@@@@@@@@@ 9
-
-Bogons per packet for New Mexico
-count:450 sum:8475 avg:18 min:-39 max:50
-value |-------------------------------------------------- count
- 0 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 145
- 10 |@@@@@@@@@@@@@@@@@@@ 59
- 20 |@@@@@@@@@@@@@@@@@@@@@@@ 69
- 30 |@@@@@@@@@@@@@@@@@@@@@@@@@@ 79
- 40 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 89
- 50 |@@@ 9
- 60 | 0
- 70 | 0
-
-
-SORTED BY COUNT
-49600 California
-450 New Mexico
-100 Washington
-90 Oregon
-45 Nevada
-45 North Carolina
-20 Ohio
-
-SORTED BY COUNT (low to high)
-20 Ohio
-45 Nevada
-45 North Carolina
-90 Oregon
-100 Washington
-450 New Mexico
-49600 California
-
-SORTED BY SUM
-3288450 California
-8475 New Mexico
-5700 Oregon
-2970 Nevada
-2025 Washington
-1000 Ohio
--4200 North Carolina
-
-SORTED BY SUM (low to high)
--4200 North Carolina
-1000 Ohio
-2025 Washington
-2970 Nevada
-5700 Oregon
-8475 New Mexico
-3288450 California
-
-SORTED BY MIN
-50 Ohio
-10 Nevada
-10 Oregon
-0 Washington
-0 California
--39 New Mexico
--620 North Carolina
-
-SORTED BY MIN (low to high)
--620 North Carolina
--39 New Mexico
-0 Washington
-0 California
-10 Nevada
-10 Oregon
-50 Ohio
-
-SORTED BY MAX
-100 North Carolina
-99 California
-98 Nevada
-90 Oregon
-81 Washington
-50 New Mexico
-50 Ohio
-
-SORTED BY MAX (low to high)
-50 New Mexico
-50 Ohio
-81 Washington
-90 Oregon
-98 Nevada
-99 California
-100 North Carolina
-
-SORTED BY AVG
-66 Nevada
-66 California
-63 Oregon
-50 Ohio
-20 Washington
-18 New Mexico
--93 North Carolina
-
-SORTED BY AVG (low to high)
--93 North Carolina
-18 New Mexico
-20 Washington
-50 Ohio
-63 Oregon
-66 Nevada
-66 California
-}
-
-test sort2 {Test of sorting (odd number of elements)} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test sort2.c
-} -body {
- exec ./test
-} -result {sorting from A-Z on value
-Boston -> 5 5 Massachusetts
-Carson City -> 7 8 Nevada
-Columbus -> 1 2 Ohio
-Des Moines -> 8 8 Iowa
-Olympia -> 5 6 Washington
-Raleigh -> -1 9 North Carolina
-Sacramento -> 3 4 California
-Salem -> 7 8 Oregon
-Santa Fe -> 1 4 New Mexico
-
-
-sorting from Z-A on value
-Santa Fe -> 1 4 New Mexico
-Salem -> 7 8 Oregon
-Sacramento -> 3 4 California
-Raleigh -> -1 9 North Carolina
-Olympia -> 5 6 Washington
-Des Moines -> 8 8 Iowa
-Columbus -> 1 2 Ohio
-Carson City -> 7 8 Nevada
-Boston -> 5 5 Massachusetts
-
-
-sorting from low to high on key 1
--1 9 North Carolina -> Raleigh
-1 4 New Mexico -> Santa Fe
-1 2 Ohio -> Columbus
-3 4 California -> Sacramento
-5 6 Washington -> Olympia
-5 5 Massachusetts -> Boston
-7 8 Oregon -> Salem
-7 8 Nevada -> Carson City
-8 8 Iowa -> Des Moines
-
-
-sorting from high to low on key 1
-8 8 Iowa -> Des Moines
-7 8 Oregon -> Salem
-7 8 Nevada -> Carson City
-5 6 Washington -> Olympia
-5 5 Massachusetts -> Boston
-3 4 California -> Sacramento
-1 4 New Mexico -> Santa Fe
-1 2 Ohio -> Columbus
--1 9 North Carolina -> Raleigh
-
-
-sorting from low to high on key 2
-1 2 Ohio -> Columbus
-3 4 California -> Sacramento
-1 4 New Mexico -> Santa Fe
-5 5 Massachusetts -> Boston
-5 6 Washington -> Olympia
-8 8 Iowa -> Des Moines
-7 8 Oregon -> Salem
-7 8 Nevada -> Carson City
--1 9 North Carolina -> Raleigh
-
-
-sorting from high to low on key 2
--1 9 North Carolina -> Raleigh
-8 8 Iowa -> Des Moines
-7 8 Oregon -> Salem
-7 8 Nevada -> Carson City
-5 6 Washington -> Olympia
-5 5 Massachusetts -> Boston
-3 4 California -> Sacramento
-1 4 New Mexico -> Santa Fe
-1 2 Ohio -> Columbus
-
-
-sorting from low to high on key 3
-California 3 4 -> Sacramento
-Iowa 8 8 -> Des Moines
-Massachusetts 5 5 -> Boston
-Nevada 7 8 -> Carson City
-New Mexico 1 4 -> Santa Fe
-North Carolina -1 9 -> Raleigh
-Ohio 1 2 -> Columbus
-Oregon 7 8 -> Salem
-Washington 5 6 -> Olympia
-
-
-sorting from high to low on key 3
-Washington 5 6 -> Olympia
-Oregon 7 8 -> Salem
-Ohio 1 2 -> Columbus
-North Carolina -1 9 -> Raleigh
-New Mexico 1 4 -> Santa Fe
-Nevada 7 8 -> Carson City
-Massachusetts 5 5 -> Boston
-Iowa 8 8 -> Des Moines
-California 3 4 -> Sacramento
-
-
-top 3 alphabetical by value
-Boston -> 5 5 Massachusetts
-Carson City -> 7 8 Nevada
-Columbus -> 1 2 Ohio
-
-
-bottom 2 alphabetical by value
-Santa Fe -> 1 4 New Mexico
-Salem -> 7 8 Oregon
-
-
-top 5 sorted by key 1
-8 8 Iowa -> Des Moines
-7 8 Oregon -> Salem
-7 8 Nevada -> Carson City
-5 6 Washington -> Olympia
-5 5 Massachusetts -> Boston
-
-
-bottom 5 sorted by key 1
--1 9 North Carolina -> Raleigh
-1 4 New Mexico -> Santa Fe
-1 2 Ohio -> Columbus
-3 4 California -> Sacramento
-5 6 Washington -> Olympia
-
-sorted by population from low to high
-Nicosia is the capitol of Cyprus and the nerd population is -1
-Valletta is the capitol of Malta and the nerd population is 1
-Chisinau is the capitol of Moldova and the nerd population is 1024
-Riga is the capitol of Latvia and the nerd population is 135786
-Sofia is the capitol of Bulgaria and the nerd population is 138740
-
-sorted by population from high to low
-Sofia is the capitol of Bulgaria and the nerd population is 138740
-Riga is the capitol of Latvia and the nerd population is 135786
-Chisinau is the capitol of Moldova and the nerd population is 1024
-Valletta is the capitol of Malta and the nerd population is 1
-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}
-
-cleanupTests
diff --git a/runtime/tests/maps/map_format.c b/runtime/tests/maps/map_format.c
deleted file mode 100644
index 184aa79a..00000000
--- a/runtime/tests/maps/map_format.c
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "runtime.h"
-
-/* torture test of map formatting */
-#define VALUE_TYPE STRING
-#define KEY1_TYPE INT64
-#define KEY2_TYPE INT64
-#define KEY3_TYPE STRING
-#include "map-gen.c"
-
-#define VALUE_TYPE INT64
-#define KEY1_TYPE STRING
-#define KEY2_TYPE STRING
-#include "map-gen.c"
-
-#define VALUE_TYPE STAT
-#define KEY1_TYPE STRING
-#define KEY2_TYPE STRING
-#include "map-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- MAP mapiis = _stp_map_new_iiss(4);
- _stp_map_set_iiss (mapiis, 1,2,"Ohio", "Columbus" );
- _stp_map_set_iiss (mapiis, 3,4,"California", "Sacramento" );
- _stp_map_set_iiss (mapiis, 5,6,"Washington", "Olympia" );
- _stp_map_set_iiss (mapiis, 7,8,"Oregon", "Salem" );
- _stp_map_print (mapiis, "%s -> mapiis %1d %2d %3s");
-
- /* test printing of '%' */
- _stp_map_print (mapiis, "%s %% %3s");
-
- /* very bad string. don't crash */
- _stp_map_print (mapiis, "%s -> mapiis %1s %2s %3d %4d");
-
- MAP mapss = _stp_map_new_ssi(4);
- _stp_map_set_ssi (mapss, "Riga", "Latvia", 0x0000c0dedbad0000LL);
- _stp_map_set_ssi (mapss, "Sofia", "Bulgaria", 0xdeadf00d12345678LL);
- _stp_map_set_ssi (mapss, "Valletta", "Malta", 1);
- _stp_map_set_ssi (mapss, "Nicosia", "Cyprus", -1);
- _stp_map_print (mapss, "The capitol of %1s is %2s and the nerd population is %d");
- _stp_map_print (mapss, "The capitol of %1s is %2s and the nerd population is %x");
- _stp_map_print (mapss, "The capitol of %1s is %2s and the nerd population is %X");
-
- MAP mapsst = _stp_map_new_ssx (4, HIST_LINEAR, 0, 100, 10 );
- int i,j;
-
- for (i = 0; i < 100; i++)
- for (j = 0; j <= i*10 ; j++ )
- _stp_map_add_ssx (mapsst, "Riga", "Latvia", i);
-
- for (i = 0; i < 10; i++)
- for (j = 0; j < 10 ; j++ )
- _stp_map_add_ssx (mapsst, "Sofia", "Bulgaria", j * i );
-
- for (i = 0; i < 100; i += 10)
- for (j = 0; j < i/10 ; j++ )
- _stp_map_add_ssx (mapsst, "Valletta", "Malta", i);
-
- _stp_map_print (mapsst, "Bogons per packet for %1s\ncount:%C sum:%S avg:%A min:%m max:%M\n%H");
-
- _stp_map_print (mapsst, "%C was the count for %1s, %2s");
-
- /* here's how to print a map without using _stp_map_print(). */
- struct map_node *ptr;
- foreach (mapsst, ptr)
- _stp_printf ("mapsst[%09s,%09s] = %llX\n", key1str(ptr), key2str(ptr), _stp_get_stat(ptr)->sum);
- _stp_print_flush();
-
- return 0;
-}
diff --git a/runtime/tests/maps/setadd.c b/runtime/tests/maps/setadd.c
deleted file mode 100644
index 8eedbaa9..00000000
--- a/runtime/tests/maps/setadd.c
+++ /dev/null
@@ -1,245 +0,0 @@
-#include "runtime.h"
-
-/* verify correct set and add behavior */
-#define VALUE_TYPE INT64
-#define KEY1_TYPE INT64
-#define STP_MAP_II
-#include "map-gen.c"
-
-#define VALUE_TYPE STRING
-#define KEY1_TYPE INT64
-#include "map-gen.c"
-
-#define VALUE_TYPE STAT
-#define KEY1_TYPE INT64
-#include "map-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- int i, res;
- MAP mapi = _stp_map_new_ii(4);
- MAP maps = _stp_map_new_is(4);
- MAP mapx = _stp_map_new_ix(4, HIST_NONE);
-
- /* use add to set initial values */
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_ii (mapi, i, i*i);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(mapi,"mapi[%1d] = %d");
-
- for (i = 1; i < 5; i++)
- {
- char buf[32];
- sprintf(buf, "value of %d", i);
- res = _stp_map_add_is (maps, i, buf);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(maps,"maps[%1d] = %s");
-
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_ix (mapx, i, i);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print (mapx, "mapx[%1d] = count:%C sum:%S avg:%A min:%m max:%M");
-
- /*************** now add some values *******************/
-
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_ii (mapi, i, i*i);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(mapi,"mapi[%1d] = %d");
-
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_is (maps, i, "*****");
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(maps,"maps[%1d] = %s");
-
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_ix (mapx, i, i+i);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print (mapx, "mapx[%1d] = count:%C sum:%S avg:%A min:%m max:%M");
-
- /*************** now add 0 *******************/
- printf ("Adding 0\n");
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_ii (mapi, i, 0);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(mapi,"mapi[%1d] = %d");
-
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_is (maps, i, "");
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(maps,"maps[%1d] = %s");
-
- /* adding NULL should be same as adding "" for string values */
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_is (maps, i, 0);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(maps,"maps[%1d] = %s");
-
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_ix (mapx, i, 0);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print (mapx, "mapx[%1d] = count:%C sum:%S avg:%A min:%m max:%M");
-
- /*************** now add X to strings *******************/
- printf ("Add 'X' to strings\n");
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_is (maps, i, "X");
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(maps,"maps[%1d] = %s");
-
- /*************** now set to 0 (clear) *******************/
- printf ("setting everything to 0\n");
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_set_ii (mapi, i, 0);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(mapi,"mapi[%1d] = %d");
-
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_set_is (maps, i, "");
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(maps,"maps[%1d] = %s");
-
- /* set it back to something */
- for (i = 1; i < 5; i++)
- {
- char buf[32];
- sprintf(buf, "%d", i);
- res = _stp_map_set_is (maps, i, buf);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
-
- /* setting to NULL also deletes */
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_set_is (maps, i, 0);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(maps,"maps[%1d] = %s");
-
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_set_ix (mapx, i, 0);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print (mapx, "mapx[%1d] = count:%C sum:%S avg:%A min:%m max:%M");
-
- /*************** now add 0 *******************/
- printf ("Adding 0\n");
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_ii (mapi, i, 0);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(mapi,"mapi[%1d] = %d");
-
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_is (maps, i, 0);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(maps,"maps[%1d] = %s");
-
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_is (maps, i, "");
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(maps,"maps[%1d] = %s");
-
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_ix (mapx, i, 0);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print (mapx, "mapx[%1d] = count:%C sum:%S avg:%A min:%m max:%M");
-
-
- /*************** now set to -1 *******************/
- printf ("setting everything to -1\n");
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_set_ii (mapi, i, -1);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(mapi,"mapi[%1d] = %d");
-
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_set_ix (mapx, i, -1);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print (mapx, "mapx[%1d] = count:%C sum:%S avg:%A min:%m max:%M");
-
- /*************** now add -1 *******************/
- printf ("adding -1\n");
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_ii (mapi, i, -1);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print(mapi,"mapi[%1d] = %d");
-
- for (i = 1; i < 5; i++)
- {
- res = _stp_map_add_ix (mapx, i, -1);
- if (res)
- printf("ERROR: got result of %d when expected 0\n", res);
- }
- _stp_map_print (mapx, "mapx[%1d] = count:%C sum:%S avg:%A min:%m max:%M");
-
-
- _stp_map_del (mapi);
- _stp_map_del (maps);
- _stp_map_del (mapx);
- return 0;
-}
diff --git a/runtime/tests/maps/si.c b/runtime/tests/maps/si.c
deleted file mode 100644
index d9db65d7..00000000
--- a/runtime/tests/maps/si.c
+++ /dev/null
@@ -1,125 +0,0 @@
-#include "runtime.h"
-
-/* test of maps with keys of string and value of int64 */
-#define VALUE_TYPE INT64
-#define KEY1_TYPE STRING
-#include "map-gen.c"
-#include "map.c"
-
-int main ()
-{
- int res;
- MAP map = _stp_map_new_si(4);
- map->wrap = 1;
-
- /* map[Ohio] = 1 */
- _stp_map_set_si (map, "Ohio", 1);
- printf ("map[Ohio]=%lld\n", _stp_map_get_si(map,"Ohio"));
- _stp_map_print(map,"map[%1s] = %d");
-
- /* map[Washington] = 2 */
- _stp_map_set_si (map, "Washington", 2);
- _stp_map_print (map, "map[%1s] = %d");
-
- /* now try to confuse things */
- /* These won't do anything useful, but shouldn't crash */
-
- /* bad map */
- res = _stp_map_set_si(0,"foo",100);
- if (res != -2)
- printf("WARNING: got result of %d when expected -2\n", res);
-
- /* bad key */
- res = _stp_map_set_si(map,0,0);
- if (res != -2)
- printf("WARNING: got result of %d when expected -2\n", res);
-
- /* bad key */
- res = _stp_map_set_si(map,0,42);
- if (res != -2)
- printf("WARNING: got result of %d when expected -2\n", res);
-
- res = _stp_map_set_si(map,"",0);
- if (res)
- printf("WARNING: got result of %d when expected 0\n", res);
- _stp_map_print (map, "map[%1s] = %d");
-
- /* create and delete a key */
- _stp_map_set_si (map, "1024", 2048);
- _stp_map_print (map, "map[%1s] = %d");
- _stp_map_set_si (map, "1024", 0);
- _stp_map_print (map, "map[%1s] = %d");
- _stp_map_set_si (map, "1024", 2048);
- _stp_map_print (map, "map[%1s] = %d");
- _stp_map_set_si (map, "1024", 0);
- _stp_map_print (map, "map[%1s] = %d");
-
- /* check that unset values are 0 */
- res = _stp_map_get_si (map, "California");
- if (res)
- printf("ERROR: map[California] = %d (should be 0)\n", res);
-
- /* map[California] = 3 */
- _stp_map_set_si (map, "California", 3);
- _stp_map_print (map, "map[%1s] = %d");
-
- /* test an empty string as key */
- _stp_map_set_si (map, "", 7777);
- _stp_map_print (map, "map[%1s] = %d");
- _stp_map_set_si (map, "", 8888);
- _stp_map_print (map, "map[%1s] = %d");
- _stp_map_set_si (map, "", 0);
- _stp_map_print (map, "map[%1s] = %d");
-
-
- /* add 4 new entries, pushing the others out */
- int i;
- for (i = 6; i < 10; i++)
- {
- char buf[32];
- sprintf (buf, "String %d", i);
- res = _stp_map_set_si (map, buf, 100 + i);
- if (res)
- printf("WARNING: During wrap test, got result of %d when expected 0\n", res);
- }
- _stp_map_print (map, "map[%1s] = %d");
-
- /* turn off wrap and repeat */
- map->wrap = 0;
- for (i = 16; i < 20; i++) {
- char buf[32];
- sprintf (buf, "BAD String %d", i);
- res = _stp_map_set_si (map, buf, 100 + i);
- if (res != -1)
- printf("WARNING: During wrap test, got result of %d when expected -1\n", res);
- }
- _stp_map_print (map, "map[%1s] = %d");
-
- /* test addition */
- for (i = 6; i < 10; i++)
- {
- char buf[32];
- sprintf (buf, "String %d", i);
- res = _stp_map_add_si (map, buf, 1000 * i);
- if (res)
- printf("WARNING: During wrap test, got result of %d when expected 0\n", res);
- }
- _stp_map_print (map, "map[%1s] = %d");
-
- /* reset all */
- for (i = 6; i < 10; i++)
- {
- char buf[32];
- sprintf (buf, "String %d", i);
- res = _stp_map_set_si (map, buf, i);
- if (res)
- printf("WARNING: During wrap test, got result of %d when expected 0\n", res);
- }
- _stp_map_print (map, "map[%1s] = %d");
-
- _stp_map_clear(map);
- _stp_map_print (map, "map[%1s] = %d");
-
- _stp_map_del (map);
- return 0;
-}
diff --git a/runtime/tests/maps/size.c b/runtime/tests/maps/size.c
deleted file mode 100644
index 2fb2575c..00000000
--- a/runtime/tests/maps/size.c
+++ /dev/null
@@ -1,103 +0,0 @@
-#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/maps/sort.c b/runtime/tests/maps/sort.c
deleted file mode 100644
index 7ae22206..00000000
--- a/runtime/tests/maps/sort.c
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "runtime.h"
-
-/* test of map sorting */
-#define VALUE_TYPE STRING
-#define KEY1_TYPE INT64
-#define KEY2_TYPE INT64
-#define KEY3_TYPE STRING
-#include "map-gen.c"
-
-#define VALUE_TYPE INT64
-#define KEY1_TYPE STRING
-#define KEY2_TYPE STRING
-#include "map-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- MAP mapiis = _stp_map_new_iiss(10);
-
- /* try to crash the sorts with sorting an empty list */
- _stp_map_sort (mapiis, 0, -1);
- _stp_map_sort (mapiis, 0, 1);
- _stp_map_sortn (mapiis, 3, 0, -1);
- _stp_map_sortn (mapiis, 0, 0, -1);
-
- /* load some test data */
- _stp_map_add_iiss (mapiis, 3,4,"California","Sacramento" );
- _stp_map_set_iiss (mapiis, 5,6,"Washington","Olympia" );
- _stp_map_set_iiss (mapiis, 7,8,"Oregon","Salem" );
- _stp_map_set_iiss (mapiis, 7,8,"Nevada","Carson City" );
- _stp_map_set_iiss (mapiis, 1, 4,"New Mexico","Santa Fe" );
- _stp_map_set_iiss (mapiis, -1,9,"North Carolina","Raleigh" );
- _stp_map_set_iiss (mapiis, 5,5,"Massachusetts","Boston" );
- _stp_map_set_iiss (mapiis, 2,2,"Vermont","Montpelier" );
- _stp_map_set_iiss (mapiis, 8,8,"Iowa","Des Moines" );
- _stp_map_set_iiss (mapiis, 1,2,"Ohio","Columbus" );
-
- _stp_printf("sorting from A-Z on value\n");
- _stp_map_sort (mapiis, 0, -1);
- _stp_map_print (mapiis, "%s -> %1d %2d %3s");
-
- _stp_printf("\nsorting from Z-A on value\n");
- _stp_map_sort (mapiis, 0, 1);
- _stp_map_print (mapiis, "%s -> %1d %2d %3s");
-
- _stp_printf("\nsorting from low to high on key 1\n");
- _stp_map_sort (mapiis, 1, -1);
- _stp_map_print (mapiis, "%1d %2d %3s -> %s");
-
- _stp_printf("\nsorting from high to low on key 1\n");
- _stp_map_sort (mapiis, 1, 1);
- _stp_map_print (mapiis, "%1d %2d %3s -> %s");
-
- _stp_printf("\nsorting from low to high on key 2\n");
- _stp_map_sort (mapiis, 2, -1);
- _stp_map_print (mapiis, "%1d %2d %3s -> %s");
-
- _stp_printf("\nsorting from high to low on key 2\n");
- _stp_map_sort (mapiis, 2, 1);
- _stp_map_print (mapiis, "%1d %2d %3s -> %s");
-
-
- _stp_printf("\nsorting from low to high on key 3\n");
- _stp_map_sort (mapiis, 3, -1);
- _stp_map_print (mapiis, "%3s\t\t%1d %2d -> %s");
-
- _stp_printf("\nsorting from high to low on key 3\n");
- _stp_map_sort (mapiis, 3, 1);
- _stp_map_print (mapiis, "%3s\t\t%1d %2d -> %s");
-
- _stp_printf("\ntop 3 alphabetical by value\n");
- _stp_map_sortn (mapiis, 3, 0, -1);
- _stp_map_printn (mapiis, 3, "%s -> %1d %2d %3s");
-
- _stp_printf("\nbottom 2 alphabetical by value\n");
- _stp_map_sortn (mapiis, 2, 0, 1);
- _stp_map_printn (mapiis, 2, "%s -> %1d %2d %3s");
-
-
- _stp_printf("\ntop 5 sorted by key 1\n");
- _stp_map_sortn (mapiis, 5, 1, 1);
- _stp_map_printn (mapiis, 5, "%1d %2d %3s -> %s");
- _stp_printf("\nbottom 5 sorted by key 1\n");
- _stp_map_sortn (mapiis, 5, 1, -1);
- _stp_map_printn (mapiis, 5, "%1d %2d %3s -> %s");
-
- MAP mapss = _stp_map_new_ssi(4);
- _stp_map_set_ssi (mapss, "Riga", "Latvia", 135786);
- _stp_map_set_ssi (mapss, "Sofia", "Bulgaria", 138740);
- _stp_map_set_ssi (mapss, "Valletta", "Malta", 1);
- _stp_map_set_ssi (mapss, "Nicosia", "Cyprus", -1);
-
- _stp_printf("sorted by population from low to high\n");
- _stp_map_sort (mapss, 0, -1);
- _stp_map_print (mapss, "%1s is the capitol of %2s and the nerd population is %d");
- _stp_printf("sorted by population from high to low\n");
- _stp_map_sort (mapss, 0, 1);
- _stp_map_print (mapss, "%1s is the capitol of %2s and the nerd population is %d");
-
- _stp_map_del(mapss);
- _stp_map_del(mapiis);
-
- return 0;
-}
diff --git a/runtime/tests/maps/sort2.c b/runtime/tests/maps/sort2.c
deleted file mode 100644
index 0b3bc547..00000000
--- a/runtime/tests/maps/sort2.c
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "runtime.h"
-
-/* test of map sorting. Just like sort.c, except test with an odd number of nodes */
-#define VALUE_TYPE STRING
-#define KEY1_TYPE INT64
-#define KEY2_TYPE INT64
-#define KEY3_TYPE STRING
-#include "map-gen.c"
-
-#define VALUE_TYPE INT64
-#define KEY1_TYPE STRING
-#define KEY2_TYPE STRING
-#include "map-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- MAP mapiis = _stp_map_new_iiss(10);
-
- /* try to crash the sorts with sorting an empty list */
- _stp_map_sort (mapiis, 0, -1);
- _stp_map_sort (mapiis, 0, 1);
- _stp_map_sortn (mapiis, 3, 0, -1);
- _stp_map_sortn (mapiis, 0, 0, -1);
-
- /* load some test data */
- _stp_map_add_iiss (mapiis, 3,4,"California","Sacramento" );
- _stp_map_set_iiss (mapiis, 5,6,"Washington","Olympia" );
- _stp_map_set_iiss (mapiis, 7,8,"Oregon","Salem" );
- _stp_map_set_iiss (mapiis, 7,8,"Nevada","Carson City" );
- _stp_map_set_iiss (mapiis, 1, 4,"New Mexico","Santa Fe" );
- _stp_map_set_iiss (mapiis, -1,9,"North Carolina","Raleigh" );
- _stp_map_set_iiss (mapiis, 5,5,"Massachusetts","Boston" );
- _stp_map_set_iiss (mapiis, 8,8,"Iowa","Des Moines" );
- _stp_map_set_iiss (mapiis, 1,2,"Ohio","Columbus" );
-
- _stp_printf("sorting from A-Z on value\n");
- _stp_map_sort (mapiis, 0, -1);
- _stp_map_print (mapiis, "%s -> %1d %2d %3s");
-
- _stp_printf("\nsorting from Z-A on value\n");
- _stp_map_sort (mapiis, 0, 1);
- _stp_map_print (mapiis, "%s -> %1d %2d %3s");
-
- _stp_printf("\nsorting from low to high on key 1\n");
- _stp_map_sort (mapiis, 1, -1);
- _stp_map_print (mapiis, "%1d %2d %3s -> %s");
-
- _stp_printf("\nsorting from high to low on key 1\n");
- _stp_map_sort (mapiis, 1, 1);
- _stp_map_print (mapiis, "%1d %2d %3s -> %s");
-
- _stp_printf("\nsorting from low to high on key 2\n");
- _stp_map_sort (mapiis, 2, -1);
- _stp_map_print (mapiis, "%1d %2d %3s -> %s");
-
- _stp_printf("\nsorting from high to low on key 2\n");
- _stp_map_sort (mapiis, 2, 1);
- _stp_map_print (mapiis, "%1d %2d %3s -> %s");
-
-
- _stp_printf("\nsorting from low to high on key 3\n");
- _stp_map_sort (mapiis, 3, -1);
- _stp_map_print (mapiis, "%3s\t\t%1d %2d -> %s");
-
- _stp_printf("\nsorting from high to low on key 3\n");
- _stp_map_sort (mapiis, 3, 1);
- _stp_map_print (mapiis, "%3s\t\t%1d %2d -> %s");
-
- _stp_printf("\ntop 3 alphabetical by value\n");
- _stp_map_sortn (mapiis, 3, 0, -1);
- _stp_map_printn (mapiis, 3, "%s -> %1d %2d %3s");
-
- _stp_printf("\nbottom 2 alphabetical by value\n");
- _stp_map_sortn (mapiis, 2, 0, 1);
- _stp_map_printn (mapiis, 2, "%s -> %1d %2d %3s");
-
-
- _stp_printf("\ntop 5 sorted by key 1\n");
- _stp_map_sortn (mapiis, 5, 1, 1);
- _stp_map_printn (mapiis, 5, "%1d %2d %3s -> %s");
- _stp_printf("\nbottom 5 sorted by key 1\n");
- _stp_map_sortn (mapiis, 5, 1, -1);
- _stp_map_printn (mapiis, 5, "%1d %2d %3s -> %s");
-
- MAP mapss = _stp_map_new_ssi(5);
- _stp_map_set_ssi (mapss, "Riga", "Latvia", 135786);
- _stp_map_set_ssi (mapss, "Sofia", "Bulgaria", 138740);
- _stp_map_set_ssi (mapss, "Valletta", "Malta", 1);
- _stp_map_set_ssi (mapss, "Nicosia", "Cyprus", -1);
- _stp_map_set_ssi (mapss, "Chisinau", "Moldova", 1024);
-
- _stp_printf("sorted by population from low to high\n");
- _stp_map_sort (mapss, 0, -1);
- _stp_map_print (mapss, "%1s is the capitol of %2s and the nerd population is %d");
- _stp_printf("sorted by population from high to low\n");
- _stp_map_sort (mapss, 0, 1);
- _stp_map_print (mapss, "%1s is the capitol of %2s and the nerd population is %d");
-
- _stp_map_del(mapss);
- _stp_map_del(mapiis);
-
- return 0;
-}
diff --git a/runtime/tests/maps/sort_stat.c b/runtime/tests/maps/sort_stat.c
deleted file mode 100644
index f3f0435e..00000000
--- a/runtime/tests/maps/sort_stat.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include "runtime.h"
-
-/* test of map sorting */
-
-#define VALUE_TYPE STAT
-#define KEY1_TYPE STRING
-#define KEY2_TYPE STRING
-#include "map-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- MAP mapssx = _stp_map_new_ssx (8, HIST_LINEAR, 0, 100, 10 );
- int i,j;
-
- for (i = 0; i < 100; i++)
- for (j = 0; j <= i*10 ; j++ )
- _stp_map_add_ssx (mapssx, "California", "Sacramento", i);
-
- for (i = 0; i < 10; i++)
- for (j = 0; j < 10 ; j++ )
- _stp_map_add_ssx (mapssx, "Washington", "Olympia", j * i );
-
- for (i = 0; i < 100; i += 10)
- for (j = 0; j < i/5 ; j++ )
- _stp_map_add_ssx (mapssx, "Oregon", "Salem", i);
-
- for (i = 0; i < 100; i += 10)
- for (j = 0; j < i/10 ; j++ )
- _stp_map_add_ssx (mapssx, "Nevada", "Carson City", i + j);
-
- for (i = 0; i < 100; i += 10)
- for (j = 0; j < i/20 ; j++ )
- _stp_map_add_ssx (mapssx, "Ohio", "Columbus", 50);
-
- for (i = 0; i < 100; i += 10)
- for (j = 0; j < i/10 ; j++ )
- _stp_map_add_ssx (mapssx, "North Carolina", "Raleigh", 100 - j * i);
-
- for (i = 0; i < 100; i += 10)
- for (j = 0; j < i ; j++ )
- _stp_map_add_ssx (mapssx, "New Mexico", "Santa Fe", 50 - j);
-
-
- _stp_map_print (mapssx, "Bogons per packet for %1s\ncount:%C sum:%S avg:%A min:%m max:%M\n%H");
-
- _stp_printf("SORTED BY COUNT\n");
- _stp_map_sort (mapssx, SORT_COUNT, 1);
- _stp_map_print (mapssx, "%C %1s");
-
- _stp_printf("SORTED BY COUNT (low to high)\n");
- _stp_map_sort (mapssx, SORT_COUNT, -1);
- _stp_map_print (mapssx, "%C %1s");
-
- _stp_printf("SORTED BY SUM\n");
- _stp_map_sort (mapssx, SORT_SUM, 1);
- _stp_map_print (mapssx, "%S %1s");
-
- _stp_printf("SORTED BY SUM (low to high)\n");
- _stp_map_sort (mapssx, SORT_SUM, -1);
- _stp_map_print (mapssx, "%S %1s");
-
- _stp_printf("SORTED BY MIN\n");
- _stp_map_sort (mapssx, SORT_MIN, 1);
- _stp_map_print (mapssx, "%m %1s");
-
- _stp_printf("SORTED BY MIN (low to high)\n");
- _stp_map_sort (mapssx, SORT_MIN, -1);
- _stp_map_print (mapssx, "%m %1s");
-
- _stp_printf("SORTED BY MAX\n");
- _stp_map_sort (mapssx, SORT_MAX, 1);
- _stp_map_print (mapssx, "%M %1s");
-
- _stp_printf("SORTED BY MAX (low to high)\n");
- _stp_map_sort (mapssx, SORT_MAX, -1);
- _stp_map_print (mapssx, "%M %1s");
-
- _stp_printf("SORTED BY AVG\n");
- _stp_map_sort (mapssx, SORT_AVG, 1);
- _stp_map_print (mapssx, "%A %1s");
-
- _stp_printf("SORTED BY AVG (low to high)\n");
- _stp_map_sort (mapssx, SORT_AVG, -1);
- _stp_map_print (mapssx, "%A %1s");
-
- _stp_map_del (mapssx);
- return 0;
-}
diff --git a/runtime/tests/maps/ssssss.c b/runtime/tests/maps/ssssss.c
deleted file mode 100644
index 1cc020b7..00000000
--- a/runtime/tests/maps/ssssss.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "runtime.h"
-
-/* test of maps with keys 5 strings and values of string */
-#define VALUE_TYPE STRING
-#define KEY1_TYPE STRING
-#define KEY2_TYPE STRING
-#define KEY3_TYPE STRING
-#define KEY4_TYPE STRING
-#define KEY5_TYPE STRING
-#include "map-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- struct map_node *ptr;
- MAP map = _stp_map_new_ssssss(4);
-
- _stp_map_set_ssssss (map, "1ABC", "2ABC", "3ABC", "4ABC", "5ABC", "666");
- _stp_map_set_ssssss (map, "1QRS", "2QRS", "3QRS", "4QRS", "5QRS", "777");
- _stp_map_set_ssssss (map, "1abc", "2abc", "3abc", "4abc", "5abc", "888");
- _stp_map_set_ssssss (map, "1XYZ", "2XYZ", "3XYZ", "4XYZ", "5XYZ", "999");
-
- foreach (map, ptr)
- printf ("map[%s, %s, %s, %s, %s] = %s\n",
- _stp_key_get_str(ptr,1),
- _stp_key_get_str(ptr,2),
- _stp_key_get_str(ptr,3),
- _stp_key_get_str(ptr,4),
- _stp_key_get_str(ptr,5),
- _stp_get_str(ptr));
-
-
- _stp_map_print(map,"%1s and %2s and %3s and %4s and %5s ---> %s");
- _stp_map_del (map);
- return 0;
-}
diff --git a/runtime/tests/math/Makefile b/runtime/tests/math/Makefile
deleted file mode 100644
index c396c132..00000000
--- a/runtime/tests/math/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-default: tests
-
-tests:
- tclsh all.tcl
-
diff --git a/runtime/tests/math/all.tcl b/runtime/tests/math/all.tcl
deleted file mode 100644
index 23757202..00000000
--- a/runtime/tests/math/all.tcl
+++ /dev/null
@@ -1,4 +0,0 @@
-package require tcltest
-namespace import -force tcltest::*
-tcltest::testsDirectory [file dir [info script]]
-tcltest::runAllTests
diff --git a/runtime/tests/math/div64.c b/runtime/tests/math/div64.c
deleted file mode 100644
index ed033d5b..00000000
--- a/runtime/tests/math/div64.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/* test of 64-bit division */
-#include "runtime.h"
-#define LLONG_MAX 0x7fffffffffffffffLL
-#ifndef LLONG_MIN
-#define LLONG_MIN 0x8000000000000000LL
-#endif
-
-/* This tests a lot of edge conditions.*/
-/* Then it does 10 million random divisions, comparing the result */
-/* with the results from glibc */
-
-int main()
-{
- int64_t x, y, div1, mod1, div2, mod2;
- const char *error;
- int i;
-
- x = 0;
- y = 0;
- div1 = _stp_div64(&error, x, y);
- if (div1 != 0 || *error != 'd') {
- printf("Failed 0/0 test\n");
- exit(-1);
- }
- error = "";
-
- mod1 = _stp_mod64(&error, x, y);
- if (mod1 != 0 || *error != 'd') {
- printf("Failed 0%0 test\n");
- exit(-1);
- }
- error = "";
-
- x = 1;
- y = 0;
- div1 = _stp_div64(&error, x, y);
- if (div1 != 0 || *error != 'd') {
- printf("Failed 1/0 test\n");
- exit(-1);
- }
- error = "";
-
- mod1 = _stp_mod64(&error, x, y);
- if (mod1 != 0 || *error != 'd') {
- printf("Failed 1%0 test\n");
- exit(-1);
- }
- error = "";
-
- x = 0;
- y = 1;
-
- div1 = _stp_div64(&error, x, y);
- if (*error || div1 != 0) {
- printf("Failed 0/1 test\n");
- exit(-1);
- }
-
- mod1 = _stp_mod64(&error, x, y);
- if (*error || mod1 != 0) {
- printf("Failed 0%1 test\n");
- exit(-1);
- }
-
- x = -1;
- y = -1;
-
- div1 = _stp_div64(&error, x, y);
- if (*error || div1 != 1) {
- printf("Failed -1/-1 test\n");
- exit(-1);
- }
-
- mod1 = _stp_mod64(&error, x, y);
- if (*error || mod1 != 0) {
- printf("Failed -1%-1 test\n");
- exit(-1);
- }
-
-
- for (y = -1; y < 2; y++) {
- if (y == 0)
- continue;
-
-#ifndef __LP64__
- for (x = LONG_MIN - 1LL; x < LONG_MIN + 2LL; x++ ) {
- div1 = _stp_div64(&error, x, y);
- mod1 = _stp_mod64(&error, x, y);
- div2 = x/y;
- mod2 = x%y;
- if (div1 != div2) {
- printf ("%lld/%lld (%llx/%llx) was %lld and should have been %lld\n", x,y,x,y,div1,div2);
- exit (-1);
- }
- if (mod1 != mod2) {
- printf ("%lld\%%%lld (%llx/%llx) was %lld and should have been %lld\n", x,y,x,y,mod1,mod2);
- exit (-1);
- }
- }
-
- for (x = LONG_MAX - 1LL; x < LONG_MAX + 2LL; x++ ) {
- div1 = _stp_div64(&error, x, y);
- mod1 = _stp_mod64(&error, x, y);
- div2 = x/y;
- mod2 = x%y;
- if (div1 != div2) {
- printf ("%lld/%lld (%llx/%llx) was %lld and should have been %lld\n", x,y,x,y,div1,div2);
- exit (-1);
- }
- if (mod1 != mod2) {
- printf ("%lld\%%%lld (%llx/%llx) was %lld and should have been %lld\n", x,y,x,y,mod1,mod2);
- exit (-1);
- }
- }
-#endif
-
- for (x = LLONG_MIN; x <= LLONG_MIN + 1LL; x++ ) {
- div1 = _stp_div64(&error, x, y);
- mod1 = _stp_mod64(&error, x, y);
-#ifdef __LP64__
- if (x == LLONG_MIN && y == -1) {
- if (div1 != LLONG_MIN) {
- printf ("%lld/%lld was %lld and should have been %lld (overflow)\n", x,y,div1,LLONG_MIN);
- exit(-1);
- }
- continue;
- }
-#endif
- div2 = x/y;
- mod2 = x%y;
- if (div1 != div2) {
- printf ("%lld/%lld was %lld and should have been %lld\n", x,y,div1,div2);
- exit (-1);
- }
- if (mod1 != mod2) {
- printf ("%lld\%%%lld was %lld and should have been %lld\n", x,y,mod1,mod2);
- exit (-1);
- }
- }
-
- for (x = LONG_MAX - 1; x > 0 && x <= LONG_MAX; x++ ) {
- div1 = _stp_div64(&error, x, y);
- mod1 = _stp_mod64(&error, x, y);
- div2 = x/y;
- mod2 = x%y;
- if (div1 != div2) {
- printf ("%lld/%lld was %lld and should have been %lld\n", x,y,div1,div2);
- exit (-1);
- }
- if (mod1 != mod2) {
- printf ("%lld\%%%lld was %lld and should have been %lld\n", x,y,mod1,mod2);
- exit (-1);
- }
- }
- }
-
- /* just for fun, do ten million random divisions and mods */
- for (i = 0; i < 10000000; i++) {
- x = mrand48();
- y = mrand48();
- if (y == 0) {
- i--;
- continue;
- }
-
- div1 = _stp_div64(NULL, x, y);
- mod1 = _stp_mod64(NULL, x, y);
- div2 = x/y;
- mod2 = x%y;
-
- if (div1 != div2) {
- printf ("%lld/%lld was %lld and should have been %lld\n", x,y,div1,div2);
- exit (-1);
- }
- if (mod1 != mod2) {
- printf ("%lld\%%%lld was %lld and should have been %lld\n", x,y,mod1,mod2);
- exit (-1);
- }
- }
- printf("OK\n");
- return 0;
-}
diff --git a/runtime/tests/math/math.test b/runtime/tests/math/math.test
deleted file mode 100644
index e7c58ba0..00000000
--- a/runtime/tests/math/math.test
+++ /dev/null
@@ -1,19 +0,0 @@
-package require tcltest
-namespace import -force tcltest::*
-
-cd $tcltest::testsDirectory
-
-set CFLAGS "-Os"
-set KPATH "/lib/modules/[exec uname -r]/build/include"
-set MPATH "/lib/modules/[exec uname -r]/build/include/asm/mach-default"
-set PATH "../../user"
-
-test printf_A {Basic printf test} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test div64.c
-} -body {
- exec ./test
-} -result {OK}
-
-exec rm test
-
-cleanupTests
diff --git a/runtime/tests/pmaps/Makefile b/runtime/tests/pmaps/Makefile
deleted file mode 100644
index c396c132..00000000
--- a/runtime/tests/pmaps/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-default: tests
-
-tests:
- tclsh all.tcl
-
diff --git a/runtime/tests/pmaps/all.tcl b/runtime/tests/pmaps/all.tcl
deleted file mode 100644
index c0b38a0e..00000000
--- a/runtime/tests/pmaps/all.tcl
+++ /dev/null
@@ -1,5 +0,0 @@
-package require tcltest
-namespace import -force tcltest::*
-tcltest::testsDirectory [file dir [info script]]
-tcltest::runAllTests
-
diff --git a/runtime/tests/pmaps/ii.c b/runtime/tests/pmaps/ii.c
deleted file mode 100644
index dfce0a07..00000000
--- a/runtime/tests/pmaps/ii.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "runtime.h"
-
-/* test of pmaps with keys of int64 and value of int64 */
-
-/* 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"
-
-int main ()
-{
- PMAP map = _stp_pmap_new_ii(4);
- int64_t x;
-
- /* 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);
- }
-
- /* read it back out and verify. Use the special get_cpu call to get non-aggregated data */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- x = _stp_pmap_get_cpu_ii (map, 3);
- if (x != _processor_number * _processor_number)
- printf("ERROR: Got %lld when expected %lld\n", x, (long long)(_processor_number * _processor_number));
- x = _stp_pmap_get_cpu_ii (map, 1);
- if (x != _processor_number)
- printf("ERROR: Got %lld when expected %lld\n", x, (long long)_processor_number);
- x = _stp_pmap_get_cpu_ii (map, 2);
- if (x != 10 * _processor_number + 1)
- printf("ERROR: Got %lld when expected %lld\n", x, (long long)(10 * _processor_number + 1));
- x = _stp_pmap_get_cpu_ii (map, 4);
- if (x != 1LL)
- printf("ERROR: Got %lld when expected %lld\n", x, 1LL);
- }
-
- /* now print the per-cpu data */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- printf("CPU #%d\n", _processor_number);
- _stp_pmap_printn_cpu (map,0, "map[%1d] = %d", _processor_number);
- }
- _processor_number = 0;
-
- /* 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
deleted file mode 100644
index 0a28ad87..00000000
--- a/runtime/tests/pmaps/ii2.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "runtime.h"
-
-/* test of maps and pmaps with keys of int64 and value of int64 */
-
-/* Make sure we can cleanly generate both */
-
-#define VALUE_TYPE INT64
-#define KEY1_TYPE INT64
-#include "pmap-gen.c"
-
-#define VALUE_TYPE INT64
-#define KEY1_TYPE INT64
-#include "map-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- MAP map = _stp_map_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 */
- /* 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(pmap, 1, _processor_number);
- _stp_pmap_add_ii(pmap, 2, 10 *_processor_number + 1);
- _stp_pmap_add_ii(pmap, 3, _processor_number * _processor_number);
- _stp_pmap_add_ii(pmap, 4, 1);
- _stp_map_add_ii(map, 1, _processor_number);
- _stp_map_add_ii(map, 2, 10 *_processor_number + 1);
- _stp_map_add_ii(map, 3, _processor_number * _processor_number);
- _stp_map_add_ii(map, 4, 1);
- }
-
- _processor_number = 0;
-
- /* print the aggregated data */
- _stp_map_print(map,"map[%1d] = %d");
- _stp_pmap_print(pmap,"pmap[%1d] = %d");
-
- _stp_map_del (map);
- _stp_pmap_del (pmap);
- return 0;
-}
-
diff --git a/runtime/tests/pmaps/ii3.c b/runtime/tests/pmaps/ii3.c
deleted file mode 100644
index e2dee7a6..00000000
--- a/runtime/tests/pmaps/ii3.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "runtime.h"
-
-/* test of pmaps with keys of int64 and value of int64 */
-
-/* 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"
-
-int main ()
-{
- PMAP map = _stp_pmap_new_ii(4);
- int i;
-
- /* 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;
-
- /* get the data with get calls. this is not very efficient */
- for (i = 1; i < 5; i++)
- printf("map[%d] = %lld\n", i, _stp_pmap_get_ii(map, i));
- printf("\n");
-
- /* do it again. test that the aggregation map got cleared */
- for (i = 1; i < 5; i++)
- printf("map[%d] = %lld\n", i, _stp_pmap_get_ii(map, i));
- printf("\n");
-
- /* print the aggregated data */
- _stp_pmap_print(map,"map[%1d] = %d");
-
- /* delete an entry and repeat */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++)
- _stp_pmap_set_ii(map, 2, 0);
- _processor_number = 0;
-
- for (i = 1; i < 5; i++)
- printf("map[%d] = %lld\n", i, _stp_pmap_get_ii(map, i));
- printf("\n");
-
- _stp_pmap_print(map,"map[%1d] = %d");
-
- _stp_pmap_del (map);
- return 0;
-}
-
diff --git a/runtime/tests/pmaps/is.c b/runtime/tests/pmaps/is.c
deleted file mode 100644
index a97d8b0b..00000000
--- a/runtime/tests/pmaps/is.c
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "runtime.h"
-
-/* test of pmaps with keys of int64 and value of string */
-
-/* It's not clear this would ever be used in the systemtap language.
- It is not clear this would be useful. */
-
-#define VALUE_TYPE STRING
-#define KEY1_TYPE INT64
-#include "pmap-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- PMAP map = _stp_pmap_new_is(4);
- char *x;
- char buf[32];
-
- /* 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++) {
- sprintf(buf, "%d,", _processor_number);
- _stp_pmap_add_is(map, 1, buf);
- sprintf(buf, "%d,", 10 *_processor_number + 1);
- _stp_pmap_add_is(map, 2, buf);
- sprintf(buf, "%d,", _processor_number * _processor_number);
- _stp_pmap_add_is(map, 3, buf);
- _stp_pmap_add_is(map, 4, "1,");
- }
-
- /* read it back out and verify. Use the special get_cpu call to get non-aggregated data */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- x = _stp_pmap_get_cpu_is (map, 3);
- sprintf(buf, "%d,", _processor_number * _processor_number);
- if (strcmp(x, buf))
- printf("ERROR: Got %s when expected %s\n", x, buf);
- x = _stp_pmap_get_cpu_is (map, 1);
- sprintf(buf, "%d,", _processor_number);
- if (strcmp(x, buf))
- printf("ERROR: Got %s when expected %s\n", x, buf);
- x = _stp_pmap_get_cpu_is (map, 4);
- sprintf(buf, "%d,", 1);
- if (strcmp(x, buf))
- printf("ERROR: Got %s when expected %s\n", x, buf);
- x = _stp_pmap_get_cpu_is (map, 2);
- sprintf(buf, "%d,", 10 * _processor_number +1);
- if (strcmp(x, buf))
- printf("ERROR: Got %s when expected %s\n", x, buf);
- }
-
- /* now print the per-cpu data */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- printf("CPU #%d\n", _processor_number);
- _stp_pmap_printn_cpu (map,0, "map[%1d] = %s", _processor_number);
- }
- _processor_number = 0;
-
- /* print the aggregated data */
- _stp_pmap_print(map,"map[%1d] = %s");
-
- _stp_pmap_del (map);
- return 0;
-}
-
diff --git a/runtime/tests/pmaps/ix.c b/runtime/tests/pmaps/ix.c
deleted file mode 100644
index 0eba2d54..00000000
--- a/runtime/tests/pmaps/ix.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "runtime.h"
-
-/* test of pmaps with keys of int64 and value of stat */
-
-#define VALUE_TYPE STAT
-#define KEY1_TYPE INT64
-#include "pmap-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- 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 */
- /* 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_ix(map, 1, _processor_number);
- _stp_pmap_add_ix(map, 2, 10 *_processor_number + 1);
- _stp_pmap_add_ix(map, 3, _processor_number * _processor_number);
- _stp_pmap_add_ix(map, 4, 1);
- }
-
-#if 0
- /* read it back out and verify. Use the special get_cpu call to get non-aggregated data */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- x = _stp_pmap_get_cpu_ix (map, 3);
- if (x != _processor_number * _processor_number)
- printf("ERROR: Got %lld when expected %lld\n", x, (long long)(_processor_number * _processor_number));
- x = _stp_pmap_get_cpu_ix (map, 1);
- if (x != _processor_number)
- printf("ERROR: Got %lld when expected %lld\n", x, (long long)_processor_number);
- x = _stp_pmap_get_cpu_ix (map, 2);
- if (x != 10 * _processor_number + 1)
- printf("ERROR: Got %lld when expected %lld\n", x, (long long)(10 * _processor_number + 1));
- x = _stp_pmap_get_cpu_ix (map, 4);
- if (x != 1LL)
- printf("ERROR: Got %lld when expected %lld\n", x, 1LL);
- }
-#endif
-
- /* now print the per-cpu data */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- printf("CPU #%d\n", _processor_number);
- _stp_pmap_printn_cpu (map,
- 0,
- "map[%1d] = count:%C sum:%S avg:%A min:%m max:%M",
- _processor_number);
- }
- _processor_number = 0;
-
- /* print the aggregated data */
- _stp_pmap_print(map,"map[%1d] = count:%C sum:%S avg:%A min:%m max:%M\n%H");
-
- _stp_pmap_del (map);
- return 0;
-}
-
diff --git a/runtime/tests/pmaps/ix2.c b/runtime/tests/pmaps/ix2.c
deleted file mode 100644
index 638e5226..00000000
--- a/runtime/tests/pmaps/ix2.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "runtime.h"
-
-/* test of pmaps with keys of int64 and value of stat */
-
-#define VALUE_TYPE STAT
-#define KEY1_TYPE INT64
-#include "pmap-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- 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 */
- /* 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_ix(map, 1, _processor_number);
- _stp_pmap_add_ix(map, 2, 10 *_processor_number + 1);
- _stp_pmap_add_ix(map, 3, _processor_number * _processor_number);
- _stp_pmap_add_ix(map, 4, 1);
- }
-
- /* now print the per-cpu data */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- printf("CPU #%d\n", _processor_number);
- _stp_pmap_printn_cpu (map,
- 0,
- "map[%1d] = count:%C sum:%S avg:%A min:%m max:%M",
- _processor_number);
- }
- _processor_number = 0;
-
- /* print the aggregated data */
- _stp_pmap_print(map,"map[%1d] = count:%C sum:%S avg:%A min:%m max:%M\n%H");
-
- /* now use GET */
- for (i = 1; i < 5; i++)
- printf("map[%d] Sum = %lld\n", i, _stp_pmap_get_ix(map, i)->sum);
- printf("\n");
-
- /* delete an entry and repeat */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++)
- _stp_pmap_set_ix(map, 2, 0);
- _processor_number = 0;
-
- /* print the aggregated data */
- _stp_pmap_print(map,"map[%1d] = count:%C sum:%S avg:%A min:%m max:%M\n%H");
-
- /* now use GET */
- for (i = 1; i < 5; i++) {
- stat *sd = _stp_pmap_get_ix(map, i);
- if (sd)
- printf("map[%d] Sum = %lld\n", i, sd->sum);
- }
- printf("\n");
-
- _stp_pmap_del (map);
- return 0;
-}
-
diff --git a/runtime/tests/pmaps/ix_log.c b/runtime/tests/pmaps/ix_log.c
deleted file mode 100644
index 4f3c5503..00000000
--- a/runtime/tests/pmaps/ix_log.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "runtime.h"
-
-/* like ix.c, except use HIST_LOG */
-/* test of pmaps with keys of int64 and value of stat */
-
-#define VALUE_TYPE STAT
-#define KEY1_TYPE INT64
-#include "pmap-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- 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 */
- /* 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_ix(map, 1, _processor_number);
- _stp_pmap_add_ix(map, 2, 10 *_processor_number + 1);
- _stp_pmap_add_ix(map, 3, _processor_number * _processor_number);
- _stp_pmap_add_ix(map, 4, 1);
- }
-
-#if 0
- /* read it back out and verify. Use the special get_cpu call to get non-aggregated data */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- x = _stp_pmap_get_cpu_ix (map, 3);
- if (x != _processor_number * _processor_number)
- printf("ERROR: Got %lld when expected %lld\n", x, (long long)(_processor_number * _processor_number));
- x = _stp_pmap_get_cpu_ix (map, 1);
- if (x != _processor_number)
- printf("ERROR: Got %lld when expected %lld\n", x, (long long)_processor_number);
- x = _stp_pmap_get_cpu_ix (map, 2);
- if (x != 10 * _processor_number + 1)
- printf("ERROR: Got %lld when expected %lld\n", x, (long long)(10 * _processor_number + 1));
- x = _stp_pmap_get_cpu_ix (map, 4);
- if (x != 1LL)
- printf("ERROR: Got %lld when expected %lld\n", x, 1LL);
- }
-#endif
-
- /* now print the per-cpu data */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- printf("CPU #%d\n", _processor_number);
- _stp_pmap_printn_cpu (map,
- 0,
- "map[%1d] = count:%C sum:%S avg:%A min:%m max:%M",
- _processor_number);
- }
- _processor_number = 0;
-
- /* print the aggregated data */
- _stp_pmap_print(map,"map[%1d] = count:%C sum:%S avg:%A min:%m max:%M\n%H");
-
- _stp_pmap_del (map);
- return 0;
-}
-
diff --git a/runtime/tests/pmaps/ix_none.c b/runtime/tests/pmaps/ix_none.c
deleted file mode 100644
index 440b0069..00000000
--- a/runtime/tests/pmaps/ix_none.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "runtime.h"
-
-/* like ix.c, except with no histogram */
-/* test of pmaps with keys of int64 and value of stat */
-
-#define VALUE_TYPE STAT
-#define KEY1_TYPE INT64
-#include "pmap-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- PMAP map = _stp_pmap_new_ix(4, HIST_NONE);
- int64_t x;
-
- /* 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_ix(map, 1, _processor_number);
- _stp_pmap_add_ix(map, 2, 10 *_processor_number + 1);
- _stp_pmap_add_ix(map, 3, _processor_number * _processor_number);
- _stp_pmap_add_ix(map, 4, 1);
- }
-
-#if 0
- /* read it back out and verify. Use the special get_cpu call to get non-aggregated data */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- x = _stp_pmap_get_cpu_ix (map, 3);
- if (x != _processor_number * _processor_number)
- printf("ERROR: Got %lld when expected %lld\n", x, (long long)(_processor_number * _processor_number));
- x = _stp_pmap_get_cpu_ix (map, 1);
- if (x != _processor_number)
- printf("ERROR: Got %lld when expected %lld\n", x, (long long)_processor_number);
- x = _stp_pmap_get_cpu_ix (map, 2);
- if (x != 10 * _processor_number + 1)
- printf("ERROR: Got %lld when expected %lld\n", x, (long long)(10 * _processor_number + 1));
- x = _stp_pmap_get_cpu_ix (map, 4);
- if (x != 1LL)
- printf("ERROR: Got %lld when expected %lld\n", x, 1LL);
- }
-#endif
-
- /* now print the per-cpu data */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- printf("CPU #%d\n", _processor_number);
- _stp_pmap_printn_cpu (map,
- 0,
- "map[%1d] = count:%C sum:%S avg:%A min:%m max:%M",
- _processor_number);
- }
- _processor_number = 0;
-
- /* print the aggregated data */
- _stp_pmap_print(map,"map[%1d] = count:%C sum:%S avg:%A min:%m max:%M\n%H");
-
- _stp_pmap_del (map);
- return 0;
-}
-
diff --git a/runtime/tests/pmaps/map_format.c b/runtime/tests/pmaps/map_format.c
deleted file mode 100644
index b27506e0..00000000
--- a/runtime/tests/pmaps/map_format.c
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "runtime.h"
-
-/* map formatting test. Same as the non-pmap version. Output should be identical */
-
-/* torture test of map formatting */
-#define VALUE_TYPE STRING
-#define KEY1_TYPE INT64
-#define KEY2_TYPE INT64
-#define KEY3_TYPE STRING
-#include "pmap-gen.c"
-
-#define VALUE_TYPE INT64
-#define KEY1_TYPE STRING
-#define KEY2_TYPE STRING
-#include "pmap-gen.c"
-
-#define VALUE_TYPE STAT
-#define KEY1_TYPE STRING
-#define KEY2_TYPE STRING
-#include "pmap-gen.c"
-
-#include "map.c"
-
-void inc_cpu(void)
-{
- _processor_number++;
- if (_processor_number == NR_CPUS)
- _processor_number = 0;
-}
-
-int main ()
-{
- 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" );
- _stp_pmap_set_iiss (mapiis, 5,6,"Washington", "Olympia" );
- _stp_pmap_set_iiss (mapiis, 7,8,"Oregon", "Salem" );
- _stp_pmap_print (mapiis, "%s -> mapiis %1d %2d %3s");
-
- /* test printing of '%' */
- _stp_pmap_print (mapiis, "%s %% %3s");
-
- /* very bad string. don't crash */
- _stp_pmap_print (mapiis, "%s -> mapiis %1s %2s %3d %4d");
-
- 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);
- _stp_pmap_set_ssi (mapss, "Nicosia", "Cyprus", -1);
- _stp_pmap_print (mapss, "The capitol of %1s is %2s and the nerd population is %d");
- _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");
-
- PMAP mapssx = _stp_pmap_new_ssx (4, HIST_LINEAR, 0, 100, 10 );
- int i,j;
-
- for (i = 0; i < 100; i++)
- for (j = 0; j <= i*10 ; j++ ) {
- inc_cpu();
- _stp_pmap_add_ssx (mapssx, "Riga", "Latvia", i);
- }
-
- for (i = 0; i < 10; i++)
- for (j = 0; j < 10 ; j++ ) {
- inc_cpu();
- _stp_pmap_add_ssx (mapssx, "Sofia", "Bulgaria", j * i );
- }
-
- for (i = 0; i < 100; i += 10)
- for (j = 0; j < i/10 ; j++ ) {
- inc_cpu();
- _stp_pmap_add_ssx (mapssx, "Valletta", "Malta", i);
- }
-
- _stp_pmap_print (mapssx, "Bogons per packet for %1s\ncount:%C sum:%S avg:%A min:%m max:%M\n%H");
-
- _stp_pmap_print (mapssx, "%C was the count for %1s, %2s");
-
- /* here's how to print a map without using _stp_pmap_print(). */
- _stp_pmap_agg (mapssx);
- struct map_node *ptr;
- foreach (_stp_pmap_get_agg(mapssx), ptr)
- _stp_printf ("mapssx[%09s,%09s] = %llX\n", key1str(ptr), key2str(ptr), _stp_get_stat(ptr)->sum);
- _stp_print_flush();
-
- _stp_pmap_del (mapssx);
- _stp_pmap_del (mapiis);
- _stp_pmap_del (mapss);
- return 0;
-}
diff --git a/runtime/tests/pmaps/pmap.test b/runtime/tests/pmaps/pmap.test
deleted file mode 100644
index fb5c3d0d..00000000
--- a/runtime/tests/pmaps/pmap.test
+++ /dev/null
@@ -1,678 +0,0 @@
-package require tcltest
-namespace import -force tcltest::*
-
-cd $tcltest::testsDirectory
-
-set CFLAGS "-Os"
-set KPATH "/lib/modules/[exec uname -r]/build/include"
-set MPATH "/lib/modules/[exec uname -r]/build/include/asm/mach-default"
-set PATH "../../user"
-
-test ii {Test of int64 keys and int64 values} -setup {
- puts "gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test ii.c"
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test ii.c
-} -body {
- exec ./test
-} -result {CPU #0
-map[2] = 1
-map[4] = 1
-
-CPU #1
-map[1] = 1
-map[2] = 11
-map[3] = 1
-map[4] = 1
-
-CPU #2
-map[1] = 2
-map[2] = 21
-map[3] = 4
-map[4] = 1
-
-CPU #3
-map[1] = 3
-map[2] = 31
-map[3] = 9
-map[4] = 1
-
-CPU #4
-map[1] = 4
-map[2] = 41
-map[3] = 16
-map[4] = 1
-
-CPU #5
-map[1] = 5
-map[2] = 51
-map[3] = 25
-map[4] = 1
-
-CPU #6
-map[1] = 6
-map[2] = 61
-map[3] = 36
-map[4] = 1
-
-CPU #7
-map[1] = 7
-map[2] = 71
-map[3] = 49
-map[4] = 1
-
-map[2] = 288
-map[4] = 8
-map[1] = 28
-map[3] = 140
-}
-
-test is {Test of int64 keys and string values} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test is.c
-} -body {
- exec ./test
-} -result {CPU #0
-map[1] = 0,
-map[2] = 1,
-map[3] = 0,
-map[4] = 1,
-
-CPU #1
-map[1] = 1,
-map[2] = 11,
-map[3] = 1,
-map[4] = 1,
-
-CPU #2
-map[1] = 2,
-map[2] = 21,
-map[3] = 4,
-map[4] = 1,
-
-CPU #3
-map[1] = 3,
-map[2] = 31,
-map[3] = 9,
-map[4] = 1,
-
-CPU #4
-map[1] = 4,
-map[2] = 41,
-map[3] = 16,
-map[4] = 1,
-
-CPU #5
-map[1] = 5,
-map[2] = 51,
-map[3] = 25,
-map[4] = 1,
-
-CPU #6
-map[1] = 6,
-map[2] = 61,
-map[3] = 36,
-map[4] = 1,
-
-CPU #7
-map[1] = 7,
-map[2] = 71,
-map[3] = 49,
-map[4] = 1,
-
-map[2] = 1,11,21,31,41,51,61,71,
-map[4] = 1,1,1,1,1,1,1,1,
-map[1] = 0,1,2,3,4,5,6,7,
-map[3] = 0,1,4,9,16,25,36,49,
-}
-
-test si {Test of string keys and int64 values} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test si.c
-} -body {
- exec ./test
-} -result {CPU #0
-map[TWO] = 1
-map[FOUR] = 1
-
-CPU #1
-map[ONE] = 1
-map[TWO] = 11
-map[THREE] = 1
-map[FOUR] = 1
-
-CPU #2
-map[ONE] = 2
-map[TWO] = 21
-map[THREE] = 4
-map[FOUR] = 1
-
-CPU #3
-map[ONE] = 3
-map[TWO] = 31
-map[THREE] = 9
-map[FOUR] = 1
-
-CPU #4
-map[ONE] = 4
-map[TWO] = 41
-map[THREE] = 16
-map[FOUR] = 1
-
-CPU #5
-map[ONE] = 5
-map[TWO] = 51
-map[THREE] = 25
-map[FOUR] = 1
-
-CPU #6
-map[ONE] = 6
-map[TWO] = 61
-map[THREE] = 36
-map[FOUR] = 1
-
-CPU #7
-map[ONE] = 7
-map[TWO] = 71
-map[THREE] = 49
-map[FOUR] = 1
-
-map[FOUR] = 8
-map[TWO] = 288
-map[THREE] = 140
-map[ONE] = 28
-}
-
-test ix {Test of int64 keys and stat values} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test ix.c
-} -body {
- exec ./test
-} -result {CPU #0
-map[1] = count:1 sum:0 avg:0 min:0 max:0
-map[2] = count:1 sum:1 avg:1 min:1 max:1
-map[3] = count:1 sum:0 avg:0 min:0 max:0
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #1
-map[1] = count:1 sum:1 avg:1 min:1 max:1
-map[2] = count:1 sum:11 avg:11 min:11 max:11
-map[3] = count:1 sum:1 avg:1 min:1 max:1
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #2
-map[1] = count:1 sum:2 avg:2 min:2 max:2
-map[2] = count:1 sum:21 avg:21 min:21 max:21
-map[3] = count:1 sum:4 avg:4 min:4 max:4
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #3
-map[1] = count:1 sum:3 avg:3 min:3 max:3
-map[2] = count:1 sum:31 avg:31 min:31 max:31
-map[3] = count:1 sum:9 avg:9 min:9 max:9
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #4
-map[1] = count:1 sum:4 avg:4 min:4 max:4
-map[2] = count:1 sum:41 avg:41 min:41 max:41
-map[3] = count:1 sum:16 avg:16 min:16 max:16
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #5
-map[1] = count:1 sum:5 avg:5 min:5 max:5
-map[2] = count:1 sum:51 avg:51 min:51 max:51
-map[3] = count:1 sum:25 avg:25 min:25 max:25
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #6
-map[1] = count:1 sum:6 avg:6 min:6 max:6
-map[2] = count:1 sum:61 avg:61 min:61 max:61
-map[3] = count:1 sum:36 avg:36 min:36 max:36
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #7
-map[1] = count:1 sum:7 avg:7 min:7 max:7
-map[2] = count:1 sum:71 avg:71 min:71 max:71
-map[3] = count:1 sum:49 avg:49 min:49 max:49
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-map[2] = count:8 sum:288 avg:36 min:1 max:71
-value |-------------------------------------------------- count
- 0 |@ 1
- 10 |@ 1
- 20 |@ 1
- 30 |@ 1
- 40 |@ 1
- 50 |@ 1
- 60 |@ 1
- 70 |@ 1
- 80 | 0
- 90 | 0
-
-map[4] = count:8 sum:8 avg:1 min:1 max:1
-value |-------------------------------------------------- count
- 0 |@@@@@@@@ 8
- 10 | 0
- 20 | 0
-
-map[1] = count:8 sum:28 avg:3 min:0 max:7
-value |-------------------------------------------------- count
- 0 |@@@@@@@@ 8
- 10 | 0
- 20 | 0
-
-map[3] = count:8 sum:140 avg:17 min:0 max:49
-value |-------------------------------------------------- count
- 0 |@@@@ 4
- 10 |@ 1
- 20 |@ 1
- 30 |@ 1
- 40 |@ 1
- 50 | 0
- 60 | 0
-
-}
-
-test ix_log {Test of int64 keys and stat values (log histogram)} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test ix_log.c
-} -body {
- exec ./test
-} -result {CPU #0
-map[1] = count:1 sum:0 avg:0 min:0 max:0
-map[2] = count:1 sum:1 avg:1 min:1 max:1
-map[3] = count:1 sum:0 avg:0 min:0 max:0
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #1
-map[1] = count:1 sum:1 avg:1 min:1 max:1
-map[2] = count:1 sum:11 avg:11 min:11 max:11
-map[3] = count:1 sum:1 avg:1 min:1 max:1
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #2
-map[1] = count:1 sum:2 avg:2 min:2 max:2
-map[2] = count:1 sum:21 avg:21 min:21 max:21
-map[3] = count:1 sum:4 avg:4 min:4 max:4
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #3
-map[1] = count:1 sum:3 avg:3 min:3 max:3
-map[2] = count:1 sum:31 avg:31 min:31 max:31
-map[3] = count:1 sum:9 avg:9 min:9 max:9
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #4
-map[1] = count:1 sum:4 avg:4 min:4 max:4
-map[2] = count:1 sum:41 avg:41 min:41 max:41
-map[3] = count:1 sum:16 avg:16 min:16 max:16
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #5
-map[1] = count:1 sum:5 avg:5 min:5 max:5
-map[2] = count:1 sum:51 avg:51 min:51 max:51
-map[3] = count:1 sum:25 avg:25 min:25 max:25
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #6
-map[1] = count:1 sum:6 avg:6 min:6 max:6
-map[2] = count:1 sum:61 avg:61 min:61 max:61
-map[3] = count:1 sum:36 avg:36 min:36 max:36
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #7
-map[1] = count:1 sum:7 avg:7 min:7 max:7
-map[2] = count:1 sum:71 avg:71 min:71 max:71
-map[3] = count:1 sum:49 avg:49 min:49 max:49
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-map[2] = count:8 sum:288 avg:36 min:1 max:71
-value |-------------------------------------------------- count
- 0 | 0
- 1 |@ 1
- 2 | 0
- 4 | 0
- 8 |@@@@@@@ 7
-
-map[4] = count:8 sum:8 avg:1 min:1 max:1
-value |-------------------------------------------------- count
- 0 | 0
- 1 |@@@@@@@@ 8
- 2 | 0
- 4 | 0
-
-map[1] = count:8 sum:28 avg:3 min:0 max:7
-value |-------------------------------------------------- count
- 0 |@ 1
- 1 |@ 1
- 2 |@@ 2
- 4 |@@@@ 4
- 8 | 0
-
-map[3] = count:8 sum:140 avg:17 min:0 max:49
-value |-------------------------------------------------- count
- 0 |@ 1
- 1 |@ 1
- 2 | 0
- 4 |@ 1
- 8 |@@@@@ 5
-
-}
-
-test ix_none {Test of int64 keys and stat values (no histogram)} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test ix_none.c
-} -body {
- exec ./test
-} -result {CPU #0
-map[1] = count:1 sum:0 avg:0 min:0 max:0
-map[2] = count:1 sum:1 avg:1 min:1 max:1
-map[3] = count:1 sum:0 avg:0 min:0 max:0
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #1
-map[1] = count:1 sum:1 avg:1 min:1 max:1
-map[2] = count:1 sum:11 avg:11 min:11 max:11
-map[3] = count:1 sum:1 avg:1 min:1 max:1
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #2
-map[1] = count:1 sum:2 avg:2 min:2 max:2
-map[2] = count:1 sum:21 avg:21 min:21 max:21
-map[3] = count:1 sum:4 avg:4 min:4 max:4
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #3
-map[1] = count:1 sum:3 avg:3 min:3 max:3
-map[2] = count:1 sum:31 avg:31 min:31 max:31
-map[3] = count:1 sum:9 avg:9 min:9 max:9
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #4
-map[1] = count:1 sum:4 avg:4 min:4 max:4
-map[2] = count:1 sum:41 avg:41 min:41 max:41
-map[3] = count:1 sum:16 avg:16 min:16 max:16
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #5
-map[1] = count:1 sum:5 avg:5 min:5 max:5
-map[2] = count:1 sum:51 avg:51 min:51 max:51
-map[3] = count:1 sum:25 avg:25 min:25 max:25
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #6
-map[1] = count:1 sum:6 avg:6 min:6 max:6
-map[2] = count:1 sum:61 avg:61 min:61 max:61
-map[3] = count:1 sum:36 avg:36 min:36 max:36
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #7
-map[1] = count:1 sum:7 avg:7 min:7 max:7
-map[2] = count:1 sum:71 avg:71 min:71 max:71
-map[3] = count:1 sum:49 avg:49 min:49 max:49
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-map[2] = count:8 sum:288 avg:36 min:1 max:71
-
-map[4] = count:8 sum:8 avg:1 min:1 max:1
-
-map[1] = count:8 sum:28 avg:3 min:0 max:7
-
-map[3] = count:8 sum:140 avg:17 min:0 max:49
-
-}
-
-test map_format {Test of map formatting and histograms} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test map_format.c
-} -body {
- exec ./test
-} -result {Columbus -> mapiis 1 2 Ohio
-Salem -> mapiis 7 8 Oregon
-Olympia -> mapiis 5 6 Washington
-Sacramento -> mapiis 3 4 California
-
-Columbus % Ohio
-Salem % Oregon
-Olympia % Washington
-Sacramento % California
-
-Columbus -> mapiis
-Salem -> mapiis
-Olympia -> mapiis
-Sacramento -> mapiis
-
-The capitol of Riga is Latvia and the nerd population is 212063400820736
-The capitol of Sofia is Bulgaria and the nerd population is -2400999087387945352
-The capitol of Nicosia is Cyprus and the nerd population is -1
-The capitol of Valletta is Malta and the nerd population is 1
-
-The capitol of Riga is Latvia and the nerd population is c0dedbad0000
-The capitol of Sofia is Bulgaria and the nerd population is deadf00d12345678
-The capitol of Nicosia is Cyprus and the nerd population is ffffffffffffffff
-The capitol of Valletta is Malta and the nerd population is 1
-
-The capitol of Riga is Latvia and the nerd population is C0DEDBAD0000
-The capitol of Sofia is Bulgaria and the nerd population is DEADF00D12345678
-The capitol of Nicosia is Cyprus and the nerd population is FFFFFFFFFFFFFFFF
-The capitol of Valletta is Malta and the nerd population is 1
-
-Bogons per packet for Riga
-count:49600 sum:3288450 avg:66 min:0 max:99
-value |-------------------------------------------------- count
- 0 |@@ 460
- 10 |@@@@@@@ 1460
- 20 |@@@@@@@@@@@@ 2460
- 30 |@@@@@@@@@@@@@@@@@@ 3460
- 40 |@@@@@@@@@@@@@@@@@@@@@@@ 4460
- 50 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 5460
- 60 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 6460
- 70 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 7460
- 80 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 8460
- 90 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 9460
-
-Bogons per packet for Sofia
-count:100 sum:2025 avg:20 min:0 max:81
-value |-------------------------------------------------- count
- 0 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 42
- 10 |@@@@@@@@@@@@@@@@@ 17
- 20 |@@@@@@@@@@@@@ 13
- 30 |@@@@@@@@@ 9
- 40 |@@@@@@@@@ 9
- 50 |@@@@ 4
- 60 |@@@ 3
- 70 |@@ 2
- 80 |@ 1
- 90 | 0
-
-Bogons per packet for Valletta
-count:45 sum:2850 avg:63 min:10 max:90
-value |-------------------------------------------------- count
- 0 | 0
- 10 |@ 1
- 20 |@@ 2
- 30 |@@@ 3
- 40 |@@@@ 4
- 50 |@@@@@ 5
- 60 |@@@@@@ 6
- 70 |@@@@@@@ 7
- 80 |@@@@@@@@ 8
- 90 |@@@@@@@@@ 9
-
-
-49600 was the count for Riga, Latvia
-100 was the count for Sofia, Bulgaria
-45 was the count for Valletta, Malta
-
-mapssx[ Riga, Latvia] = 322D82
-mapssx[ Sofia, Bulgaria] = 7E9
-mapssx[ Valletta, Malta] = B22}
-
-
-test ii2 {Test of maps and pmaps with int64 keys and int64 values} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test ii2.c
-} -body {
- exec ./test
-} -result {map[2] = 288
-map[4] = 8
-map[1] = 28
-map[3] = 140
-
-pmap[2] = 288
-pmap[4] = 8
-pmap[1] = 28
-pmap[3] = 140
-}
-
-test ii3 {Test of int64 keys and int64 values with GET} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test ii3.c
-} -body {
- exec ./test
-} -result {map[1] = 28
-map[2] = 288
-map[3] = 140
-map[4] = 8
-
-map[1] = 28
-map[2] = 288
-map[3] = 140
-map[4] = 8
-
-map[2] = 288
-map[4] = 8
-map[1] = 28
-map[3] = 140
-
-map[1] = 28
-map[2] = 0
-map[3] = 140
-map[4] = 8
-
-map[4] = 8
-map[1] = 28
-map[3] = 140
-}
-
-test ix2 {Test of int64 keys and sttat values with GET} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test ix2.c
-} -body {
- exec ./test
-} -result {CPU #0
-map[1] = count:1 sum:0 avg:0 min:0 max:0
-map[2] = count:1 sum:1 avg:1 min:1 max:1
-map[3] = count:1 sum:0 avg:0 min:0 max:0
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #1
-map[1] = count:1 sum:1 avg:1 min:1 max:1
-map[2] = count:1 sum:11 avg:11 min:11 max:11
-map[3] = count:1 sum:1 avg:1 min:1 max:1
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #2
-map[1] = count:1 sum:2 avg:2 min:2 max:2
-map[2] = count:1 sum:21 avg:21 min:21 max:21
-map[3] = count:1 sum:4 avg:4 min:4 max:4
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #3
-map[1] = count:1 sum:3 avg:3 min:3 max:3
-map[2] = count:1 sum:31 avg:31 min:31 max:31
-map[3] = count:1 sum:9 avg:9 min:9 max:9
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #4
-map[1] = count:1 sum:4 avg:4 min:4 max:4
-map[2] = count:1 sum:41 avg:41 min:41 max:41
-map[3] = count:1 sum:16 avg:16 min:16 max:16
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #5
-map[1] = count:1 sum:5 avg:5 min:5 max:5
-map[2] = count:1 sum:51 avg:51 min:51 max:51
-map[3] = count:1 sum:25 avg:25 min:25 max:25
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #6
-map[1] = count:1 sum:6 avg:6 min:6 max:6
-map[2] = count:1 sum:61 avg:61 min:61 max:61
-map[3] = count:1 sum:36 avg:36 min:36 max:36
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-CPU #7
-map[1] = count:1 sum:7 avg:7 min:7 max:7
-map[2] = count:1 sum:71 avg:71 min:71 max:71
-map[3] = count:1 sum:49 avg:49 min:49 max:49
-map[4] = count:1 sum:1 avg:1 min:1 max:1
-
-map[2] = count:8 sum:288 avg:36 min:1 max:71
-value |-------------------------------------------------- count
- 0 |@ 1
- 10 |@ 1
- 20 |@ 1
- 30 |@ 1
- 40 |@ 1
- 50 |@ 1
- 60 |@ 1
- 70 |@ 1
- 80 | 0
- 90 | 0
-
-map[4] = count:8 sum:8 avg:1 min:1 max:1
-value |-------------------------------------------------- count
- 0 |@@@@@@@@ 8
- 10 | 0
- 20 | 0
-
-map[1] = count:8 sum:28 avg:3 min:0 max:7
-value |-------------------------------------------------- count
- 0 |@@@@@@@@ 8
- 10 | 0
- 20 | 0
-
-map[3] = count:8 sum:140 avg:17 min:0 max:49
-value |-------------------------------------------------- count
- 0 |@@@@ 4
- 10 |@ 1
- 20 |@ 1
- 30 |@ 1
- 40 |@ 1
- 50 | 0
- 60 | 0
-
-
-map[1] Sum = 28
-map[2] Sum = 288
-map[3] Sum = 140
-map[4] Sum = 8
-
-map[4] = count:8 sum:8 avg:1 min:1 max:1
-value |-------------------------------------------------- count
- 0 |@@@@@@@@ 8
- 10 | 0
- 20 | 0
-
-map[1] = count:8 sum:28 avg:3 min:0 max:7
-value |-------------------------------------------------- count
- 0 |@@@@@@@@ 8
- 10 | 0
- 20 | 0
-
-map[3] = count:8 sum:140 avg:17 min:0 max:49
-value |-------------------------------------------------- count
- 0 |@@@@ 4
- 10 |@ 1
- 20 |@ 1
- 30 |@ 1
- 40 |@ 1
- 50 | 0
- 60 | 0
-
-
-map[1] Sum = 28
-map[3] Sum = 140
-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}
-
-cleanupTests
diff --git a/runtime/tests/pmaps/si.c b/runtime/tests/pmaps/si.c
deleted file mode 100644
index 8b05da74..00000000
--- a/runtime/tests/pmaps/si.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "runtime.h"
-
-/* test of pmaps with keys of string and value of int64 */
-
-/* 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 STRING
-#include "pmap-gen.c"
-
-#include "map.c"
-
-int main ()
-{
- 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 */
- /* different values are stored in each cpu */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- _stp_pmap_add_si(map, "ONE", _processor_number);
- _stp_pmap_add_si(map, "TWO", 10 *_processor_number + 1);
- _stp_pmap_add_si(map, "THREE", _processor_number * _processor_number);
- _stp_pmap_add_si(map, "FOUR", 1);
- }
-
- /* read it back out and verify. Use the special get_cpu call to get non-aggregated data */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- x = _stp_pmap_get_cpu_si (map, "THREE");
- if (x != _processor_number * _processor_number)
- printf("ERROR: Got %lld when expected %lld\n", x, (long long)(_processor_number * _processor_number));
- x = _stp_pmap_get_cpu_si (map, "ONE");
- if (x != _processor_number)
- printf("ERROR: Got %lld when expected %lld\n", x, (long long)_processor_number);
- x = _stp_pmap_get_cpu_si (map, "TWO");
- if (x != 10 * _processor_number + 1)
- printf("ERROR: Got %lld when expected %lld\n", x, (long long)(10 * _processor_number + 1));
- x = _stp_pmap_get_cpu_si (map, "FOUR");
- if (x != 1LL)
- printf("ERROR: Got %lld when expected %lld\n", x, 1LL);
- }
-
- /* now print the per-cpu data */
- for (_processor_number = 0; _processor_number < NR_CPUS; _processor_number++) {
- printf("CPU #%d\n", _processor_number);
- _stp_pmap_printn_cpu (map,0, "map[%1s] = %d", _processor_number);
- }
- _processor_number = 0;
-
- /* print the aggregated data */
- _stp_pmap_print(map,"map[%1s] = %d");
-
- _stp_pmap_del (map);
- return 0;
-}
-
diff --git a/runtime/tests/pmaps/size.c b/runtime/tests/pmaps/size.c
deleted file mode 100644
index be8b4590..00000000
--- a/runtime/tests/pmaps/size.c
+++ /dev/null
@@ -1,72 +0,0 @@
-#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;
-}
-
diff --git a/runtime/tests/string/Makefile b/runtime/tests/string/Makefile
deleted file mode 100644
index c396c132..00000000
--- a/runtime/tests/string/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-default: tests
-
-tests:
- tclsh all.tcl
-
diff --git a/runtime/tests/string/all.tcl b/runtime/tests/string/all.tcl
deleted file mode 100644
index 23757202..00000000
--- a/runtime/tests/string/all.tcl
+++ /dev/null
@@ -1,4 +0,0 @@
-package require tcltest
-namespace import -force tcltest::*
-tcltest::testsDirectory [file dir [info script]]
-tcltest::runAllTests
diff --git a/runtime/tests/string/print_cstr.c b/runtime/tests/string/print_cstr.c
deleted file mode 100644
index 2de0f592..00000000
--- a/runtime/tests/string/print_cstr.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* test of _stp_print_cstr() */
-
-/* use very small buffer size for testing */
-#define STP_PRINT_BUF_LEN 20
-#include "runtime.h"
-
-int main ()
-{
- /* can we see output? */
- _stp_print_cstr("ABCDE\n");
- _stp_print_flush();
-
-
- /* overflow */
- _stp_print_cstr("1234567890123456789012345\n");
- _stp_print_cstr("XYZZY\n");
- _stp_print_flush();
-
- /* small string then overflow string */
- _stp_print_cstr("XYZZY\n");
- _stp_print_cstr("1234567890123456789012345");
- _stp_print_cstr("\n");
- _stp_print_flush();
-
- /* two small string that overflow */
- _stp_print_cstr("abcdefghij");
- _stp_print_cstr("1234567890");
- _stp_print_cstr("\n");
- _stp_print_flush();
-
- /* two small string that overflow */
- _stp_print_cstr("abcdefghij");
- _stp_print_cstr("1234567890X");
- _stp_print_cstr("\n");
- _stp_print_flush();
-
- _stp_print_cstr("12345\n");
- _stp_print_cstr("67890\n");
- _stp_print_cstr("abcde\n");
- _stp_print_flush();
- _stp_print_flush();
- _stp_print_cstr("12345");
- _stp_print_cstr("67890");
- _stp_print_cstr("abcde");
- _stp_print_cstr("fghij");
- _stp_print_cstr("\n");
- _stp_print_flush();
-
- /* null string */
- _stp_print_cstr("");
- _stp_print_flush();
- _stp_print_cstr("");
- _stp_print_cstr("Q\n");
- _stp_print_flush();
- return 0;
-}
diff --git a/runtime/tests/string/printf_A.c b/runtime/tests/string/printf_A.c
deleted file mode 100644
index e6c1a93f..00000000
--- a/runtime/tests/string/printf_A.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* basic printf tests */
-
-/* use very small buffer size for testing */
-#define STP_PRINT_BUF_LEN 20
-#include "runtime.h"
-
-int main ()
-{
- /* can we see output? */
- _stp_printf("ABCDE\n");
- _stp_print_flush();
-
-
- /* overflow */
- _stp_printf("1234567890123456789012345\n");
- _stp_printf("XYZZY\n");
- _stp_print_flush();
-
- /* small string then overflow string */
- _stp_printf("XYZZY\n");
- _stp_printf("1234567890123456789012345");
- _stp_printf("\n");
- _stp_print_flush();
-
- /* two small string that overflow */
- _stp_printf("abcdefghij");
- _stp_printf("1234567890");
- _stp_printf("\n");
- _stp_print_flush();
-
- /* two small string that overflow */
- _stp_printf("abcdefghij");
- _stp_printf("1234567890X");
- _stp_printf("\n");
- _stp_print_flush();
-
- _stp_printf("12345\n");
- _stp_printf("67890\n");
- _stp_printf("abcde\n");
- _stp_print_flush();
- _stp_print_flush();
- _stp_printf("12345");
- _stp_printf("67890");
- _stp_printf("abcde");
- _stp_printf("fghij");
- _stp_printf("\n");
- _stp_print_flush();
-
- /* null string */
- _stp_printf("");
- _stp_print_flush();
- _stp_printf("");
- _stp_printf("Q\n");
- _stp_print_flush();
- return 0;
-}
diff --git a/runtime/tests/string/printf_B.c b/runtime/tests/string/printf_B.c
deleted file mode 100644
index b9bbe170..00000000
--- a/runtime/tests/string/printf_B.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* more printf tests */
-
-/* use very small buffer size for testing */
-#define STP_PRINT_BUF_LEN 20
-#include "runtime.h"
-
-#define LLONG_MAX 9223372036854775807LL
-#define LLONG_MIN (-LLONG_MAX - 1LL)
-
-
-int main ()
-{
- int i;
-
- /* a couple of loops showing continuous output */
- for (i = 0; i < 20; i++)
- _stp_sprintf(_stp_stdout, "i=%d ", i);
- _stp_printf("\n");
- _stp_print_flush();
-
- for (i = 0; i < 5; i++)
- _stp_printf("[%d %d %d] ", i, i*i, i*i*i);
- _stp_printf("\n");
- _stp_print_flush();
-
- int64_t x,y;
- x = LLONG_MAX;
- y = LLONG_MIN;
-
- _stp_printf("%lld ",x);
- _stp_printf("(%llx) ", x);
- _stp_printf("%lld ",y);
- _stp_printf("(%llx) ", y);
- _stp_printf("\n");
- _stp_print_flush();
- return 0;
-}
diff --git a/runtime/tests/string/string.test b/runtime/tests/string/string.test
deleted file mode 100644
index 348b6b1f..00000000
--- a/runtime/tests/string/string.test
+++ /dev/null
@@ -1,89 +0,0 @@
-package require tcltest
-namespace import -force tcltest::*
-
-cd $tcltest::testsDirectory
-
-set CFLAGS "-Os"
-set KPATH "/lib/modules/[exec uname -r]/build/include"
-set MPATH "/lib/modules/[exec uname -r]/build/include/asm/mach-default"
-set PATH "../../user"
-
-test printf_A {Basic printf test} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test printf_A.c
-} -body {
- exec ./test
-} -result {ABCDE
-12345678901234567890XYZZY
-XYZZY
-12345678901234567890
-abcdefghij1234567890
-abcdefghij1234567890X
-12345
-67890
-abcde
-1234567890abcdefghij
-Q}
-
-test printf_B {More printf test} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test printf_B.c
-} -body {
- exec ./test
-} -result {i=0 i=1 i=2 i=3 i=4 i=5 i=6 i=7 i=8 i=9 i=10 i=11 i=12 i=13 i=14 i=15 i=16 i=17 i=18 i=19
-[0 0 0] [1 1 1] [2 4 8] [3 9 27] [4 16 64]
-9223372036854775807 (7fffffffffffffff) -9223372036854775808(8000000000000000) }
-
-test print_cstr {Test of _stp_print_cstr()} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test print_cstr.c
-} -body {
- exec ./test
-} -result {ABCDE
-12345678901234567890XYZZY
-XYZZY
-12345678901234567890
-abcdefghij1234567890
-abcdefghij1234567890X
-12345
-67890
-abcde
-1234567890abcdefghij
-Q}
-
-test string1 {Basic String test} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test string1.c
-} -body {
- exec ./test
-} -result {Hello worldRed HatIntelIBM
-Hello world / Red Hat / Intel / IBM /
-Red Hat Inc.
-Hello world Red Hat
-IntelIBM}
-
-test string2 {More String tests} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test string2.c
-} -body {
- exec ./test
-} -result {ABCDE
-1234567890123456789
-XYZZY
-1234567890123
-abcdefghij123456789
-abcdefghij123456789
-12345
-67890
-abcde
-1234567890abcdefghi
-Q}
-test string3 {Even More String tests} -setup {
- exec gcc $CFLAGS -I $KPATH -I $PATH -I $MPATH -o test string3.c
-} -body {
- exec ./test
-} -result {1234567890abcABCDEvwxyz
-abcde
-1234567890abcde
-1234567890abcdeABCD
-1234567890abcdeABCD
-ABCDEvwxyz}
-
-exec rm test
-
-cleanupTests
diff --git a/runtime/tests/string/string1.c b/runtime/tests/string/string1.c
deleted file mode 100644
index 48773e5f..00000000
--- a/runtime/tests/string/string1.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* test of Strings */
-
-/* use very small buffer size for testing */
-#define STP_PRINT_BUF_LEN 20
-#define STP_NUM_STRINGS 4
-#include "runtime.h"
-
-int main ()
-{
- String str[4];
- int i;
-
- for (i = 0; i < 4; i++)
- str[i] = _stp_string_init (i);
-
- _stp_sprintf(str[0], "Hello world");
- _stp_sprintf(str[1], "Red Hat");
- _stp_sprintf(str[2], "Intel");
- _stp_sprintf(str[3], "IBM");
-
- for (i = 0; i < 4; i++)
- _stp_print(str[i]);
- _stp_print_cstr("\n");
-
- for (i = 0; i < 4; i++) {
- _stp_print(str[i]);
- _stp_print(" / ");
- }
- _stp_print_cstr("\n");
-
- _stp_string_cat_cstr (str[1], " Inc.");
- _stp_print(str[1]);
- _stp_print("\n");
-
- _stp_string_cat_cstr (str[0], " ");
- _stp_string_cat_string (str[0], str[1]);
- _stp_print(str[0]);
- _stp_print("\n");
-
- _stp_sprintf(str[2], "%s\n", _stp_string_ptr(str[3]));
- _stp_print(str[2]);
- _stp_print_flush();
- return 0;
-}
diff --git a/runtime/tests/string/string2.c b/runtime/tests/string/string2.c
deleted file mode 100644
index ccf3997a..00000000
--- a/runtime/tests/string/string2.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* test of Strings */
-
-/* use very small buffer size for testing */
-#define STP_STRING_SIZE 20
-#define STP_NUM_STRINGS 1
-#include "runtime.h"
-
-int main ()
-{
- String str = _stp_string_init (0);
-
- /* can we see output? */
- _stp_sprintf(str, "ABCDE\n");
- _stp_print(str);
-
-
- /* overflow */
- str = _stp_string_init (0);
- _stp_sprintf(str, "1234567890123456789012345\n");
- _stp_sprintf(str, "XYZZY\n");
- _stp_print(str);
- _stp_printf("\n");
-
- /* small string then overflow string */
- str = _stp_string_init (0);
- _stp_sprintf(str,"XYZZY\n");
- _stp_sprintf(str,"1234567890123456789012345");
- _stp_print(str);
- _stp_printf("\n");
-
- /* two small string that overflow */
- str = _stp_string_init (0);
- _stp_sprintf(str,"abcdefghij");
- _stp_sprintf(str,"123456789");
- _stp_print(str);
- _stp_printf("\n");
-
- /* two small string that overflow */
- str = _stp_string_init (0);
- _stp_sprintf(str,"abcdefghij");
- _stp_sprintf(str,"1234567890X");
- _stp_print(str);
- _stp_printf("\n");
-
- str = _stp_string_init (0);
- _stp_sprintf(str,"12345\n");
- _stp_sprintf(str,"67890\n");
- _stp_sprintf(str,"abcde\n");
- _stp_print(str);
-
- str = _stp_string_init (0);
- _stp_sprintf(str,"12345");
- _stp_sprintf(str,"67890");
- _stp_sprintf(str,"abcde");
- _stp_sprintf(str,"fghij");
- _stp_print(str);
- _stp_printf("\n");
-
- /* null string */
- str = _stp_string_init (0);
- _stp_sprintf(str,"");
- _stp_sprintf(str,"");
- _stp_sprintf(str,"Q\n");
- _stp_print(str);
-
- _stp_print_flush();
- return 0;
-}
diff --git a/runtime/tests/string/string3.c b/runtime/tests/string/string3.c
deleted file mode 100644
index 3982a8e1..00000000
--- a/runtime/tests/string/string3.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* test of Strings */
-
-/* use very small buffer size for testing */
-#define STP_STRING_SIZE 20
-#define STP_NUM_STRINGS 4
-#include "runtime.h"
-
-int main ()
-{
- String str[4];
- int i;
-
- for (i = 0; i < 4; i++)
- str[i] = _stp_string_init (i);
-
- _stp_string_cat(str[0], "1234567890");
- _stp_string_cat(str[1], "abc");
- _stp_string_cat(str[2], "ABCDE");
- _stp_string_cat(str[3], "vwxyz");
-
- for (i = 0; i < 4; i++)
- _stp_print(str[i]);
- _stp_print("\n");
-
- _stp_string_cat (str[1], "de");
- _stp_print(str[1]);
- _stp_print("\n");
-
- _stp_string_cat(str[0], str[1]);
- _stp_print(str[0]);
- _stp_print("\n");
-
- _stp_string_cat(str[0], str[2]);
- _stp_print(str[0]);
- _stp_print("\n");
-
- _stp_string_cat(str[0], str[2]);
- _stp_print(str[0]);
- _stp_print("\n");
-
- _stp_sprintf(str[2], "%s\n", _stp_string_ptr(str[3]));
- _stp_print(str[2]);
- _stp_print_flush();
- return 0;
-}