From 9e105413fd7e6c0b21ac163016e80a6b19ab7033 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias <rodrigo.arias@bsc.es>
Date: Thu, 6 Apr 2023 17:38:37 +0200
Subject: [PATCH] Replace brk with breakdown

---
 src/emu/nanos6/breakdown.c   | 12 ++++++------
 src/emu/nanos6/nanos6_priv.h |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/emu/nanos6/breakdown.c b/src/emu/nanos6/breakdown.c
index ad4e548..26fa0d6 100644
--- a/src/emu/nanos6/breakdown.c
+++ b/src/emu/nanos6/breakdown.c
@@ -55,7 +55,7 @@ model_nanos6_breakdown_create(struct emu *emu)
 		return 0;
 
 	struct nanos6_emu *memu = EXT(emu, '6');
-	struct breakdown_emu *bemu = &memu->brk;
+	struct breakdown_emu *bemu = &memu->breakdown;
 
 	/* Count phy cpus */
 	struct system *sys = &emu->system;
@@ -80,7 +80,7 @@ model_nanos6_breakdown_create(struct emu *emu)
 			continue;
 
 		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) {
 			err("create_cpu failed");
@@ -156,7 +156,7 @@ select_idle(struct mux *mux, struct value value, struct mux_input **input)
 static int
 connect_cpu(struct bay *bay, struct nanos6_cpu *mcpu)
 {
-	struct breakdown_cpu *bcpu = &mcpu->brk;
+	struct breakdown_cpu *bcpu = &mcpu->breakdown;
 
 	/* Channel aliases */
 	struct chan *ss = &mcpu->m.track[CH_SUBSYSTEM].ch;
@@ -210,7 +210,7 @@ model_nanos6_breakdown_connect(struct emu *emu)
 		return 0;
 
 	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 system *sys = &emu->system;
 
@@ -220,7 +220,7 @@ model_nanos6_breakdown_connect(struct emu *emu)
 			continue;
 
 		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 */
 		if (connect_cpu(bay, mcpu) != 0) {
@@ -259,7 +259,7 @@ model_nanos6_breakdown_finish(struct emu *emu,
 		return 0;
 
 	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);
 	long typeid = PRV_NANOS6_BREAKDOWN;
 	char label[] = "CPU: Nanos6 Runtime/Idle/Task breakdown";
diff --git a/src/emu/nanos6/nanos6_priv.h b/src/emu/nanos6/nanos6_priv.h
index 33bcea2..a971496 100644
--- a/src/emu/nanos6/nanos6_priv.h
+++ b/src/emu/nanos6/nanos6_priv.h
@@ -79,7 +79,7 @@ struct nanos6_thread {
 
 struct nanos6_cpu {
 	struct model_cpu m;
-	struct breakdown_cpu brk;
+	struct breakdown_cpu breakdown;
 };
 
 struct nanos6_proc {
@@ -89,7 +89,7 @@ struct nanos6_proc {
 struct nanos6_emu {
 	int connected;
 	int event;
-	struct breakdown_emu brk;
+	struct breakdown_emu breakdown;
 };
 
 int model_nanos6_probe(struct emu *emu);