diff --git a/.clang-format b/.clang-format index 3013d6f..dcdb881 100644 --- a/.clang-format +++ b/.clang-format @@ -102,7 +102,7 @@ PointerAlignment: Right ContinuationIndentWidth: 2 IndentWidth: 2 TabWidth: 2 -ColumnLimit: 80 +ColumnLimit: 160 UseTab: Never SpaceAfterCStyleCast: false IncludeBlocks: Regroup diff --git a/examples/ex_3.c b/examples/ex_3.c index dc73b53..c3e9a9c 100644 --- a/examples/ex_3.c +++ b/examples/ex_3.c @@ -70,74 +70,39 @@ main(void) { int i = 0; rnd_ctx_t prng; - int array[1024] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, - 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, - 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, - 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, - 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, - 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, - 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, - 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, - 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, - 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, - 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, - 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, - 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, - 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, - 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, - 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, - 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, - 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, - 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, - 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, - 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, - 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, - 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, - 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, - 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, - 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, - 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, - 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, - 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, 604, - 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, - 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, - 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, - 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, - 665, 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, - 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, - 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, - 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, - 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, - 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, 754, - 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, - 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, - 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, - 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, - 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, 826, 827, 828, 829, - 830, 831, 832, 833, 834, 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, - 845, 846, 847, 848, 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, - 860, 861, 862, 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, - 875, 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, 886, 887, 888, 889, - 890, 891, 892, 893, 894, 895, 896, 897, 898, 899, 900, 901, 902, 903, 904, - 905, 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, - 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, 933, 934, - 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, 948, 949, - 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, - 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 975, 976, 977, 978, 979, - 980, 981, 982, 983, 984, 985, 986, 987, 988, 989, 990, 991, 992, 993, 994, - 995, 996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, - 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, - 1020, 1021, 1022, 1023, 1024 }; + int array[1024] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, + 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, + 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, + 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, + 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, + 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, + 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, + 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, + 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, + 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, + 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, + 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, + 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, + 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, + 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, + 609, 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, + 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, + 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, + 702, 703, 704, 705, 706, 707, 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, + 733, 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, + 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, + 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, + 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, 846, 847, 848, 849, 850, 851, 852, 853, 854, 855, 856, + 857, 858, 859, 860, 861, 862, 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, 886, 887, + 888, 889, 890, 891, 892, 893, 894, 895, 896, 897, 898, 899, 900, 901, 902, 903, 904, 905, 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, 918, + 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, 948, 949, + 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 975, 976, 977, 978, 979, 980, + 981, 982, 983, 984, 985, 986, 987, 988, 989, 990, 991, 992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, + 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024 }; // disable buffering setbuf(stderr, 0); diff --git a/examples/ex_4.c b/examples/ex_4.c new file mode 100644 index 0000000..ac1bc84 --- /dev/null +++ b/examples/ex_4.c @@ -0,0 +1,329 @@ +#include +#include +#include +#include +#include +#include +#include + +#include "../include/sparsemap.h" + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wvariadic-macros" +#define __diag(...) \ + do { \ + fprintf(stderr, "%s:%d:%s(): ", __FILE__, __LINE__, __func__); \ + fprintf(stderr, __VA_ARGS__); \ + } while (0) +#pragma GCC diagnostic pop + +#define SEED + +uint32_t +xorshift(int *state) +{ + if (!state) { + return 0; + } + // Xorshift algorithm + uint32_t x = *state; // Dereference state to get the current state value + if (x == 0) x = 123456789; // Ensure the state is never zero; use a default seed if so + x ^= x << 13; + x ^= x >> 17; + x ^= x << 5; + *state = x; // Update the state + return x; // Return the new state as the next pseudo-random number +} + +void +shuffle(int *array, size_t n, int *prng) +{ + size_t i, j; + + if (n > 1) { + for (i = n - 1; i > 0; i--) { + j = (unsigned int)(xorshift(prng) % (i + 1)); + // XOR swap algorithm + if (i != j) { // avoid self-swap leading to zero-ing the element + array[i] = array[i] ^ array[j]; + array[j] = array[i] ^ array[j]; + array[i] = array[i] ^ array[j]; + } + } + } +} + +int +compare_ints(const void *a, const void *b) +{ + return *(const int *)a - *(const int *)b; +} + +// Check if there's already a sequence of 'r' sequential integers +int has_sequential_set(int *a, size_t l, int r) { + int count = 1; // Start with a count of 1 for the first number + for (size_t i = 1; i < l; ++i) { + if (a[i] - a[i - 1] == 1) { // Check if the current and previous elements are sequential + count++; + if (count >= r) return 1; // Found a sequential set of length 'r' + } else { + count = 1; // Reset count if the sequence breaks + } + } + return 0; // No sequential set of length 'r' found +} + +// Function to ensure an array contains a set of 'r' sequential integers +void ensure_sequential_set(int *a, size_t l, int r, uint32_t *prng) { + if (r > l) return; // If 'r' is greater than array length, cannot satisfy the condition + + // Sort the array to check for existing sequences + qsort(a, l, sizeof(int), compare_ints); + + // Check if a sequential set of length 'r' already exists + if (has_sequential_set(a, l, r)) { + return; // Sequence already exists, no modification needed + } + + // Find the minimum and maximum values in the array + int min_value = a[0]; + int max_value = a[l - 1]; + + // Generate a random value between min_value and max_value + int value = xorshift(prng) % (max_value - min_value - r + 1); + + // Generate a random location between 0 and l - r + int offset = xorshift(prng) % (l + r + 1); + + // Adjust the array to include a sequential set of 'r' integers at the random offset + for (int i = 0; i < r; ++i) { + a[i + offset] = value + i; + } +} + +void +print_array(int *array, size_t l) +{ + int a[l]; + memcpy(a, array, sizeof(int) * l); + qsort(a, l, sizeof(int), compare_ints); + + printf("int a[] = {"); + for (int i = 0; i < l; i++) { + printf("%d", a[i]); + if (i != l) { + printf(", "); + } + } + printf("};\n"); +} + +bool +has_span(sparsemap_t *map, int *array, size_t l, size_t n) +{ + if (n == 0 || l == 0 || n > l) { + return false; + } + + int sorted[l]; + memcpy(sorted, array, sizeof(int) * l); + qsort(sorted, l, sizeof(int), compare_ints); + + for (size_t i = 0; i <= l - n; i++) { + if (sorted[i] + n - 1 == sorted[i + n - 1]) { +#if 0 + fprintf(stderr, "Found span: "); + for (size_t j = i; j < i + n; j++) { + fprintf(stderr, "%d ", sorted[j]); + } + fprintf(stderr, "\n"); +#endif + for (size_t j = 0; j < n; j++) { + size_t pos = sorted[j + i]; + bool set = sparsemap_is_set(map, pos); + assert(set); + } + __diag("Found span: [%d, %d], length: %zu\n", sorted[i], sorted[i + n - 1], n); + return true; + } + } + + return false; +} + +bool +is_span(int *array, size_t n, int x, int l) +{ + if (n == 0 || l < 0) { + return false; + } + + int a[n]; + memcpy(a, array, sizeof(int) * n); + qsort(a, n, sizeof(int), compare_ints); + + // Iterate through the array to find a span starting at x of length l + for (size_t i = 0; i < n; i++) { + if (a[i] == x) { + // Check if the span can fit in the array + if (i + l - 1 < n && a[i + l - 1] == x + l - 1) { + return true; // Found the span + } + } + } + return false; // Span not found +} + +void +print_spans(int *array, size_t n) +{ + int a[n]; + size_t start = 0, end = 0; + + if (n == 0) { + fprintf(stderr, "Array is empty\n"); + return; + } + + memcpy(a, array, sizeof(int) * n); + qsort(a, n, sizeof(int), compare_ints); + + for (size_t i = 1; i < n; i++) { + if (a[i] == a[i - 1] + 1) { + end = i; // Extend the span + } else { + // Print the current span + if (start == end) { + fprintf(stderr, "[%d] ", a[start]); + } else { + fprintf(stderr, "[%d, %d] ", a[start], a[end]); + } + // Move to the next span + start = i; + end = i; + } + } + + // Print the last span if needed + if (start == end) { + fprintf(stderr, "[%d]\n", a[start]); + } else { + fprintf(stderr, "[%d, %d]\n", a[start], a[end]); + } +} + +bool +was_set(size_t bit, const int array[]) +{ + for (int i = 0; i < 1024; i++) { + if (array[i] == (int)bit) { + return true; + } + } + return false; +} + +#define TEST_ARRAY_SIZE 1024 + +int +is_unique(int a[], size_t l, int value) { + for (size_t i = 0; i < l; ++i) { + if (a[i] == value) { + return 0; // Not unique + } + } + return 1; // Unique +} + +void +setup_test_array(int a[], size_t l, int max_value, int *prng) +{ + if (a == NULL || prng == NULL || max_value < 0) return; // Basic error handling and validation + + for (size_t i = 0; i < l; ++i) { + int candidate; + do { + candidate = xorshift(prng) % (max_value + 1); // Generate a new value within the specified range + } while (!is_unique(a, i, candidate)); // Repeat until a unique value is found + a[i] = candidate; // Assign the unique value to the array + } +} + +int +main(void) +{ + int i = 0; + size_t rank; + int array[TEST_ARRAY_SIZE]; + int prng; + +// seed the PRNG +#ifdef SEED + prng = 8675309; +#else + prng = (unsigned int)time(NULL) ^ getpid(); +#endif + + // disable buffering + setvbuf(stdout, NULL, _IONBF, 0); // Disable buffering for stdout + setvbuf(stderr, NULL, _IONBF, 0); // Disable buffering for stdout + + // start with a 3KiB buffer, TEST_ARRAY_SIZE bits + uint8_t *buf = calloc(3 * 1024, sizeof(uint8_t)); + + // create the sparse bitmap + sparsemap_t *map = sparsemap(buf, sizeof(uint8_t) * 3 * 1024, 0); + + // create an array of ints + setup_test_array(array, TEST_ARRAY_SIZE, 1024 * 3, &prng); + + // randomize setting the bits on + shuffle(array, TEST_ARRAY_SIZE, &prng); + //print_array(array, TEST_ARRAY_SIZE); + //print_spans(array, TEST_ARRAY_SIZE); + + // set all the bits on in a random order + for (i = 0; i < TEST_ARRAY_SIZE; i++) { + sparsemap_set(map, array[i], true); + assert(sparsemap_is_set(map, array[i]) == true); + } + + // for (size_t len = 1; len < 20; len++) { + // for (size_t len = 1; len < TEST_ARRAY_SIZE - 1; len++) { + // for (size_t len = 1; len <= 1; len++) { + // for (size_t len = 2; len <= 2; len++) { + // for (size_t len = 3; len <= 3; len++) { + // for (size_t len = 4; len <= 4; len++) { + // for (size_t len = 5; len <= 5; len++) { + // for (size_t len = 8; len <= 8; len++) { + for (size_t len = 372; len <= 372; len++) { + __diag("================> %lu\n", len); + sparsemap_clear(map); + // set all the bits on in a random order + ensure_sequential_set(array, TEST_ARRAY_SIZE, len, &prng); + shuffle(array, TEST_ARRAY_SIZE, &prng); + print_spans(array, TEST_ARRAY_SIZE); + for (i = 0; i < TEST_ARRAY_SIZE; i++) { + sparsemap_set(map, array[i], true); + assert(sparsemap_is_set(map, array[i]) == true); + } + has_span(map, array, TEST_ARRAY_SIZE, len); + size_t l = sparsemap_span(map, 0, len); + if (l != (size_t)-1) { + __diag("Found span in map starting at %lu of length %lu\n", l, len); + __diag("is_span(%lu, %lu) == %s\n", l, len, is_span(array, TEST_ARRAY_SIZE, l, len) ? "yes" : "no"); + i = (int)l; + do { + bool set = sparsemap_is_set(map, i); + if (set) { + __diag("verified %d was set\n", i); + } else { + __diag("darn, %d was not really set, %s\n", i, was_set(i, array) ? "but we thought it was" : "because it wasn't"); + } + } while (++i < l + len); + } else { + __diag("UNABLE TO FIND SPAN in map of length %lu\n", len); + } + } + return 0; +} diff --git a/include/sparsemap.h b/include/sparsemap.h index 23d32b9..ce431cc 100644 --- a/include/sparsemap.h +++ b/include/sparsemap.h @@ -105,8 +105,7 @@ sm_idx_t sparsemap_get_start_offset(sparsemap_t *map); size_t sparsemap_get_size(sparsemap_t *map); /* Decompresses the whole bitmap; calls scanner for all bits. */ -void sparsemap_scan(sparsemap_t *map, void (*scanner)(sm_idx_t[], size_t), - size_t skip); +void sparsemap_scan(sparsemap_t *map, void (*scanner)(sm_idx_t[], size_t), size_t skip); /* Appends all chunk maps from |map| starting at |sstart| to |other|, then reduces the chunk map-count appropriately. */ @@ -118,4 +117,6 @@ size_t sparsemap_select(sparsemap_t *map, size_t n); /* Counts the set bits in the range [offset, idx]. */ size_t sparsemap_rank(sparsemap_t *map, size_t offset, size_t idx); +size_t sparsemap_span(sparsemap_t *map, size_t loc, size_t len); + #endif diff --git a/main b/main deleted file mode 100755 index 83e3a1b..0000000 Binary files a/main and /dev/null differ diff --git a/src/sparsemap.c b/src/sparsemap.c index 8ec8eea..8cfeaca 100644 --- a/src/sparsemap.c +++ b/src/sparsemap.c @@ -17,23 +17,20 @@ #include #include +#include +#include #include #include #include -#include -#include - #ifdef SPARSEMAP_DIAGNOSTIC #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wpedantic" #pragma GCC diagnostic ignored "-Wvariadic-macros" #include -#define __sm_diag(format, ...) \ - __sm_diag_(__FILE__, __LINE__, __func__, format, ##__VA_ARGS__) +#define __sm_diag(format, ...) __sm_diag_(__FILE__, __LINE__, __func__, format, ##__VA_ARGS__) #pragma GCC diagnostic pop -void __attribute__((format(printf, 4, 5))) __sm_diag_(const char *file, - int line, const char *func, const char *format, ...) +void __attribute__((format(printf, 4, 5))) __sm_diag_(const char *file, int line, const char *func, const char *format, ...) { va_list args; va_start(args, format); @@ -47,10 +44,9 @@ void __attribute__((format(printf, 4, 5))) __sm_diag_(const char *file, #ifndef SPARSEMAP_ASSERT #define SPARSEMAP_ASSERT -#define __sm_assert(expr) \ - if (!(expr)) \ - fprintf(stderr, "%s:%d:%s(): assertion failed! %s", __FILE__, __LINE__, \ - __func__, #expr) +#define __sm_assert(expr) \ + if (!(expr)) \ + fprintf(stderr, "%s:%d:%s(): assertion failed! %s", __FILE__, __LINE__, __func__, #expr) #else #define __sm_assert(expr) ((void)0) #endif @@ -59,7 +55,7 @@ enum __SM_CHUNK_INFO { /* metadata overhead: 4 bytes for __sm_chunk_t count */ SM_SIZEOF_OVERHEAD = sizeof(uint32_t), - /* number of bits that can be stored in a BitVector */ + /* number of bits that can be stored in a sm_bitvec_t */ SM_BITS_PER_VECTOR = (sizeof(sm_bitvec_t) * 8), /* number of flags that can be stored in a single index byte */ @@ -137,8 +133,7 @@ static size_t __sm_chunk_map_get_position(__sm_chunk_t *map, size_t bv) { // handle 4 indices (1 byte) at a time - size_t num_bytes = bv / - ((size_t)SM_FLAGS_PER_INDEX_BYTE * SM_BITS_PER_VECTOR); + size_t num_bytes = bv / ((size_t)SM_FLAGS_PER_INDEX_BYTE * SM_BITS_PER_VECTOR); size_t position = 0; register uint8_t *p = (uint8_t *)map->m_data; @@ -148,8 +143,7 @@ __sm_chunk_map_get_position(__sm_chunk_t *map, size_t bv) bv -= num_bytes * SM_FLAGS_PER_INDEX_BYTE; for (size_t i = 0; i < bv; i++) { - size_t flags = ((*map->m_data) & ((sm_bitvec_t)SM_FLAG_MASK << (i * 2))) >> - (i * 2); + size_t flags = ((*map->m_data) & ((sm_bitvec_t)SM_FLAG_MASK << (i * 2))) >> (i * 2); if (flags == SM_PAYLOAD_MIXED) { position++; } @@ -161,7 +155,7 @@ __sm_chunk_map_get_position(__sm_chunk_t *map, size_t bv) /** * Initialize __sm_chunk_t with provided data. */ -static void +static inline void __sm_chunk_map_init(__sm_chunk_t *map, uint8_t *data) { map->m_data = (sm_bitvec_t *)data; @@ -234,8 +228,7 @@ __sm_chunk_map_is_empty(__sm_chunk_t *map) for (size_t i = 0; i < sizeof(sm_bitvec_t); i++, p++) { if (*p) { for (int j = 0; j < SM_FLAGS_PER_INDEX_BYTE; j++) { - size_t flags = ((*p) & ((sm_bitvec_t)SM_FLAG_MASK << (j * 2))) >> - (j * 2); + size_t flags = ((*p) & ((sm_bitvec_t)SM_FLAG_MASK << (j * 2))) >> (j * 2); if (flags != SM_PAYLOAD_NONE && flags != SM_PAYLOAD_ZEROS) { return (false); } @@ -273,8 +266,7 @@ __sm_chunk_map_is_set(__sm_chunk_t *map, size_t idx) __sm_assert(bv < SM_FLAGS_PER_INDEX); /* now retrieve the flags of that sm_bitvec_t */ - size_t flags = ((*map->m_data) & ((sm_bitvec_t)SM_FLAG_MASK << (bv * 2))) >> - (bv * 2); + size_t flags = ((*map->m_data) & ((sm_bitvec_t)SM_FLAG_MASK << (bv * 2))) >> (bv * 2); switch (flags) { case SM_PAYLOAD_ZEROS: case SM_PAYLOAD_NONE: @@ -302,16 +294,14 @@ __sm_chunk_map_is_set(__sm_chunk_t *map, size_t idx) * this time with |retried| = true. */ static int -__sm_chunk_map_set(__sm_chunk_t *map, size_t idx, bool value, size_t *pos, - sm_bitvec_t *fill, bool retried) +__sm_chunk_map_set(__sm_chunk_t *map, size_t idx, bool value, size_t *pos, sm_bitvec_t *fill, bool retried) { /* In which sm_bitvec_t is |idx| stored? */ size_t bv = idx / SM_BITS_PER_VECTOR; __sm_assert(bv < SM_FLAGS_PER_INDEX); /* Now retrieve the flags of that sm_bitvec_t. */ - size_t flags = ((*map->m_data) & ((sm_bitvec_t)SM_FLAG_MASK << (bv * 2))) >> - (bv * 2); + size_t flags = ((*map->m_data) & ((sm_bitvec_t)SM_FLAG_MASK << (bv * 2))) >> (bv * 2); assert(flags != SM_PAYLOAD_NONE); if (flags == SM_PAYLOAD_ZEROS) { /* Easy - set bit to 0 in a sm_bitvec_t of zeroes. */ @@ -381,11 +371,11 @@ __sm_chunk_map_set(__sm_chunk_t *map, size_t idx, bool value, size_t *pos, } /** - * Returns the index of the 'nth' set bit; sets |*pnew_n| to 0 if the + * Returns the index of the n'th set bit; sets |*pnew_n| to 0 if the * n'th bit was found in this __sm_chunk_t, or to the new, reduced value of |n| */ static size_t -__sm_chunk_map_select(__sm_chunk_t *map, ssize_t n, ssize_t *pnew_n) +__sm_chunk_map_select(__sm_chunk_t *map, size_t n, ssize_t *pnew_n) { size_t ret = 0; register uint8_t *p; @@ -417,8 +407,7 @@ __sm_chunk_map_select(__sm_chunk_t *map, ssize_t n, ssize_t *pnew_n) return (ret + n); } if (flags == SM_PAYLOAD_MIXED) { - sm_bitvec_t w = map->m_data[1 + - __sm_chunk_map_get_position(map, i * SM_FLAGS_PER_INDEX_BYTE + j)]; + sm_bitvec_t w = map->m_data[1 + __sm_chunk_map_get_position(map, i * SM_FLAGS_PER_INDEX_BYTE + j)]; for (int k = 0; k < SM_BITS_PER_VECTOR; k++) { if (w & ((sm_bitvec_t)1 << k)) { if (n == 0) { @@ -433,15 +422,15 @@ __sm_chunk_map_select(__sm_chunk_t *map, ssize_t n, ssize_t *pnew_n) } } - *pnew_n = n; + *pnew_n = (ssize_t)n; return (ret); } /** - * Counts the set bits in the range [0, idx]. + * Counts the set bits in the range [first, last] inclusive. */ static size_t -__sm_chunk_map_rank(__sm_chunk_t *map, size_t idx) +__sm_chunk_map_rank(__sm_chunk_t *map, size_t first, size_t last, size_t *after) { size_t ret = 0; @@ -453,27 +442,64 @@ __sm_chunk_map_rank(__sm_chunk_t *map, size_t idx) continue; } if (flags == SM_PAYLOAD_ZEROS) { - if (idx > SM_BITS_PER_VECTOR) { - idx -= SM_BITS_PER_VECTOR; + if (last > SM_BITS_PER_VECTOR) { + if (*after > SM_BITS_PER_VECTOR) { + *after = *after - SM_BITS_PER_VECTOR; + } else { + last -= SM_BITS_PER_VECTOR - *after; + *after = 0; + } } else { return (ret); } } else if (flags == SM_PAYLOAD_ONES) { - if (idx > SM_BITS_PER_VECTOR) { - idx -= SM_BITS_PER_VECTOR; - ret += SM_BITS_PER_VECTOR; + if (last > SM_BITS_PER_VECTOR) { + if (*after > SM_BITS_PER_VECTOR) { + *after = *after - SM_BITS_PER_VECTOR; + } else { + last -= SM_BITS_PER_VECTOR - *after; + if (*after == 0) { + ret += SM_BITS_PER_VECTOR; + } + *after = 0; + } } else { - return (ret + idx); + return (ret + last); } } else if (flags == SM_PAYLOAD_MIXED) { - if (idx > SM_BITS_PER_VECTOR) { - idx -= SM_BITS_PER_VECTOR; - ret += popcountll((uint64_t)map->m_data[1 + - __sm_chunk_map_get_position(map, i * SM_FLAGS_PER_INDEX_BYTE + j)]); + if (last > SM_BITS_PER_VECTOR) { + last -= SM_BITS_PER_VECTOR; + if (*after > SM_BITS_PER_VECTOR) { + *after = *after - SM_BITS_PER_VECTOR; + } else { + sm_bitvec_t w = map->m_data[1 + __sm_chunk_map_get_position(map, i * SM_FLAGS_PER_INDEX_BYTE + j)]; + uint64_t mask = UINT64_MAX; + if (*after > 0) { + mask = ~(mask >> (SM_BITS_PER_VECTOR - *after)); + size_t amt = popcountll(w & mask); + if (amt <= *after) { + *after = *after - amt; + } else { + *after = 0; + ret += popcountll(w & ~mask); + } + } else { + ret += popcountll(w); + } + } } else { - sm_bitvec_t w = map->m_data[1 + - __sm_chunk_map_get_position(map, i * SM_FLAGS_PER_INDEX_BYTE + j)]; - for (size_t k = 0; k < idx; k++) { + sm_bitvec_t w = map->m_data[1 + __sm_chunk_map_get_position(map, i * SM_FLAGS_PER_INDEX_BYTE + j)]; + size_t ks = 0; + if (*after > 0) { + if (*after > last) { + ks = last; + *after = *after - last; + } else { + ks += *after; + *after = 0; + } + } + for (size_t k = ks; k < last; k++) { if (w & ((sm_bitvec_t)1 << k)) { ret++; } @@ -491,8 +517,7 @@ __sm_chunk_map_rank(__sm_chunk_t *map, size_t idx) * Returns the number of (set) bits that were passed to the scanner */ static size_t -__sm_chunk_map_scan(__sm_chunk_t *map, sm_idx_t start, - void (*scanner)(sm_idx_t[], size_t), size_t skip) +__sm_chunk_map_scan(__sm_chunk_t *map, sm_idx_t start, void (*scanner)(sm_idx_t[], size_t), size_t skip) { size_t ret = 0; register uint8_t *p = (uint8_t *)map->m_data; @@ -529,8 +554,7 @@ __sm_chunk_map_scan(__sm_chunk_t *map, sm_idx_t start, ret += SM_BITS_PER_VECTOR; } } else if (flags == SM_PAYLOAD_MIXED) { - sm_bitvec_t w = map->m_data[1 + - __sm_chunk_map_get_position(map, i * SM_FLAGS_PER_INDEX_BYTE + j)]; + sm_bitvec_t w = map->m_data[1 + __sm_chunk_map_get_position(map, i * SM_FLAGS_PER_INDEX_BYTE + j)]; int n = 0; if (skip) { for (int b = 0; b < SM_BITS_PER_VECTOR; b++) { @@ -691,8 +715,7 @@ __sm_append_data(sparsemap_t *map, uint8_t *buffer, size_t buffer_size) * Inserts data somewhere in the middle of m_data. */ static int -__sm_insert_data(sparsemap_t *map, size_t offset, uint8_t *buffer, - size_t buffer_size) +__sm_insert_data(sparsemap_t *map, size_t offset, uint8_t *buffer, size_t buffer_size) { if (map->m_data_used + buffer_size > map->m_data_size) { __sm_assert(!"buffer overflow"); @@ -703,6 +726,7 @@ __sm_insert_data(sparsemap_t *map, size_t offset, uint8_t *buffer, memmove(p + buffer_size, p, map->m_data_used - offset); memcpy(p, buffer, buffer_size); map->m_data_used += buffer_size; + return 0; } /** @@ -718,8 +742,8 @@ __sm_remove_data(sparsemap_t *map, size_t offset, size_t gap_size) } /** -* Clears the whole buffer -*/ + * Clears the whole buffer + */ void sparsemap_clear(sparsemap_t *map) { @@ -916,8 +940,7 @@ sparsemap_set(sparsemap_t *map, size_t idx, bool value) /* Now update the __sm_chunk_t. */ size_t position; sm_bitvec_t fill; - int code = __sm_chunk_map_set(&chunk, idx - start, value, &position, &fill, - false); + int code = __sm_chunk_map_set(&chunk, idx - start, value, &position, &fill, false); switch (code) { case SM_OK: break; @@ -926,8 +949,7 @@ sparsemap_set(sparsemap_t *map, size_t idx, bool value) offset += sizeof(sm_idx_t) + position * sizeof(sm_bitvec_t); __sm_insert_data(map, offset, (uint8_t *)&fill, sizeof(sm_bitvec_t)); } - code = __sm_chunk_map_set(&chunk, idx - start, value, &position, &fill, - true); + code = __sm_chunk_map_set(&chunk, idx - start, value, &position, &fill, true); __sm_assert(code == SM_OK); break; case SM_NEEDS_TO_SHRINK: @@ -979,8 +1001,7 @@ sparsemap_get_size(sparsemap_t *map) * Decompresses the whole bitmap; calls scanner for all bits. */ void -sparsemap_scan(sparsemap_t *map, void (*scanner)(sm_idx_t[], size_t), - size_t skip) +sparsemap_scan(sparsemap_t *map, void (*scanner)(sm_idx_t[], size_t), size_t skip) { uint8_t *p = __sm_get_chunk_map_data(map, 0); size_t count = __sm_get_chunk_map_count(map); @@ -1129,7 +1150,6 @@ sparsemap_select(sparsemap_t *map, size_t n) assert(sparsemap_get_size(map) >= SM_SIZEOF_OVERHEAD); size_t result = 0; size_t count = __sm_get_chunk_map_count(map); - uint8_t *p = __sm_get_chunk_map_data(map, 0); for (size_t i = 0; i < count; i++) { @@ -1138,7 +1158,7 @@ sparsemap_select(sparsemap_t *map, size_t n) __sm_chunk_t chunk; __sm_chunk_map_init(&chunk, p); - ssize_t new_n = n; + ssize_t new_n = (ssize_t)n; size_t index = __sm_chunk_map_select(&chunk, n, &new_n); if (new_n == -1) { return (result + index); @@ -1147,33 +1167,62 @@ sparsemap_select(sparsemap_t *map, size_t n) p += __sm_chunk_map_get_size(&chunk); } +#ifdef DEBUG assert(!"shouldn't be here"); - return (0); +#endif + return (size_t)-1; } /** - * Counts the set bits in the range [offset, idx]. + * Counts the set bits in the range [first, last] inclusive. */ size_t -sparsemap_rank(sparsemap_t *map, size_t offset, size_t idx) +sparsemap_rank(sparsemap_t *map, size_t first, size_t last) { assert(sparsemap_get_size(map) >= SM_SIZEOF_OVERHEAD); - size_t result = 0; - size_t count = __sm_get_chunk_map_count(map); - - uint8_t *p = __sm_get_chunk_map_data(map, offset); + size_t result = 0, after = first, count = __sm_get_chunk_map_count(map); + uint8_t *p = __sm_get_chunk_map_data(map, 0); for (size_t i = 0; i < count; i++) { sm_idx_t start = *(sm_idx_t *)p; - if (start > idx) { + if (start > last) { return (result); } p += sizeof(sm_idx_t); __sm_chunk_t chunk; __sm_chunk_map_init(&chunk, p); - result += __sm_chunk_map_rank(&chunk, idx - start); + result += __sm_chunk_map_rank(&chunk, first - start, last - start, &after); p += __sm_chunk_map_get_size(&chunk); } return (result); } + +/** + * Finds a span of set bits of at least |len| after |loc|. Returns the index of + * the n'th set bit that starts a span of at least |len| bits set to true. + */ +size_t +sparsemap_span(sparsemap_t *map, size_t loc, size_t len) +{ + size_t offset, nth = 0, count = 0; + + offset = sparsemap_select(map, 0); + if (len == 1) { + return offset; + } + do { + count = sparsemap_rank(map, offset, offset + len); + if (count == len) { + return offset; + } else { + count = len; + while (--count && sparsemap_is_set(map, offset)) { + nth++; + } + } + offset = sparsemap_select(map, nth); + } while (offset != ((size_t)-1)); + + return offset; +}