correct main.c to use correct integer types, and optimise cpu_setter.

This commit is contained in:
2025-08-19 10:45:02 +02:00
parent 4200d859aa
commit 96ec279d9a

View File

@@ -8,28 +8,25 @@
#include "error.h" #include "error.h"
#include "opts.h" #include "opts.h"
static inline bool cpu_setter(uint32_t id, bool nstate, uint8_t opts) { /* sets CPU `id` to `nstate`, if it hasn't been set yet.
bool cstate = !nstate; * If `opt` contains `OPT_SET_ALL`, this check is ignored.
if (!(opts & OPT_SET_ALL)) * Returns `0` upon success, `1` upon failure. */
cstate = cpu_getenabled(id); static int setcpu(uint id, int nstate, u8 opts) {
bool nsetall = !(opts & OPT_SET_ALL); // if SET_ALL has not been set
if (cstate != nstate) { int cstate = nsetall && cpu_getenabled(id); // get state if nsetall=1
cpu_setenabled(id, nstate); return (nsetall && cstate == nstate) || cpu_setenabled(id, nstate); // set if cstate matches nstate, unless nsetall=1
return true;
}
return false;
} }
static inline void print_cpu_count(int32_t mcpus) { static inline void print_cpu_count(uint mcpus) {
printf("%i/%i cpus enabled.\n", get_nprocs(), mcpus); // get the number of available processors printf("%i/%i cpus enabled.\n", get_nprocs(), mcpus); // get the number of available processors
} }
int32_t main(int32_t argc, char **argv) { int main(int argc, char **argv) {
if (geteuid() != 0) fatal("must be executed as the root user!"); if (geteuid() != 0) fatal("must be executed as the root user!");
int32_t ncpus; // the number of CPUs to activate int mcpus, ncpus; // the number of CPUs to activate
uint8_t opts = getoptions(argc, argv, &ncpus); // the options to use u8 opts = getoptions(argc, argv, &ncpus); // the options to use
int32_t mcpus = get_nprocs_conf(); // the max number of CPUs that are available mcpus = get_nprocs_conf(); // the max number of CPUs that are available
if (opts & OPT_LIST_CORES && ncpus < 0) { if (opts & OPT_LIST_CORES && ncpus < 0) {
print_cpu_count(mcpus); print_cpu_count(mcpus);
@@ -44,17 +41,17 @@ int32_t main(int32_t argc, char **argv) {
if (ncpus < 1) fatal("may not keep less than 1 cpu enabled, requested to enable %i", ncpus); if (ncpus < 1) fatal("may not keep less than 1 cpu enabled, requested to enable %i", ncpus);
const char *const cpu_set_log = "set cpu %i to %hi\n"; const char *const cpu_set_log = "set cpu %i to %hi\n";
for (int32_t id = 1; id < mcpus; id++) { // start at CPU 1, as CPU 0 is not writeable for (int id = 1; id < mcpus; id++) { // start at CPU 1, as CPU 0 is not writeable
// whilst the id is less then the amount of cpus to enable // whilst the id is less then the amount of cpus to enable
if (id < ncpus) { if (id < ncpus) {
// enable the cpu & print if it was actually set (if -v was given) // enable the cpu & print if it was actually set (if -v was given)
if (cpu_setter(id, true, opts) && (opts & OPT_VERBOSE)) if (!setcpu(id, true, opts) && (opts & OPT_VERBOSE))
printf(cpu_set_log, id, 1); printf(cpu_set_log, id, 1);
continue; continue;
} }
// disable the cpu & print if it was actually set (if -v was given) // disable the cpu & print if it was actually set (if -v was given)
if (cpu_setter(id, false, opts) && (opts & OPT_VERBOSE)) { if (!setcpu(id, false, opts) && (opts & OPT_VERBOSE)) {
printf(cpu_set_log, id, 0); printf(cpu_set_log, id, 0);
continue; continue;
} }