Skip to content

Commit 10bceb4

Browse files
vnepogodinvnepogodin
committed
🚧 conf: adjust default options
1 parent d32730b commit 10bceb4

1 file changed

Lines changed: 25 additions & 22 deletions

File tree

‎src/conf-window.cpp‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ namespace fs = std::filesystem;
9999

100100
namespace {
101101

102-
GENERATE_CONST_LOOKUP_OPTION_VALUES(kernel_name, "cachyos", "bore", "rc", "rt", "rt-bore", "eevdf", "bmq")
102+
GENERATE_CONST_LOOKUP_OPTION_VALUES(kernel_name, "cachyos", "bore", "rc", "rt", "eevdf", "bmq")
103103
GENERATE_CONST_LOOKUP_OPTION_VALUES(hz_tick, "1000", "750", "600", "500", "300", "250", "100")
104104
GENERATE_CONST_LOOKUP_OPTION_VALUES(tickless_mode, "full", "idle", "perodic")
105105
GENERATE_CONST_LOOKUP_OPTION_VALUES(preempt_mode, "full", "lazy", "voluntary", "none")
@@ -113,9 +113,8 @@ static_assert(lookup_kernel_name("cachyos") == 0, "Invalid position");
113113
static_assert(lookup_kernel_name("bore") == 1, "Invalid position");
114114
static_assert(lookup_kernel_name("rc") == 2, "Invalid position");
115115
static_assert(lookup_kernel_name("rt") == 3, "Invalid position");
116-
static_assert(lookup_kernel_name("rt-bore") == 4, "Invalid position");
117-
static_assert(lookup_kernel_name("eevdf") == 5, "Invalid position");
118-
static_assert(lookup_kernel_name("bmq") == 6, "Invalid position");
116+
static_assert(lookup_kernel_name("eevdf") == 4, "Invalid position");
117+
static_assert(lookup_kernel_name("bmq") == 5, "Invalid position");
119118

120119
constexpr auto get_kernel_name_path(std::string_view kernel_name) noexcept {
121120
using namespace std::string_view_literals;
@@ -125,22 +124,14 @@ constexpr auto get_kernel_name_path(std::string_view kernel_name) noexcept {
125124
return "linux-cachyos-bmq"sv;
126125
} else if (kernel_name == "bore"sv) {
127126
return "linux-cachyos-bore"sv;
128-
} else if (kernel_name == "cfs"sv) {
129-
return "linux-cachyos-cfs"sv;
130127
} else if (kernel_name == "hardened"sv) {
131128
return "linux-cachyos-hardened"sv;
132-
} else if (kernel_name == "pds"sv) {
133-
return "linux-cachyos-pds"sv;
129+
} else if (kernel_name == "lts"sv) {
130+
return "linux-cachyos-lts"sv;
134131
} else if (kernel_name == "rc"sv) {
135132
return "linux-cachyos-rc"sv;
136133
} else if (kernel_name == "rt"sv) {
137-
return "linux-cachyos-rt"sv;
138-
} else if (kernel_name == "tt"sv) {
139-
return "linux-cachyos-tt"sv;
140-
} else if (kernel_name == "rt-bore"sv) {
141134
return "linux-cachyos-rt-bore"sv;
142-
} else if (kernel_name == "sched-ext"sv) {
143-
return "linux-cachyos-sched-ext"sv;
144135
} else if (kernel_name == "eevdf"sv) {
145136
return "linux-cachyos-eevdf"sv;
146137
}
@@ -479,15 +470,13 @@ ConfWindow::ConfWindow(QWidget* parent)
479470
<< tr("BORE - Burst-Oriented Response Enhancer")
480471
<< tr("RC - Release Candidate")
481472
<< tr("RT - Realtime kernel")
482-
<< tr("RT-Bore")
483473
<< tr("EEVDF")
484474
<< tr("BMQ (BitMap Queue)");
485475
options_page_ui_obj->main_combo_box->addItems(kernel_names);
486476

487477
// Setting default options
488478
options_page_ui_obj->cachyconfig_check->setCheckState(Qt::Checked);
489479
options_page_ui_obj->hardly_check->setCheckState(Qt::Checked);
490-
options_page_ui_obj->tcpbbr_check->setCheckState(Qt::Checked);
491480

492481
QStringList hz_ticks;
493482
hz_ticks << "1000HZ"
@@ -527,18 +516,32 @@ ConfWindow::ConfWindow(QWidget* parent)
527516
<< "Full"
528517
<< "Thin";
529518
options_page_ui_obj->lto_combo_box->addItems(lto_modes);
519+
// ThinLTO is enabled by default for defaultkernel,rckernel in the PKGBUILD
520+
options_page_ui_obj->lto_combo_box->setCurrentIndex(2);
530521

531522
QStringList hugepage_modes;
532523
hugepage_modes << "Always"
533-
<< "Madivse";
524+
<< "Madvise";
534525
options_page_ui_obj->hugepage_combo_box->addItems(hugepage_modes);
535526

536527
// Connect buttons signal
537528
connect(options_page_ui_obj->cancel_button, &QPushButton::clicked, this, &ConfWindow::on_cancel);
538529
connect(options_page_ui_obj->ok_button, &QPushButton::clicked, this, &ConfWindow::on_execute);
539530
connect(options_page_ui_obj->save_button, &QPushButton::clicked, this, &ConfWindow::on_save);
540531
connect(options_page_ui_obj->load_button, &QPushButton::clicked, this, &ConfWindow::on_load);
541-
connect(options_page_ui_obj->main_combo_box, &QComboBox::currentIndexChanged, this, [this](std::int32_t) {
532+
connect(options_page_ui_obj->main_combo_box, &QComboBox::currentIndexChanged, this, [this, options_page_ui_obj](std::int32_t main_combo_index) {
533+
using namespace std::string_view_literals;
534+
// ThinLTO is enabled by default for defaultkernel,rckernel in the PKGBUILD
535+
const std::string_view kernel_name = get_kernel_name(static_cast<size_t>(main_combo_index));
536+
if (kernel_name == "cachyos"sv || kernel_name == "rc"sv) {
537+
options_page_ui_obj->lto_combo_box->setCurrentIndex(2);
538+
} else {
539+
options_page_ui_obj->lto_combo_box->setCurrentIndex(0);
540+
}
541+
542+
reset_patches_data_tab();
543+
});
544+
connect(options_page_ui_obj->lto_combo_box, &QComboBox::currentIndexChanged, this, [this](std::int32_t) {
542545
reset_patches_data_tab();
543546
});
544547

@@ -669,15 +672,15 @@ void ConfWindow::on_save() noexcept {
669672
ConfigOptions config_options{};
670673

671674
// checkboxes values (booleans)
672-
config_options.hardly_check = checkstate_checked(options_page_ui_obj->hardly_check);
673-
config_options.per_gov_check = checkstate_checked(options_page_ui_obj->perfgovern_check);
674-
config_options.tcp_bbr3_check = checkstate_checked(options_page_ui_obj->tcpbbr_check);
675+
config_options.hardly_check = checkstate_checked(options_page_ui_obj->hardly_check);
676+
config_options.per_gov_check = checkstate_checked(options_page_ui_obj->perfgovern_check);
677+
config_options.tcp_bbr3_check = checkstate_checked(options_page_ui_obj->tcpbbr_check);
675678

676679
config_options.cachy_config_check = checkstate_checked(options_page_ui_obj->cachyconfig_check);
677680
config_options.nconfig_check = checkstate_checked(options_page_ui_obj->nconfig_check);
678681
config_options.xconfig_check = checkstate_checked(options_page_ui_obj->xconfig_check);
679682
config_options.localmodcfg_check = checkstate_checked(options_page_ui_obj->localmodcfg_check);
680-
config_options.use_current_check = checkstate_checked(options_page_ui_obj->use_current_check);
683+
config_options.use_current_check = checkstate_checked(options_page_ui_obj->use_current_check);
681684
config_options.builtin_zfs_check = checkstate_checked(options_page_ui_obj->builtin_zfs_check);
682685
config_options.builtin_nvidia_check = checkstate_checked(options_page_ui_obj->builtin_nvidia_check);
683686
config_options.builtin_nvidia_open_check = checkstate_checked(options_page_ui_obj->builtin_nvidia_open_check);

0 commit comments

Comments
 (0)