From d2377257f38cb4752301ce9b1bf2afa867ddb877 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 28 Jun 2023 12:07:49 +0600 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=83=D1=82=D0=B5=D1=87=D0=BA=D1=83=20=D0=BF=D0=B0?= =?UTF-8?q?=D0=BC=D1=8F=D1=82=D0=B8=20=D0=BF=D1=80=D0=B8=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B5=20=D1=83=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B9=D1=81=D1=82=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-resourcequota.c | 61 +++++++++++++---------------- 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/source/ubl-settings-resourcequota.c b/source/ubl-settings-resourcequota.c index 0da421d..f8c6357 100644 --- a/source/ubl-settings-resourcequota.c +++ b/source/ubl-settings-resourcequota.c @@ -351,6 +351,32 @@ void init_cfg_array(int index) { philos_set_pow_size_memory("-", &main_config.swap_size, index, array_size_pow); set_size_memory_integer("-",&main_config.swap , index); + + int* array_limit = NULL; + char** array_disk = NULL; + int index_n2 = 0; + array_limit = philos_int_append(array_limit, &index_n2, -3); + index_n2--; + array_disk = yon_char_parsed_append(array_disk, &index_n2, "-"); + array_limit = philos_int_append(array_limit, &index_n2, -2); + index_n2--; + array_disk = yon_char_parsed_append(array_disk, &index_n2, NULL); + main_config.i_o_limit_read = yon_remalloc(main_config.i_o_limit_read, (index + 1) * sizeof(int*)); + main_config.i_o_limit_read_size = yon_remalloc(main_config.i_o_limit_read_size, (index + 1) * sizeof(int*)); + main_config.disk = yon_remalloc(main_config.disk, (index + 1) * sizeof(char**)); + main_config.i_o_limit_write = yon_remalloc(main_config.i_o_limit_write, (index + 1) * sizeof(int*)); + main_config.i_o_limit_write_size = yon_remalloc(main_config.i_o_limit_write_size, (index + 1) * sizeof(int*)); + main_config.disk = yon_remalloc(main_config.disk, (index + 1) * sizeof(char**)); + + philos_array_int_copy(&main_config.i_o_limit_read[index], &array_limit); + philos_array_int_copy(&main_config.i_o_limit_read_size[index], &array_limit); + yon_char_parsed_copy(&main_config.disk[index], &array_disk); + + philos_array_int_copy(&main_config.i_o_limit_write[main_config.size_tree_view], &array_limit); + philos_array_int_copy(&main_config.i_o_limit_write_size[main_config.size_tree_view], &array_limit); + yon_char_parsed_copy(&main_config.disk[main_config.size_tree_view], &array_disk); + philos_free_int_array(&array_limit, 1); + philos_free_string_array(&array_disk, 1); } void str_split_key(char* source_value, int index) { @@ -426,41 +452,9 @@ void str_split_value(char* values, int index) { if (yon_char_find_count(key, "IOReadBandwidthMax") != 0) { get_param_io_limit(arr_values, index_1, size,index, "IOReadBandwidthMax"); } - else { - int* array_limit = NULL; - char** array_disk = NULL; - int index11 = 0; - array_limit = philos_int_append(array_limit, &index11, -2); - index11--; - array_disk = yon_char_parsed_append(array_disk, &index11, NULL); - main_config.i_o_limit_read = yon_remalloc(main_config.i_o_limit_read, (main_config.size_tree_view + 1) * sizeof(int*)); - main_config.i_o_limit_read_size = yon_remalloc(main_config.i_o_limit_read_size, (main_config.size_tree_view + 1) * sizeof(int*)); - main_config.disk = yon_remalloc(main_config.disk, (main_config.size_tree_view + 1) * sizeof(char**)); - philos_array_int_copy(&main_config.i_o_limit_read[main_config.size_tree_view], &array_limit); - philos_array_int_copy(&main_config.i_o_limit_read_size[main_config.size_tree_view], &array_limit); - yon_char_parsed_copy(&main_config.disk[main_config.size_tree_view], &array_disk); - philos_free_int_array(&array_limit, 1); - philos_free_string_array(&array_disk, 1); - } if (yon_char_find_count(key, "IOWriteBandwidthMax") != 0) { get_param_io_limit(arr_values, index_1, size,index, "IOWriteBandwidthMax"); } - else { - int* array_limit = NULL; - char** array_disk = NULL; - int index11 = 0; - array_limit = philos_int_append(array_limit, &index11, -2); - index11--; - array_disk = yon_char_parsed_append(array_disk, &index11, NULL); - main_config.i_o_limit_write = yon_remalloc(main_config.i_o_limit_write, (main_config.size_tree_view + 1) * sizeof(int*)); - main_config.i_o_limit_write_size = yon_remalloc(main_config.i_o_limit_write_size, (main_config.size_tree_view + 1) * sizeof(int*)); - main_config.disk = yon_remalloc(main_config.disk, (main_config.size_tree_view + 1) * sizeof(char**)); - philos_array_int_copy(&main_config.i_o_limit_write[main_config.size_tree_view], &array_limit); - philos_array_int_copy(&main_config.i_o_limit_write_size[main_config.size_tree_view], &array_limit); - yon_char_parsed_copy(&main_config.disk[main_config.size_tree_view], &array_disk); - philos_free_int_array(&array_limit, 1); - philos_free_string_array(&array_disk, 1); - } if (yon_char_find_count(key, "MemoryHigh") != 0) { philos_set_pow_size_memory(yon_char_new(value), &main_config.soft_raw_limit_size, index, array_size_pow); set_size_memory_integer(yon_char_new(value), &main_config.soft_raw_limit, index); @@ -506,7 +500,6 @@ void get_param_io_limit(char** arr_values, int index_start, int size, int index_ strstr(arr_values[i], key_find)==NULL && flag_parsed == 1) { // Найден ключ в массив, но не тот flag_exit = 1; - } free(value); } @@ -697,7 +690,7 @@ char* format_io_limit_in_tree_view(config_str* disk, int** i_o_limit, int** i_o_ } else if (strstr(disk[index][index_to_n2], "-")){ - str = yon_char_unite(str, ",", NULL); + // str = yon_char_unite(str, ",", NULL); } else { if (!strstr(str, "-")) {