Applications
/
ubl-settings-resourcequota
7
0
Fork 2
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Исправлена проблема с записью параметр write при добавлении диска

Browse Source
pull/4/head
Igor Belitskiy 2 years ago
parent 1dfc1c2d78
commit 2883b81cc3
6 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File

16
source/ubl-settings-resourcequota.c
Unescape View File

@ -610,10 +610,6 @@ void tree_view_add(int index) {
main_config.swap_size = philos_int_append(main_config.swap_size, &main_config.size_tree_view, add_get_limit_swap_size()); main_config.swap_size = philos_int_append(main_config.swap_size, &main_config.size_tree_view, add_get_limit_swap_size());
main_config.size_tree_view--; main_config.size_tree_view--;
main_config.cpu_limit_size = philos_int_append(main_config.cpu_limit_size, &main_config.size_tree_view, add_get_limit_cpu_size()); main_config.cpu_limit_size = philos_int_append(main_config.cpu_limit_size, &main_config.size_tree_view, add_get_limit_cpu_size());
//main_config.size_tree_view--;
//main_config.i_o_limit_read_size = philos_int_append(main_config.i_o_limit_read_size, &main_config.size_tree_view, add_get_read_device_size());
///main_config.size_tree_view--;
// main_config.i_o_limit_write_size = philos_int_append(main_config.i_o_limit_write_size, &main_config.size_tree_view, add_get_write_device_size());
fill_tree_view(main_config.size_tree_view-1, main_config.size_tree_view, 1); fill_tree_view(main_config.size_tree_view-1, main_config.size_tree_view, 1);
main_config.flag_set_data = 1; main_config.flag_set_data = 1;
} }
@ -687,9 +683,7 @@ char* format_io_limit_in_tree_view(config_str* disk, int** i_o_limit, int** i_o_
} }
else { else {
break; break;
} }
} }
if (strlen(str)==0) { if (strlen(str)==0) {
return yon_char_new("-"); return yon_char_new("-");
@ -712,12 +706,6 @@ int tree_view_edit() {
main_config.swap[index] = edit_get_limit_swap(); main_config.swap[index] = edit_get_limit_swap();
main_config.cpu_limit[index] = edit_get_limit_cpu(); main_config.cpu_limit[index] = edit_get_limit_cpu();
// philos_free_string_array(&main_config.i_o_limit_read[index], index);
// philos_free_int_array(&main_config.i_o_limit_read_size[index], index);
// philos_free_string_array(&main_config.i_o_limit_write[index], index);
// philos_free_int_array(&main_config.i_o_limit_write_size[index], index);
// philos_free_string_array(&main_config.disk[index], index);
philos_array_int_copy(&main_config.i_o_limit_read[index], edit_get_read_device()); philos_array_int_copy(&main_config.i_o_limit_read[index], edit_get_read_device());
philos_array_int_copy(&main_config.i_o_limit_read_size[index], edit_get_read_device_size_pow()); philos_array_int_copy(&main_config.i_o_limit_read_size[index], edit_get_read_device_size_pow());
yon_char_parsed_copy(&main_config.disk[index], edit_get_select_device()); yon_char_parsed_copy(&main_config.disk[index], edit_get_select_device());
@ -837,7 +825,6 @@ void wrapper_edit_show() {
size_t size_disk_array = 0; size_t size_disk_array = 0;
if (main_config.disk) { if (main_config.disk) {
for (size_disk_array; main_config.disk[index][size_disk_array]; size_disk_array++) { for (size_disk_array; main_config.disk[index][size_disk_array]; size_disk_array++) {
puts(main_config.disk[index][size_disk_array]);
} }
} }
edit_show(NULL, glade_path); edit_show(NULL, glade_path);
@ -1085,7 +1072,6 @@ char* template_format_str_set_save(dictionary* load_cfg, char* source_set_cmd) {
value = yon_char_new(save_format_value(index)); value = yon_char_new(save_format_value(index));
if (key != NULL && value != NULL) { if (key != NULL && value != NULL) {
cmd = yon_char_unite(cmd, " " , key, "=\"" , value, "\" ", NULL); cmd = yon_char_unite(cmd, " " , key, "=\"" , value, "\" ", NULL);
puts(cmd);
flag_save = 1; flag_save = 1;
} }
if (key != NULL) { if (key != NULL) {

2
source/ubl-settings-resourcequota.h
Unescape View File

@ -43,7 +43,7 @@
#define CMD_GET_GROUP "cut -d: -f1 /etc/group" #define CMD_GET_GROUP "cut -d: -f1 /etc/group"
typedef char *string; typedef char *string;
string version_application = "1.2-47-ga9ac737"; string version_application = "1.2-48-g1dfc1c2";
static char *local; static char *local;

26
source/ubl-utils.c
Unescape View File

@ -1298,8 +1298,6 @@ void philos_temp_generate_cmd(temp_set_window *widgets, temp_config* _config) {
} }
} }
puts(str_cmd);
gtk_entry_set_text(GTK_ENTRY(widgets->entryTempCmd), str_cmd); gtk_entry_set_text(GTK_ENTRY(widgets->entryTempCmd), str_cmd);
free(split_simvol); free(split_simvol);
} }
@ -1444,9 +1442,9 @@ void philos_temp_add_disk(temp_set_window *widgets, temp_config* _config){
_config->size--; _config->size--;
} }
else { else {
_config->i_o_limit_read_size = philos_int_append(_config->i_o_limit_read_size,&_config->size,-1); _config->i_o_limit_read_size = philos_int_append(_config->i_o_limit_read_size,&_config->size,-3);
_config->size--; _config->size--;
_config->i_o_limit_read = philos_int_append(_config->i_o_limit_read,&_config->size,-1); _config->i_o_limit_read = philos_int_append(_config->i_o_limit_read,&_config->size,-3);
_config->size--; _config->size--;
} }
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->chbTempWrite))) { if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->chbTempWrite))) {
@ -1456,9 +1454,9 @@ void philos_temp_add_disk(temp_set_window *widgets, temp_config* _config){
_config->size--; _config->size--;
} }
else { else {
_config->i_o_limit_write_size = philos_int_append(_config->i_o_limit_write_size,&_config->size,-1); _config->i_o_limit_write_size = philos_int_append(_config->i_o_limit_write_size,&_config->size,-3);
_config->size--; _config->size--;
_config->i_o_limit_write = philos_int_append(_config->i_o_limit_write,&_config->size,-1); _config->i_o_limit_write = philos_int_append(_config->i_o_limit_write,&_config->size,-3);
_config->size--; _config->size--;
} }
_config->size++; _config->size++;
@ -1472,16 +1470,16 @@ void philos_temp_add_disk(temp_set_window *widgets, temp_config* _config){
_config->i_o_limit_read[index_find] = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widgets->spinTempRead)); _config->i_o_limit_read[index_find] = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widgets->spinTempRead));
} }
else { else {
_config->i_o_limit_read_size[index_find] = -1; _config->i_o_limit_read_size[index_find] = -3;
_config->i_o_limit_read[index_find] = -1; _config->i_o_limit_read[index_find] = -3;
} }
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->chbTempWrite))) { if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->chbTempWrite))) {
_config->i_o_limit_write_size[index_find] = (int)gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->cbtTempWrite)); _config->i_o_limit_write_size[index_find] = (int)gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->cbtTempWrite));
_config->i_o_limit_write[index_find] = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widgets->spinTempWrite)); _config->i_o_limit_write[index_find] = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widgets->spinTempWrite));
} }
else { else {
_config->i_o_limit_write_size[index_find] = -1; _config->i_o_limit_write_size[index_find] = -3;
_config->i_o_limit_write[index_find] = -1; _config->i_o_limit_write[index_find] = -3;
} }
} }
@ -1497,9 +1495,9 @@ void philos_temp_add_disk(temp_set_window *widgets, temp_config* _config){
_config->size--; _config->size--;
} }
else { else {
_config->i_o_limit_read_size = philos_int_append(_config->i_o_limit_read_size,&_config->size,-1); _config->i_o_limit_read_size = philos_int_append(_config->i_o_limit_read_size,&_config->size,-3);
_config->size--; _config->size--;
_config->i_o_limit_read = philos_int_append(_config->i_o_limit_read,&_config->size,-1); _config->i_o_limit_read = philos_int_append(_config->i_o_limit_read,&_config->size,-3);
_config->size--; _config->size--;
} }
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->chbTempWrite))) { if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->chbTempWrite))) {
@ -1509,9 +1507,9 @@ void philos_temp_add_disk(temp_set_window *widgets, temp_config* _config){
_config->size--; _config->size--;
} }
else { else {
_config->i_o_limit_write_size = philos_int_append(_config->i_o_limit_write_size,&_config->size,-1); _config->i_o_limit_write_size = philos_int_append(_config->i_o_limit_write_size,&_config->size,-3);
_config->size--; _config->size--;
_config->i_o_limit_write = philos_int_append(_config->i_o_limit_write,&_config->size,-1); _config->i_o_limit_write = philos_int_append(_config->i_o_limit_write,&_config->size,-3);
_config->size--; _config->size--;
} }
_config->size++; _config->size++;

