From 4d3c95233beec21079b6f895a7a55ae1421ee5cc Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 8 Nov 2011 11:36:52 -0500 Subject: [PATCH] Move libringbuffer and comm connect messages to debug level Signed-off-by: Mathieu Desnoyers --- liblttng-ust/lttng-ust-comm.c | 2 +- liblttng-ust/ust-core.c | 2 -- libringbuffer/ring_buffer_frontend.c | 10 +++++----- snprintf/Makefile.am | 4 +++- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c index d35511b2..ad02dd9d 100644 --- 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 b42e3ea8..67e01600 100644 --- 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 6de83368..56608eca 100644 --- 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 efa35340..f04846a2 100644 --- 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 -- 2.34.1