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

Replace class by category to avoid C++ problems

Browse Source
This commit is contained in:
Rodrigo Arias 2021-10-11 15:46:49 +02:00
parent 019668ac53
commit ac6013419b
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dump.c
View File

@ -45,7 +45,7 @@ void emit(struct ovni_stream *stream, struct ovni_ev *ev)
printf("%d.%d.%d %c %c %c % 20ld % 15ld ", printf("%d.%d.%d %c %c %c % 20ld % 15ld ",
stream->loom, stream->proc, stream->tid, stream->loom, stream->proc, stream->tid,
ev->header.model, ev->header.class, ev->header.value, clock, delta); ev->header.model, ev->header.category, ev->header.value, clock, delta);
payloadsize = ovni_payload_size(ev); payloadsize = ovni_payload_size(ev);
for(i=0; i<payloadsize; i++) for(i=0; i<payloadsize; i++)

4
emu.c
View File

@ -42,7 +42,7 @@ emit_ev(struct ovni_stream *stream, struct ovni_ev *ev)
dbg(">>> %d.%d.%d %c %c %c % 20ld % 15ld ", dbg(">>> %d.%d.%d %c %c %c % 20ld % 15ld ",
stream->loom, stream->proc, stream->tid, stream->loom, stream->proc, stream->tid,
ev->header.model, ev->header.class, ev->header.value, clock, delta); ev->header.model, ev->header.category, ev->header.value, clock, delta);
payloadsize = ovni_payload_size(ev); payloadsize = ovni_payload_size(ev);
for(i=0; i<payloadsize; i++) for(i=0; i<payloadsize; i++)
@ -776,7 +776,7 @@ emu_virtual_ev(struct ovni_emu *emu, char *mcv)
ev->header.flags = 0; ev->header.flags = 0;
ev->header.model = mcv[0]; ev->header.model = mcv[0];
ev->header.class = mcv[1]; ev->header.category = mcv[1];
ev->header.value = mcv[2]; ev->header.value = mcv[2];
ev->header.clock = emu->cur_ev->header.clock; ev->header.clock = emu->cur_ev->header.clock;

2
emu_nosv.c
View File

@ -422,7 +422,7 @@ hook_pre_nosv(struct ovni_emu *emu)
{ {
assert(emu->cur_ev->header.model == 'V'); assert(emu->cur_ev->header.model == 'V');
switch(emu->cur_ev->header.class) switch(emu->cur_ev->header.category)
{ {
case 'T': pre_task(emu); break; case 'T': pre_task(emu); break;
case 'Y': pre_type(emu); break; case 'Y': pre_type(emu); break;

2
emu_nosv_ss.c
View File

@ -111,7 +111,7 @@ hook_pre_nosv_ss(struct ovni_emu *emu)
{ {
assert(emu->cur_ev->header.model == 'V'); assert(emu->cur_ev->header.model == 'V');
switch(emu->cur_ev->header.class) switch(emu->cur_ev->header.category)
{ {
case 'S': pre_sched(emu); break; case 'S': pre_sched(emu); break;
case 'U': pre_submit(emu); break; case 'U': pre_submit(emu); break;

6
emu_ovni.c
View File

@ -549,14 +549,14 @@ hook_pre_ovni(struct ovni_emu *emu)
if(emu->cur_ev->header.model != 'O') if(emu->cur_ev->header.model != 'O')
return; return;
switch(emu->cur_ev->header.class) switch(emu->cur_ev->header.category)
{ {
case 'H': pre_thread(emu); break; case 'H': pre_thread(emu); break;
case 'A': pre_affinity(emu); break; case 'A': pre_affinity(emu); break;
case 'B': pre_burst(emu); break; case 'B': pre_burst(emu); break;
default: default:
dbg("unknown ovni event class %c\n", dbg("unknown ovni event category %c\n",
emu->cur_ev->header.class); emu->cur_ev->header.category);
break; break;
} }

2
ovni.c
View File

@ -411,7 +411,7 @@ void
ovni_ev_set_mcv(struct ovni_ev *ev, char *mcv) ovni_ev_set_mcv(struct ovni_ev *ev, char *mcv)
{ {
ev->header.model = mcv[0]; ev->header.model = mcv[0];
ev->header.class = mcv[1]; ev->header.category = mcv[1];
ev->header.value = mcv[2]; ev->header.value = mcv[2];
} }

2
ovni.h
View File

@ -51,7 +51,7 @@ struct __attribute__((__packed__)) ovni_ev_header {
/* first 4 bits reserved, last 4 for payload size */ /* first 4 bits reserved, last 4 for payload size */
uint8_t flags; uint8_t flags;
uint8_t model; uint8_t model;
uint8_t class; uint8_t category;
uint8_t value; uint8_t value;
uint64_t clock; uint64_t clock;
}; };

2
ovni2prv.c
View File

@ -31,7 +31,7 @@ void emit(struct ovni_stream *stream, struct ovni_ev *ev, int row)
//2:0:1:1:7:1542091:6400025:1 //2:0:1:1:7:1542091:6400025:1
//2:0:1:1:7:1542091:6400017:0 //2:0:1:1:7:1542091:6400017:0
printf("2:0:1:1:%d:%ld:%d:%d\n", row, delta, ev->header.class, ev->header.value); printf("2:0:1:1:%d:%ld:%d:%d\n", row, delta, ev->header.category, ev->header.value);
} }
void dump_events(struct ovni_trace *trace) void dump_events(struct ovni_trace *trace)