diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0737c4e..57fb4f0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,13 +33,6 @@ add_executable(ovnidump parson.c ) -add_executable(ovni2prv - ovni2prv.c - ovni.c - trace.c - parson.c -) - add_executable(ovnisort sort.c ovni.c @@ -58,5 +51,5 @@ add_executable(ovnisync ovnisync.c) target_link_libraries(ovnisync m MPI::MPI_C) install(TARGETS ovni LIBRARY DESTINATION lib) -install(TARGETS ovniemu ovnidump ovni2prv ovnisync ovnisort RUNTIME DESTINATION bin) +install(TARGETS ovniemu ovnidump ovnisync ovnisort RUNTIME DESTINATION bin) install(FILES ovni.h DESTINATION include) diff --git a/src/ovni2prv.c b/src/ovni2prv.c deleted file mode 100644 index 4c66c9d..0000000 --- a/src/ovni2prv.c +++ /dev/null @@ -1,137 +0,0 @@ -/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC) - * SPDX-License-Identifier: GPL-3.0-or-later */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "ovni.h" -#include "trace.h" - -static void -emit(struct ovni_ev *ev, int row) -{ - static uint64_t firstclock = 0; - int64_t delta; - - if (firstclock == 0) - firstclock = ovni_ev_get_clock(ev); - - delta = ovni_ev_get_clock(ev) - firstclock; - - //#Paraver (19/01/38 at 03:14):00000000000000000000_ns:0:1:1(00000000000000000008:1) - // 2:0:1:1:7:1540663:6400010:1 - // 2:0:1:1:7:1540663:6400015:1 - // 2:0:1:1:7:1540663:6400017:0 - // 2:0:1:1:7:1542091:6400010:1 - // 2:0:1:1:7:1542091:6400015:1 - // 2:0:1:1:7:1542091:6400025:1 - // 2:0:1:1:7:1542091:6400017:0 - - printf("2:0:1:1:%d:%ld:%d:%d\n", row, delta, ev->header.category, ev->header.value); -} - -static void -dump_events(struct ovni_trace *trace) -{ - size_t i; - int f, row; - uint64_t minclock, lastclock; - struct ovni_ev *ev; - struct ovni_stream *stream; - - /* Load events */ - for (i = 0; i < trace->nstreams; i++) { - stream = &trace->stream[i]; - ovni_load_next_event(stream); - } - - lastclock = 0; - - while (1) { - f = -1; - minclock = 0; - - /* Select next event based on the clock */ - for (i = 0; i < trace->nstreams; i++) { - stream = &trace->stream[i]; - - if (!stream->active) - continue; - - ev = stream->cur_ev; - if (f < 0 || ovni_ev_get_clock(ev) < minclock) { - f = i; - minclock = ovni_ev_get_clock(ev); - } - } - - // fprintf(stderr, "f=%d minclock=%u\n", f, minclock); - - if (f < 0) - break; - - stream = &trace->stream[f]; - - if (lastclock >= ovni_ev_get_clock(stream->cur_ev)) { - fprintf(stderr, "warning: backwards jump in time\n"); - } - - /* Emit current event */ - row = f + 1; - emit(stream->cur_ev, row); - - lastclock = ovni_ev_get_clock(stream->cur_ev); - - /* Read the next one */ - ovni_load_next_event(stream); - - /* Unset the index */ - f = -1; - minclock = 0; - } -} - -int -main(int argc, char *argv[]) -{ - char *tracedir; - struct ovni_trace *trace = calloc(1, sizeof(struct ovni_trace)); - - if (trace == NULL) { - perror("calloc"); - exit(EXIT_FAILURE); - } - - if (argc != 2) { - fprintf(stderr, "missing tracedir\n"); - exit(EXIT_FAILURE); - } - - tracedir = argv[1]; - - if (ovni_load_trace(trace, tracedir)) - return 1; - - if (ovni_load_streams(trace)) - return 1; - - printf("#Paraver (19/01/38 at 03:14):00000000000000000000_ns:0:1:1(%ld:1)\n", - trace->nstreams); - - dump_events(trace); - - ovni_free_streams(trace); - - fflush(stdout); - - free(trace); - - return 0; -}