rarias/ovni
rarias/ovni
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix pcf_labels type

Browse Source
This commit is contained in:
Rodrigo Arias 2023-03-24 15:27:12 +01:00 committed by Rodrigo Arias Mallo
parent 30f68ea5df
commit 5b64737ad9
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/emu/nanos6/breakdown.c
View File

@ -217,7 +217,7 @@ model_nanos6_breakdown_connect(struct emu *emu)
int int
model_nanos6_breakdown_finish(struct emu *emu, model_nanos6_breakdown_finish(struct emu *emu,
const struct pcf_value_label (**labels)[]) const struct pcf_value_label **labels)
{ {
if (emu->args.breakdown == 0) if (emu->args.breakdown == 0)
return 0; return 0;
@ -231,12 +231,20 @@ model_nanos6_breakdown_finish(struct emu *emu,
const struct pcf_value_label *v = NULL; const struct pcf_value_label *v = NULL;
/* Emit subsystem values */ /* Emit subsystem values */
for (v = *labels[CH_SUBSYSTEM]; v->label; v++) for (v = labels[CH_SUBSYSTEM]; v->label; v++) {
pcf_add_value(pcftype, v->value, v->label); if (pcf_add_value(pcftype, v->value, v->label) != 0) {
err("pcf_add_value failed");
return -1;
}
}
/* Emit idle values */ /* Emit idle values */
for (v = *labels[CH_IDLE]; v->label; v++) for (v = labels[CH_IDLE]; v->label; v++) {
pcf_add_value(pcftype, v->value, v->label); if (pcf_add_value(pcftype, v->value, v->label) != 0) {
err("pcf_add_value failed");
return -1;
}
}
/* Emit task_type values */ /* Emit task_type values */
struct system *sys = &emu->system; struct system *sys = &emu->system;

2
src/emu/nanos6/nanos6_priv.h
View File

@ -98,6 +98,6 @@ int model_nanos6_finish(struct emu *emu);
int model_nanos6_breakdown_create(struct emu *emu); int model_nanos6_breakdown_create(struct emu *emu);
int model_nanos6_breakdown_connect(struct emu *emu); int model_nanos6_breakdown_connect(struct emu *emu);
int model_nanos6_breakdown_finish(struct emu *emu, int model_nanos6_breakdown_finish(struct emu *emu,
const struct pcf_value_label (**labels)[]); const struct pcf_value_label **labels);
#endif /* NANOS6_PRIV_H */ #endif /* NANOS6_PRIV_H */

8
src/emu/nanos6/setup.c
View File

@ -131,10 +131,10 @@ static const struct pcf_value_label nanos6_worker_idle[] = {
{ -1, NULL }, { -1, NULL },
}; };
static const struct pcf_value_label (*pcf_labels[CH_MAX])[] = { static const struct pcf_value_label *pcf_labels[CH_MAX] = {
[CH_SUBSYSTEM] = &nanos6_ss_values, [CH_SUBSYSTEM] = nanos6_ss_values,
[CH_THREAD] = &nanos6_thread_type, [CH_THREAD] = nanos6_thread_type,
[CH_IDLE] = &nanos6_worker_idle, [CH_IDLE] = nanos6_worker_idle,
}; };
static const long prv_flags[CH_MAX] = { static const long prv_flags[CH_MAX] = {