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

Use int64_t printf formats for mark channels

Browse Source
This commit is contained in:
Rodrigo Arias 2024-07-24 15:37:50 +02:00
parent 97282ff051
commit 439b716a71
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/emu/ovni/mark.c
View File

@ -311,15 +311,14 @@ create_thread_chan(struct ovni_mark_emu *m, struct bay *bay, struct thread *th)
t->nchannels = m->ntypes; t->nchannels = m->ntypes;
const char *fmt = "thread%ld.mark%ld";
struct mark_type *type; struct mark_type *type;
for (type = m->types; type; type = type->hh.next) { for (type = m->types; type; type = type->hh.next) {
/* TODO: We may use a vector of thread channels in every type to /* TODO: We may use a vector of thread channels in every type to
* avoid the double hash access in events */ * avoid the double hash access in events */
long i = type->index; long i = type->index;
struct chan *ch = &t->channels[i]; 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 */ /* Allow duplicates */
chan_prop_set(ch, CHAN_ALLOW_DUP, 1); 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]; struct track *track = &t->track[i];
/* For now only tracking to active thread is supported */ /* For now only tracking to active thread is supported */
if (track_init(track, bay, TRACK_TYPE_TH, TRACK_TH_ACT, 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"); err("track_init failed");
return -1; 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_cpu *ocpu = EXT(cpu, 'O');
struct ovni_mark_cpu *c = &ocpu->mark; struct ovni_mark_cpu *c = &ocpu->mark;
const char *fmt = "cpu%ld.mark%ld";
/* Setup tracking */ /* Setup tracking */
c->track = calloc(m->ntypes, sizeof(struct track)); c->track = calloc(m->ntypes, sizeof(struct track));
if (c->track == NULL) { 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]; struct track *track = &c->track[i];
/* For now only tracking to running thread is supported */ /* For now only tracking to running thread is supported */
if (track_init(track, bay, TRACK_TYPE_TH, TRACK_TH_RUN, 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"); err("track_init failed");
return -1; return -1;
} }