Mathieu Desnoyers | 30 Jul 00:36 2014

[PATCH lttng-tools] Fix: git version build system integration (v2)

Fix:
- Don't overwrite version.h if the previous content matches.
- While we are there, if we notice the previous content matches,
  print a (cached) message to show that we do not overwrite the
  content.
- Introduce LTTNG_TOOLS_BUILD_GIT_SOURCE automake conditional rather
  than compile-time define to disable the feature. It ensures we
  do not invoke "git describe" when configure --disable-git-version
  has been requested.
- Use git describe rather than git describe --long --all. Based
  on the last tag, and adds the first numbers of git revision.
  Last tag is useful both to the developer and in a bug report,
  whereas the branch name returned by --long --all is meaningless
  in a bug report.
- We want to ship version.h.tmpl in the tarball (make dist), not
  version.h which is generated. Someone could very well do a
  git init on the extracted tarball and want to have git tracking
  support.
- Fix the git prefix " - " that is incorrectly printed in some
  situations, e.g. when GIT_SOURCE was active, but we are in
  a non-git tree (or git is not available).
- Fix incorrect handling of out of tree build. Invoke git describe from
  top_srcdir.

Changelog since v1:
- Add missing comma for lttng usage output.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers <at> efficios.com>
---
 configure.ac                     |  8 +++---
(Continue reading)

Mathieu Desnoyers | 30 Jul 00:10 2014

[PATCH lttng-tools 1/2] Fix: out of tree build by adding missing ini.c include

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers <at> efficios.com>
---
 src/common/config/ini.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/common/config/ini.c b/src/common/config/ini.c
index 4369a32..7b2a4b6 100644
--- a/src/common/config/ini.c
+++ b/src/common/config/ini.c
 <at>  <at>  -31,9 +31,11  <at>  <at> 
  * http://code.google.com/p/inih/
  */

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
+#include <common/common.h>

 #include "ini.h"

--

-- 
2.0.1
Jonathan Rajotte Julien | 29 Jul 21:24 2014
Picon

[PATCH lttng-tool] Fix: mi: missing files on make dist

Signed-off-by: Jonathan Rajotte Julien <jonathan.r.julien <at> gmail.com>
---
 src/common/Makefile.am                | 1 +
 tests/regression/tools/mi/Makefile.am | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 4b623c8..7011d97 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
 <at>  <at>  -12,6 +12,7  <at>  <at>  noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h \

 # Common library
 noinst_LTLIBRARIES = libcommon.la
+EXTRA_DIST = mi_lttng.xsd

 libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.c runas.h \
                        common.h futex.c futex.h uri.c uri.h defaults.c \
diff --git a/tests/regression/tools/mi/Makefile.am b/tests/regression/tools/mi/Makefile.am
index 5586461..4c77f56 100644
--- a/tests/regression/tools/mi/Makefile.am
+++ b/tests/regression/tools/mi/Makefile.am
 <at>  <at>  -10,7 +10,7  <at>  <at>  extract_xml_CPPFLAGS = $(XML_CPPFLAGS) $(AM_CPPFLAGS)
 extract_xml_LDADD = $(XML_LIBS)

 noinst_SCRIPTS = test_mi
-EXTRA_DIST =
+EXTRA_DIST = test_mi

 all-local:
(Continue reading)

Jonathan Rajotte Julien | 29 Jul 16:25 2014
Picon

[PATCH lttng-tool] mi: add machine interface description to man page

Signed-off-by: Jonathan Rajotte Julien <jonathan.r.julien <at> gmail.com>
---
 doc/man/lttng.1 | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/doc/man/lttng.1 b/doc/man/lttng.1
index 12ca33d..de13b76 100644
--- a/doc/man/lttng.1
+++ b/doc/man/lttng.1
 <at>  <at>  -77,6 +77,26  <at>  <at>  Simple listing of lttng options.
 .TP
 .BR "\-\-list\-commands"
 Simple listing of lttng commands.
+.TP
+.BR "\-m, \-\-mi TYPE
+Machine interface
+
+TYPE supported: XML
+
+Machine interface (MI) mode convert the traditional pretty printing to a more
+machine friendly output syntax. Mi mode provide a format change-resistant way to
+access information generated via lttng-cli.
+
+When using MI mode, the generated document is outputted on STDOUT.
+Errors and warning are outputted as normal on STDERR and in normal format.
+
+If any errors occurs during the execution of a command, the return value
+of the command will be different than zero as normal. In this event, lttng does
+no guarantees the syntax and data validity of the generated document.
+
(Continue reading)

Thibault, Daniel | 29 Jul 15:19 2014
Picon

Re: User-space events not creating logs

----------------------------------------------------------------------
Date: Mon, 28 Jul 2014 14:35:11 -0400
From: Jérémie Galarneau <jeremie.galarneau <at> efficios.com>
To: RGIAS MUG <rajhindunews <at> gmail.com>
Cc: "lttng-dev <at> lists.lttng.org" <lttng-dev <at> lists.lttng.org>

> Is this reproductible on stable 2.5?
>
> Jérémie
>
> On Mon, Jul 28, 2014 at 1:36 AM, RGIAS MUG <rajhindunews <at> gmail.com> wrote:
> >         I am using the lttng (LTTng Trace Control) 2.3.1 - Dominus Vobiscum.
> > I have attached the log file with lttng-sessiond and sample user space 
> > tracing application with full verbosity option.
> >
> >        The User space tracing events logs were not available. Same 
> > thing when i tried in ubuntu, there i am able to see some message 
> > communications which was not present in my linux machine having 3.10 kernel.

   Any chance the instrumented application (./ackermann) is not emitting events?

Daniel U. Thibault
Protection des systèmes et contremesures (PSC) | Systems Protection & Countermeasures (SPC)
Cyber sécurité pour les missions essentielles (CME) | Mission Critical Cyber Security (MCCS)
RDDC - Centre de recherches de Valcartier | DRDC - Valcartier Research Centre
2459 route de la Bravoure
Québec QC  G3J 1X5
CANADA
Vox : (418) 844-4000 x4245
Fax : (418) 844-4538
(Continue reading)

Jonathan Rajotte Julien | 28 Jul 23:54 2014
Picon

[PATCH lttng-tool] Fix: mi: Make sure GIT_VERSION symbol always exist

The use of GIT_VERSION symbol in mi to express the position in git tree
force the need to have it defined for each type of build.

This make sure that a build from source file only (git scm not present) is possible.

Signed-off-by: Jonathan Rajotte Julien <jonathan.r.julien <at> gmail.com>
---
 include/Makefile.am    | 15 ++-------------
 include/version.h.tmpl |  6 +++++-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/include/Makefile.am b/include/Makefile.am
