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

Replace brk with breakdown

Browse Source
This commit is contained in:
Rodrigo Arias 2023-04-06 17:38:37 +02:00
parent 602daabe23
commit 9e105413fd
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@ model_nanos6_breakdown_create(struct emu *emu)
return 0; return 0;
struct nanos6_emu *memu = EXT(emu, '6'); struct nanos6_emu *memu = EXT(emu, '6');
struct breakdown_emu *bemu = &memu->brk; struct breakdown_emu *bemu = &memu->breakdown;
/* Count phy cpus */ /* Count phy cpus */
struct system *sys = &emu->system; struct system *sys = &emu->system;
@ -80,7 +80,7 @@ model_nanos6_breakdown_create(struct emu *emu)
continue; continue;
struct nanos6_cpu *mcpu = EXT(cpu, '6'); struct nanos6_cpu *mcpu = EXT(cpu, '6');
struct breakdown_cpu *bcpu = &mcpu->brk; struct breakdown_cpu *bcpu = &mcpu->breakdown;
if (create_cpu(&emu->bay, bcpu, cpu->gindex) != 0) { if (create_cpu(&emu->bay, bcpu, cpu->gindex) != 0) {
err("create_cpu failed"); err("create_cpu failed");
@ -156,7 +156,7 @@ select_idle(struct mux *mux, struct value value, struct mux_input **input)
static int static int
connect_cpu(struct bay *bay, struct nanos6_cpu *mcpu) connect_cpu(struct bay *bay, struct nanos6_cpu *mcpu)
{ {
struct breakdown_cpu *bcpu = &mcpu->brk; struct breakdown_cpu *bcpu = &mcpu->breakdown;
/* Channel aliases */ /* Channel aliases */
struct chan *ss = &mcpu->m.track[CH_SUBSYSTEM].ch; struct chan *ss = &mcpu->m.track[CH_SUBSYSTEM].ch;
@ -210,7 +210,7 @@ model_nanos6_breakdown_connect(struct emu *emu)
return 0; return 0;
struct nanos6_emu *memu = EXT(emu, '6'); struct nanos6_emu *memu = EXT(emu, '6');
struct breakdown_emu *bemu = &memu->brk; struct breakdown_emu *bemu = &memu->breakdown;
struct bay *bay = &emu->bay; struct bay *bay = &emu->bay;
struct system *sys = &emu->system; struct system *sys = &emu->system;
@ -220,7 +220,7 @@ model_nanos6_breakdown_connect(struct emu *emu)
continue; continue;
struct nanos6_cpu *mcpu = EXT(cpu, '6'); struct nanos6_cpu *mcpu = EXT(cpu, '6');
struct breakdown_cpu *bcpu = &mcpu->brk; struct breakdown_cpu *bcpu = &mcpu->breakdown;
/* Connect tr and tri channels and muxes */ /* Connect tr and tri channels and muxes */
if (connect_cpu(bay, mcpu) != 0) { if (connect_cpu(bay, mcpu) != 0) {
@ -259,7 +259,7 @@ model_nanos6_breakdown_finish(struct emu *emu,
return 0; return 0;
struct nanos6_emu *memu = EXT(emu, '6'); struct nanos6_emu *memu = EXT(emu, '6');
struct breakdown_emu *bemu = &memu->brk; struct breakdown_emu *bemu = &memu->breakdown;
struct pcf *pcf = pvt_get_pcf(bemu->pvt); struct pcf *pcf = pvt_get_pcf(bemu->pvt);
long typeid = PRV_NANOS6_BREAKDOWN; long typeid = PRV_NANOS6_BREAKDOWN;
char label[] = "CPU: Nanos6 Runtime/Idle/Task breakdown"; char label[] = "CPU: Nanos6 Runtime/Idle/Task breakdown";

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

@ -79,7 +79,7 @@ struct nanos6_thread {
struct nanos6_cpu { struct nanos6_cpu {
struct model_cpu m; struct model_cpu m;
struct breakdown_cpu brk; struct breakdown_cpu breakdown;
}; };
struct nanos6_proc { struct nanos6_proc {
@ -89,7 +89,7 @@ struct nanos6_proc {
struct nanos6_emu { struct nanos6_emu {
int connected; int connected;
int event; int event;
struct breakdown_emu brk; struct breakdown_emu breakdown;
}; };
int model_nanos6_probe(struct emu *emu); int model_nanos6_probe(struct emu *emu);