--- Begin Message ---
Package: release.debian.org
User: [email protected]
Usertags: unblock
Severity: normal
Please unblock package ltt-control
I realize the timing is not great, but I feel obligated to try for an
unblock for this package. A bug was discovered upstream in the version
in testing (2.5.1) and fixed just after the freeze:
https://github.com/lttng/lttng-tools/commit/e5ca40eeb602ab82458d902b0ba4de87204d23b3
I have uploaded the new version (2.5.2) that includes this patch to
unstable. I spoke with the upstream author about this and it was
indicated that allowing this fix into testing would make upstream
support much easier for them:
http://lists.lttng.org/pipermail/lttng-dev/2014-November/023753.html
The package itself has all of its dependencies met by the versions in
testing already, so only this package needs consideration.
The debdiff between 2.5.1-1 and 2.5.2-1 is attached. Let me know if
I can provide any additional information.
Thank you for your consideration.
unblock ltt-control/2.5.2-1
--
Jon
diffstat for ltt-control-2.5.1 ltt-control-2.5.2
ChangeLog | 6
Makefile.am | 3
Makefile.in | 6
README | 2
aclocal.m4 | 3
config/config.guess | 164 ++++++++
config/config.sub | 26 -
config/libtool.m4 | 79 +---
config/ltmain.sh | 32 -
configure | 132 ++----
configure.ac | 2
debian/changelog | 6
doc/man/lttng-sessiond.8 | 2
doc/man/lttng.1 | 2
include/version.h | 2
src/common/consumer-stream.c | 94 +++-
src/lib/lttng-ctl/filter/filter-lexer.c | 21 -
tests/regression/ust/java-jul/JTestLTTng.java | 62 ---
tests/regression/ust/java-jul/test_java_jul | 504 --------------------------
19 files changed, 355 insertions(+), 793 deletions(-)
diff -Nru ltt-control-2.5.1/aclocal.m4 ltt-control-2.5.2/aclocal.m4
--- ltt-control-2.5.1/aclocal.m4 2014-10-20 19:45:41.000000000 +0000
+++ ltt-control-2.5.2/aclocal.m4 2014-11-05 22:47:20.000000000 +0000
@@ -573,8 +573,7 @@
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi
-])
+fi])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
diff -Nru ltt-control-2.5.1/ChangeLog ltt-control-2.5.2/ChangeLog
--- ltt-control-2.5.1/ChangeLog 2014-10-20 19:45:36.000000000 +0000
+++ ltt-control-2.5.2/ChangeLog 2014-11-05 22:47:12.000000000 +0000
@@ -1,3 +1,9 @@
+2014-11-05 lttng-tools 2.5.2
+ * Update maintainer section of the man pages
+ * Update maintainer section of README
+ * Fix: add README to documentation files
+ * Fix: UST consumer sync all available metadata
+
2014-10-20 lttng-tools 2.5.1
* Fix: handle sysconf possible negative returned value
* Fix: channel deref. after NULL check in kernel consumer
diff -Nru ltt-control-2.5.1/config/config.guess
ltt-control-2.5.2/config/config.guess
--- ltt-control-2.5.1/config/config.guess 2014-10-20 13:10:42.000000000
+0000
+++ ltt-control-2.5.2/config/config.guess 2014-11-05 22:47:22.000000000
+0000
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2014-03-23'
+timestamp='2013-11-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's,
,,g'`
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
;;
esac
@@ -826,7 +826,7 @@
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
- *:MSYS*:*)
+ i*:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
@@ -969,10 +969,10 @@
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
- openrisc*:Linux:*:*)
- echo or1k-unknown-linux-${LIBC}
+ or1k:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
- or32:Linux:*:* | or1k*:Linux:*:*)
+ or32:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
@@ -1371,6 +1371,154 @@
exit ;;
esac
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
+ I don't know.... */
+ printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+ printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+ "4"
+#else
+ ""
+#endif
+ ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+ printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+ printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+ int version;
+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+ if (version < 4)
+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+ else
+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+ exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+ printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+ printf ("ns32k-encore-mach\n"); exit (0);
+#else
+ printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+ printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+ printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+ printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+ struct utsname un;
+
+ uname(&un);
+
+ if (strncmp(un.version, "V2", 2) == 0) {
+ printf ("i386-sequent-ptx2\n"); exit (0);
+ }
+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+ printf ("i386-sequent-ptx1\n"); exit (0);
+ }
+ printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+# include <sys/param.h>
+# if defined (BSD)
+# if BSD == 43
+ printf ("vax-dec-bsd4.3\n"); exit (0);
+# else
+# if BSD == 199006
+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# endif
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# else
+ printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+ printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+ exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+ case `getsysinfo -f cpu_type` in
+ c1*)
+ echo c1-convex-bsd
+ exit ;;
+ c2*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit ;;
+ c34*)
+ echo c34-convex-bsd
+ exit ;;
+ c38*)
+ echo c38-convex-bsd
+ exit ;;
+ c4*)
+ echo c4-convex-bsd
+ exit ;;
+ esac
+fi
+
cat >&2 <<EOF
$0: unable to guess system type
diff -Nru ltt-control-2.5.1/config/config.sub
ltt-control-2.5.2/config/config.sub
--- ltt-control-2.5.1/config/config.sub 2014-10-20 13:10:42.000000000 +0000
+++ ltt-control-2.5.2/config/config.sub 2014-11-05 22:47:22.000000000 +0000
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2014-09-11'
+timestamp='2013-10-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -283,10 +283,8 @@
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
- | mipsisa32r6 | mipsisa32r6el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
- | mipsisa64r6 | mipsisa64r6el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
@@ -298,11 +296,11 @@
| nds32 | nds32le | nds32be \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
- | open8 | or1k | or1knd | or32 \
+ | open8 \
+ | or1k | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
- | riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb |
shbe | shle | sh[1234]le | sh3ele \
@@ -404,10 +402,8 @@
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
- | mipsisa32r6-* | mipsisa32r6el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
- | mipsisa64r6-* | mipsisa64r6el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipsr5900-* | mipsr5900el-* \
@@ -419,7 +415,6 @@
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
- | or1k*-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -829,10 +824,6 @@
basic_machine=powerpc-unknown
os=-morphos
;;
- moxiebox)
- basic_machine=moxie-unknown
- os=-moxiebox
- ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -1378,14 +1369,14 @@
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems*
\
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* |
-tirtos*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1603,6 +1594,9 @@
mips*-*)
os=-elf
;;
+ or1k-*)
+ os=-elf
+ ;;
or32-*)
os=-coff
;;
diff -Nru ltt-control-2.5.1/config/libtool.m4
ltt-control-2.5.2/config/libtool.m4
--- ltt-control-2.5.1/config/libtool.m4 2014-10-20 13:10:52.000000000 +0000
+++ ltt-control-2.5.2/config/libtool.m4 2014-11-05 22:47:17.000000000 +0000
@@ -1312,7 +1312,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -1324,19 +1324,9 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
- ;;
- powerpc64le-*)
- LD="${LD-ld} -m elf32lppclinux"
+ LD="${LD-ld} -m elf_i386"
;;
- powerpc64-*)
+ ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1355,10 +1345,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- powerpcle-*)
- LD="${LD-ld} -m elf64lppc"
- ;;
- powerpc-*)
+ ppc*-*linux*|powerpc*-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -1701,8 +1688,7 @@
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -2526,6 +2512,17 @@
esac
;;
+gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -2642,7 +2639,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -2687,18 +2684,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3258,6 +3243,10 @@
fi
;;
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3296,11 +3285,11 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern
/lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4048,7 +4037,7 @@
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4112,7 +4101,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4347,7 +4336,7 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -4589,9 +4578,6 @@
;;
esac
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=unknown
- ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience |
$global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4654,9 +4640,6 @@
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=unknown
- ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4878,7 +4861,7 @@
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs
$linker_flags -o $lib'
wlarc=
@@ -5055,7 +5038,6 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- _LT_TAGVAR(link_all_deplibs, $1)=unknown
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5360,7 +5342,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs
$linker_flags' # a.out
else
@@ -6240,6 +6222,9 @@
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
+ gnu*)
+ ;;
+
haiku*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6401,7 +6386,7 @@
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
diff -Nru ltt-control-2.5.1/config/ltmain.sh ltt-control-2.5.2/config/ltmain.sh
--- ltt-control-2.5.1/config/ltmain.sh 2014-10-20 13:10:39.000000000 +0000
+++ ltt-control-2.5.2/config/ltmain.sh 2014-11-05 22:47:17.000000000 +0000
@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.10ubuntu1
+# $progname: (GNU libtool) 2.4.2
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.10ubuntu1"
+VERSION=2.4.2
TIMESTAMP=""
package_revision=1.3337
@@ -6124,10 +6124,7 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link)
- libs="$deplibs %DEPLIBS%"
- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
- ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6447,19 +6444,19 @@
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps ; then
- case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- func_append tmp_libs " $deplib"
- done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+ fi
+ func_append tmp_libs " $deplib"
+ done
continue
fi # $pass = conv
@@ -7352,9 +7349,6 @@
revision="$number_minor"
lt_irix_increment=no
;;
- *)
- func_fatal_configuration "$modename: unknown library version type
\`$version_type'"
- ;;
esac
;;
no)
diff -Nru ltt-control-2.5.1/configure ltt-control-2.5.2/configure
--- ltt-control-2.5.1/configure 2014-10-20 19:45:41.000000000 +0000
+++ ltt-control-2.5.2/configure 2014-11-05 22:47:21.000000000 +0000
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for lttng-tools 2.5.1.
+# Generated by GNU Autoconf 2.69 for lttng-tools 2.5.2.
#
-# Report bugs to <[email protected]>.
+# Report bugs to <[email protected]>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -275,10 +275,10 @@
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell [email protected] and
-$0: [email protected] about your system, including any
-$0: error possibly output before this message. Then install
-$0: a modern shell, or manually run the script under such a
-$0: shell if you do have one."
+$0: [email protected] about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
fi
exit 1
fi
@@ -590,10 +590,10 @@
# Identity of this package.
PACKAGE_NAME='lttng-tools'
PACKAGE_TARNAME='lttng-tools'
-PACKAGE_VERSION='2.5.1'
-PACKAGE_STRING='lttng-tools 2.5.1'
-PACKAGE_BUGREPORT='[email protected]'
-PACKAGE_URL='http://lttng.org'
+PACKAGE_VERSION='2.5.2'
+PACKAGE_STRING='lttng-tools 2.5.2'
+PACKAGE_BUGREPORT='[email protected]'
+PACKAGE_URL='https://lttng.org'
# Factoring default headers for most tests.
ac_includes_default="\
@@ -1399,7 +1399,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures lttng-tools 2.5.1 to adapt to many kinds of systems.
+\`configure' configures lttng-tools 2.5.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1470,7 +1470,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of lttng-tools 2.5.1:";;
+ short | recursive ) echo "Configuration of lttng-tools 2.5.2:";;
esac
cat <<\_ACEOF
@@ -1560,8 +1560,8 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <[email protected]>.
-lttng-tools home page: <http://lttng.org>.
+Report bugs to <[email protected]>.
+lttng-tools home page: <https://lttng.org>.
_ACEOF
ac_status=$?
fi
@@ -1624,7 +1624,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-lttng-tools configure 2.5.1
+lttng-tools configure 2.5.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1783,9 +1783,9 @@
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\""
>&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the
compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ----------------------------------- ##
-## Report this to [email protected] ##
-## ----------------------------------- ##"
+( $as_echo "## --------------------------------------------- ##
+## Report this to [email protected] ##
+## --------------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -2039,7 +2039,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by lttng-tools $as_me 2.5.1, which was
+It was created by lttng-tools $as_me 2.5.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3014,7 +3014,7 @@
# Define the identity of the package.
PACKAGE='lttng-tools'
- VERSION='2.5.1'
+ VERSION='2.5.2'
cat >>confdefs.h <<_ACEOF
@@ -3107,7 +3107,6 @@
fi
fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable
maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of
Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
@@ -3240,9 +3239,9 @@
SED="$ac_cv_path_SED"
rm -f conftest.sed
-major_version=$(echo 2.5.1 | sed 's/^\([0-9]\)*\.[0-9]*\.[0-9]*.*$/\1/')
-minor_version=$(echo 2.5.1 | sed 's/^[0-9]*\.\([0-9]*\)\.[0-9]*.*$/\1/')
-patchlevel_version=$(echo 2.5.1 | sed 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*$/\1/')
+major_version=$(echo 2.5.2 | sed 's/^\([0-9]\)*\.[0-9]*\.[0-9]*.*$/\1/')
+minor_version=$(echo 2.5.2 | sed 's/^[0-9]*\.\([0-9]*\)\.[0-9]*.*$/\1/')
+patchlevel_version=$(echo 2.5.2 | sed 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*$/\1/')
MAJOR_VERSION=$major_version
MINOR_VERSION=$minor_version
@@ -6409,7 +6408,7 @@
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -6455,7 +6454,7 @@
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -6479,7 +6478,7 @@
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -6524,7 +6523,7 @@
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -6548,7 +6547,7 @@
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -7994,8 +7993,7 @@
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -8396,6 +8394,10 @@
fi
;;
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -8434,11 +8436,11 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern
/lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -9515,7 +9517,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9531,19 +9533,9 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
- ;;
- powerpc64le-*)
- LD="${LD-ld} -m elf32lppclinux"
+ LD="${LD-ld} -m elf_i386"
;;
- powerpc64-*)
+ ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -9562,10 +9554,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- powerpcle-*)
- LD="${LD-ld} -m elf64lppc"
- ;;
- powerpc-*)
+ ppc*-*linux*|powerpc*-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -11106,7 +11095,7 @@
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -11584,9 +11573,6 @@
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- link_all_deplibs=unknown
- ;;
esac
ld_shlibs=yes
@@ -11808,7 +11794,7 @@
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -11985,7 +11971,6 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- link_all_deplibs=unknown
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -12439,7 +12424,7 @@
link_all_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
# a.out
else
@@ -13276,6 +13261,17 @@
esac
;;
+gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -13392,7 +13388,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -13456,18 +13452,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -15248,7 +15232,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by lttng-tools $as_me 2.5.1, which was
+This file was extended by lttng-tools $as_me 2.5.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15308,14 +15292,14 @@
Configuration commands:
$config_commands
-Report bugs to <[email protected]>.
-lttng-tools home page: <http://lttng.org>."
+Report bugs to <[email protected]>.
+lttng-tools home page: <https://lttng.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-lttng-tools config.status 2.5.1
+lttng-tools config.status 2.5.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Nru ltt-control-2.5.1/configure.ac ltt-control-2.5.2/configure.ac
--- ltt-control-2.5.1/configure.ac 2014-10-20 19:44:48.000000000 +0000
+++ ltt-control-2.5.2/configure.ac 2014-11-05 22:47:12.000000000 +0000
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools],[2.5.1],[[email protected]],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.5.2],[[email protected]],[],[https://lttng.org])
AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
diff -Nru ltt-control-2.5.1/debian/changelog ltt-control-2.5.2/debian/changelog
--- ltt-control-2.5.1/debian/changelog 2014-10-24 15:15:47.000000000 +0000
+++ ltt-control-2.5.2/debian/changelog 2014-12-03 01:33:21.000000000 +0000
@@ -1,3 +1,9 @@
+ltt-control (2.5.2-1) unstable; urgency=medium
+
+ * [8304e3f] New upstream version 2.5.2
+
+ -- Jon Bernard <[email protected]> Wed, 03 Dec 2014 01:32:33 +0000
+
ltt-control (2.5.1-1) unstable; urgency=medium
* [8385f65] New upstream version 2.5.1
diff -Nru ltt-control-2.5.1/doc/man/lttng.1 ltt-control-2.5.2/doc/man/lttng.1
--- ltt-control-2.5.1/doc/man/lttng.1 2014-10-20 19:43:42.000000000 +0000
+++ ltt-control-2.5.2/doc/man/lttng.1 2014-11-05 22:46:34.000000000 +0000
@@ -1106,5 +1106,5 @@
.PP
lttng-tools was originally written by Mathieu Desnoyers, Julien Desfossez and
David Goulet. More people have since contributed to it. It is currently
-maintained by David Goulet <[email protected]>.
+maintained by Jérémie Galarneau <[email protected]>.
.PP
diff -Nru ltt-control-2.5.1/doc/man/lttng-sessiond.8
ltt-control-2.5.2/doc/man/lttng-sessiond.8
--- ltt-control-2.5.1/doc/man/lttng-sessiond.8 2014-10-20 19:43:42.000000000
+0000
+++ ltt-control-2.5.2/doc/man/lttng-sessiond.8 2014-11-05 22:46:34.000000000
+0000
@@ -233,5 +233,5 @@
.PP
lttng-tools was originally written by Mathieu Desnoyers, Julien Desfossez and
David Goulet. More people have since contributed to it. It is currently
-maintained by David Goulet <[email protected]>.
+maintained by Jérémie Galarneau <[email protected]>.
.PP
diff -Nru ltt-control-2.5.1/include/version.h
ltt-control-2.5.2/include/version.h
--- ltt-control-2.5.1/include/version.h 2014-10-20 19:47:51.000000000 +0000
+++ ltt-control-2.5.2/include/version.h 2014-11-05 22:47:37.000000000 +0000
@@ -20,7 +20,7 @@
#ifndef VERSION_H
#define VERSION_H
-#define GIT_VERSION "heads/stable-2.5-0-g56eb774"
+#define GIT_VERSION "heads/stable-2.5-0-g69049c5"
/*
* Define the macro containing the FULL version
diff -Nru ltt-control-2.5.1/Makefile.am ltt-control-2.5.2/Makefile.am
--- ltt-control-2.5.1/Makefile.am 2014-10-01 18:58:27.000000000 +0000
+++ ltt-control-2.5.2/Makefile.am 2014-11-05 22:46:34.000000000 +0000
@@ -7,7 +7,8 @@
doc
dist_doc_DATA = LICENSE \
- ChangeLog
+ ChangeLog \
+ README
dist_noinst_DATA = CodingStyle
diff -Nru ltt-control-2.5.1/Makefile.in ltt-control-2.5.2/Makefile.in
--- ltt-control-2.5.1/Makefile.in 2014-10-20 19:45:42.000000000 +0000
+++ ltt-control-2.5.2/Makefile.in 2014-11-05 22:47:22.000000000 +0000
@@ -84,8 +84,7 @@
$(top_srcdir)/configure $(am__configure_deps) $(dist_doc_DATA) \
$(dist_noinst_DATA) ChangeLog INSTALL README TODO \
config/compile config/config.guess config/config.sub \
- config/depcomp config/install-sh config/missing \
- config/py-compile config/ylwrap config/ltmain.sh \
+ config/install-sh config/missing config/ltmain.sh \
$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
$(top_srcdir)/config/config.sub \
$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
@@ -401,7 +400,8 @@
doc
dist_doc_DATA = LICENSE \
- ChangeLog
+ ChangeLog \
+ README
dist_noinst_DATA = CodingStyle
EXTRA_DIST = extras/lttng-bash_completion gpl-2.0.txt lgpl-2.1.txt
diff -Nru ltt-control-2.5.1/README ltt-control-2.5.2/README
--- ltt-control-2.5.1/README 2014-10-20 19:43:42.000000000 +0000
+++ ltt-control-2.5.2/README 2014-11-05 22:46:34.000000000 +0000
@@ -2,7 +2,7 @@
----------------
Please visit https://lttng.org for more information. The current maintainer is
-David Goulet <[email protected]>.
+Jérémie Galarneau <[email protected]>.
Latest development can be found at:
diff -Nru ltt-control-2.5.1/src/common/consumer-stream.c
ltt-control-2.5.2/src/common/consumer-stream.c
--- ltt-control-2.5.1/src/common/consumer-stream.c 2014-06-19
18:47:09.000000000 +0000
+++ ltt-control-2.5.2/src/common/consumer-stream.c 2014-11-05
20:28:09.000000000 +0000
@@ -391,45 +391,20 @@
}
/*
- * Synchronize the metadata using a given session ID. A successful acquisition
- * of a metadata stream will trigger a request to the session daemon and a
- * snapshot so the metadata thread can consume it.
+ * Actually do the metadata sync using the given metadata stream.
*
- * This function call is a rendez-vous point between the metadata thread and
- * the data thread.
- *
- * Return 0 on success or else a negative value.
+ * Return 0 on success else a negative value. ENODATA can be returned also
+ * indicating that there is no metadata available for that stream.
*/
-int consumer_stream_sync_metadata(struct lttng_consumer_local_data *ctx,
- uint64_t session_id)
+static int do_sync_metadata(struct lttng_consumer_stream *metadata,
+ struct lttng_consumer_local_data *ctx)
{
int ret;
- struct lttng_consumer_stream *metadata = NULL, *stream = NULL;
- struct lttng_ht_iter iter;
- struct lttng_ht *ht;
+ assert(metadata);
+ assert(metadata->metadata_flag);
assert(ctx);
- /* Ease our life a bit. */
- ht = consumer_data.stream_list_ht;
-
- rcu_read_lock();
-
- /* Search the metadata associated with the session id of the given
stream. */
-
- cds_lfht_for_each_entry_duplicate(ht->ht,
- ht->hash_fct(&session_id, lttng_ht_seed), ht->match_fct,
- &session_id, &iter.iter, stream, node_session_id.node) {
- if (stream->metadata_flag) {
- metadata = stream;
- break;
- }
- }
- if (!metadata) {
- ret = 0;
- goto end_unlock_rcu;
- }
-
/*
* In UST, since we have to write the metadata from the cache packet
* by packet, we might need to start this procedure multiple times
@@ -515,12 +490,61 @@
pthread_mutex_unlock(&metadata->metadata_rdv_lock);
} while (ret == EAGAIN);
- ret = 0;
- goto end_unlock_rcu;
+ /* Success */
+ return 0;
end_unlock_mutex:
pthread_mutex_unlock(&metadata->lock);
-end_unlock_rcu:
+ return ret;
+}
+
+/*
+ * Synchronize the metadata using a given session ID. A successful acquisition
+ * of a metadata stream will trigger a request to the session daemon and a
+ * snapshot so the metadata thread can consume it.
+ *
+ * This function call is a rendez-vous point between the metadata thread and
+ * the data thread.
+ *
+ * Return 0 on success or else a negative value.
+ */
+int consumer_stream_sync_metadata(struct lttng_consumer_local_data *ctx,
+ uint64_t session_id)
+{
+ int ret;
+ struct lttng_consumer_stream *stream = NULL;
+ struct lttng_ht_iter iter;
+ struct lttng_ht *ht;
+
+ assert(ctx);
+
+ /* Ease our life a bit. */
+ ht = consumer_data.stream_list_ht;
+
+ rcu_read_lock();
+
+ /* Search the metadata associated with the session id of the given
stream. */
+
+ cds_lfht_for_each_entry_duplicate(ht->ht,
+ ht->hash_fct(&session_id, lttng_ht_seed), ht->match_fct,
+ &session_id, &iter.iter, stream, node_session_id.node) {
+ if (!stream->metadata_flag) {
+ continue;
+ }
+
+ ret = do_sync_metadata(stream, ctx);
+ if (ret < 0) {
+ goto end;
+ }
+ }
+
+ /*
+ * Force return code to 0 (success) since ret might be ENODATA for
instance
+ * which is not an error but rather that we should come back.
+ */
+ ret = 0;
+
+end:
rcu_read_unlock();
return ret;
}
diff -Nru ltt-control-2.5.1/src/lib/lttng-ctl/filter/filter-lexer.c
ltt-control-2.5.2/src/lib/lttng-ctl/filter/filter-lexer.c
--- ltt-control-2.5.1/src/lib/lttng-ctl/filter/filter-lexer.c 2014-10-20
13:11:22.000000000 +0000
+++ ltt-control-2.5.2/src/lib/lttng-ctl/filter/filter-lexer.c 2014-11-05
22:47:58.000000000 +0000
@@ -158,15 +158,7 @@
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
#define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the
main buffer.
@@ -701,7 +693,7 @@
/* bison-locations */
-#line 705 "filter-lexer.c"
+#line 697 "filter-lexer.c"
#define INITIAL 0
#define comment_ml 1
@@ -836,12 +828,7 @@
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
#define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -982,7 +969,7 @@
* and strings.
*/
-#line 986 "filter-lexer.c"
+#line 973 "filter-lexer.c"
while ( 1 ) /* loops until end-of-file is reached */
{
@@ -1375,7 +1362,7 @@
#line 137 "filter-lexer.l"
ECHO;
YY_BREAK
-#line 1379 "filter-lexer.c"
+#line 1366 "filter-lexer.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(comment_ml):
case YY_STATE_EOF(comment_sl):
@@ -2555,7 +2542,7 @@
#define YYTABLES_NAME "yytables"
-#line 136 "filter-lexer.l"
+#line 137 "filter-lexer.l"
diff -Nru ltt-control-2.5.1/tests/regression/ust/java-jul/JTestLTTng.java
ltt-control-2.5.2/tests/regression/ust/java-jul/JTestLTTng.java
--- ltt-control-2.5.1/tests/regression/ust/java-jul/JTestLTTng.java
2014-10-20 19:43:42.000000000 +0000
+++ ltt-control-2.5.2/tests/regression/ust/java-jul/JTestLTTng.java
1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2013 - David Goulet <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-import java.lang.Integer;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
-import org.lttng.ust.jul.LTTngAgent;
-
-public class JTestLTTng
-{
- private static LTTngAgent lttngAgent;
-
- public static void main(String args[]) throws Exception
- {
- Logger lttng = Logger.getLogger("JTestLTTng");
- Logger lttng2 = Logger.getLogger("JTestLTTng2");
- int nrIter = Integer.parseInt(args[0]);
- int waitTime = Integer.parseInt(args[1]);
- int fire_finest_tp = 0;
- int fire_second_tp = 0;
-
- if (args.length > 2) {
- fire_finest_tp = Integer.parseInt(args[2]);
- }
- if (args.length > 3) {
- fire_second_tp = Integer.parseInt(args[3]);
- }
-
- lttngAgent = LTTngAgent.getLTTngAgent();
- lttng.setLevel(Level.FINEST);
-
- for (int iter = 0; iter < nrIter; iter++) {
- lttng.info("JUL tp fired!");
- if (fire_finest_tp == 1) {
- /* Third arg, trigger finest TP. */
- lttng.finest("JUL FINEST tp fired");
- }
- Thread.sleep(waitTime);
- }
-
- if (fire_second_tp == 1) {
- lttng2.info("JUL second logger fired");
- }
-
- lttngAgent.dispose();
- }
-}
diff -Nru ltt-control-2.5.1/tests/regression/ust/java-jul/test_java_jul
ltt-control-2.5.2/tests/regression/ust/java-jul/test_java_jul
--- ltt-control-2.5.1/tests/regression/ust/java-jul/test_java_jul
2014-10-20 19:43:42.000000000 +0000
+++ ltt-control-2.5.2/tests/regression/ust/java-jul/test_java_jul
1970-01-01 00:00:00.000000000 +0000
@@ -1,504 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) - 2013 David Goulet <[email protected]>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License, version 2 only, as published by
-# the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-TEST_DESC="Java JUL support"
-
-CURDIR=$(dirname $0)/
-TESTDIR=$CURDIR/../../..
-NR_ITER=6
-NR_MSEC_WAIT=1000
-TESTAPP_NAME="JTestLTTng"
-TESTAPP_BIN="$TESTAPP_NAME.java"
-TESTAPP_PATH="$CURDIR/$TESTAPP_NAME"
-SESSION_NAME="jul"
-EVENT_NAME="JTestLTTng"
-EVENT_NAME2="JTestLTTng2"
-JAVA_CP="$CURDIR:/usr/local/lib/lttng/java/liblttng-ust-jul.jar:/usr/lib/lttng/java/liblttng-ust-jul.jar"
-
-NUM_TESTS=139
-
-source $TESTDIR/utils/utils.sh
-
-function run_app
-{
- local finest_tp=$1
- local fire_second_tp=$2
-
- java -cp $JAVA_CP -Djava.library.path="/usr/local/lib:/usr/lib"
$TESTAPP_NAME $NR_ITER $NR_MSEC_WAIT $finest_tp $fire_second_tp >/dev/null 2>&1
&
-}
-
-function wait_apps
-{
- while [ -n "$(pidof java)" ]; do
- sleep 0.5
- done
- pass "Wait for applications to end"
-}
-
-function enable_jul_loglevel_only()
-{
- sess_name=$1
- event_name="$2"
- loglevel=$3
- channel_name=$4
-
- if [ -z $channel_name ]; then
- # default channel if none specified
- chan=""
- else
- chan="-c $channel_name"
- fi
-
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel-only
$loglevel "$event_name" $chan -s $sess_name -j >/dev/null 2>&1
- ok $? "Enable JUL event $event_name for session $sess_name with
loglevel-only $loglevel"
-}
-
-function enable_jul_filter()
-{
- local sess_name="$1"
- local event_name="$2"
- local filter="$3"
-
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s
$sess_name -j --filter "$filter" >/dev/null 2>&1
- ok $? "Enable event $event_name with filter $filter for session
$sess_name"
-}
-
-# MUST set TESTDIR before calling those functions
-
-function test_jul_before_start ()
-{
- diag "Test JUL application BEFORE tracing starts"
- create_lttng_session $SESSION_NAME $TRACE_PATH
- enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
-
- # Run 5 times with a 1 second delay
- run_app
-
- start_lttng_tracing $SESSION_NAME
-
- wait_apps
-
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
-
- # Validate test. Expecting all events.
- trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
- if [ $? -ne 0 ]; then
- return $?
- fi
-}
-
-function test_jul_after_start ()
-{
- diag "Test JUL application AFTER tracing starts"
-
- create_lttng_session $SESSION_NAME $TRACE_PATH
- enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
- start_lttng_tracing $SESSION_NAME
-
- # Run 5 times with a 1 second delay
- run_app
-
- wait_apps
-
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
-
- # Validate test. Expecting all events.
- trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
- if [ $? -ne 0 ]; then
- return $?
- fi
-}
-
-function test_jul_loglevel ()
-{
- diag "Test JUL application with loglevel"
-
- create_lttng_session $SESSION_NAME $TRACE_PATH
- enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_INFO"
- start_lttng_tracing $SESSION_NAME
-
- # Run 5 times with a 1 second delay
- run_app
-
- wait_apps
-
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
-
- # Validate test. Expecting all events.
- trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
- if [ $? -ne 0 ]; then
- return $?
- fi
-
- diag "Test JUL applications with lower loglevel"
-
- create_lttng_session $SESSION_NAME $TRACE_PATH
- enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_SEVERE"
- start_lttng_tracing $SESSION_NAME
-
- # Run 5 times with a 1 second delay
- run_app
-
- wait_apps
-
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
-
- # Validate test. Expecting 0 events.
- trace_matches $EVENT_NAME 0 $TRACE_PATH
- if [ $? -ne 0 ]; then
- return $?
- fi
-
- diag "Test JUL applications with higher loglevel"
-
- create_lttng_session $SESSION_NAME $TRACE_PATH
- enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_FINER"
- start_lttng_tracing $SESSION_NAME
-
- # Run 5 times with a 1 second delay
- run_app
-
- wait_apps
-
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
-
- # Validate test. Expecting all events.
- trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
- return $?
-}
-
-function test_jul_loglevel_multiple ()
-{
- diag "Test JUL application with multiple loglevel"
-
- create_lttng_session $SESSION_NAME $TRACE_PATH
- enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_INFO"
- enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_FINEST"
- start_lttng_tracing $SESSION_NAME
-
- # Run 5 times with a 1 second delay and fire two TP.
- run_app 1
- wait_apps
-
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
-
- # Validate test. Expecting all events times two.
- trace_matches $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH
- if [ $? -ne 0 ]; then
- return $?
- fi
-
- create_lttng_session $SESSION_NAME $TRACE_PATH
- enable_jul_lttng_event_loglevel $SESSION_NAME '*' "JUL_INFO"
- enable_jul_lttng_event_loglevel $SESSION_NAME '*' "JUL_FINEST"
- start_lttng_tracing $SESSION_NAME
-
- # Run 5 times with a 1 second delay and fire two TP.
- run_app 1
- wait_apps
-
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
-
- # Validate test. Expecting all events times two.
- trace_matches $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH
- if [ $? -ne 0 ]; then
- return $?
- fi
-}
-
-function test_jul_multi_session_loglevel()
-{
- diag "Test JUL with multiple session"
-
- create_lttng_session $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
- enable_jul_loglevel_only $SESSION_NAME-1 '*' "JUL_INFO"
- start_lttng_tracing $SESSION_NAME-1
-
- create_lttng_session $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
- enable_jul_loglevel_only $SESSION_NAME-2 '*' "JUL_FINEST"
- start_lttng_tracing $SESSION_NAME-2
-
- # Run 5 times with a 1 second delay and fire second TP.
- run_app 1 1
- wait_apps
-
- stop_lttng_tracing $SESSION_NAME-1
- stop_lttng_tracing $SESSION_NAME-2
- destroy_lttng_session $SESSION_NAME-1
- destroy_lttng_session $SESSION_NAME-2
-
- # Expecting 6 events being the main event plus the second tp.
- trace_matches $EVENT_NAME $(($NR_ITER + 1)) $TRACE_PATH/$SESSION_NAME-1
- if [ $? -ne 0 ]; then
- return $?
- fi
-
- # Expectin 5 events being the finest TP.
- trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-2
- if [ $? -ne 0 ]; then
- return $?
- fi
-}
-
-function test_jul_multi_session_disable()
-{
- diag "Test JUL with multiple session with disabled event"
-
- create_lttng_session $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
- enable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME
- enable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME2
- disable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME
- start_lttng_tracing $SESSION_NAME-1
-
- create_lttng_session $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
- enable_jul_lttng_event $SESSION_NAME-2 $EVENT_NAME2
- start_lttng_tracing $SESSION_NAME-2
-
- # Run 5 times with a 1 second delay and fire second TP.
- run_app 0 1
- wait_apps
-
- stop_lttng_tracing $SESSION_NAME-1
- stop_lttng_tracing $SESSION_NAME-2
- destroy_lttng_session $SESSION_NAME-1
- destroy_lttng_session $SESSION_NAME-2
-
- # Validate test. Expecting one event of the second TP.
- trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-1
- if [ $? -ne 0 ]; then
- return $?
- fi
-
- # Validate test. Expecting one event of the second TP.
- trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2
- if [ $? -ne 0 ]; then
- return $?
- fi
-}
-
-function test_jul_multi_session()
-{
- diag "Test JUL with multiple session"
-
- create_lttng_session $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
- enable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME
- start_lttng_tracing $SESSION_NAME-1
-
- create_lttng_session $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
- enable_jul_lttng_event $SESSION_NAME-2 $EVENT_NAME2
- start_lttng_tracing $SESSION_NAME-2
-
- # Run 5 times with a 1 second delay and fire second TP.
- run_app 0 1
- wait_apps
-
- stop_lttng_tracing $SESSION_NAME-1
- stop_lttng_tracing $SESSION_NAME-2
- destroy_lttng_session $SESSION_NAME-1
- destroy_lttng_session $SESSION_NAME-2
-
- # Validate test. Expecting all events of first TP
- trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-1
- if [ $? -ne 0 ]; then
- return $?
- fi
-
- # Validate test. Expecting one event of the second TP.
- trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2
- if [ $? -ne 0 ]; then
- return $?
- fi
-}
-
-function test_jul_destroy_session()
-{
- diag "Test JUL two session with destroy"
-
- create_lttng_session $SESSION_NAME $TRACE_PATH/first-sess
- enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
- start_lttng_tracing $SESSION_NAME
-
- # Run 5 times with a 1 second delay
- run_app 0 1
-
- sleep 1
-
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
-
- # Validate test. Expecting at least one event num 1
- validate_trace $EVENT_NAME $TRACE_PATH/first-sess
- if [ $? -ne 0 ]; then
- return $?
- fi
-
- create_lttng_session $SESSION_NAME $TRACE_PATH/second-sess
- enable_jul_lttng_event $SESSION_NAME $EVENT_NAME2
- start_lttng_tracing $SESSION_NAME
-
- wait_apps
-
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
-
- # Validate test. Expecting only one event num 2
- trace_matches $EVENT_NAME2 1 $TRACE_PATH/second-sess
- if [ $? -ne 0 ]; then
- return $?
- fi
-}
-
-function test_jul_filtering()
-{
- diag "Test JUL filtering"
-
- create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
- # Enable all event with a filter.
- enable_jul_filter $SESSION_NAME '*' 'msg == "JUL second logger fired"'
- start_lttng_tracing $SESSION_NAME
-
- # Run 5 times with a 1 second delay and fire second TP.
- run_app 0 1
- wait_apps
-
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
-
- # Validate test. Expecting one event of the second TP only.
- trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME
- if [ $? -ne 0 ]; then
- return $?
- fi
-
- create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
- # Enable first Logger but filter msg payload for the INFO one while
- # triggering the finest and second TP.
- enable_jul_filter $SESSION_NAME $EVENT_NAME 'msg == "JUL tp fired!"'
- start_lttng_tracing $SESSION_NAME
-
- # Run 5 times with a 1 second delay, fire finest and second TP.
- run_app 1 1
- wait_apps
-
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
-
- # Validate test. Expecting NR_ITER event of the main INFO tp.
- trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME
- if [ $? -ne 0 ]; then
- return $?
- fi
-}
-
-function test_jul_disable()
-{
- diag "Test JUL disable event"
-
- create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
- # Enable all event with a filter.
- enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
- enable_jul_lttng_event $SESSION_NAME $EVENT_NAME2
- disable_jul_lttng_event $SESSION_NAME $EVENT_NAME
- start_lttng_tracing $SESSION_NAME
-
- # Run 5 times with a 1 second delay and fire second TP.
- run_app 0 1
- wait_apps
-
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
-
- # Validate test. Expecting one event of the second TP only.
- trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME
- if [ $? -ne 0 ]; then
- return $?
- fi
-}
-
-function test_jul_disable_enable()
-{
- diag "Test JUL disable event followed by an enable"
-
- create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
- # Enable all event with a filter.
- enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
- disable_jul_lttng_event $SESSION_NAME $EVENT_NAME
- enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
- start_lttng_tracing $SESSION_NAME
-
- # Run 5 times with a 1 second delay and fire second TP.
- run_app 0 1
- wait_apps
-
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
-
- # Validate test. Expecting NR_ITER event of the main INFO tp.
- trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME
- if [ $? -ne 0 ]; then
- return $?
- fi
-}
-
-plan_tests $NUM_TESTS
-
-print_test_banner "$TEST_DESC"
-
-if [ ! -f "$TESTAPP_PATH.class" ]; then
- withapp=0
-else
- withapp=1
-fi
-
-skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS ||
-{
- start_lttng_sessiond
-
- tests=(
- test_jul_multi_session_disable
- test_jul_disable
- test_jul_disable_enable
- test_jul_filtering
- test_jul_multi_session_loglevel
- test_jul_destroy_session
- test_jul_loglevel
- test_jul_loglevel_multiple
- test_jul_before_start
- test_jul_after_start
- test_jul_multi_session
- )
-
- for fct_test in ${tests[@]};
- do
- TRACE_PATH=$(mktemp -d)
-
- ${fct_test}
- if [ $? -ne 0 ]; then
- break;
- fi
- rm -rf $TRACE_PATH
- done
-
- stop_lttng_sessiond
-}
--- End Message ---