index d40cb4a..ca515da 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
 <at>  <at>  -47,19 +47,8  <at>  <at>  version.h:
 			## don't want to update the file if it is already up to date
 			##
 			if [ $$(grep -cE "^#define GIT_VERSION \"?$${git_version}\"?$$" "$${version_h}") -eq 0 ]; then \
-				if [ $$(grep -c "^#define GIT_VERSION" "$${version_h}") -gt 0 ]; then \
-					##
-					## If there is already a GIT_VERSION defined,
-					## we just replace it by the new version
-					##
-					sed -i "s'^#define GIT_VERSION.*$$'#define GIT_VERSION \"$${git_version}\"'"
"$${version_h}"; \
-				else \
-					##
-					## Else, we add a GIT_VERSION define
-					## containing our new version.
(Continue reading)

Raphaël Beamonte | 28 Jul 22:00 2014
Picon

[PATCH lttng-tools] Add the formal version before the git version for a commit outside the master branch

Signed-off-by: Raphaël Beamonte <raphael.beamonte <at> gmail.com>
---
 include/Makefile.am | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/Makefile.am b/include/Makefile.am
index d40cb4a..67a7063 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
 <at>  <at>  -24,8 +24,10  <at>  <at>  version.h:
 			if [ "$${git_branch}" == "$${git_describe}" ] || \
 				[ "$${git_branch}" == "heads/master" ]; then \
 				git_version="$${git_describe}"; \
+				addversion=""; \
 			else \
 				git_version="$$(git describe --long --all)"; \
+				addversion="\" VERSION \"-"; \
 			fi; \
 		fi; \
 		##
 <at>  <at>  -46,19 +48,19  <at>  <at>  version.h:
 			## as the one currently in the file (if there is one), as we
 			## don't want to update the file if it is already up to date
 			##
-			if [ $$(grep -cE "^#define GIT_VERSION \"?$${git_version}\"?$$" "$${version_h}") -eq 0 ]; then \
+			if [ $$(grep -cE "^#define GIT_VERSION \"?$${addversion}$${git_version}\"?$$"
"$${version_h}") -eq 0 ]; then \
 				if [ $$(grep -c "^#define GIT_VERSION" "$${version_h}") -gt 0 ]; then \
 					##
 					## If there is already a GIT_VERSION defined,
(Continue reading)

Jonathan Rajotte Julien | 28 Jul 21:50 2014
Picon

[PATCH lttng-tool] Fix: mi: logically dead code, missing ret assignment

