Move libringbuffer and comm connect messages to debug level

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index d35511b2f1afecc7bf16a10317955130c6cbc175..ad02dd9d366faaf043f9b13bc638eef371b99a4a 100644 (file)
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -625,7 +625,7 @@ restart:
        /* Register */
        ret = ustcomm_connect_unix_sock(sock_info->sock_path);
        if (ret < 0) {
-               ERR("Error connecting to %s apps socket", sock_info->name);
+               DBG("Info: sessiond not accepting connections to %s apps socket", sock_info->name);
                prev_connect_failed = 1;
                /*
                 * If we cannot find the sessiond daemon, don't delay

diff --git a/liblttng-ust/ust-core.c b/liblttng-ust/ust-core.c
index b42e3ea8660b1e567b12e41107c3d577be4d6118..67e016007dd8bbb540d874b639f19738f7c6ef13 100644 (file)
--- a/liblttng-ust/ust-core.c
+++ b/liblttng-ust/ust-core.c
@@ -24,8 +24,6 @@
 
 CDS_LIST_HEAD(ltt_transport_list);
 
-volatile enum ust_loglevel ust_loglevel;
-
 void init_usterr(void)
 {
        char *ust_debug;

diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c
index 6de8336861e4dadc43d77cf4f77140c54f67f64f..56608eca9e14af3b84e1f4d8426fb33a8e608165 100644 (file)
--- a/libringbuffer/ring_buffer_frontend.c
+++ b/libringbuffer/ring_buffer_frontend.c
@@ -973,7 +973,7 @@ void lib_ring_buffer_print_subbuffer_errors(struct lttng_ust_lib_ring_buffer *bu
        commit_count_sb = v_read(config, &shmp_index(handle, buf->commit_cold, cons_idx)->cc_sb);
 
        if (subbuf_offset(commit_count, chan) != 0)
-               ERRMSG("ring buffer %s, cpu %d: "
+               DBG("ring buffer %s, cpu %d: "
                       "commit count in subbuffer %lu,\n"
                       "expecting multiples of %lu bytes\n"
                       "  [ %lu bytes committed, %lu bytes reader-visible ]\n",
@@ -981,7 +981,7 @@ void lib_ring_buffer_print_subbuffer_errors(struct lttng_ust_lib_ring_buffer *bu
                       chan->backend.subbuf_size,
                       commit_count, commit_count_sb);
 
-       ERRMSG("ring buffer: %s, cpu %d: %lu bytes committed\n",
+       DBG("ring buffer: %s, cpu %d: %lu bytes committed\n",
               chan->backend.name, cpu, commit_count);
 }
 
@@ -1008,7 +1008,7 @@ void lib_ring_buffer_print_buffer_errors(struct lttng_ust_lib_ring_buffer *buf,
        write_offset = v_read(config, &buf->offset);
        cons_offset = uatomic_read(&buf->consumed);
        if (write_offset != cons_offset)
-               ERRMSG("ring buffer %s, cpu %d: "
+               DBG("ring buffer %s, cpu %d: "
                       "non-consumed data\n"
                       "  [ %lu bytes written, %lu bytes read ]\n",
                       chan->backend.name, cpu, write_offset, cons_offset);
@@ -1030,7 +1030,7 @@ void lib_ring_buffer_print_errors(struct channel *chan,
        const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
        void *priv = channel_get_private(chan);
 
-       ERRMSG("ring buffer %s, cpu %d: %lu records written, "
+       DBG("ring buffer %s, cpu %d: %lu records written, "
                          "%lu records overrun\n",
                          chan->backend.name, cpu,
                          v_read(config, &buf->records_count),
@@ -1039,7 +1039,7 @@ void lib_ring_buffer_print_errors(struct channel *chan,
        if (v_read(config, &buf->records_lost_full)
            || v_read(config, &buf->records_lost_wrap)
            || v_read(config, &buf->records_lost_big))
-               ERRMSG("ring buffer %s, cpu %d: records were lost. Caused by:\n"
+               DBG("ring buffer %s, cpu %d: records were lost. Caused by:\n"
                       "  [ %lu buffer full, %lu nest buffer wrap-around, "
                       "%lu event too big ]\n",
                       chan->backend.name, cpu,

diff --git a/snprintf/Makefile.am b/snprintf/Makefile.am
index efa35340540df66972ddb829daa46594a72dde3a..f04846a2a881fc739604c513a13f20592648cc2c 100644 (file)
--- a/snprintf/Makefile.am
+++ b/snprintf/Makefile.am
@@ -14,6 +14,8 @@ libustsnprintf_la_SOURCES = \
        various.h \
        vfprintf.c \
        wcio.h \
-       wsetup.c
+       wsetup.c \
+       core.c
+
 libustsnprintf_la_LDFLAGS = -no-undefined -static
 libustsnprintf_la_CFLAGS = -DUST_COMPONENT="ust_snprintf" -fPIC -fno-strict-aliasing