14
source/view_add.c
Unescape View File

@ -121,8 +121,8 @@ void add_event(temp_set_window *widgets) {
g_signal_connect(G_OBJECT(widgets->cbtTempDevice),"changed",G_CALLBACK(combo_box_device), NULL); g_signal_connect(G_OBJECT(widgets->cbtTempDevice),"changed",G_CALLBACK(combo_box_device), NULL);
g_signal_connect(G_OBJECT(widgets->cbtTempRead),"changed",G_CALLBACK(event_check_io_device), NULL); g_signal_connect(G_OBJECT(widgets->cbtTempRead),"changed",G_CALLBACK(event_check_io_device), NULL);
g_signal_connect(G_OBJECT(widgets->cbtTempWrite),"changed",G_CALLBACK(event_check_io_device), NULL); g_signal_connect(G_OBJECT(widgets->cbtTempWrite),"changed",G_CALLBACK(event_check_io_device), NULL);
g_signal_connect(G_OBJECT(widgets->spinTempRead),"changed",G_CALLBACK(event_check_io_device), NULL); g_signal_connect(G_OBJECT(widgets->spinTempRead),"value-changed",G_CALLBACK(event_check_io_device), NULL);
g_signal_connect(G_OBJECT(widgets->spinTempWrite),"changed",G_CALLBACK(event_check_io_device), NULL); g_signal_connect(G_OBJECT(widgets->spinTempWrite),"value-changed",G_CALLBACK(event_check_io_device), NULL);
g_signal_connect(G_OBJECT(widgets->chbTempRead), "toggled", G_CALLBACK(event_check_io_device), NULL); g_signal_connect(G_OBJECT(widgets->chbTempRead), "toggled", G_CALLBACK(event_check_io_device), NULL);
g_signal_connect(G_OBJECT(widgets->chbTempWrite), "toggled", G_CALLBACK(event_check_io_device), NULL); g_signal_connect(G_OBJECT(widgets->chbTempWrite), "toggled", G_CALLBACK(event_check_io_device), NULL);
} }
@ -202,11 +202,18 @@ int** add_get_write_device_size_pow() {
return &obj_add_config.i_o_limit_write_size; return &obj_add_config.i_o_limit_write_size;
} }
char*** add_get_select_device() { char*** add_get_select_device() {
int flag = 0;
if (obj_add_config.size == 0) { if (obj_add_config.size == 0) {
obj_add_config.disk = yon_char_parsed_append(obj_add_config.disk,&obj_add_config.size, "-"); obj_add_config.disk = yon_char_parsed_append(obj_add_config.disk,&obj_add_config.size, "-");
flag = 1;
} }
obj_add_config.disk = yon_char_parsed_append(obj_add_config.disk,&obj_add_config.size, NULL); obj_add_config.disk = yon_char_parsed_append(obj_add_config.disk,&obj_add_config.size, NULL);
obj_add_config.size-=2; if (flag == 1) {
obj_add_config.size-=2;
}
else {
obj_add_config.size-=1;
}
return &obj_add_config.disk; return &obj_add_config.disk;
} }
@ -237,7 +244,6 @@ int add_get_limit_swap_size() {
else { else {
return -3; return -3;
} }
} }
int add_get_quota_object_size() { int add_get_quota_object_size() {
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(add_widgets->chkPaddingFLTemp))) { if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(add_widgets->chkPaddingFLTemp))) {

1
source/view_add.h
Unescape View File

@ -41,6 +41,7 @@ int add_get_limit_cpu();
int add_get_limit_swap(); int add_get_limit_swap();
char* add_get_quota_object(); char* add_get_quota_object();
void combo_box_device();
int** add_get_write_device_size_pow(); int** add_get_write_device_size_pow();
int** add_get_read_device_size_pow(); int** add_get_read_device_size_pow();
int add_get_soft_size(); int add_get_soft_size();

3
source/view_edit.c
Unescape View File

@ -180,7 +180,6 @@ int edit_get_limit_swap_size() {
else { else {
return -3; return -3;
} }
} }
int edit_get_quota_object_size() { int edit_get_quota_object_size() {
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(edit_widgets->chkPaddingFLTemp))) { if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(edit_widgets->chkPaddingFLTemp))) {
@ -230,7 +229,7 @@ int edit_get_limit_cpu() {
return gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(edit_widgets->spinCPULimitTemp)); return gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(edit_widgets->spinCPULimitTemp));
} }
else { else {
return 0; return -3;
} }
} }
int edit_get_limit_swap() { int edit_get_limit_swap() {

Write Preview
Loading…
Cancel
Save