Skip to content

Commit

Permalink
Merge pull request #317 from neheb/ci2
Browse files Browse the repository at this point in the history 
clang-tidy and g_ API conversions
  • Loading branch information
@nhorman
nhorman authored Jul 5, 2024
2 parents f235494 + 4d53728 commit 282ce14
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 68 deletions.
4 changes: 2 additions & 2 deletions cputree.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ static struct topo_obj* add_cpu_to_cache_domain(struct topo_obj *cpu,
entry = g_list_find(cache->children, cpu);
if (!entry) {
cache->children = g_list_append(cache->children, cpu);
cpu->parent = (struct topo_obj *)cache;
cpu->parent = cache;
}

if (!numa_avail || (nodeid > NUMA_NO_NODE))
Expand Down Expand Up @@ -441,7 +441,7 @@ static void dump_numa_node_num(struct topo_obj *p, void *data __attribute__((unu

static void dump_balance_obj(struct topo_obj *d, void *data __attribute__((unused)))
{
struct topo_obj *c = (struct topo_obj *)d;
struct topo_obj *c = d;
log(TO_CONSOLE, LOG_INFO, "%s%s%s%sCPU number %i numa_node is ",
log_indent, log_indent, log_indent, log_indent, c->number);
for_each_object(cpu_numa_node(c), dump_numa_node_num, NULL);
Expand Down
34 changes: 19 additions & 15 deletions irqbalance.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ unsigned long migrate_ratio = 0;

#ifdef HAVE_IRQBALANCEUI
int socket_fd;
char socket_name[64];
char socket_name[108];
char *banned_cpumask_from_ui = NULL;
#endif

Expand Down Expand Up @@ -406,11 +406,12 @@ gboolean sock_handle(gint fd, GIOCondition condition, gpointer user_data __attri
int valid_user = 0;

struct iovec iov = { buff, 500 };
struct msghdr msg = { 0 };
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
msg.msg_control = malloc(CMSG_SPACE(sizeof(struct ucred)));
msg.msg_controllen = CMSG_SPACE(sizeof(struct ucred));
struct msghdr msg = {
.msg_iov = &iov,
.msg_iovlen = 1,
.msg_control = g_malloc(CMSG_SPACE(sizeof(struct ucred))),
.msg_controllen = CMSG_SPACE(sizeof(struct ucred)),
};

struct cmsghdr *cmsg;

Expand Down Expand Up @@ -502,7 +503,7 @@ gboolean sock_handle(gint fd, GIOCondition condition, gpointer user_data __attri
recv_size - strlen("settings cpus "));
cpu_ban_string[recv_size - strlen("settings cpus ")] = '\0';
banned_cpumask_from_ui = strtok(cpu_ban_string, " ");
if (!strncmp(banned_cpumask_from_ui, "NULL", strlen("NULL"))) {
if (banned_cpumask_from_ui && !strncmp(banned_cpumask_from_ui, "NULL", strlen("NULL"))) {
banned_cpumask_from_ui = NULL;
free(cpu_ban_string);
cpu_ban_string = NULL;
Expand Down Expand Up @@ -539,7 +540,7 @@ gboolean sock_handle(gint fd, GIOCondition condition, gpointer user_data __attri
}

out:
free(msg.msg_control);
g_free(msg.msg_control);
return TRUE;
}

Expand Down Expand Up @@ -653,13 +654,16 @@ int main(int argc, char** argv)
if (daemon(0,0))
exit(EXIT_FAILURE);
/* Write pidfile which can be used to avoid starting multiple instances */
if (pidfile && (pidfd = open(pidfile,
O_WRONLY | O_CREAT | O_EXCL | O_TRUNC,
S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) >= 0) {
char str[16];
snprintf(str, sizeof(str), "%u\n", getpid());
write(pidfd, str, strlen(str));
close(pidfd);
if (pidfile) {
pidfd = open(pidfile,
O_WRONLY | O_CREAT | O_EXCL | O_TRUNC,
S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
if (pidfd >= 0) {
char str[16];
snprintf(str, sizeof(str), "%u\n", getpid());
write(pidfd, str, strlen(str));
close(pidfd);
}
}
}

Expand Down
6 changes: 3 additions & 3 deletions ui/helpers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ char * hex_to_bitmap(char hex_digit) {
return "0000\0";
}

char *bitmap = malloc(5 * sizeof(char));
char *bitmap = g_malloc_n(5, sizeof(char));
bitmap[4] = '\0';
int i;
for(i = 3; i >= 0; i--) {
Expand All @@ -86,7 +86,7 @@ char * hex_to_bitmap(char hex_digit) {
gpointer copy_cpu_ban(gconstpointer src, gpointer data __attribute__((unused)))
{
cpu_ban_t *old = (cpu_ban_t *)src;
cpu_ban_t *new = malloc(sizeof(cpu_ban_t));
cpu_ban_t *new = g_malloc(sizeof(cpu_ban_t));
new->number = old->number;
new->is_banned = old->is_banned;
new->is_changed = 0;
Expand All @@ -96,7 +96,7 @@ gpointer copy_cpu_ban(gconstpointer src, gpointer data __attribute__((unused)))
gpointer copy_irq(gconstpointer src, gpointer data __attribute__((unused)))
{
irq_t *old = (irq_t *)src;
irq_t *new = malloc(sizeof(irq_t));
irq_t *new = g_malloc(sizeof(irq_t));
new->vector = old->vector;
new->load = old->load;
new->diff = old->diff;
Expand Down
73 changes: 33 additions & 40 deletions ui/irqbalance-ui.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,22 @@ static int default_bufsz = 8192;

struct msghdr * create_credentials_msg(void)
{
struct ucred *credentials = malloc(sizeof(struct ucred));
credentials->pid = getpid();
credentials->uid = geteuid();
credentials->gid = getegid();
struct ucred credentials = {
.pid = getpid(),
.uid = geteuid(),
.gid = getegid(),
};

struct msghdr *msg = malloc(sizeof(struct msghdr));
memset(msg, 0, sizeof(struct msghdr));
struct msghdr *msg = g_malloc0(sizeof(struct msghdr));
msg->msg_iovlen = 1;
msg->msg_control = malloc(CMSG_SPACE(sizeof(struct ucred)));
msg->msg_control = g_malloc(CMSG_SPACE(sizeof(struct ucred)));
msg->msg_controllen = CMSG_SPACE(sizeof(struct ucred));

struct cmsghdr *cmsg = CMSG_FIRSTHDR(msg);
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_CREDENTIALS;
cmsg->cmsg_len = CMSG_LEN(sizeof(struct ucred));
memcpy(CMSG_DATA(cmsg), credentials, sizeof(struct ucred));

free(credentials);
memcpy(CMSG_DATA(cmsg), &credentials, sizeof(struct ucred));
return msg;
}

Expand Down Expand Up @@ -100,8 +98,8 @@ void send_settings(char *data)
sendmsg(socket_fd, msg, 0);

close(socket_fd);
free(msg->msg_control);
free(msg);
g_free(msg->msg_control);
g_free(msg);
}

char * get_data(char *string)
Expand All @@ -118,26 +116,27 @@ char * get_data(char *string)
}

struct msghdr *msg = create_credentials_msg();
struct iovec iov;
iov.iov_base = (void *) string;
iov.iov_len = strlen(string);
struct iovec iov = {
.iov_base = (void *) string,
.iov_len = strlen(string),
};
msg->msg_iov = &iov;
sendmsg(socket_fd, msg, 0);

char *data = malloc(default_bufsz);
char *data = g_malloc(default_bufsz);
int len = recv(socket_fd, data, default_bufsz, MSG_TRUNC);
close(socket_fd);
free(msg->msg_control);
free(msg);
g_free(msg->msg_control);
g_free(msg);
if (len < 0) {
free(data);
g_free(data);
return NULL;
}
data[len] = '\0';
if (len >= default_bufsz) {
/* msg was truncated, increase bufsz and try again */
default_bufsz += 8192;
free(data);
g_free(data);
goto try_again;
}
return data;
Expand All @@ -162,7 +161,7 @@ void parse_setup(char *setup_data)
token = strtok_r(NULL, " ", &ptr);
/* Parse banned IRQ data */
while(!strncmp(token, "IRQ", strlen("IRQ"))) {
new_irq = malloc(sizeof(irq_t));
new_irq = g_malloc(sizeof(irq_t));
new_irq->vector = strtol(strtok_r(NULL, " ", &ptr), NULL, 10);
token = strtok_r(NULL, " ", &ptr);
if(strncmp(token, "LOAD", strlen("LOAD")) != 0) goto out;
Expand All @@ -188,26 +187,24 @@ void parse_setup(char *setup_data)
char *map = hex_to_bitmap(token[i]);
for(j = 3; j >= 0; j--) {
if(map[j] == '1') {
uint64_t *banned_cpu = malloc(sizeof(uint64_t));
uint64_t *banned_cpu = g_malloc(sizeof(uint64_t));
*banned_cpu = cpu;
setup.banned_cpus = g_list_append(setup.banned_cpus,
banned_cpu);
}
cpu++;
}
free(map);
g_free(map);

}
free(copy);
g_free(copy);
return;

out: {
/* Invalid data presented */
printf("Invalid data sent. Unexpected token: %s", token);
if (new_irq) {
free(new_irq);
}
free(copy);
g_free(new_irq);
g_free(copy);
g_list_free(tree);
exit(1);
}
Expand Down Expand Up @@ -251,7 +248,7 @@ void assign_cpu_lists(cpu_node_t *node, void *data __attribute__((unused)))

void assign_cpu_mask(cpu_node_t *node, void *data __attribute__((unused)))
{
char *mask = malloc(16 * sizeof(char));
char *mask = g_malloc_n(16, sizeof(char));
mask[0] = '\0';
unsigned int sum = 0;
GList *list_entry = g_list_first(node->cpu_list);
Expand Down Expand Up @@ -280,16 +277,16 @@ void parse_into_tree(char *data)
if (!data || strlen(data) == 0)
return;

copy = strdup(data);
copy = g_strdup(data);
if (!copy)
return;

token = strtok_r(copy, " ", &ptr);
while(token != NULL) {
/* Parse node data */
if(strncmp(token, "TYPE", strlen("TYPE")) != 0) {
free(copy);
goto out;
g_free(copy);
goto out;
}
new = g_malloc0(sizeof(cpu_node_t));
new->type = strtol(strtok_r(NULL, " ", &ptr), NULL, 10);
Expand All @@ -311,7 +308,7 @@ void parse_into_tree(char *data)

/* Parse assigned IRQ data */
while((token != NULL) && (!strncmp(token, "IRQ", strlen("IRQ")))) {
new_irq = malloc(sizeof(irq_t));
new_irq = g_malloc(sizeof(irq_t));
new_irq->vector = strtol(strtok_r(NULL, " ", &ptr), NULL, 10);
token = strtok_r(NULL, " ", &ptr);
if(strncmp(token, "LOAD", strlen("LOAD")) != 0) goto out;
Expand Down Expand Up @@ -342,20 +339,16 @@ void parse_into_tree(char *data)

new = NULL;
}
free(copy);
g_free(copy);
for_each_node(tree, assign_cpu_lists, NULL);
for_each_node(tree, assign_cpu_mask, NULL);
return;

out: {
/* Invalid data presented */
printf("Invalid data sent. Unexpected token: %s\n", token);
if (new_irq) {
free(new_irq);
}
if (new) {
free(new);
}
g_free(new_irq);
g_free(new);
g_list_free(tree);
exit(1);
}
Expand Down
18 changes: 10 additions & 8 deletions ui/ui.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void show_footer(void)

char * check_control_in_sleep_input(int max_len, int column_offest, int line_offset)
{
char *input_to = malloc(max_len * sizeof(char));
char *input_to = g_malloc_n(max_len, sizeof(char));
int iteration = 0;
while(iteration < max_len) {
int new = getch();
Expand All @@ -76,7 +76,7 @@ char * check_control_in_sleep_input(int max_len, int column_offest, int line_off
attrset(COLOR_PAIR(5) | A_REVERSE | A_BOLD);
break;
case 27:
free(input_to);
g_free(input_to);
return NULL;
default:
input_to[iteration] = new;
Expand Down Expand Up @@ -112,6 +112,7 @@ int get_valid_sleep_input(int column_offest)
char *error;
new_sleep = strtol(input, &error, 10);
if((*error == '\0') && (new_sleep >= 1)) {
g_free(input);
break;
}
new_sleep = setup.sleep;
Expand All @@ -120,7 +121,7 @@ int get_valid_sleep_input(int column_offest)
"Invalid input: %s ",
input);
refresh();
free(input);
g_free(input);
}

attrset(COLOR_PAIR(1));
Expand All @@ -131,7 +132,7 @@ int get_valid_sleep_input(int column_offest)

void get_banned_cpu(int *cpu, char *data __attribute__((unused)))
{
cpu_ban_t *new = malloc(sizeof(cpu_ban_t));
cpu_ban_t *new = g_malloc(sizeof(cpu_ban_t));
new->number = *cpu;
new->is_banned = 1;
all_cpus = g_list_append(all_cpus, new);
Expand Down Expand Up @@ -236,7 +237,7 @@ void get_new_cpu_ban_values(cpu_ban_t *cpu, void *data)
void get_cpu(cpu_node_t *node, void *data __attribute__((unused)))
{
if(node->type == OBJ_TYPE_CPU) {
cpu_ban_t *new = malloc(sizeof(cpu_ban_t));
cpu_ban_t *new = g_malloc(sizeof(cpu_ban_t));
new->number = node->number;
new->is_banned = 0;
all_cpus = g_list_append(all_cpus, new);
Expand Down Expand Up @@ -401,10 +402,9 @@ void get_irq_name(int end)
char buffer[128];

if (irq_name == NULL) {
irq_name = malloc(sizeof(char *) * LINES);
irq_name = g_malloc_n(LINES, sizeof(char *));
for (i = 4; i < LINES; i++) {
irq_name[i] = malloc(sizeof(char) * 50);
memset(irq_name[i], 0, sizeof(char) * 50);
irq_name[i] = g_malloc0_n(50, sizeof(char));
}
}

Expand All @@ -418,6 +418,8 @@ void get_irq_name(int end)
cmd = alloca(sizeof(char) * (len + 1));
snprintf(cmd, len + 1, "cat /proc/interrupts | awk '{for (i=%d;i<=NF;i++)printf(\"%%s \", $i);print \"\"}' | cut -c-49", cpunr + 2);
output = popen(cmd, "r");
if (!output)
return;
for (i = 0; i <= offset; i++)
fgets(buffer, 50, output);
for (i = 4; i < end; i++)
Expand Down

0 comments on commit 282ce14

Please sign in to comment.