Merge branch 'master' into modified

5 files changed, 63 insertions, 55 deletions

diff --git a/misc/benchmarks/various/cbits_benchmark.cpp b/misc/benchmarks/various/cbits_benchmark.cpp
index dd709db1..1764f556 100644
--- a/misc/benchmarks/various/cbits_benchmark.cpp
+++ b/misc/benchmarks/various/cbits_benchmark.cpp
@@ -5,7 +5,7 @@
 
 enum{ N=1<<22 }; // 4.2 mill.
 #define i_static
-#include <stc/crandom.h>
+#include <stc/crand.h>
 #define i_type cbits
 #define i_len N
 #include <stc/cbits.h>
@@ -39,12 +39,12 @@ int main(int argc, char **argv)
     one_sec_delay();
 
     total = 0;
-    csrandom(seed);
+    csrand(seed);
     current_time = get_time_in_ms();
 
     c_forrange (40 * N)
     {
-        uint64_t r = crandom();
+        uint64_t r = crand();
         bools[r & (N-1)] = r & 1<<29;
     }
 
@@ -66,13 +66,13 @@ int main(int argc, char **argv)
     one_sec_delay();
 
     total = 0;
-    csrandom(seed);
+    csrand(seed);
     current_time = get_time_in_ms();
     bitset<N> bits;
 
     c_forrange (40 * N)
     {
-        uint64_t r = crandom();
+        uint64_t r = crand();
         bits[r & (N-1)] = r & 1<<29;
     }
 
@@ -92,13 +92,13 @@ int main(int argc, char **argv)
     one_sec_delay();
 
     total = 0;
-    csrandom(seed);
+    csrand(seed);
     current_time = get_time_in_ms();
     cbits bits2 = cbits_with_size(N, false);
 
     c_forrange (40 * N)
     {
-        uint64_t r = crandom();
+        uint64_t r = crand();
         cbits_set_value(&bits2, r & (N-1), r & 1<<29);
     }
 
diff --git a/misc/benchmarks/various/csort_bench.c b/misc/benchmarks/various/csort_bench.c
index 97885eb8..d5d7fa7c 100644
--- a/misc/benchmarks/various/csort_bench.c
+++ b/misc/benchmarks/various/csort_bench.c
@@ -9,7 +9,7 @@
 #include <stc/algo/csort.h>
 
 #define ROTL(d,bits) ((d<<(bits)) | (d>>(8*sizeof(d)-(bits))))
