From 439b716a710acdee91e55a4d044e7da42df67045 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Date: Wed, 24 Jul 2024 15:37:50 +0200 Subject: [PATCH] Use int64_t printf formats for mark channels --- src/emu/ovni/mark.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/emu/ovni/mark.c b/src/emu/ovni/mark.c index 950ae00..2081b41 100644 --- a/src/emu/ovni/mark.c +++ b/src/emu/ovni/mark.c @@ -311,15 +311,14 @@ create_thread_chan(struct ovni_mark_emu *m, struct bay *bay, struct thread *th) t->nchannels = m->ntypes; - const char *fmt = "thread%ld.mark%ld"; - struct mark_type *type; for (type = m->types; type; type = type->hh.next) { /* TODO: We may use a vector of thread channels in every type to * avoid the double hash access in events */ long i = type->index; struct chan *ch = &t->channels[i]; - chan_init(ch, type->ctype, fmt, th->gindex, type->type); + chan_init(ch, type->ctype, "thread%"PRIi64".mark%ld", + th->gindex, type->type); /* Allow duplicates */ chan_prop_set(ch, CHAN_ALLOW_DUP, 1); @@ -342,7 +341,8 @@ create_thread_chan(struct ovni_mark_emu *m, struct bay *bay, struct thread *th) struct track *track = &t->track[i]; /* For now only tracking to active thread is supported */ if (track_init(track, bay, TRACK_TYPE_TH, TRACK_TH_ACT, - fmt, th->gindex, type->type) != 0) { + "thread%"PRIi64".mark%ld", + th->gindex, type->type) != 0) { err("track_init failed"); return -1; } @@ -357,8 +357,6 @@ init_cpu(struct ovni_mark_emu *m, struct bay *bay, struct cpu *cpu) struct ovni_cpu *ocpu = EXT(cpu, 'O'); struct ovni_mark_cpu *c = &ocpu->mark; - const char *fmt = "cpu%ld.mark%ld"; - /* Setup tracking */ c->track = calloc(m->ntypes, sizeof(struct track)); if (c->track == NULL) { @@ -372,7 +370,8 @@ init_cpu(struct ovni_mark_emu *m, struct bay *bay, struct cpu *cpu) struct track *track = &c->track[i]; /* For now only tracking to running thread is supported */ if (track_init(track, bay, TRACK_TYPE_TH, TRACK_TH_RUN, - fmt, cpu->gindex, type->type) != 0) { + "cpu%"PRIi64".mark%ld", + cpu->gindex, type->type) != 0) { err("track_init failed"); return -1; }