Avoid clash with babeltrace live libs

For now just a rename, will become a statically linked lib later.

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index f199ca12c7f01024b778e55153bceba346908c99..bc1e258d73a9b3bca4b089f263b3e244b27b0863 100644 (file)
--- 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 67e7aba0831346adf29962191eee021072399057..83be1e95d104b8bff5fbf28fbddf8b5a9cffadbb 100644 (file)
--- 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);