From: Kevin Day Date: Sun, 4 Aug 2024 06:09:07 +0000 (-0500) Subject: Update: Greatly reduce memory consumption by implementing simple low allocation step. X-Git-Tag: 0.6.11~8 X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=22e79a09c741d3b0bb4bbd1881abe1a9f5de3e81;p=fll Update: Greatly reduce memory consumption by implementing simple low allocation step. This is the back port of the improvement from the 0.7 development branch. Adding the macro neither breaks API nor ABI. Historically the step was always 3. I found, over time, that increasing the step greatly to something like 128 could greatly reduce memory consumption and performance in many cases. In the situation where a large number of small objects are allocated then this number like 128 becomes highly abusive. The simple low allocation step will only allocate a single unit on the very first allocation. If the next allocation is on an array that has a size greater than one and less than four (via the tiny define), then the step size is set to four during allocation. If the next allocation is on an array that has a size greater than four and less than eight (via the small define), then the step size is set to eight during allocation. If the next allocation is on an array that has a size greater than eight and less than sixty-four (via the large define), then the step size is set to sixty-four during allocation. In all cases, if the request step is less than the calculated step, then the requested step is used. For example, if the requested step is twelve, then after eight is allocation, then the next generated step size is twelve rather than sixty-four. Using some test files, shows the following reduction: - Old: ~8GB of RAM -> New: ~200MB of RAM. - Old: ~500MB of RAM -> New: ~20MB of RAM. --- diff --git a/build/stand_alone/byte_dump.config.h b/build/stand_alone/byte_dump.config.h index ce8eef9d8..24ed9fc50 100644 --- a/build/stand_alone/byte_dump.config.h +++ b/build/stand_alone/byte_dump.config.h @@ -320,6 +320,7 @@ //#define _di_f_memory_default_allocation_step_ #define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/controller.config.h b/build/stand_alone/controller.config.h index 23cf3b26f..4dea305ef 100644 --- a/build/stand_alone/controller.config.h +++ b/build/stand_alone/controller.config.h @@ -588,6 +588,7 @@ //#define _di_f_memory_default_allocation_step_ //#define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ //#define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/fake.config.h b/build/stand_alone/fake.config.h index 89745b500..18c133a12 100644 --- a/build/stand_alone/fake.config.h +++ b/build/stand_alone/fake.config.h @@ -598,6 +598,7 @@ //#define _di_f_memory_default_allocation_step_ //#define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/firewall.config.h b/build/stand_alone/firewall.config.h index 89302adc9..f9cb670ab 100644 --- a/build/stand_alone/firewall.config.h +++ b/build/stand_alone/firewall.config.h @@ -542,6 +542,7 @@ //#define _di_f_memory_default_allocation_step_ //#define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/fss_basic_list_read.config.h b/build/stand_alone/fss_basic_list_read.config.h index b0d787907..ca9697592 100644 --- a/build/stand_alone/fss_basic_list_read.config.h +++ b/build/stand_alone/fss_basic_list_read.config.h @@ -712,6 +712,7 @@ //#define _di_f_memory_default_allocation_step_ //#define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/fss_basic_list_write.config.h b/build/stand_alone/fss_basic_list_write.config.h index d53665bd6..53b6a692c 100644 --- a/build/stand_alone/fss_basic_list_write.config.h +++ b/build/stand_alone/fss_basic_list_write.config.h @@ -712,6 +712,7 @@ //#define _di_f_memory_default_allocation_step_ //#define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/fss_basic_read.config.h b/build/stand_alone/fss_basic_read.config.h index fb73ae311..839fc9b4f 100644 --- a/build/stand_alone/fss_basic_read.config.h +++ b/build/stand_alone/fss_basic_read.config.h @@ -712,6 +712,7 @@ //#define _di_f_memory_default_allocation_step_ //#define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/fss_basic_write.config.h b/build/stand_alone/fss_basic_write.config.h index ac922b5e9..4a13ea17e 100644 --- a/build/stand_alone/fss_basic_write.config.h +++ b/build/stand_alone/fss_basic_write.config.h @@ -712,6 +712,7 @@ //#define _di_f_memory_default_allocation_step_ //#define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/fss_extended_list_read.config.h b/build/stand_alone/fss_extended_list_read.config.h index 9d352a69b..66e95c2e0 100644 --- a/build/stand_alone/fss_extended_list_read.config.h +++ b/build/stand_alone/fss_extended_list_read.config.h @@ -712,6 +712,7 @@ //#define _di_f_memory_default_allocation_step_ //#define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/fss_extended_list_write.config.h b/build/stand_alone/fss_extended_list_write.config.h index 2eabb3925..8313dbed9 100644 --- a/build/stand_alone/fss_extended_list_write.config.h +++ b/build/stand_alone/fss_extended_list_write.config.h @@ -712,6 +712,7 @@ //#define _di_f_memory_default_allocation_step_ //#define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/fss_extended_read.config.h b/build/stand_alone/fss_extended_read.config.h index ff90065c0..c6ae15b6c 100644 --- a/build/stand_alone/fss_extended_read.config.h +++ b/build/stand_alone/fss_extended_read.config.h @@ -712,6 +712,7 @@ //#define _di_f_memory_default_allocation_step_ //#define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/fss_extended_write.config.h b/build/stand_alone/fss_extended_write.config.h index de610b093..c45c48026 100644 --- a/build/stand_alone/fss_extended_write.config.h +++ b/build/stand_alone/fss_extended_write.config.h @@ -712,6 +712,7 @@ //#define _di_f_memory_default_allocation_step_ //#define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/fss_identify.config.h b/build/stand_alone/fss_identify.config.h index 6466dc4e8..9bc6bec6b 100644 --- a/build/stand_alone/fss_identify.config.h +++ b/build/stand_alone/fss_identify.config.h @@ -696,6 +696,7 @@ //#define _di_f_memory_default_allocation_step_ #define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/fss_payload_read.config.h b/build/stand_alone/fss_payload_read.config.h index 8c3b64f46..eb570f4a4 100644 --- a/build/stand_alone/fss_payload_read.config.h +++ b/build/stand_alone/fss_payload_read.config.h @@ -712,6 +712,7 @@ //#define _di_f_memory_default_allocation_step_ //#define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/fss_payload_write.config.h b/build/stand_alone/fss_payload_write.config.h index ffbbe669d..11b365b0b 100644 --- a/build/stand_alone/fss_payload_write.config.h +++ b/build/stand_alone/fss_payload_write.config.h @@ -712,6 +712,7 @@ //#define _di_f_memory_default_allocation_step_ //#define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/fss_status_code.config.h b/build/stand_alone/fss_status_code.config.h index e3999e972..f386683a4 100644 --- a/build/stand_alone/fss_status_code.config.h +++ b/build/stand_alone/fss_status_code.config.h @@ -420,6 +420,7 @@ //#define _di_f_memory_default_allocation_step_ #define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/iki_read.config.h b/build/stand_alone/iki_read.config.h index 9b294d5be..d868dd5b7 100644 --- a/build/stand_alone/iki_read.config.h +++ b/build/stand_alone/iki_read.config.h @@ -592,6 +592,7 @@ //#define _di_f_memory_default_allocation_step_ #define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/iki_write.config.h b/build/stand_alone/iki_write.config.h index b84507fd4..79dd4a184 100644 --- a/build/stand_alone/iki_write.config.h +++ b/build/stand_alone/iki_write.config.h @@ -577,6 +577,7 @@ //#define _di_f_memory_default_allocation_step_ #define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/status_code.config.h b/build/stand_alone/status_code.config.h index 74ec36a92..bd97ba3ea 100644 --- a/build/stand_alone/status_code.config.h +++ b/build/stand_alone/status_code.config.h @@ -316,6 +316,7 @@ //#define _di_f_memory_default_allocation_step_ #define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/build/stand_alone/utf8.config.h b/build/stand_alone/utf8.config.h index 3a3332a35..d59592a0e 100644 --- a/build/stand_alone/utf8.config.h +++ b/build/stand_alone/utf8.config.h @@ -316,6 +316,7 @@ //#define _di_f_memory_default_allocation_step_ #define _di_f_memory_delete_ #define _di_f_memory_destroy_ +//#define _di_f_memory_increase_step_d_ #define _di_f_memory_new_ #define _di_f_memory_new_aligned_ //#define _di_f_memory_resize_ diff --git a/level_0/f_fss/c/fss/named.c b/level_0/f_fss/c/fss/named.c index 27dd66dfd..d8ae7b79e 100644 --- a/level_0/f_fss/c/fss/named.c +++ b/level_0/f_fss/c/fss/named.c @@ -54,7 +54,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && named->objects.used + 1 > named->objects.size) { - f_array_length_t size = named->objects.used + step; + f_array_length_t size = named->objects.used + macro_f_memory_increase_step_4(step, named->objects.size); if (size > F_array_length_t_size_d) { if (named->objects.used + 1 > F_array_length_t_size_d) { @@ -150,7 +150,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && nameds->used + 1 > nameds->size) { - f_array_length_t size = nameds->used + step; + f_array_length_t size = nameds->used + macro_f_memory_increase_step_4(step, nameds->size); if (size > F_array_length_t_size_d) { if (nameds->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_fss/c/fss/nest.c b/level_0/f_fss/c/fss/nest.c index 887f3b3a5..3b55fef8d 100644 --- a/level_0/f_fss/c/fss/nest.c +++ b/level_0/f_fss/c/fss/nest.c @@ -54,7 +54,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && items->used + 1 > items->size) { - f_array_length_t size = items->used + step; + f_array_length_t size = items->used + macro_f_memory_increase_step_4(step, items->size); if (size > F_array_length_t_size_d) { if (items->used + 1 > F_array_length_t_size_d) { @@ -150,7 +150,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && nest->used + 1 > nest->size) { - f_array_length_t size = nest->used + step; + f_array_length_t size = nest->used + macro_f_memory_increase_step_4(step, nest->size); if (size > F_array_length_t_size_d) { if (nest->used + 1 > F_array_length_t_size_d) { @@ -246,7 +246,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && nests->used + 1 > nests->size) { - f_array_length_t size = nests->used + step; + f_array_length_t size = nests->used + macro_f_memory_increase_step_4(step, nests->size); if (size > F_array_length_t_size_d) { if (nests->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_fss/c/fss/set.c b/level_0/f_fss/c/fss/set.c index e783cfee5..bdef37ff9 100644 --- a/level_0/f_fss/c/fss/set.c +++ b/level_0/f_fss/c/fss/set.c @@ -54,7 +54,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && set->objects.used + 1 > set->objects.size) { - f_array_length_t size = set->objects.used + step; + f_array_length_t size = set->objects.used + macro_f_memory_increase_step_4(step, set->objects.size); if (size > F_array_length_t_size_d) { if (set->objects.used + 1 > F_array_length_t_size_d) { @@ -150,7 +150,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && set_quote->objects.used + 1 > set_quote->objects.size) { - f_array_length_t size = set_quote->objects.used + step; + f_array_length_t size = set_quote->objects.used + macro_f_memory_increase_step_4(step, set_quote->objects.size); if (size > F_array_length_t_size_d) { if (set_quote->objects.used + 1 > F_array_length_t_size_d) { @@ -246,7 +246,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && set_quotes->used + 1 > set_quotes->size) { - f_array_length_t size = set_quotes->used + step; + f_array_length_t size = set_quotes->used + macro_f_memory_increase_step_4(step, set_quotes->size); if (size > F_array_length_t_size_d) { if (set_quotes->used + 1 > F_array_length_t_size_d) { @@ -342,7 +342,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && sets->used + 1 > sets->size) { - f_array_length_t size = sets->used + step; + f_array_length_t size = sets->used + macro_f_memory_increase_step_4(step, sets->size); if (size > F_array_length_t_size_d) { if (sets->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_memory/c/memory/common.h b/level_0/f_memory/c/memory/common.h index d0757a3f7..ba8e8d591 100644 --- a/level_0/f_memory/c/memory/common.h +++ b/level_0/f_memory/c/memory/common.h @@ -40,8 +40,56 @@ extern "C" { #ifndef _di_f_memory_default_allocation_step_ #define F_memory_default_allocation_large_d 64 #define F_memory_default_allocation_small_d 8 + #define F_memory_default_allocation_tiny_d 4 #endif // _di_f_memory_default_allocation_step_ +/** + * Helper macros for conditionally determining how much memory to allocate for a given step. + * + * For each macro: + * - step: Represents the amount to increase past the helper amount. + * - size: Represents the amount already allocated. + * + * macro_f_memory_increase_*: + * - 1: If size is 0, then allocate 1, otherwise allocate step. + * - 2: As step 1, plus if size is 1, then allocate tiny, otherwise allocate step. + * - 3: As step 2, plus if size is less than small, then allocate small, otherwise allocate step. + * - 4: As step 3, plus if size is less than large, then allocate large, otherwise allocate step. + */ +#ifndef _di_f_memory_increase_step_d_ + #define macro_f_memory_increase_step_1(step, size) (size \ + ? step \ + : 1 \ + ) + + #define macro_f_memory_increase_step_2(step, size) (size \ + ? size == 1 \ + ? step < F_memory_default_allocation_tiny_d ? step : F_memory_default_allocation_tiny_d \ + : step \ + : 1 \ + ) + + #define macro_f_memory_increase_step_3(step, size) (size \ + ? size == 1 \ + ? step < F_memory_default_allocation_tiny_d ? step : F_memory_default_allocation_tiny_d \ + : size < F_memory_default_allocation_small_d \ + ? step < F_memory_default_allocation_small_d ? step : F_memory_default_allocation_small_d \ + : step \ + : 1 \ + ) + + #define macro_f_memory_increase_step_4(step, size) (size \ + ? size == 1 \ + ? step < F_memory_default_allocation_tiny_d ? step : F_memory_default_allocation_tiny_d \ + : size < F_memory_default_allocation_small_d \ + ? step < F_memory_default_allocation_small_d ? step : F_memory_default_allocation_small_d \ + : size < F_memory_default_allocation_large_d \ + ? step < F_memory_default_allocation_large_d ? step : F_memory_default_allocation_large_d \ + : step \ + : 1 \ + ) +#endif // _di_f_memory_increase_step_d_ + /** * Reset a generic memory stucture to 0 (clear all values). * diff --git a/level_0/f_string/c/string/dynamic.c b/level_0/f_string/c/string/dynamic.c index 6418933a8..1d498851c 100644 --- a/level_0/f_string/c/string/dynamic.c +++ b/level_0/f_string/c/string/dynamic.c @@ -149,7 +149,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && dynamic->used + 1 > dynamic->size) { - f_array_length_t size = dynamic->used + step; + f_array_length_t size = dynamic->used + macro_f_memory_increase_step_4(step, dynamic->size); if (size > F_string_t_size_d) { if (dynamic->used + 1 > F_string_t_size_d) { @@ -860,7 +860,7 @@ extern "C" { if (!step) return F_data_not; if (dynamics->used + 1 > dynamics->size) { - f_array_length_t size = dynamics->used + step; + f_array_length_t size = dynamics->used + macro_f_memory_increase_step_4(step, dynamics->size); if (size > F_array_length_t_size_d) { if (dynamics->used + 1 > F_array_length_t_size_d) { @@ -1013,7 +1013,7 @@ extern "C" { if (!step) return F_data_not; if (dynamicss->used + 1 > dynamicss->size) { - f_array_length_t size = dynamicss->used + step; + f_array_length_t size = dynamicss->used + macro_f_memory_increase_step_4(step, dynamicss->size); if (size > F_array_length_t_size_d) { if (dynamicss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_string/c/string/map.c b/level_0/f_string/c/string/map.c index 13c89f090..8941f147e 100644 --- a/level_0/f_string/c/string/map.c +++ b/level_0/f_string/c/string/map.c @@ -99,7 +99,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && maps->used + 1 > maps->size) { - f_array_length_t size = maps->used + step; + f_array_length_t size = maps->used + macro_f_memory_increase_step_4(step, maps->size); if (size > F_array_length_t_size_d) { if (maps->used + 1 > F_array_length_t_size_d) { @@ -252,7 +252,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && mapss->used + 1 > mapss->size) { - f_array_length_t size = mapss->used + step; + f_array_length_t size = mapss->used + macro_f_memory_increase_step_4(step, mapss->size); if (size > F_array_length_t_size_d) { if (mapss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_string/c/string/map_multi.c b/level_0/f_string/c/string/map_multi.c index 67d7de5cb..2b8791abd 100644 --- a/level_0/f_string/c/string/map_multi.c +++ b/level_0/f_string/c/string/map_multi.c @@ -100,7 +100,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && map_multis->used + 1 > map_multis->size) { - f_array_length_t size = map_multis->used + step; + f_array_length_t size = map_multis->used + macro_f_memory_increase_step_4(step, map_multis->size); if (size > F_array_length_t_size_d) { if (map_multis->used + 1 > F_array_length_t_size_d) { @@ -253,7 +253,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && map_multiss->used + 1 > map_multiss->size) { - f_array_length_t size = map_multiss->used + step; + f_array_length_t size = map_multiss->used + macro_f_memory_increase_step_4(step, map_multiss->size); if (size > F_array_length_t_size_d) { if (map_multiss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_string/c/string/quantity.c b/level_0/f_string/c/string/quantity.c index 1a53234e7..6b1135fe7 100644 --- a/level_0/f_string/c/string/quantity.c +++ b/level_0/f_string/c/string/quantity.c @@ -85,7 +85,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && quantitys->used + 1 > quantitys->size) { - f_array_length_t size = quantitys->used + step; + f_array_length_t size = quantitys->used + macro_f_memory_increase_step_4(step, quantitys->size); if (size > F_array_length_t_size_d) { if (quantitys->used + 1 > F_array_length_t_size_d) { @@ -238,7 +238,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && quantityss->used + 1 > quantityss->size) { - f_array_length_t size = quantityss->used + step; + f_array_length_t size = quantityss->used + macro_f_memory_increase_step_4(step, quantityss->size); if (size > F_array_length_t_size_d) { if (quantityss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_string/c/string/range.c b/level_0/f_string/c/string/range.c index fc9fa2876..50903f3e5 100644 --- a/level_0/f_string/c/string/range.c +++ b/level_0/f_string/c/string/range.c @@ -96,7 +96,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && ranges->used + 1 > ranges->size) { - f_array_length_t size = ranges->used + step; + f_array_length_t size = ranges->used + macro_f_memory_increase_step_4(step, ranges->size); if (size > F_array_length_t_size_d) { if (ranges->used + 1 > F_array_length_t_size_d) { @@ -249,7 +249,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && rangess->used + 1 > rangess->size) { - f_array_length_t size = rangess->used + step; + f_array_length_t size = rangess->used + macro_f_memory_increase_step_4(step, rangess->size); if (size > F_array_length_t_size_d) { if (rangess->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_string/c/string/triple.c b/level_0/f_string/c/string/triple.c index 68bb6f337..94e4b64b6 100644 --- a/level_0/f_string/c/string/triple.c +++ b/level_0/f_string/c/string/triple.c @@ -285,7 +285,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && tripless->used + 1 > tripless->size) { - f_array_length_t size = tripless->used + step; + f_array_length_t size = tripless->used + macro_f_memory_increase_step_4(step, tripless->size); if (size > F_array_length_t_size_d) { if (tripless->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_thread/c/thread/attribute.c b/level_0/f_thread/c/thread/attribute.c index f248e048e..a0d369fbc 100644 --- a/level_0/f_thread/c/thread/attribute.c +++ b/level_0/f_thread/c/thread/attribute.c @@ -55,7 +55,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && attributes->used + 1 > attributes->size) { - f_array_length_t size = attributes->used + step; + f_array_length_t size = attributes->used + macro_f_memory_increase_step_4(step, attributes->size); if (size > F_array_length_t_size_d) { if (attributes->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_thread/c/thread/barrier.c b/level_0/f_thread/c/thread/barrier.c index c31fe1a4f..6e682e6d9 100644 --- a/level_0/f_thread/c/thread/barrier.c +++ b/level_0/f_thread/c/thread/barrier.c @@ -55,7 +55,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && barriers->used + 1 > barriers->size) { - f_array_length_t size = barriers->used + step; + f_array_length_t size = barriers->used + macro_f_memory_increase_step_4(step, barriers->size); if (size > F_array_length_t_size_d) { if (barriers->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_thread/c/thread/barrier_attribute.c b/level_0/f_thread/c/thread/barrier_attribute.c index afa4c702e..8ca71fe6b 100644 --- a/level_0/f_thread/c/thread/barrier_attribute.c +++ b/level_0/f_thread/c/thread/barrier_attribute.c @@ -55,7 +55,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && attributes->used + 1 > attributes->size) { - f_array_length_t size = attributes->used + step; + f_array_length_t size = attributes->used + macro_f_memory_increase_step_4(step, attributes->size); if (size > F_array_length_t_size_d) { if (attributes->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_thread/c/thread/condition.c b/level_0/f_thread/c/thread/condition.c index a7363ae98..74c4e9831 100644 --- a/level_0/f_thread/c/thread/condition.c +++ b/level_0/f_thread/c/thread/condition.c @@ -55,7 +55,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && conditions->used + 1 > conditions->size) { - f_array_length_t size = conditions->used + step; + f_array_length_t size = conditions->used + macro_f_memory_increase_step_4(step, conditions->size); if (size > F_array_length_t_size_d) { if (conditions->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_thread/c/thread/condition_attribute.c b/level_0/f_thread/c/thread/condition_attribute.c index 3b2c41265..a4f322bf0 100644 --- a/level_0/f_thread/c/thread/condition_attribute.c +++ b/level_0/f_thread/c/thread/condition_attribute.c @@ -55,7 +55,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && attributes->used + 1 > attributes->size) { - f_array_length_t size = attributes->used + step; + f_array_length_t size = attributes->used + macro_f_memory_increase_step_4(step, attributes->size); if (size > F_array_length_t_size_d) { if (attributes->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_thread/c/thread/id.c b/level_0/f_thread/c/thread/id.c index 126734293..12e479c5f 100644 --- a/level_0/f_thread/c/thread/id.c +++ b/level_0/f_thread/c/thread/id.c @@ -55,7 +55,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && ids->used + 1 > ids->size) { - f_array_length_t size = ids->used + step; + f_array_length_t size = ids->used + macro_f_memory_increase_step_4(step, ids->size); if (size > F_array_length_t_size_d) { if (ids->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_thread/c/thread/key.c b/level_0/f_thread/c/thread/key.c index 45d27b807..293d8c3c3 100644 --- a/level_0/f_thread/c/thread/key.c +++ b/level_0/f_thread/c/thread/key.c @@ -55,7 +55,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && keys->used + 1 > keys->size) { - f_array_length_t size = keys->used + step; + f_array_length_t size = keys->used + macro_f_memory_increase_step_4(step, keys->size); if (size > F_array_length_t_size_d) { if (keys->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_thread/c/thread/lock.c b/level_0/f_thread/c/thread/lock.c index ecc28bc0d..4743901a5 100644 --- a/level_0/f_thread/c/thread/lock.c +++ b/level_0/f_thread/c/thread/lock.c @@ -55,7 +55,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && locks->used + 1 > locks->size) { - f_array_length_t size = locks->used + step; + f_array_length_t size = locks->used + macro_f_memory_increase_step_4(step, locks->size); if (size > F_array_length_t_size_d) { if (locks->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_thread/c/thread/lock_attribute.c b/level_0/f_thread/c/thread/lock_attribute.c index 3794481a0..f14c48ac2 100644 --- a/level_0/f_thread/c/thread/lock_attribute.c +++ b/level_0/f_thread/c/thread/lock_attribute.c @@ -55,7 +55,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && attributes->used + 1 > attributes->size) { - f_array_length_t size = attributes->used + step; + f_array_length_t size = attributes->used + macro_f_memory_increase_step_4(step, attributes->size); if (size > F_array_length_t_size_d) { if (attributes->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_thread/c/thread/mutex.c b/level_0/f_thread/c/thread/mutex.c index e2478cbb1..54f8ad494 100644 --- a/level_0/f_thread/c/thread/mutex.c +++ b/level_0/f_thread/c/thread/mutex.c @@ -55,7 +55,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && mutexs->used + 1 > mutexs->size) { - f_array_length_t size = mutexs->used + step; + f_array_length_t size = mutexs->used + macro_f_memory_increase_step_4(step, mutexs->size); if (size > F_array_length_t_size_d) { if (mutexs->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_thread/c/thread/mutex_attribute.c b/level_0/f_thread/c/thread/mutex_attribute.c index fa7b609c6..4d42d44b8 100644 --- a/level_0/f_thread/c/thread/mutex_attribute.c +++ b/level_0/f_thread/c/thread/mutex_attribute.c @@ -55,7 +55,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && attributes->used + 1 > attributes->size) { - f_array_length_t size = attributes->used + step; + f_array_length_t size = attributes->used + macro_f_memory_increase_step_4(step, attributes->size); if (size > F_array_length_t_size_d) { if (attributes->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_thread/c/thread/once.c b/level_0/f_thread/c/thread/once.c index 28a5a452d..f0df66d13 100644 --- a/level_0/f_thread/c/thread/once.c +++ b/level_0/f_thread/c/thread/once.c @@ -55,7 +55,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && onces->used + 1 > onces->size) { - f_array_length_t size = onces->used + step; + f_array_length_t size = onces->used + macro_f_memory_increase_step_4(step, onces->size); if (size > F_array_length_t_size_d) { if (onces->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_thread/c/thread/semaphore.c b/level_0/f_thread/c/thread/semaphore.c index 9aa95694a..9442ec0d6 100644 --- a/level_0/f_thread/c/thread/semaphore.c +++ b/level_0/f_thread/c/thread/semaphore.c @@ -55,7 +55,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && semaphores->used + 1 > semaphores->size) { - f_array_length_t size = semaphores->used + step; + f_array_length_t size = semaphores->used + macro_f_memory_increase_step_4(step, semaphores->size); if (size > F_array_length_t_size_d) { if (semaphores->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_thread/c/thread/set.c b/level_0/f_thread/c/thread/set.c index b0228c250..17f924b99 100644 --- a/level_0/f_thread/c/thread/set.c +++ b/level_0/f_thread/c/thread/set.c @@ -55,7 +55,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && sets->used + 1 > sets->size) { - f_array_length_t size = sets->used + step; + f_array_length_t size = sets->used + macro_f_memory_increase_step_4(step, sets->size); if (size > F_array_length_t_size_d) { if (sets->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_thread/c/thread/spin.c b/level_0/f_thread/c/thread/spin.c index da7a2b232..e376b0f3d 100644 --- a/level_0/f_thread/c/thread/spin.c +++ b/level_0/f_thread/c/thread/spin.c @@ -55,7 +55,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && spins->used + 1 > spins->size) { - f_array_length_t size = spins->used + step; + f_array_length_t size = spins->used + macro_f_memory_increase_step_4(step, spins->size); if (size > F_array_length_t_size_d) { if (spins->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_type_array/c/type_array/array_length.c b/level_0/f_type_array/c/type_array/array_length.c index 455029b2c..7f0a022e5 100644 --- a/level_0/f_type_array/c/type_array/array_length.c +++ b/level_0/f_type_array/c/type_array/array_length.c @@ -84,7 +84,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && lengths->used + 1 > lengths->size) { - f_array_length_t size = lengths->used + step; + f_array_length_t size = lengths->used + macro_f_memory_increase_step_4(step, lengths->size); if (size > F_array_length_t_size_d) { if (lengths->used + 1 > F_array_length_t_size_d) { @@ -233,7 +233,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && lengthss->used + 1 > lengthss->size) { - f_array_length_t size = lengthss->used + step; + f_array_length_t size = lengthss->used + macro_f_memory_increase_step_4(step, lengthss->size); if (size > F_array_length_t_size_d) { if (lengthss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_type_array/c/type_array/cell.c b/level_0/f_type_array/c/type_array/cell.c index 4eb3503cc..315992216 100644 --- a/level_0/f_type_array/c/type_array/cell.c +++ b/level_0/f_type_array/c/type_array/cell.c @@ -77,7 +77,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && cells->used + 1 > cells->size) { - f_array_length_t size = cells->used + step; + f_array_length_t size = cells->used + macro_f_memory_increase_step_4(step, cells->size); if (size > F_array_length_t_size_d) { if (cells->used + 1 > F_array_length_t_size_d) { @@ -226,7 +226,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && cellss->used + 1 > cellss->size) { - f_array_length_t size = cellss->used + step; + f_array_length_t size = cellss->used + macro_f_memory_increase_step_4(step, cellss->size); if (size > F_array_length_t_size_d) { if (cellss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_type_array/c/type_array/fll_id.c b/level_0/f_type_array/c/type_array/fll_id.c index f122a35b3..0d8cd84d1 100644 --- a/level_0/f_type_array/c/type_array/fll_id.c +++ b/level_0/f_type_array/c/type_array/fll_id.c @@ -77,7 +77,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && ids->used + 1 > ids->size) { - f_array_length_t size = ids->used + step; + f_array_length_t size = ids->used + macro_f_memory_increase_step_4(step, ids->size); if (size > F_array_length_t_size_d) { if (ids->used + 1 > F_array_length_t_size_d) { @@ -226,7 +226,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && idss->used + 1 > idss->size) { - f_array_length_t size = idss->used + step; + f_array_length_t size = idss->used + macro_f_memory_increase_step_4(step, idss->size); if (size > F_array_length_t_size_d) { if (idss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_type_array/c/type_array/int128.c b/level_0/f_type_array/c/type_array/int128.c index 5d6128db2..6c293acd5 100644 --- a/level_0/f_type_array/c/type_array/int128.c +++ b/level_0/f_type_array/c/type_array/int128.c @@ -77,7 +77,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && int128s->used + 1 > int128s->size) { - f_array_length_t size = int128s->used + step; + f_array_length_t size = int128s->used + macro_f_memory_increase_step_4(step, int128s->size); if (size > F_array_length_t_size_d) { if (int128s->used + 1 > F_array_length_t_size_d) { @@ -226,7 +226,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && int128ss->used + 1 > int128ss->size) { - f_array_length_t size = int128ss->used + step; + f_array_length_t size = int128ss->used + macro_f_memory_increase_step_4(step, int128ss->size); if (size > F_array_length_t_size_d) { if (int128ss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_type_array/c/type_array/int16.c b/level_0/f_type_array/c/type_array/int16.c index f580fd341..c227af020 100644 --- a/level_0/f_type_array/c/type_array/int16.c +++ b/level_0/f_type_array/c/type_array/int16.c @@ -77,7 +77,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && int16s->used + 1 > int16s->size) { - f_array_length_t size = int16s->used + step; + f_array_length_t size = int16s->used + macro_f_memory_increase_step_4(step, int16s->size); if (size > F_array_length_t_size_d) { if (int16s->used + 1 > F_array_length_t_size_d) { @@ -226,7 +226,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && int16ss->used + 1 > int16ss->size) { - f_array_length_t size = int16ss->used + step; + f_array_length_t size = int16ss->used + macro_f_memory_increase_step_4(step, int16ss->size); if (size > F_array_length_t_size_d) { if (int16ss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_type_array/c/type_array/int32.c b/level_0/f_type_array/c/type_array/int32.c index aff3139d3..7aef42d7e 100644 --- a/level_0/f_type_array/c/type_array/int32.c +++ b/level_0/f_type_array/c/type_array/int32.c @@ -77,7 +77,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && int32s->used + 1 > int32s->size) { - f_array_length_t size = int32s->used + step; + f_array_length_t size = int32s->used + macro_f_memory_increase_step_4(step, int32s->size); if (size > F_array_length_t_size_d) { if (int32s->used + 1 > F_array_length_t_size_d) { @@ -226,7 +226,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && int32ss->used + 1 > int32ss->size) { - f_array_length_t size = int32ss->used + step; + f_array_length_t size = int32ss->used + macro_f_memory_increase_step_4(step, int32ss->size); if (size > F_array_length_t_size_d) { if (int32ss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_type_array/c/type_array/int64.c b/level_0/f_type_array/c/type_array/int64.c index d661974ce..7a3a2c7d5 100644 --- a/level_0/f_type_array/c/type_array/int64.c +++ b/level_0/f_type_array/c/type_array/int64.c @@ -77,7 +77,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && int64s->used + 1 > int64s->size) { - f_array_length_t size = int64s->used + step; + f_array_length_t size = int64s->used + macro_f_memory_increase_step_4(step, int64s->size); if (size > F_array_length_t_size_d) { if (int64s->used + 1 > F_array_length_t_size_d) { @@ -226,7 +226,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && int64ss->used + 1 > int64ss->size) { - f_array_length_t size = int64ss->used + step; + f_array_length_t size = int64ss->used + macro_f_memory_increase_step_4(step, int64ss->size); if (size > F_array_length_t_size_d) { if (int64ss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_type_array/c/type_array/int8.c b/level_0/f_type_array/c/type_array/int8.c index 0c3de4a1b..5477242ce 100644 --- a/level_0/f_type_array/c/type_array/int8.c +++ b/level_0/f_type_array/c/type_array/int8.c @@ -77,7 +77,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && int8s->used + 1 > int8s->size) { - f_array_length_t size = int8s->used + step; + f_array_length_t size = int8s->used + macro_f_memory_increase_step_4(step, int8s->size); if (size > F_array_length_t_size_d) { if (int8s->used + 1 > F_array_length_t_size_d) { @@ -226,7 +226,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && int8ss->used + 1 > int8ss->size) { - f_array_length_t size = int8ss->used + step; + f_array_length_t size = int8ss->used + macro_f_memory_increase_step_4(step, int8ss->size); if (size > F_array_length_t_size_d) { if (int8ss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_type_array/c/type_array/state.c b/level_0/f_type_array/c/type_array/state.c index 179931480..56d3d5ca0 100644 --- a/level_0/f_type_array/c/type_array/state.c +++ b/level_0/f_type_array/c/type_array/state.c @@ -77,7 +77,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && states->used + 1 > states->size) { - f_array_length_t size = states->used + step; + f_array_length_t size = states->used + macro_f_memory_increase_step_4(step, states->size); if (size > F_array_length_t_size_d) { if (states->used + 1 > F_array_length_t_size_d) { @@ -226,7 +226,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && statess->used + 1 > statess->size) { - f_array_length_t size = statess->used + step; + f_array_length_t size = statess->used + macro_f_memory_increase_step_4(step, statess->size); if (size > F_array_length_t_size_d) { if (statess->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_type_array/c/type_array/status.c b/level_0/f_type_array/c/type_array/status.c index cf45bb425..2b0a4cb41 100644 --- a/level_0/f_type_array/c/type_array/status.c +++ b/level_0/f_type_array/c/type_array/status.c @@ -77,7 +77,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && statuss->used + 1 > statuss->size) { - f_array_length_t size = statuss->used + step; + f_array_length_t size = statuss->used + macro_f_memory_increase_step_4(step, statuss->size); if (size > F_array_length_t_size_d) { if (statuss->used + 1 > F_array_length_t_size_d) { @@ -226,7 +226,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && statusss->used + 1 > statusss->size) { - f_array_length_t size = statusss->used + step; + f_array_length_t size = statusss->used + macro_f_memory_increase_step_4(step, statusss->size); if (size > F_array_length_t_size_d) { if (statusss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_type_array/c/type_array/uint128.c b/level_0/f_type_array/c/type_array/uint128.c index ed8bfe596..b2e04ed03 100644 --- a/level_0/f_type_array/c/type_array/uint128.c +++ b/level_0/f_type_array/c/type_array/uint128.c @@ -77,7 +77,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && uint128s->used + 1 > uint128s->size) { - f_array_length_t size = uint128s->used + step; + f_array_length_t size = uint128s->used + macro_f_memory_increase_step_4(step, uint128s->size); if (size > F_array_length_t_size_d) { if (uint128s->used + 1 > F_array_length_t_size_d) { @@ -226,7 +226,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && uint128ss->used + 1 > uint128ss->size) { - f_array_length_t size = uint128ss->used + step; + f_array_length_t size = uint128ss->used + macro_f_memory_increase_step_4(step, uint128ss->size); if (size > F_array_length_t_size_d) { if (uint128ss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_type_array/c/type_array/uint16.c b/level_0/f_type_array/c/type_array/uint16.c index aaf88c12f..6d0dd613c 100644 --- a/level_0/f_type_array/c/type_array/uint16.c +++ b/level_0/f_type_array/c/type_array/uint16.c @@ -77,7 +77,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && uint16s->used + 1 > uint16s->size) { - f_array_length_t size = uint16s->used + step; + f_array_length_t size = uint16s->used + macro_f_memory_increase_step_4(step, uint16s->size); if (size > F_array_length_t_size_d) { if (uint16s->used + 1 > F_array_length_t_size_d) { @@ -226,7 +226,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && uint16ss->used + 1 > uint16ss->size) { - f_array_length_t size = uint16ss->used + step; + f_array_length_t size = uint16ss->used + macro_f_memory_increase_step_4(step, uint16ss->size); if (size > F_array_length_t_size_d) { if (uint16ss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_type_array/c/type_array/uint32.c b/level_0/f_type_array/c/type_array/uint32.c index 43eec953d..da0a80a38 100644 --- a/level_0/f_type_array/c/type_array/uint32.c +++ b/level_0/f_type_array/c/type_array/uint32.c @@ -77,7 +77,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && uint32s->used + 1 > uint32s->size) { - f_array_length_t size = uint32s->used + step; + f_array_length_t size = uint32s->used + macro_f_memory_increase_step_4(step, uint32s->size); if (size > F_array_length_t_size_d) { if (uint32s->used + 1 > F_array_length_t_size_d) { @@ -226,7 +226,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && uint32ss->used + 1 > uint32ss->size) { - f_array_length_t size = uint32ss->used + step; + f_array_length_t size = uint32ss->used + macro_f_memory_increase_step_4(step, uint32ss->size); if (size > F_array_length_t_size_d) { if (uint32ss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_type_array/c/type_array/uint64.c b/level_0/f_type_array/c/type_array/uint64.c index fa08f97d4..1e0cc9e7f 100644 --- a/level_0/f_type_array/c/type_array/uint64.c +++ b/level_0/f_type_array/c/type_array/uint64.c @@ -77,7 +77,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && uint64s->used + 1 > uint64s->size) { - f_array_length_t size = uint64s->used + step; + f_array_length_t size = uint64s->used + macro_f_memory_increase_step_4(step, uint64s->size); if (size > F_array_length_t_size_d) { if (uint64s->used + 1 > F_array_length_t_size_d) { @@ -226,7 +226,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && uint64ss->used + 1 > uint64ss->size) { - f_array_length_t size = uint64ss->used + step; + f_array_length_t size = uint64ss->used + macro_f_memory_increase_step_4(step, uint64ss->size); if (size > F_array_length_t_size_d) { if (uint64ss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_type_array/c/type_array/uint8.c b/level_0/f_type_array/c/type_array/uint8.c index 0a62f8bc7..194c4020a 100644 --- a/level_0/f_type_array/c/type_array/uint8.c +++ b/level_0/f_type_array/c/type_array/uint8.c @@ -77,7 +77,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && uint8s->used + 1 > uint8s->size) { - f_array_length_t size = uint8s->used + step; + f_array_length_t size = uint8s->used + macro_f_memory_increase_step_4(step, uint8s->size); if (size > F_array_length_t_size_d) { if (uint8s->used + 1 > F_array_length_t_size_d) { @@ -226,7 +226,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && uint8ss->used + 1 > uint8ss->size) { - f_array_length_t size = uint8ss->used + step; + f_array_length_t size = uint8ss->used + macro_f_memory_increase_step_4(step, uint8ss->size); if (size > F_array_length_t_size_d) { if (uint8ss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_utf/c/utf/dynamic.c b/level_0/f_utf/c/utf/dynamic.c index a670937dc..40fcb5570 100644 --- a/level_0/f_utf/c/utf/dynamic.c +++ b/level_0/f_utf/c/utf/dynamic.c @@ -151,7 +151,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && dynamic->used + 1 > dynamic->size) { - f_array_length_t size = dynamic->used + step; + f_array_length_t size = dynamic->used + macro_f_memory_increase_step_4(step, dynamic->size); if (size > F_string_t_size_d) { if (dynamic->used + 1 > F_string_t_size_d) { @@ -874,7 +874,7 @@ extern "C" { if (!step) return F_data_not; if (dynamics->used + 1 > dynamics->size) { - f_array_length_t size = dynamics->used + step; + f_array_length_t size = dynamics->used + macro_f_memory_increase_step_4(step, dynamics->size); if (size > F_array_length_t_size_d) { if (dynamics->used + 1 > F_array_length_t_size_d) { @@ -1027,7 +1027,7 @@ extern "C" { if (!step) return F_data_not; if (dynamicss->used + 1 > dynamicss->size) { - f_array_length_t size = dynamicss->used + step; + f_array_length_t size = dynamicss->used + macro_f_memory_increase_step_4(step, dynamicss->size); if (size > F_array_length_t_size_d) { if (dynamicss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_utf/c/utf/map.c b/level_0/f_utf/c/utf/map.c index 6a3133d33..210c216f6 100644 --- a/level_0/f_utf/c/utf/map.c +++ b/level_0/f_utf/c/utf/map.c @@ -100,7 +100,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && maps->used + 1 > maps->size) { - f_array_length_t size = maps->used + step; + f_array_length_t size = maps->used + macro_f_memory_increase_step_4(step, maps->size); if (size > F_array_length_t_size_d) { if (maps->used + 1 > F_array_length_t_size_d) { @@ -253,7 +253,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && mapss->used + 1 > mapss->size) { - f_array_length_t size = mapss->used + step; + f_array_length_t size = mapss->used + macro_f_memory_increase_step_4(step, mapss->size); if (size > F_array_length_t_size_d) { if (mapss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_utf/c/utf/map_multi.c b/level_0/f_utf/c/utf/map_multi.c index 9399f25e8..8da7cd46f 100644 --- a/level_0/f_utf/c/utf/map_multi.c +++ b/level_0/f_utf/c/utf/map_multi.c @@ -101,7 +101,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && map_multis->used + 1 > map_multis->size) { - f_array_length_t size = map_multis->used + step; + f_array_length_t size = map_multis->used + macro_f_memory_increase_step_4(step, map_multis->size); if (size > F_array_length_t_size_d) { if (map_multis->used + 1 > F_array_length_t_size_d) { @@ -254,7 +254,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && map_multiss->used + 1 > map_multiss->size) { - f_array_length_t size = map_multiss->used + step; + f_array_length_t size = map_multiss->used + macro_f_memory_increase_step_4(step, map_multiss->size); if (size > F_array_length_t_size_d) { if (map_multiss->used + 1 > F_array_length_t_size_d) { diff --git a/level_0/f_utf/c/utf/triple.c b/level_0/f_utf/c/utf/triple.c index bb79331db..bbf8a03e8 100644 --- a/level_0/f_utf/c/utf/triple.c +++ b/level_0/f_utf/c/utf/triple.c @@ -286,7 +286,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (step && tripless->used + 1 > tripless->size) { - f_array_length_t size = tripless->used + step; + f_array_length_t size = tripless->used + macro_f_memory_increase_step_4(step, tripless->size); if (size > F_array_length_t_size_d) { if (tripless->used + 1 > F_array_length_t_size_d) {