From: Julien Desfossez Date: Thu, 30 Jan 2014 20:05:33 +0000 (-0500) Subject: Avoid clash with babeltrace live libs X-Git-Tag: v0.3~64 X-Git-Url: http://git.lttng.org/?p=lttngtop.git;a=commitdiff_plain;h=e4404da406c52631a553466dc2d29dfe75beeef2 Avoid clash with babeltrace live libs For now just a rename, will become a statically linked lib later. Signed-off-by: Julien Desfossez --- diff --git a/src/Makefile.am b/src/Makefile.am index f199ca1..bc1e258 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,8 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/lib -DBABELTRACE_HAVE_LIBUUID -lib_LTLIBRARIES = libbabeltrace-lttng-live.la +lib_LTLIBRARIES = libbabeltrace-lttngtop-live.la -libbabeltrace_lttng_live_la_SOURCES = \ +libbabeltrace_lttngtop_live_la_SOURCES = \ network-live.c lttng-live-functions.c bin_PROGRAMS = lttngtop @@ -30,5 +30,5 @@ lttngtop_LDFLAGS = -Wl,--no-as-needed #lttngtop_LDADD = -lbabeltrace -lbabeltrace-ctf -llttngtop-helper -llttng-ctl -lurcu -llttngtopmmappacketseek -llttng-ust-ctl -lcurses -lpanel lttngtop_LDADD = -lbabeltrace -lbabeltrace-ctf -llttng-ctl -lurcu -llttng-ust-ctl -lcurses -lpanel \ - $(top_builddir)/src/libbabeltrace-lttng-live.la + $(top_builddir)/src/libbabeltrace-lttngtop-live.la diff --git a/src/lttng-live-functions.c b/src/lttng-live-functions.c index 67e7aba..83be1e9 100644 --- a/src/lttng-live-functions.c +++ b/src/lttng-live-functions.c @@ -823,7 +823,7 @@ retry: g_array_append_val(file_stream->pos.packet_real_index, packet_index); - compute_discarded_events(file_stream, pos); + //compute_discarded_events(file_stream, pos); packet_index = g_array_index(pos->packet_cycles_index, struct packet_index, pos->cur_index);