Signed-off-by: Jonathan Rajotte Julien <jonathan.r.julien <at> gmail.com>
---
 src/bin/lttng/commands/list.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 210c2f4..956b62e 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
 <at>  <at>  -748,7 +748,7  <at>  <at>  static int mi_list_kernel_events(struct lttng_event *events, int count,
 	}

 	for (i = 0; i < count; i++) {
-		mi_lttng_event(writer, &events[i], 0);
+		ret = mi_lttng_event(writer, &events[i], 0);
 		if (ret) {
 			goto end;
 		}
--

-- 
2.0.0
RGIAS MUG | 28 Jul 07:36 2014
Picon

User Space Events Not creating Logs

Hi All,

        I am using the lttng (LTTng Trace Control) 2.3.1 - Dominus Vobiscum.  I had attached the log file with lttng-sessiond and sample user space tracing applivcation with full verbosity option.

       The User space tracing events logs were not available. Same thing when i tried in ubuntu, there i am able to see some message communications which was not present in my linux machine having 3.10 kernel.

       I attached the log file for ur reference..








Thanks & Regards,
Rajivgandhi
root <at> / # lttng-sessiond -vvv
DEBUG3 [1157/1157]: Creating LTTng run directory: /var/run/lttng (in create_lttng_rundir() at main.c:4170)
DEBUG2 [1157/1157]: Kernel consumer err path: /var/run/lttng/kconsumerd/error (in main() at main.c:4467)
DEBUG2 [1157/1157]: Kernel consumer cmd path: /var/run/lttng/kconsumerd/command (in main() at main.c:4469)
DEBUG1 [1157/1157]: Client socket path /var/run/lttng/client-lttng-sessiond (in main() at main.c:4522)
DEBUG1 [1157/1157]: Application socket path /var/run/lttng/lttng-ust-sock-5 (in main() at main.c:4523)
DEBUG1 [1157/1157]: Application wait path /lttng-ust-wait-5 (in main() at main.c:4524)
DEBUG1 [1157/1157]: LTTng run directory path: /var/run/lttng (in main() at main.c:4525)
DEBUG2 [1157/1157]: UST consumer 32 bits err path: /var/run/lttng/ustconsumerd32/error (in main() at main.c:4534)
DEBUG2 [1157/1157]: UST consumer 32 bits cmd path: /var/run/lttng/ustconsumerd32/command (in main()
at main.c:4536)
DEBUG2 [1157/1157]: UST consumer 64 bits err path: /var/run/lttng/ustconsumerd64/error (in main() at main.c:4545)
DEBUG2 [1157/1157]: UST consumer 64 bits cmd path: /var/run/lttng/ustconsumerd64/command (in main()
at main.c:4547)
DEBUG3 [1157/1157]: Created hashtable size 4 at 0x139b0a0 of type 1 (in lttng_ht_new() at hashtable.c:112)
DEBUG3 [1157/1157]: Created hashtable size 4 at 0x139b5c0 of type 1 (in lttng_ht_new() at hashtable.c:112)
DEBUG3 [1157/1157]: Created hashtable size 4 at 0x139bb00 of type 1 (in lttng_ht_new() at hashtable.c:112)
DEBUG2 [1157/1157]: Creating consumer directory: /var/run/lttng/kconsumerd (in
set_consumer_sockets() at main.c:4212)
DEBUG1 [1157/1157]: Modprobe successfully lttng-tracer (in modprobe_lttng_control() at modprobe.c:192)
DEBUG2 [1157/1157]: Kernel tracer version validated (major version 2) (in kernel_validate_version()
at kernel.c:700)
modprobe: module 'lttng_ftrace' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-ftrace (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-kprobes (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-kretprobes (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-lib-ring-buffer (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-ring-buffer-client-discard (in
modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-ring-buffer-client-overwrite (in
modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-ring-buffer-metadata-client (in
modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-ring-buffer-client-mmap-discard (in
modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-ring-buffer-client-mmap-overwrite (in
modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-ring-buffer-metadata-mmap-client (in
modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-types (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_asoc' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-asoc (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_block' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-block (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_btrfs' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-btrfs (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-compaction (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_ext3' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-ext3 (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-ext4 (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_gpio' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-gpio (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-irq (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_jbd' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-jbd (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-jbd2 (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-kmem (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_kvm' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-kvm (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_kvm_x86' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-kvm-x86 (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_kvm_x86_mmu' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-kvm-x86-mmu (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_lock' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-lock (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-module (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-napi (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-net (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-power (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-printk (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-random (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-rcu (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_regmap' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-regmap (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_regulator' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-regulator (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_rpm' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-rpm (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-sched (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-scsi (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-signal (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-skb (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-sock (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-statedump (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_sunrpc' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-sunrpc (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-timer (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-udp (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_vmscan' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-vmscan (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-workqueue (in modprobe_lttng_data() at modprobe.c:228)
modprobe: module 'lttng_probe_writeback' not found
DEBUG1 [1157/1157]: Modprobe successfully lttng-probe-writeback (in modprobe_lttng_data() at modprobe.c:228)
DEBUG1 [1157/1157]: Kernel tracer fd 6 (in init_kernel_tracer() at main.c:2342)
DEBUG2 [1157/1157]: Creating consumer directory: /var/run/lttng/ustconsumerd64 (in
set_consumer_sockets() at main.c:4212)
DEBUG2 [1157/1157]: Creating consumer directory: /var/run/lttng/ustconsumerd32 (in
set_consumer_sockets() at main.c:4212)
DEBUG1 [1157/1157]: Signal handler set for SIGTERM, SIGPIPE and SIGINT (in set_signal_handler() at main.c:4314)
DEBUG3 [1157/1157]: Session daemon client socket 9 and application socket 10 created (in
init_daemon_socket() at main.c:4075)
DEBUG1 [1157/1157]: All permissions are set (in set_permissions() at main.c:4158)
DEBUG3 [1157/1157]: Created hashtable size 4 at 0x139e000 of type 2 (in lttng_ht_new() at hashtable.c:112)
DEBUG3 [1157/1157]: Global buffer per UID registry initialized (in buffer_reg_init_uid_registry() at buffer-registry.c:99)
DEBUG3 [1157/1157]: Created hashtable size 4 at 0x139e540 of type 2 (in lttng_ht_new() at hashtable.c:112)
DEBUG3 [1157/1157]: Global buffer per PID registry initialized (in buffer_reg_init_pid_registry() at buffer-registry.c:220)
DEBUG1 [1157/1157]: epoll set max size is 1337405 (in compat_epoll_set_max_size() at compat-epoll.c:274)
DEBUG1 [1157/1157]: Command subsystem initialized (in cmd_init() at cmd.c:2847)
DEBUG1 [1157/1157]: Pid 1157 written in file /var/run/lttng/lttng-sessiond.pid (in
utils_create_pid_file() at utils.c:280)
DEBUG1 [1157/1157]: TCP inet operation timeout set to 216 sec (in lttcomm_inet_init() at inet.c:523)
DEBUG1 [1157/1157]: Health check time delta in seconds set to 236 (in health_init() at health.c:272)
DEBUG1 [1157/1290]: [ht-thread] startup. (in thread_ht_cleanup() at ht-cleanup.c:34)
DEBUG1 [1157/1291]: [thread] Manage health check started (in thread_manage_health() at main.c:3418)
DEBUG3 [1157/1290]: [ht-thread] Polling on 2 fds. (in thread_ht_cleanup() at ht-cleanup.c:58)
DEBUG1 [1157/1292]: [thread] Manage client started (in thread_manage_clients() at main.c:3621)
DEBUG1 [1157/1291]: Health check ready (in thread_manage_health() at main.c:3460)
DEBUG1 [1157/1293]: [thread] Dispatch UST command started (in thread_dispatch_ust_registration() at main.c:1509)
DEBUG1 [1157/1292]: Accepting client command ... (in thread_manage_clients() at main.c:3667)
DEBUG1 [1157/1293]: Futex n to 1 prepare done (in futex_nto1_prepare() at futex.c:75)
DEBUG1 [1157/1293]: Woken up but nothing in the UST command queue (in
thread_dispatch_ust_registration() at main.c:1532)
DEBUG1 [1157/1295]: [thread] Manage application started (in thread_manage_apps() at main.c:1218)
DEBUG1 [1157/1294]: [thread] Manage application registration started (in
thread_registration_apps() at main.c:1732)
DEBUG1 [1157/1295]: Apps thread polling on 2 fds (in thread_manage_apps() at main.c:1248)
DEBUG1 [1157/1294]: Notifying applications of session daemon state: 1 (in notify_ust_apps() at main.c:555)
DEBUG1 [1157/1297]: [thread] Thread manage kernel started (in thread_manage_kernel() at main.c:756)
DEBUG1 [1157/1296]: [ust-thread] Manage application notify command (in ust_thread_manage_notify()
at ust-thread.c:37)
DEBUG1 [1157/1297]: Updating kernel poll set (in update_kernel_poll() at main.c:616)
DEBUG1 [1157/1297]: Thread kernel polling on 2 fds (in thread_manage_kernel() at main.c:801)
DEBUG3 [1157/1296]: [ust-thread] Manage notify polling on 2 fds (in ust_thread_manage_notify() at ust-thread.c:61)
DEBUG1 [1157/1294]: Got the wait shm fd 26 (in get_wait_shm() at shm.c:115)
DEBUG1 [1157/1294]: Futex wait update active 1 (in futex_wait_update() at futex.c:63)
DEBUG1 [1157/1294]: Accepting application registration (in thread_registration_apps() at main.c:1769)




root <at> / #
root <at> / # lttng -vvv create
DEBUG1 [2177/2312]: Wait for client response (in thread_manage_clients() at main.c:3709)
DEBUG1 [2177/2312]: Receiving data from client ... (in thread_manage_clients() at main.c:3754)
DEBUG1 [2177/2312]: Nothing recv() from client... continuing (in thread_manage_clients() at main.c:3758)
DEBUG1 [3547/3547]: Auto session name set to auto-20140729-122811 (in create_session() at commands/create.c:250)
DEBUG1 [2177/2312]: Clean command context structure (in clean_command_ctx() at main.c:535)
DEBUG1 [2177/2312]: Accepting client command ... (in thread_manage_clients() at main.c:3667)
DEBUG3 [3547/3547]: URI string: file:///root/lttng-traces/auto-20140729-122811 (in uri_parse() at uri.c:291)
DEBUG3 [3547/3547]: URI file destination: /root/lttng-traces/auto-20140729-122811 (in uri_parse()
at uri.c:328)
DEBUG3 [3547/3547]: URI dtype: 3, proto: 0, host: , subdir: , ctrl: 0, data: 0 (in uri_parse() at uri.c:505)
DEBUG1 [2177/2312]: Wait for client response (in thread_manage_clients() at main.c:3709)
DEBUG1 [3547/3547]: LSM cmd type : 8 (in send_session_msg() at lttng-ctl.c:130)
DEBUG1 [2177/2312]: Receiving data from client ... (in thread_manage_clients() at main.c:3754)
DEBUG1 [2177/2312]: Processing client command 8 (in process_client_msg() at main.c:2578)
DEBUG1 [2177/2312]: Waiting for 1 URIs from client ... (in process_client_msg() at main.c:3073)
DEBUG2 [2177/2312]: Trying to find session by name auto-20140729-122811 (in session_find_by_name() at session.c:133)
DEBUG3 [2177/2312]: Created hashtable size 4 at 0x7f8d80005ea0 of type 1 (in lttng_ht_new() at hashtable.c:112)
DEBUG1 [2177/2312]: Tracing session auto-20140729-122811 created with ID 0 by UID 0 GID 0 (in
session_create() at session.c:224)
DEBUG2 [2177/2312]: Trying to find session by name auto-20140729-122811 (in session_find_by_name() at session.c:133)
DEBUG3 [2177/2312]: Created hashtable size 4 at 0x7f8d8000b430 of type 1 (in lttng_ht_new() at hashtable.c:112)
DEBUG2 [2177/2312]: Setting trace directory path from URI to
/root/lttng-traces/auto-20140729-122811 (in add_uri_to_consumer() at cmd.c:429)
DEBUG1 [2177/2312]: Sending response (size: 16, retcode: Success) (in thread_manage_clients() at main.c:3803)
DEBUG1 [2177/2312]: Clean command context structure (in clean_command_ctx() at main.c:535)
DEBUG1 [2177/2312]: Accepting client command ... (in thread_manage_clients() at main.c:3667)
Session auto-20140729-122811 created.
Traces will be written in /root/lttng-traces/auto-20140729-122811
DEBUG1 [3547/3547]: Init config session in /root (in config_init() at conf.c:290)


root <at> / # lttng -vvv enable-event -u -a
DEBUG1 [2177/2312]: Wait for client response (in thread_manage_clients() at main.c:3709)
DEBUG1 [2177/2312]: Receiving data from client ... (in thread_manage_clients() at main.c:3754)
DEBUG1 [2177/2312]: Nothing recv() from client... continuing (in thread_manage_clients() at main.c:3758)
DEBUG1 [2177/2312]: Clean command context structure (in clean_command_ctx() at main.c:535)
DEBUG1 [2177/2312]: Accepting client command ... (in thread_manage_clients() at main.c:3667)
DEBUG2 [3657/3657]: Config file path found: /root (in get_session_name() at utils.c:52)
DEBUG1 [3657/3657]: Session name found: auto-20140729-122811 (in get_session_name() at utils.c:53)
DEBUG1 [2177/2312]: Wait for client response (in thread_manage_clients() at main.c:3709)
DEBUG1 [3657/3657]: LSM cmd type : 6 (in send_session_msg() at lttng-ctl.c:130)
DEBUG1 [2177/2312]: Receiving data from client ... (in thread_manage_clients() at main.c:3754)
DEBUG1 [2177/2312]: Processing client command 6 (in process_client_msg() at main.c:2578)
DEBUG1 [2177/2312]: Getting session auto-20140729-122811 by name (in process_client_msg() at main.c:2655)
DEBUG2 [2177/2312]: Trying to find session by name auto-20140729-122811 (in session_find_by_name() at session.c:133)
DEBUG1 [2177/2312]: Creating UST session (in create_ust_session() at main.c:2459)
DEBUG3 [2177/2312]: Created hashtable size 4 at 0x7f8d80003d60 of type 0 (in lttng_ht_new() at hashtable.c:112)
DEBUG3 [2177/2312]: Created hashtable size 4 at 0x7f8d800042a0 of type 1 (in lttng_ht_new() at hashtable.c:112)
DEBUG2 [2177/2312]: UST trace session create successful (in trace_ust_create_session() at trace-ust.c:235)
DEBUG3 [2177/2312]: Copying tracing session consumer output in UST session (in
copy_session_consumer() at main.c:2409)
DEBUG3 [2177/2312]: Created hashtable size 4 at 0x7f8d800047e0 of type 1 (in lttng_ht_new() at hashtable.c:112)
DEBUG3 [2177/2312]: Copy session consumer subdir /ust (in copy_session_consumer() at main.c:2427)
DEBUG3 [2177/2310]: [ht-thread] Polling on 2 fds. (in thread_ht_cleanup() at ht-cleanup.c:58)
DEBUG1 [2177/2312]: Spawning consumerd (in spawn_consumerd() at main.c:2086)
DEBUG2 [2177/2312]: Consumer pid 3658 (in start_consumerd() at main.c:2269)
DEBUG2 [2177/2312]: Spawning consumer control thread (in start_consumerd() at main.c:2272)
DEBUG1 [2177/3659]: [thread] Manage consumer started (in thread_manage_consumer() at main.c:922)
DEBUG1 [3658/3658]: Using 64-bit UST consumer at: /lib/lttng/libexec/lttng-consumerd (in
spawn_consumerd() at main.c:2161)
DEBUG2 [2177/3659]: Receiving code from consumer err_sock (in thread_manage_consumer() at main.c:1007)
DEBUG1 [2177/3659]: Consumer command socket ready (fd: 30 (in thread_manage_consumer() at main.c:1042)
DEBUG1 [2177/3659]: Consumer metadata socket ready (fd: 31) (in thread_manage_consumer() at main.c:1044)
DEBUG3 [2177/2312]: Consumer socket created (fd: 30) and added to output (in consumer_create_socket()
at consumer.c:298)
DEBUG1 [2177/2312]: Setting relayd for session auto-20140729-122811 (in cmd_setup_relayd() at cmd.c:665)
DEBUG2 [2177/2312]: Trace UST channel channel0 not found by name (in trace_ust_find_channel_by_name()
at trace-ust.c:149)
DEBUG1 [2177/2312]: Enabling channel  for session auto-20140729-122811 (in cmd_enable_channel() at cmd.c:849)
DEBUG2 [2177/2312]: Trace UST channel channel0 not found by name (in trace_ust_find_channel_by_name()
at trace-ust.c:149)
DEBUG3 [2177/2312]: Created hashtable size 4 at 0x7f8d80004fb0 of type 0 (in lttng_ht_new() at hashtable.c:112)
DEBUG3 [2177/2312]: Created hashtable size 4 at 0x7f8d80005480 of type 1 (in lttng_ht_new() at hashtable.c:112)
DEBUG2 [2177/2312]: Trace UST channel channel0 created (in trace_ust_create_channel() at trace-ust.c:302)
DEBUG2 [2177/2312]: Channel channel0 is being created for UST with buffer 1 and id 0 (in
channel_ust_create() at channel.c:343)
DEBUG2 [2177/2312]: UST app adding channel channel0 to UST domain for session id 0 (in
ust_app_create_channel_glb() at ust-app.c:3511)
DEBUG2 [2177/2312]: Channel channel0 created successfully (in channel_ust_create() at channel.c:367)
DEBUG2 [2177/2312]: Trace UST channel channel0 found by name (in trace_ust_find_channel_by_name() at trace-ust.c:144)
DEBUG2 [2177/2312]: Trace UST event * NOT found (in trace_ust_find_event() at trace-ust.c:183)
DEBUG2 [2177/2312]: Trace UST event *, loglevel (0,-1) created (in trace_ust_create_event() at trace-ust.c:374)
DEBUG1 [2177/2312]: UST app creating event * for all apps for session id 0 (in ust_app_create_event_glb()
at ust-app.c:3664)
DEBUG1 [2177/2312]: Event UST * created in channel channel0 (in event_ust_enable_tracepoint() at event.c:467)
DEBUG1 [2177/2312]: Sending response (size: 16, retcode: Success) (in thread_manage_clients() at main.c:3803)
DEBUG1 [2177/2312]: Clean command context structure (in clean_command_ctx() at main.c:535)
DEBUG1 [2177/2312]: Accepting client command ... (in thread_manage_clients() at main.c:3667)
All UST events are enabled in channel channel0


root <at> / # lttng -vvv start
DEBUG1 [2177/2312]: Wait for client response (in thread_manage_clients() at main.c:3709)
DEBUG1 [2177/2312]: Receiving data from client ... (in thread_manage_clients() at main.c:3754)
DEBUG1 [2177/2312]: Nothing recv() from client... continuing (in thread_manage_clients() at main.c:3758)
DEBUG1 [2177/2312]: Clean command context structure (in clean_command_ctx() at main.c:535)
DEBUG1 [2177/2312]: Accepting client command ... (in thread_manage_clients() at main.c:3667)
DEBUG2 [3761/3761]: Config file path found: /root (in get_session_name() at utils.c:52)
DEBUG1 [3761/3761]: Session name found: auto-20140729-122811 (in get_session_name() at utils.c:53)
DEBUG1 [3761/3761]: Starting tracing for session auto-20140729-122811 (in start_tracing() at commands/start.c:81)
DEBUG1 [2177/2312]: Wait for client response (in thread_manage_clients() at main.c:3709)
DEBUG1 [3761/3761]: LSM cmd type : 16 (in send_session_msg() at lttng-ctl.c:130)
DEBUG1 [2177/2312]: Receiving data from client ... (in thread_manage_clients() at main.c:3754)
DEBUG1 [2177/2312]: Processing client command 16 (in process_client_msg() at main.c:2578)
DEBUG1 [2177/2312]: Getting session auto-20140729-122811 by name (in process_client_msg() at main.c:2655)
DEBUG2 [2177/2312]: Trying to find session by name auto-20140729-122811 (in session_find_by_name() at session.c:133)
DEBUG1 [2177/2312]: Starting all UST traces (in ust_app_start_trace_all() at ust-app.c:4011)
DEBUG1 [2177/2312]: Sending response (size: 16, retcode: Success) (in thread_manage_clients() at main.c:3803)
DEBUG1 [2177/2312]: Clean command context structure (in clean_command_ctx() at main.c:535)
DEBUG1 [2177/2312]: Accepting client command ... (in thread_manage_clients() at main.c:3667)
Tracing started for session auto-20140729-122811

root <at> / #

root <at> / # LTTNG_UST_DEBUG=1 LD_PRELOAD=/lib/liblttng-ust.so.0 ./ackermann
libust[3867/3867]: LTT : ltt ring buffer client "relay-metadata-mmap" init
 (in lttng_ring_buffer_metadata_client_init() at lttng-ring-buffer-metadata-client.h:314)
libust[3867/3867]: LTT : ltt ring buffer client "relay-overwrite-mmap" init
 (in lttng_ring_buffer_client_overwrite_init() at lttng-ring-buffer-client.h:563)
libust[3867/3867]: LTT : ltt ring buffer client "relay-overwrite-rt-mmap" init
 (in lttng_ring_buffer_client_overwrite_rt_init() at lttng-ring-buffer-client.h:563)
libust[3867/3867]: LTT : ltt ring buffer client "relay-discard-mmap" init
 (in lttng_ring_buffer_client_discard_init() at lttng-ring-buffer-client.h:563)
libust[3867/3867]: LTT : ltt ring buffer client "relay-discard-rt-mmap" init
 (in lttng_ring_buffer_client_discard_rt_init() at lttng-ring-buffer-client.h:563)
libust[3867/3869]: Info: sessiond not accepting connections to local apps socket (in
ust_listener_thread() at lttng-ust-comm.c:988)
libust[3867/3868]: Info: sessiond not accepting connections to global apps socket (in
ust_listener_thread() at lttng-ust-comm.c:988)
libust[3867/3869]: Waiting for local apps sessiond (in wait_for_sessiond() at lttng-ust-comm.c:899)
libust[3867/3867]: Provider "usttut" accepted, version 1.0 is compatible with LTTng UST provider
version 1.0. (in check_provider_version() at lttng-probes.c:174)
libust[3867/3867]: adding probe usttut containing 1 events to lazy registration list (in
lttng_probe_register() at lttng-probes.c:216)
libust[3867/3868]: Waiting for global apps sessiond (in wait_for_sessiond() at lttng-ust-comm.c:899)
liblttng_ust_tracepoint[3867/3867]: just registered a tracepoints section from 0x602138 and having 1
tracepoints (in tracepoint_register_lib() at tracepoint.c:758)
liblttng_ust_tracepoint[3867/3867]: registered tracepoint: usttut:ackermann_entry (in
tracepoint_register_lib() at tracepoint.c:763)
ackermann( 2, 2 ) = 7
liblttng_ust_tracepoint[3867/3867]: just unregistered a tracepoints section from 0x602138 (in
tracepoint_unregister_lib() at tracepoint.c:788)
libust[3867/3867]: Provider "usttut" accepted, version 1.0 is compatible with LTTng UST provider
version 1.0. (in check_provider_version() at lttng-probes.c:174)
libust[3867/3867]: just unregistered probe usttut (in lttng_probe_unregister() at lttng-probes.c:245)
libust[3867/3868]: Info: sessiond not accepting connections to global apps socket (in
ust_listener_thread() at lttng-ust-comm.c:988)
libust[3867/3867]: LTT : ltt ring buffer client "relay-discard-rt-mmap" exit
 (in lttng_ring_buffer_client_discard_rt_exit() at lttng-ring-buffer-client.h:570)
libust[3867/3867]: LTT : ltt ring buffer client "relay-discard-mmap" exit
 (in lttng_ring_buffer_client_discard_exit() at lttng-ring-buffer-client.h:570)
libust[3867/3867]: LTT : ltt ring buffer client "relay-overwrite-rt-mmap" exit
 (in lttng_ring_buffer_client_overwrite_rt_exit() at lttng-ring-buffer-client.h:570)
libust[3867/3867]: LTT : ltt ring buffer client "relay-overwrite-mmap" exit
 (in lttng_ring_buffer_client_overwrite_exit() at lttng-ring-buffer-client.h:570)
libust[3867/3867]: LTT : ltt ring buffer client "relay-metadata-mmap" exit
 (in lttng_ring_buffer_metadata_client_exit() at lttng-ring-buffer-metadata-client.h:321)
root <at> / # lttng -vvv stop
DEBUG1 [2177/2312]: Wait for client response (in thread_manage_clients() at main.c:3709)
DEBUG1 [2177/2312]: Receiving data from client ... (in thread_manage_clients() at main.c:3754)
DEBUG1 [2177/2312]: Nothing recv() from client... continuing (in thread_manage_clients() at main.c:3758)
DEBUG1 [2177/2312]: Clean command context structure (in clean_command_ctx() at main.c:535)
DEBUG1 [2177/2312]: Accepting client command ... (in thread_manage_clients() at main.c:3667)
DEBUG2 [4075/4075]: Config file path found: /root (in get_session_name() at utils.c:52)
DEBUG1 [4075/4075]: Session name found: auto-20140729-122811 (in get_session_name() at utils.c:53)
DEBUG1 [2177/2312]: Wait for client response (in thread_manage_clients() at main.c:3709)
DEBUG1 [2177/2312]: Receiving data from client ... (in thread_manage_clients() at main.c:3754)
DEBUG1 [4075/4075]: LSM cmd type : 17 (in send_session_msg() at lttng-ctl.c:130)
DEBUG1 [2177/2312]: Processing client command 17 (in process_client_msg() at main.c:2578)
DEBUG1 [2177/2312]: Getting session auto-20140729-122811 by name (in process_client_msg() at main.c:2655)
DEBUG2 [2177/2312]: Trying to find session by name auto-20140729-122811 (in session_find_by_name() at session.c:133)
DEBUG1 [2177/2312]: Stopping all UST traces (in ust_app_stop_trace_all() at ust-app.c:4037)
DEBUG1 [2177/2312]: Sending response (size: 16, retcode: Success) (in thread_manage_clients() at main.c:3803)
DEBUG1 [2177/2312]: Clean command context structure (in clean_command_ctx() at main.c:535)
DEBUG1 [2177/2312]: Accepting client command ... (in thread_manage_clients() at main.c:3667)
Waiting for data availabilityDEBUG1 [2177/2312]: Wait for client response (in
thread_manage_clients() at main.c:3709)
DEBUG1 [2177/2312]: Receiving data from client ... (in thread_manage_clients() at main.c:3754)
DEBUG1 [4075/4075]: LSM cmd type : 24 (in send_session_msg() at lttng-ctl.c:130)
DEBUG1 [2177/2312]: Processing client command 24 (in process_client_msg() at main.c:2578)
DEBUG1 [2177/2312]: Getting session auto-20140729-122811 by name (in process_client_msg() at main.c:2655)
DEBUG2 [2177/2312]: Trying to find session by name auto-20140729-122811 (in session_find_by_name() at session.c:133)
DEBUG3 [2177/2312]: Consumer data pending for id 0 (in consumer_is_data_pending() at consumer.c:1053)
DEBUG1 [2177/2312]: Consumer data is NOT pending for session id 0 (in consumer_is_data_pending() at consumer.c:1085)
DEBUG1 [2177/2312]: Sending response (size: 16, retcode: Unknown error code) (in
thread_manage_clients() at main.c:3803)
DEBUG1 [2177/2312]: Clean command context structure (in clean_command_ctx() at main.c:535)
DEBUG1 [2177/2312]: Accepting client command ... (in thread_manage_clients() at main.c:3667)

Tracing stopped for session auto-20140729-122811


root <at> / # lttng -vvv destroy
DEBUG1 [2177/2312]: Wait for client response (in thread_manage_clients() at main.c:3709)
DEBUG1 [2177/2312]: Receiving data from client ... (in thread_manage_clients() at main.c:3754)
DEBUG1 [2177/2312]: Nothing recv() from client... continuing (in thread_manage_clients() at main.c:3758)
DEBUG1 [2177/2312]: Clean command context structure (in clean_command_ctx() at main.c:535)
DEBUG1 [2177/2312]: Accepting client command ... (in thread_manage_clients() at main.c:3667)
DEBUG2 [4137/4137]: Config file path found: /root (in get_session_name() at utils.c:52)
DEBUG1 [4137/4137]: Session name found: auto-20140729-122811 (in get_session_name() at utils.c:53)
DEBUG1 [2177/2312]: Wait for client response (in thread_manage_clients() at main.c:3709)
DEBUG1 [4137/4137]: LSM cmd type : 9 (in send_session_msg() at lttng-ctl.c:130)
DEBUG1 [2177/2312]: Receiving data from client ... (in thread_manage_clients() at main.c:3754)
DEBUG1 [2177/2312]: Processing client command 9 (in process_client_msg() at main.c:2578)
DEBUG1 [2177/2312]: Getting session auto-20140729-122811 by name (in process_client_msg() at main.c:2655)
DEBUG2 [2177/2312]: Trying to find session by name auto-20140729-122811 (in session_find_by_name() at session.c:133)
DEBUG3 [2177/2312]: No kernel session when tearing down session (in kernel_destroy_session() at kernel.c:751)
DEBUG1 [2177/2312]: Destroy all UST traces (in ust_app_destroy_trace_all() at ust-app.c:4116)
DEBUG2 [2177/2312]: Trace UST destroy session 0 (in trace_ust_destroy_session() at trace-ust.c:676)
DEBUG1 [2177/2312]: Destroying session auto-20140729-122811 (in session_destroy() at session.c:158)
DEBUG3 [2177/2310]: [ht-thread] Polling on 2 fds. (in thread_ht_cleanup() at ht-cleanup.c:58)
DEBUG1 [2177/2312]: Sending response (size: 16, retcode: Success) (in thread_manage_clients() at main.c:3803)
DEBUG1 [2177/2317]: Updating kernel poll set (in update_kernel_poll() at main.c:616)
DEBUG1 [2177/2317]: Thread kernel polling on 2 fds (in thread_manage_kernel() at main.c:801)
DEBUG1 [2177/2312]: Clean command context structure (in clean_command_ctx() at main.c:535)
DEBUG1 [2177/2312]: Accepting client command ... (in thread_manage_clients() at main.c:3667)
DEBUG3 [2177/2310]: [ht-thread] Polling on 2 fds. (in thread_ht_cleanup() at ht-cleanup.c:58)
DEBUG2 [2177/4138]: Trace destroy UST channel channel0 (in _trace_ust_destroy_channel() at trace-ust.c:573)
DEBUG3 [2177/2310]: [ht-thread] Polling on 2 fds. (in thread_ht_cleanup() at ht-cleanup.c:58)
DEBUG3 [2177/2310]: [ht-thread] Polling on 2 fds. (in thread_ht_cleanup() at ht-cleanup.c:58)
DEBUG3 [2177/2310]: [ht-thread] Polling on 2 fds. (in thread_ht_cleanup() at ht-cleanup.c:58)
Session auto-20140729-122811 destroyed
DEBUG1 [4137/4137]: Removing /root/.lttngrc
 (in config_destroy() at conf.c:143)
root <at> / # DEBUG2 [2177/4138]: Trace destroy UST event * (in trace_ust_destroy_event() at trace-ust.c:524)

root <at> / #
_______________________________________________
lttng-dev mailing list
lttng-dev <at> lists.lttng.org
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Mathieu Desnoyers | 28 Jul 02:38 2014

[PATCH lttng-tools] Fix: unbalanced ustconsumer32_data.pid_mutex lock

It is never locked in this function, but should be. This is triggering
spurious runtime failures on my system, where it seems that sessiond was
sometimes breaking the communication pipe with liblttng-ctl when the
unbalanced unlock is reached.

This should be backported to stable-2.4 and stable-2.5.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers <at> efficios.com>
---
 src/bin/lttng-sessiond/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index a8751c6..1ee6f4a 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
 <at>  <at>  -3016,6 +3016,7  <at>  <at>  static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 			}

 			/* 32-bit */
+			pthread_mutex_lock(&ustconsumer32_data.pid_mutex);
 			if (consumerd32_bin[0] != '\0' &&
 					ustconsumer32_data.pid == 0 &&
 					cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) {
--

-- 
2.0.1
Simon Marchi | 26 Jul 07:26 2014
Picon
Picon

[PATCH lttng-tools] Change wfq usages for wfcq

This removes the deprecated warnings when building lttng-tools. We can
now build with -Werror, woohoo!

Verified by running make check.
---
 configure.ac                            |  8 ++++----
 src/bin/lttng-relayd/connection.h       |  4 ++--
 src/bin/lttng-relayd/live.c             | 12 +++++++-----
 src/bin/lttng-relayd/lttng-relayd.h     |  5 +++--
 src/bin/lttng-relayd/main.c             | 12 +++++++-----
 src/bin/lttng-sessiond/lttng-sessiond.h |  7 ++++---
 src/bin/lttng-sessiond/main.c           | 10 +++++-----
 7 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/configure.ac b/configure.ac
index a6f5b0b..3d59a20 100644
--- a/configure.ac
+++ b/configure.ac
 <at>  <at>  -177,11 +177,11  <at>  <at>  liburcu_version=">= 0.7.2"
 AC_CHECK_DECL([cds_list_add], [],
 	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/list.h>]]
 )
-AC_CHECK_DECL([cds_wfq_init], [],
-	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
+AC_CHECK_DECL([cds_wfcq_init], [],
+	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfcqueue.h>]]
 )
-AC_CHECK_DECL([cds_wfq_dequeue_blocking], [],
-    [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
+AC_CHECK_DECL([cds_wfcq_dequeue_blocking], [],
+    [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfcqueue.h>]]
 )
 AC_CHECK_DECL([futex_async], [],
 	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/futex.h>]]
diff --git a/src/bin/lttng-relayd/connection.h b/src/bin/lttng-relayd/connection.h
index fc4a590..70fe4ba 100644
--- a/src/bin/lttng-relayd/connection.h
+++ b/src/bin/lttng-relayd/connection.h
 <at>  <at>  -23,7 +23,7  <at>  <at> 
 #include <inttypes.h>
 #include <pthread.h>
 #include <urcu.h>
-#include <urcu/wfqueue.h>
+#include <urcu/wfcqueue.h>
 #include <urcu/list.h>

 #include <common/hashtable/hashtable.h>
 <at>  <at>  -46,7 +46,7  <at>  <at>  struct relay_connection {
 	struct lttcomm_sock *sock;
 	struct relay_session *session;
 	struct relay_viewer_session *viewer_session;
-	struct cds_wfq_node qnode;
+	struct cds_wfcq_node qnode;
 	struct lttng_ht_node_ulong sock_n;
 	struct rcu_head rcu_node;
 	enum connection_type type;
diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 8c716db..5684608 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
 <at>  <at>  -558,11 +558,12  <at>  <at>  restart:
 				new_conn->sock = newsock;

 				/* Enqueue request for the dispatcher thread. */
-				cds_wfq_enqueue(&viewer_conn_queue.queue, &new_conn->qnode);
+				cds_wfcq_enqueue(&viewer_conn_queue.head, &viewer_conn_queue.tail,
+						 &new_conn->qnode);

 				/*
 				 * Wake the dispatch queue futex. Implicit memory barrier with
-				 * the exchange in cds_wfq_enqueue.
+				 * the exchange in cds_wfcq_enqueue.
 				 */
 				futex_nto1_wake(&viewer_conn_queue.futex);
 			}
 <at>  <at>  -601,7 +602,7  <at>  <at>  void *thread_dispatcher(void *data)
 {
 	int err = -1;
 	ssize_t ret;
-	struct cds_wfq_node *node;
+	struct cds_wfcq_node *node;
 	struct relay_connection *conn = NULL;

 	DBG("[thread] Live viewer relay dispatcher started");
 <at>  <at>  -624,7 +625,8  <at>  <at>  void *thread_dispatcher(void *data)
 			health_code_update();

 			/* Dequeue commands */
-			node = cds_wfq_dequeue_blocking(&viewer_conn_queue.queue);
+			node = cds_wfcq_dequeue_blocking(&viewer_conn_queue.head,
+							 &viewer_conn_queue.tail);
 			if (node == NULL) {
 				DBG("Woken up but nothing in the live-viewer "
 						"relay command queue");
 <at>  <at>  -2113,7 +2115,7  <at>  <at>  int live_start_threads(struct lttng_uri *uri,
 	}

 	/* Init relay command queue. */
-	cds_wfq_init(&viewer_conn_queue.queue);
+	cds_wfcq_init(&viewer_conn_queue.head, &viewer_conn_queue.tail);

 	/* Set up max poll set size */
 	lttng_poll_set_max_size();
diff --git a/src/bin/lttng-relayd/lttng-relayd.h b/src/bin/lttng-relayd/lttng-relayd.h
index 55ce25e..896925f 100644
--- a/src/bin/lttng-relayd/lttng-relayd.h
+++ b/src/bin/lttng-relayd/lttng-relayd.h
 <at>  <at>  -22,7 +22,7  <at>  <at> 
 #define _LGPL_SOURCE
 #include <limits.h>
 #include <urcu.h>
-#include <urcu/wfqueue.h>
+#include <urcu/wfcqueue.h>

 #include <common/hashtable/hashtable.h>

 <at>  <at>  -30,7 +30,8  <at>  <at> 
  * Queue used to enqueue relay requests
  */
 struct relay_conn_queue {
-	struct cds_wfq_queue queue;
+	struct cds_wfcq_head head;
+	struct cds_wfcq_tail tail;
 	int32_t futex;
 };

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 3a6beba..a3b8016 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
 <at>  <at>  -882,11 +882,12  <at>  <at>  restart:
 				new_conn->sock = newsock;

 				/* Enqueue request for the dispatcher thread. */
-				cds_wfq_enqueue(&relay_conn_queue.queue, &new_conn->qnode);
+				cds_wfcq_enqueue(&relay_conn_queue.head, &relay_conn_queue.tail,
+						 &new_conn->qnode);

 				/*
 				 * Wake the dispatch queue futex. Implicit memory barrier with
-				 * the exchange in cds_wfq_enqueue.
+				 * the exchange in cds_wfcq_enqueue.
 				 */
 				futex_nto1_wake(&relay_conn_queue.futex);
 			}
 <at>  <at>  -933,7 +934,7  <at>  <at>  void *relay_thread_dispatcher(void *data)
 {
 	int err = -1;
 	ssize_t ret;
-	struct cds_wfq_node *node;
+	struct cds_wfcq_node *node;
 	struct relay_connection *new_conn = NULL;

 	DBG("[thread] Relay dispatcher started");
 <at>  <at>  -956,7 +957,8  <at>  <at>  void *relay_thread_dispatcher(void *data)
 			health_code_update();

 			/* Dequeue commands */
-			node = cds_wfq_dequeue_blocking(&relay_conn_queue.queue);
+			node = cds_wfcq_dequeue_blocking(&relay_conn_queue.head,
+							 &relay_conn_queue.tail);
 			if (node == NULL) {
 				DBG("Woken up but nothing in the relay command queue");
 				/* Continue thread execution */
 <at>  <at>  -2762,7 +2764,7  <at>  <at>  int main(int argc, char **argv)
 	}

 	/* Init relay command queue. */
-	cds_wfq_init(&relay_conn_queue.queue);
+	cds_wfcq_init(&relay_conn_queue.head, &relay_conn_queue.tail);

 	/* Set up max poll set size */
 	lttng_poll_set_max_size();
diff --git a/src/bin/lttng-sessiond/lttng-sessiond.h b/src/bin/lttng-sessiond/lttng-sessiond.h
index 0f4c668..f3fb750 100644
--- a/src/bin/lttng-sessiond/lttng-sessiond.h
+++ b/src/bin/lttng-sessiond/lttng-sessiond.h
 <at>  <at>  -21,7 +21,7  <at>  <at> 

 #define _LGPL_SOURCE
 #include <urcu.h>
-#include <urcu/wfqueue.h>
+#include <urcu/wfcqueue.h>

 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/compat/poll.h>
 <at>  <at>  -55,7 +55,7  <at>  <at>  struct command_ctx {
 struct ust_command {
 	int sock;
 	struct ust_register_msg reg_msg;
-	struct cds_wfq_node node;
+	struct cds_wfcq_node node;
 };

 /*
 <at>  <at>  -64,7 +64,8  <at>  <at>  struct ust_command {
  */
 struct ust_cmd_queue {
 	int32_t futex;
-	struct cds_wfq_queue queue;
+	struct cds_wfcq_head head;
+	struct cds_wfcq_tail tail;
 };

 /*
diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index a8751c6..2e53b0a 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
 <at>  <at>  -1685,7 +1685,7  <at>  <at>  error_create:
 static void *thread_dispatch_ust_registration(void *data)
 {
 	int ret, err = -1;
-	struct cds_wfq_node *node;
+	struct cds_wfcq_node *node;
 	struct ust_command *ust_cmd = NULL;
 	struct ust_reg_wait_node *wait_node = NULL, *tmp_wait_node;
 	struct ust_reg_wait_queue wait_queue = {
 <at>  <at>  -1723,7 +1723,7  <at>  <at>  static void *thread_dispatch_ust_registration(void *data)

 			health_code_update();
 			/* Dequeue command for registration */
-			node = cds_wfq_dequeue_blocking(&ust_cmd_queue.queue);
+			node = cds_wfcq_dequeue_blocking(&ust_cmd_queue.head, &ust_cmd_queue.tail);
 			if (node == NULL) {
 				DBG("Woken up but nothing in the UST command queue");
 				/* Continue thread execution */
 <at>  <at>  -2077,11 +2077,11  <at>  <at>  static void *thread_registration_apps(void *data)
 					 * Lock free enqueue the registration request. The red pill
 					 * has been taken! This apps will be part of the *system*.
 					 */
-					cds_wfq_enqueue(&ust_cmd_queue.queue, &ust_cmd->node);
+					cds_wfcq_enqueue(&ust_cmd_queue.head, &ust_cmd_queue.tail, &ust_cmd->node);

 					/*
 					 * Wake the registration queue futex. Implicit memory
-					 * barrier with the exchange in cds_wfq_enqueue.
+					 * barrier with the exchange in cds_wfcq_enqueue.
 					 */
 					futex_nto1_wake(&ust_cmd_queue.futex);
 				}
 <at>  <at>  -5256,7 +5256,7  <at>  <at>  int main(int argc, char **argv)
 	buffer_reg_init_pid_registry();

 	/* Init UST command queue. */
-	cds_wfq_init(&ust_cmd_queue.queue);
+	cds_wfcq_init(&ust_cmd_queue.head, &ust_cmd_queue.tail);

 	/*
 	 * Get session list pointer. This pointer MUST NOT be free(). This list is
--

-- 
2.0.0

Gmane