-uint64_t random(uint64_t s[3]) {
+uint64_t romutrio(uint64_t s[3]) {
     uint64_t xp = s[0], yp = s[1], zp = s[2];
     s[0] = 15241094284759029579u * zp;
     s[1] = yp - xp; s[1] = ROTL(s[1], 12);
@@ -17,12 +17,18 @@ uint64_t random(uint64_t s[3]) {
     return xp;
 }
 
+static int cmp_int(const void* a, const void* b) {
+    return c_default_cmp((const int*)a, (const int*)b);
+}
+
 void testsort(int *a, int size, const char *desc) {
     clock_t t = clock();
 #ifdef __cplusplus
-        { printf("std::sort: "); std::sort(a, a + size); }
+    printf("std::sort: "); std::sort(a, a + size);
+#elif defined QSORT
+    printf("qsort: "); qsort(a, size, sizeof *a, cmp_int);
 #else
-        { printf("stc_sort: "); csort_int(a, size); }
+    printf("stc_sort: "); csort_int(a, size);
 #endif
     t = clock() - t;
 
@@ -39,7 +45,7 @@ int main(int argc, char *argv[]) {
     if (!a) return -1;
 
     for (i = 0; i < size; i++)
-        a[i] = random(s) & (1U << 30) - 1;
+        a[i] = romutrio(s) & (1U << 30) - 1;
     testsort(a, size, "random");
     for (i = 0; i < 20; i++)
         printf(" %d", (int)a[i]);
diff --git a/misc/benchmarks/various/prng_bench.cpp b/misc/benchmarks/various/prng_bench.cpp
index 6f4e0e47..234e3805 100644
--- a/misc/benchmarks/various/prng_bench.cpp
+++ b/misc/benchmarks/various/prng_bench.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <ctime>
 #include <random>
-#include <stc/crandom.h>
+#include <stc/crand.h>
 
 static inline uint64_t rotl64(const uint64_t x, const int k)
   { return (x << k) | (x >> (64 - k)); }
@@ -122,9 +122,9 @@ using namespace std;
 
 int main(void)
 {
-    enum {N = 2000000000};
+    enum {N = 500000000};
     uint16_t* recipient = new uint16_t[N];
-    static stc64_t rng;
+    static crand_t rng;
     init_state(rng.state, 12345123);
     std::mt19937 mt(12345123);
 
@@ -187,7 +187,7 @@ int main(void)
 
         beg = clock();
         for (size_t i = 0; i < N; i++)
-            recipient[i] = stc64_rand(&rng);
+            recipient[i] = crand_u64(&rng);
         end = clock();
         cout << "stc64:\t\t"
              << (float(end - beg) / CLOCKS_PER_SEC)
diff --git a/misc/benchmarks/various/rust_cmap.c b/misc/benchmarks/various/rust_cmap.c
index 83b7dd19..abdb42b0 100644
--- a/misc/benchmarks/various/rust_cmap.c
+++ b/misc/benchmarks/various/rust_cmap.c
@@ -24,38 +24,40 @@ uint64_t romu_trio(uint64_t s[3]) {
 
 int main()
 {
-    c_auto (cmap_u64, m) {
-        const size_t n = 50000000, 
-                     mask = (1 << 25) - 1,
-                     ms = CLOCKS_PER_SEC/1000; 
-        cmap_u64_reserve(&m, n);
-        printf("STC cmap  n = %" c_ZU ", mask = 0x%" PRIxMAX "\n", n, mask);
-
-        uint64_t rng[3] = {1872361123, 123879177, 87739234}, sum;
-        clock_t now = clock();
-        c_forrange (n) {
-            uint64_t key = romu_trio(rng) & mask;
-            cmap_u64_insert(&m, key, 0).ref->second += 1;
-        }
-        printf("insert  : %" c_ZU "ms  \tsize : %" c_ZU "\n", (clock() - now)/ms, cmap_u64_size(&m));
-
-        now = clock();
-        sum = 0;
-        c_forrange (key, mask + 1) { sum += cmap_u64_contains(&m, key); }
-        printf("lookup  : %" c_ZU "ms  \tsum  : %" c_ZU "\n", (clock() - now)/ms, sum);
-
-        now = clock();
-        sum = 0;
-        c_foreach (i, cmap_u64, m) { sum += i.ref->second; }
-        printf("iterate : %" c_ZU "ms  \tsum  : %" c_ZU "\n", (clock() - now)/ms, sum);
-
-        uint64_t rng2[3] = {1872361123, 123879177, 87739234};
-        now = clock();
-        c_forrange (n) {
-            uint64_t key = romu_trio(rng2) & mask;
-            cmap_u64_erase(&m, key);
-        }
-        printf("remove  : %" c_ZU "ms  \tsize : %" c_ZU "\n", (clock() - now)/ms, cmap_u64_size(&m));
-        printf("press a key:\n"); getchar();
+    cmap_u64 m = {0};
+
+    const size_t n = 50000000, 
+                    mask = (1 << 25) - 1,
+                    ms = CLOCKS_PER_SEC/1000; 
+    cmap_u64_reserve(&m, n);
+    printf("STC cmap  n = %" c_ZU ", mask = 0x%" PRIxMAX "\n", n, mask);
+
+    uint64_t rng[3] = {1872361123, 123879177, 87739234}, sum;
+    clock_t now = clock();
+    c_forrange (n) {
+        uint64_t key = romu_trio(rng) & mask;
+        cmap_u64_insert(&m, key, 0).ref->second += 1;
     }
+    printf("insert  : %" c_ZU "ms  \tsize : %" c_ZU "\n", (clock() - now)/ms, cmap_u64_size(&m));
+
+    now = clock();
+    sum = 0;
+    c_forrange (key, mask + 1) { sum += cmap_u64_contains(&m, key); }
+    printf("lookup  : %" c_ZU "ms  \tsum  : %" c_ZU "\n", (clock() - now)/ms, sum);
+
+    now = clock();
+    sum = 0;
+    c_foreach (i, cmap_u64, m) { sum += i.ref->second; }
+    printf("iterate : %" c_ZU "ms  \tsum  : %" c_ZU "\n", (clock() - now)/ms, sum);
+
+    uint64_t rng2[3] = {1872361123, 123879177, 87739234};
+    now = clock();
+    c_forrange (n) {
+        uint64_t key = romu_trio(rng2) & mask;
+        cmap_u64_erase(&m, key);
+    }
+    printf("remove  : %" c_ZU "ms  \tsize : %" c_ZU "\n", (clock() - now)/ms, cmap_u64_size(&m));
+    printf("press a key:\n"); getchar();
+
+    cmap_u64_drop(&m);
 }
diff --git a/misc/benchmarks/various/sso_bench.cpp b/misc/benchmarks/various/sso_bench.cpp
index 0fffef7a..993ff1bb 100644
--- a/misc/benchmarks/various/sso_bench.cpp
+++ b/misc/benchmarks/various/sso_bench.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <chrono>
 
-#include <stc/crandom.h>
+#include <stc/crand.h>
 #include <stc/cstr.h>
 
 #define i_type StcVec
@@ -30,7 +30,7 @@ static inline std::string randomString_STD(int strsize) {
     char* p = &s[0];
     union { uint64_t u8; uint8_t b[8]; } r;
     for (int i = 0; i < strsize; ++i) {
-        if ((i & 7) == 0) r.u8 = crandom() & 0x3f3f3f3f3f3f3f3f;
+        if ((i & 7) == 0) r.u8 = crand() & 0x3f3f3f3f3f3f3f3f;
         p[i] = CHARS[r.b[i & 7]];
     }
     return s;
@@ -41,7 +41,7 @@ static inline cstr randomString_STC(int strsize) {
     char* p = cstr_data(&s);
     union { uint64_t u8; uint8_t b[8]; } r;
     for (int i = 0; i < strsize; ++i) {
-        if ((i & 7) == 0) r.u8 = crandom() & 0x3f3f3f3f3f3f3f3f;
+        if ((i & 7) == 0) r.u8 = crand() & 0x3f3f3f3f3f3f3f3f;
         p[i] = CHARS[r.b[i & 7]];
     }
     return s;
@@ -85,7 +85,7 @@ int main() {
 
     // VECTOR WITH STRINGS
 
-    csrandom(seed);
+    csrand(seed);
     sum = 0, n = 0;
     std::cerr << "\nstrsize\tmsecs\tstd::vector<std::string>, size=" << BENCHMARK_SIZE << "\n";
     for (int strsize = 1; strsize <= MAX_STRING_SIZE; strsize += 2) {
@@ -95,7 +95,7 @@ int main() {
     }
     std::cout << "Avg:\t" << sum/n << '\n';
 
-    csrandom(seed);
+    csrand(seed);
     sum = 0, n = 0;
     std::cerr << "\nstrsize\tmsecs\tcvec<cstr>, size=" << BENCHMARK_SIZE << "\n";
     for (int strsize = 1; strsize <= MAX_STRING_SIZE; strsize += 2) {
@@ -108,7 +108,7 @@ int main() {
 
     // SORTED SET WITH STRINGS
     
-    csrandom(seed);
+    csrand(seed);
     sum = 0, n = 0;
     std::cerr << "\nstrsize\tmsecs\tstd::set<std::string>, size=" << BENCHMARK_SIZE/16 << "\n";
     for (int strsize = 1; strsize <= MAX_STRING_SIZE; strsize += 2) {
@@ -118,7 +118,7 @@ int main() {
     }
     std::cout << "Avg:\t" << sum/n << '\n';
 
-    csrandom(seed);
+    csrand(seed);
     sum = 0, n = 0;
     std::cerr << "\nstrsize\tmsecs\tcsset<cstr>, size=" << BENCHMARK_SIZE/16 << "\n";
     for (int strsize = 1; strsize <= MAX_STRING_SIZE; strsize += 2) {