diff -Nru ltt-control-2.10.2/ChangeLog ltt-control-2.10.4/ChangeLog --- ltt-control-2.10.2/ChangeLog 2018-02-05 20:46:09.483026142 +0000 +++ ltt-control-2.10.4/ChangeLog 2018-04-30 18:47:49.507522024 +0000 @@ -1,3 +1,46 @@ +2018-04-30 lttng-tools 2.10.4 (CERN announces WWW protocols will be free) + * Fix build: in_git_repo is used before being set + * Add DBG statement for TCP keep-alive options + * Fix: unprivilieged sessiond agent port clashes with root sessiond + * Fix: erroneous use of extern keyword + * Fix: failure to launch agent thread is not reported + * Fix: agent may not be ready on launch + * Fix: checking for existing session daemon is done after daemonizing + * Fix: lttng logs nanoseconds + * Fix: stream_per_chan_id_ht should allow duplicates + * Fix: relayd send_command() util not logging on failure + * Fix: create_output_path() relayd util is not const-correct + * Fix: kernel snapshot handling of EAGAIN + * Fix validate_trace_empty test check + * Fix: circular inclusion of lttng.h results in warning + * Fix: channel lock must be taken to check for pending notifications + * Fix: quiet option is not set in sessiond-config + * Fix: hold consumer socket lock for consumer_send_msg + * Fix: use off_t type for lseek function return value to avoid overflow + * Fix: double similar condition + +2018-03-26 lttng-tools 2.10.3 (Purple Day) + * Fix: set errno with value from SO_ERROR on error. + * Fix: missing value handling for lttng_event_context_type + * Fix: Use SOL_SOCKET level for SO_KEEPALIVE on all platform + * Fix: error out on leftover arguments + * Fix: reply to version check even on protocol mismatch + * Fix: error handling on relay version check + * Document add-context limitation for started session + * Fix: add-context cannot be performed after a session has been started + * Fix: duplicated kernel consumer socket locking + * Fix: remove unused event types in MI XML schema + * Tests: cleanly exit from test apps on reception of SIGTERM + * Document consumer socket locking assumptions + * Fix: consumer socket lock not held during snapshot record + * Fix: set_relayd_for_snapshot does not acquire the consumer socket lock + * Fix: send_channel_monitor_pipe does not take the consumer socket lock + * Document the locking assumptions of consumerd-relayd socket passing + * Assert that the consumer lock is held while sending FDs to consumerd + * Assert that the consumer socket lock is taken during communication + * Tests: refuse to run test suite if lttng processes are present + * Fix: metadata channel leak when using the snapshot tracing mode + 2018-02-05 lttng-tools 2.10.2 * Fix: do not flag consumer as disabled on relayd comm failure * Fix: cleanup inactive FDs in the consumer polling thread diff -Nru ltt-control-2.10.2/configure ltt-control-2.10.4/configure --- ltt-control-2.10.2/configure 2018-02-05 20:46:56.229745129 +0000 +++ ltt-control-2.10.4/configure 2018-04-30 18:48:38.462190014 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for lttng-tools 2.10.2. +# Generated by GNU Autoconf 2.69 for lttng-tools 2.10.4. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='lttng-tools' PACKAGE_TARNAME='lttng-tools' -PACKAGE_VERSION='2.10.2' -PACKAGE_STRING='lttng-tools 2.10.2' +PACKAGE_VERSION='2.10.4' +PACKAGE_STRING='lttng-tools 2.10.4' PACKAGE_BUGREPORT='jeremie.galarneau@efficios.com' PACKAGE_URL='https://lttng.org' @@ -699,8 +699,6 @@ MAN_PAGES_OPT_TRUE XMLTO ASCIIDOC -IN_GIT_REPO_FALSE -IN_GIT_REPO_TRUE JAR UUDECODE JAVAC @@ -807,7 +805,8 @@ DEFAULT_CHANNEL_TRACEFILE_COUNT DEFAULT_CHANNEL_SUBBUF_SIZE DEFAULT_APP_SOCKET_RW_TIMEOUT -DEFAULT_AGENT_TCP_PORT +DEFAULT_AGENT_TCP_PORT_RANGE_END +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN LTTNG_SYSTEM_RUNDIR SESSIOND_BIN CONSUMERD64_LIBDIR @@ -838,6 +837,8 @@ BISON_VERSION YFLAGS YACC +IN_GIT_REPO_FALSE +IN_GIT_REPO_TRUE HAVE_PGREP_FALSE HAVE_PGREP_TRUE PGREP @@ -1587,7 +1588,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.10.2 to adapt to many kinds of systems. +\`configure' configures lttng-tools 2.10.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1659,7 +1660,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lttng-tools 2.10.2:";; + short | recursive ) echo "Configuration of lttng-tools 2.10.4:";; esac cat <<\_ACEOF @@ -1860,7 +1861,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lttng-tools configure 2.10.2 +lttng-tools configure 2.10.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2459,7 +2460,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.10.2, which was +It was created by lttng-tools $as_me 2.10.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3439,7 +3440,7 @@ # Define the identity of the package. PACKAGE='lttng-tools' - VERSION='2.10.2' + VERSION='2.10.4' cat >>confdefs.h <<_ACEOF @@ -14381,6 +14382,22 @@ fi +# set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file +# is not distributed in tarballs +if test -f "$srcdir/bootstrap"; then : + in_git_repo=yes +else + in_git_repo=no +fi + if test "x$in_git_repo" = "xyes"; then + IN_GIT_REPO_TRUE= + IN_GIT_REPO_FALSE='#' +else + IN_GIT_REPO_TRUE='#' + IN_GIT_REPO_FALSE= +fi + + # check for bison for ac_prog in 'bison -y' byacc do @@ -15703,9 +15720,9 @@ # Compute minor/major/patchlevel version numbers -major_version=$(echo 2.10.2 | $SED 's/^\([0-9]\)*\.[0-9]*\.[0-9]*.*$/\1/') -minor_version=$(echo 2.10.2 | $SED 's/^[0-9]*\.\([0-9]*\)\.[0-9]*.*$/\1/') -patchlevel_version=$(echo 2.10.2 | $SED 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*$/\1/') +major_version=$(echo 2.10.4 | $SED 's/^\([0-9]\)*\.[0-9]*\.[0-9]*.*$/\1/') +minor_version=$(echo 2.10.4 | $SED 's/^[0-9]*\.\([0-9]*\)\.[0-9]*.*$/\1/') +patchlevel_version=$(echo 2.10.4 | $SED 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*$/\1/') MAJOR_VERSION=$major_version @@ -16191,10 +16208,19 @@ cat >>confdefs.h <<_ACEOF -#define CONFIG_DEFAULT_AGENT_TCP_PORT 5345 +#define CONFIG_DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN 5345 _ACEOF - DEFAULT_AGENT_TCP_PORT="5345" + DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN="5345" + + + + +cat >>confdefs.h <<_ACEOF +#define CONFIG_DEFAULT_AGENT_TCP_PORT_RANGE_END 5354 +_ACEOF + + DEFAULT_AGENT_TCP_PORT_RANGE_END="5354" @@ -18740,7 +18766,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 18743 "configure" */ +/* #line 18769 "configure" */ public class Test { } EOF @@ -18915,7 +18941,7 @@ if $UUDECODE Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 18918: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 18944: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -19032,7 +19058,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 19035 "configure" */ +/* #line 19061 "configure" */ public class Test { } EOF @@ -19067,7 +19093,7 @@ CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 19070 "configure" */ +/* [#]line 19096 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -19239,7 +19265,7 @@ if $UUDECODE Test.uue; then : else - echo "configure: 19242: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 19268: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -19259,7 +19285,7 @@ else cat << \EOF > Test.java -/* #line 19262 "configure" */ +/* #line 19288 "configure" */ import org.lttng.ust.agent.AbstractLttngAgent; public class Test { @@ -19334,7 +19360,7 @@ if $UUDECODE Test.uue; then : else - echo "configure: 19337: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 19363: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -19354,7 +19380,7 @@ else cat << \EOF > Test.java -/* #line 19357 "configure" */ +/* #line 19383 "configure" */ import org.lttng.ust.agent.jul.LttngLogHandler; public class Test { @@ -19430,7 +19456,7 @@ if $UUDECODE Test.uue; then : else - echo "configure: 19433: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 19459: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -19450,7 +19476,7 @@ else cat << \EOF > Test.java -/* #line 19453 "configure" */ +/* #line 19479 "configure" */ import org.lttng.ust.agent.log4j.LttngLogAppender; public class Test { @@ -19524,7 +19550,7 @@ if $UUDECODE Test.uue; then : else - echo "configure: 19527: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 19553: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -19544,7 +19570,7 @@ else cat << \EOF > Test.java -/* #line 19547 "configure" */ +/* #line 19573 "configure" */ import org.apache.log4j.Logger; public class Test { @@ -19587,22 +19613,6 @@ fi fi -# set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file -# is not distributed in tarballs -if test -f "$srcdir/bootstrap"; then : - in_git_repo=yes -else - in_git_repo=no -fi - if test "x$in_git_repo" = "xyes"; then - IN_GIT_REPO_TRUE= - IN_GIT_REPO_FALSE='#' -else - IN_GIT_REPO_TRUE='#' - IN_GIT_REPO_FALSE= -fi - - # enable building man pages (user's intention) # Check whether --enable-man-pages was given. if test "${enable_man_pages+set}" = set; then : @@ -20576,6 +20586,10 @@ as_fn_error $? "conditional \"HAVE_PGREP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${IN_GIT_REPO_TRUE}" && test -z "${IN_GIT_REPO_FALSE}"; then + as_fn_error $? "conditional \"IN_GIT_REPO\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_BISON_TRUE}" && test -z "${HAVE_BISON_FALSE}"; then as_fn_error $? "conditional \"HAVE_BISON\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20616,10 +20630,6 @@ as_fn_error $? "conditional \"TEST_JAVA_LOG4J_AGENT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${IN_GIT_REPO_TRUE}" && test -z "${IN_GIT_REPO_FALSE}"; then - as_fn_error $? "conditional \"IN_GIT_REPO\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${MAN_PAGES_OPT_TRUE}" && test -z "${MAN_PAGES_OPT_FALSE}"; then as_fn_error $? "conditional \"MAN_PAGES_OPT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21109,7 +21119,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.10.2, which was +This file was extended by lttng-tools $as_me 2.10.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21176,7 +21186,7 @@ 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.10.2 +lttng-tools config.status 2.10.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru ltt-control-2.10.2/configure.ac ltt-control-2.10.4/configure.ac --- ltt-control-2.10.2/configure.ac 2018-02-05 20:46:09.487026032 +0000 +++ ltt-control-2.10.4/configure.ac 2018-04-30 18:47:49.511521916 +0000 @@ -1,5 +1,5 @@ AC_PREREQ([2.64]) -AC_INIT([lttng-tools],[2.10.2],[jeremie.galarneau@efficios.com],[],[https://lttng.org]) +AC_INIT([lttng-tools],[2.10.4],[jeremie.galarneau@efficios.com],[],[https://lttng.org]) AC_CONFIG_HEADERS([include/config.h]) AC_CONFIG_AUX_DIR([config]) @@ -40,6 +40,11 @@ AC_PATH_PROG([PGREP], [pgrep], [no]) AM_CONDITIONAL([HAVE_PGREP], [test "x$PGREP" != "xno"]) +# set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file +# is not distributed in tarballs +AS_IF([test -f "$srcdir/bootstrap"], [in_git_repo=yes], [in_git_repo=no]) +AM_CONDITIONAL([IN_GIT_REPO], [test "x$in_git_repo" = "xyes"]) + # check for bison AC_PROG_YACC BISON=$YACC @@ -326,7 +331,8 @@ m4_define([_DEFAULT_CHANNEL_READ_TIMER], [200000]) m4_define([_DEFAULT_CHANNEL_MONITOR_TIMER], [1000000]) m4_define([_DEFAULT_CHANNEL_BLOCKING_TIMEOUT], [0]) -_AC_DEFINE_AND_SUBST([DEFAULT_AGENT_TCP_PORT], [5345]) +_AC_DEFINE_AND_SUBST([DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN], [5345]) +_AC_DEFINE_AND_SUBST([DEFAULT_AGENT_TCP_PORT_RANGE_END], [5354]) _AC_DEFINE_AND_SUBST([DEFAULT_APP_SOCKET_RW_TIMEOUT], [5]) _AC_DEFINE_AND_SUBST([DEFAULT_CHANNEL_SUBBUF_SIZE], [_DEFAULT_CHANNEL_SUBBUF_SIZE]) _AC_DEFINE_AND_SUBST([DEFAULT_CHANNEL_TRACEFILE_COUNT], [0]) @@ -675,11 +681,6 @@ fi fi -# set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file -# is not distributed in tarballs -AS_IF([test -f "$srcdir/bootstrap"], [in_git_repo=yes], [in_git_repo=no]) -AM_CONDITIONAL([IN_GIT_REPO], [test "x$in_git_repo" = "xyes"]) - # enable building man pages (user's intention) AC_ARG_ENABLE( man-pages, diff -Nru ltt-control-2.10.2/debian/changelog ltt-control-2.10.4/debian/changelog --- ltt-control-2.10.2/debian/changelog 2018-02-12 17:27:41.000000000 +0000 +++ ltt-control-2.10.4/debian/changelog 2018-04-30 20:14:58.000000000 +0000 @@ -1,3 +1,17 @@ +ltt-control (2.10.4-1) unstable; urgency=medium + + * [4d4f049] New upstream version 2.10.4 + * [d8b6008] Use salsa canonical uri in VCS-Browser + * [6ef519b] Bump standard to 4.1.4, no changes necessary + + -- Michael Jeanson Mon, 30 Apr 2018 16:14:58 -0400 + +ltt-control (2.10.3-1) unstable; urgency=medium + + * [685fb83] New upstream version 2.10.3 + + -- Michael Jeanson Mon, 26 Mar 2018 17:40:15 -0400 + ltt-control (2.10.2-1) unstable; urgency=medium * [a2a1f7b] Switched my uploader email to @debian.org diff -Nru ltt-control-2.10.2/debian/control ltt-control-2.10.4/debian/control --- ltt-control-2.10.2/debian/control 2018-02-12 17:27:11.000000000 +0000 +++ ltt-control-2.10.4/debian/control 2018-04-30 20:10:08.000000000 +0000 @@ -10,9 +10,9 @@ liburcu-dev (>= 0.8.4), liblttng-ust-dev (>= 2.10.0~), liblttng-ust-dev (<< 2.11.0~) -Standards-Version: 4.1.3 +Standards-Version: 4.1.4 Vcs-Git: https://salsa.debian.org/debian/ltt-control.git -Vcs-Browser: https://salsa.debian.org/debian/ltt-control.git +Vcs-Browser: https://salsa.debian.org/debian/ltt-control Homepage: https://lttng.org/ X-Python3-Version: >= 3.0 diff -Nru ltt-control-2.10.2/doc/Makefile.in ltt-control-2.10.4/doc/Makefile.in --- ltt-control-2.10.2/doc/Makefile.in 2018-02-05 20:46:52.905835879 +0000 +++ ltt-control-2.10.4/doc/Makefile.in 2018-04-30 18:48:35.150280141 +0000 @@ -279,7 +279,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/doc/man/asciidoc-attrs.conf.in ltt-control-2.10.4/doc/man/asciidoc-attrs.conf.in --- ltt-control-2.10.2/doc/man/asciidoc-attrs.conf.in 2018-02-05 20:46:09.487026032 +0000 +++ ltt-control-2.10.4/doc/man/asciidoc-attrs.conf.in 2018-04-30 18:47:49.511521916 +0000 @@ -1,6 +1,7 @@ [attributes] # default values -default_agent_tcp_port="@DEFAULT_AGENT_TCP_PORT@" +default_agent_tcp_port_range_begin="@DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@" +default_agent_tcp_port_range_end="@DEFAULT_AGENT_TCP_PORT_RANGE_END@" default_app_socket_rw_timeout="@DEFAULT_APP_SOCKET_RW_TIMEOUT@" default_channel_subbuf_size="@DEFAULT_CHANNEL_SUBBUF_SIZE@" default_channel_tracefile_count="@DEFAULT_CHANNEL_TRACEFILE_COUNT@" diff -Nru ltt-control-2.10.2/doc/man/lttng.1 ltt-control-2.10.4/doc/man/lttng.1 --- ltt-control-2.10.2/doc/man/lttng.1 2018-02-05 20:47:16.605188809 +0000 +++ ltt-control-2.10.4/doc/man/lttng.1 2018-04-30 18:48:58.721638660 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-add-context.1 ltt-control-2.10.4/doc/man/lttng-add-context.1 --- ltt-control-2.10.2/doc/man/lttng-add-context.1 2018-02-05 20:47:31.552780658 +0000 +++ ltt-control-2.10.4/doc/man/lttng-add-context.1 2018-04-30 18:49:13.717230515 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-add-context .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-ADD\-CONTEXT" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-ADD\-CONTEXT" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -113,6 +113,8 @@ .RE .sp Use the \fB--list\fR option without other arguments to list the available context field names\&. +.sp +See the \fILIMITATIONS\fR section below for a list of limitations to consider\&. .SH "OPTIONS" .sp General options are described in \fBlttng\fR(1)\&. @@ -186,6 +188,9 @@ .RS 4 List available command options\&. .RE +.SH "LIMITATIONS" +.sp +As of this version of LTTng, it is not possible to add context fields to a channel once its tracing session has been started (see \fBlttng-start\fR(1)) at least once\&. .SH "ENVIRONMENT VARIABLES" .PP \fBLTTNG_ABORT_ON_ERROR\fR diff -Nru ltt-control-2.10.2/doc/man/lttng-add-context.1.txt ltt-control-2.10.4/doc/man/lttng-add-context.1.txt --- ltt-control-2.10.2/doc/man/lttng-add-context.1.txt 2018-02-05 20:46:09.491025923 +0000 +++ ltt-control-2.10.4/doc/man/lttng-add-context.1.txt 2018-04-30 18:47:49.511521916 +0000 @@ -79,6 +79,8 @@ Use the option:--list option without other arguments to list the available context field names. +See the <> section below for a list of +limitations to consider. include::common-cmd-options-head.txt[] @@ -123,6 +125,12 @@ include::common-cmd-help-options.txt[] +[[limitations]] +LIMITATIONS +----------- +As of this version of LTTng, it is not possible to add context fields to +a channel once its tracing session has been started (see man:lttng-start(1)) +at least once. include::common-cmd-footer.txt[] diff -Nru ltt-control-2.10.2/doc/man/lttng-crash.1 ltt-control-2.10.4/doc/man/lttng-crash.1 --- ltt-control-2.10.2/doc/man/lttng-crash.1 2018-02-05 20:47:42.956469258 +0000 +++ ltt-control-2.10.4/doc/man/lttng-crash.1 2018-04-30 18:49:25.320914666 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-crash .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-CRASH" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-CRASH" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-create.1 ltt-control-2.10.4/doc/man/lttng-create.1 --- ltt-control-2.10.2/doc/man/lttng-create.1 2018-02-05 20:47:18.097148072 +0000 +++ ltt-control-2.10.4/doc/man/lttng-create.1 2018-04-30 18:49:00.169599252 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-create .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-CREATE" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-CREATE" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-destroy.1 ltt-control-2.10.4/doc/man/lttng-destroy.1 --- ltt-control-2.10.2/doc/man/lttng-destroy.1 2018-02-05 20:47:19.289115525 +0000 +++ ltt-control-2.10.4/doc/man/lttng-destroy.1 2018-04-30 18:49:01.333567572 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-destroy .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-DESTROY" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-DESTROY" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-disable-channel.1 ltt-control-2.10.4/doc/man/lttng-disable-channel.1 --- ltt-control-2.10.2/doc/man/lttng-disable-channel.1 2018-02-05 20:47:30.244816374 +0000 +++ ltt-control-2.10.4/doc/man/lttng-disable-channel.1 2018-04-30 18:49:12.413266008 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-disable-channel .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-DISABLE\-CHAN" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-DISABLE\-CHAN" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-disable-event.1 ltt-control-2.10.4/doc/man/lttng-disable-event.1 --- ltt-control-2.10.2/doc/man/lttng-disable-event.1 2018-02-05 20:47:41.880498640 +0000 +++ ltt-control-2.10.4/doc/man/lttng-disable-event.1 2018-04-30 18:49:24.256943628 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-disable-event .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-DISABLE\-EVEN" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-DISABLE\-EVEN" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-enable-channel.1 ltt-control-2.10.4/doc/man/lttng-enable-channel.1 --- ltt-control-2.10.2/doc/man/lttng-enable-channel.1 2018-02-05 20:47:29.192845099 +0000 +++ ltt-control-2.10.4/doc/man/lttng-enable-channel.1 2018-04-30 18:49:11.233298125 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-enable-channel .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-ENABLE\-CHANN" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-ENABLE\-CHANN" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-enable-event.1 ltt-control-2.10.4/doc/man/lttng-enable-event.1 --- ltt-control-2.10.2/doc/man/lttng-enable-event.1 2018-02-05 20:47:40.596533701 +0000 +++ ltt-control-2.10.4/doc/man/lttng-enable-event.1 2018-04-30 18:49:22.984978252 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-enable-event .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-ENABLE\-EVENT" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-ENABLE\-EVENT" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-help.1 ltt-control-2.10.4/doc/man/lttng-help.1 --- ltt-control-2.10.2/doc/man/lttng-help.1 2018-02-05 20:47:37.448619662 +0000 +++ ltt-control-2.10.4/doc/man/lttng-help.1 2018-04-30 18:49:19.849063611 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-help .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-HELP" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-HELP" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-list.1 ltt-control-2.10.4/doc/man/lttng-list.1 --- ltt-control-2.10.2/doc/man/lttng-list.1 2018-02-05 20:47:32.724748656 +0000 +++ ltt-control-2.10.4/doc/man/lttng-list.1 2018-04-30 18:49:14.997195677 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-list .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-LIST" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-LIST" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-load.1 ltt-control-2.10.4/doc/man/lttng-load.1 --- ltt-control-2.10.2/doc/man/lttng-load.1 2018-02-05 20:47:22.885017338 +0000 +++ ltt-control-2.10.4/doc/man/lttng-load.1 2018-04-30 18:49:04.837472206 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-load .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-LOAD" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-LOAD" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-metadata.1 ltt-control-2.10.4/doc/man/lttng-metadata.1 --- ltt-control-2.10.2/doc/man/lttng-metadata.1 2018-02-05 20:47:44.056439220 +0000 +++ ltt-control-2.10.4/doc/man/lttng-metadata.1 2018-04-30 18:49:26.496882655 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-metadata .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-METADATA" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-METADATA" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-regenerate.1 ltt-control-2.10.4/doc/man/lttng-regenerate.1 --- ltt-control-2.10.2/doc/man/lttng-regenerate.1 2018-02-05 20:47:45.236406998 +0000 +++ ltt-control-2.10.4/doc/man/lttng-regenerate.1 2018-04-30 18:49:27.692850100 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-regenerate .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-REGENERATE" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-REGENERATE" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-relayd.8 ltt-control-2.10.4/doc/man/lttng-relayd.8 --- ltt-control-2.10.2/doc/man/lttng-relayd.8 2018-02-05 20:47:48.136327807 +0000 +++ ltt-control-2.10.4/doc/man/lttng-relayd.8 2018-04-30 18:49:30.348777802 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-relayd .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-RELAYD" "8" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-RELAYD" "8" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-save.1 ltt-control-2.10.4/doc/man/lttng-save.1 --- ltt-control-2.10.2/doc/man/lttng-save.1 2018-02-05 20:47:21.629051633 +0000 +++ ltt-control-2.10.4/doc/man/lttng-save.1 2018-04-30 18:49:03.661504213 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-save .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-SAVE" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-SAVE" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-sessiond.8 ltt-control-2.10.4/doc/man/lttng-sessiond.8 --- ltt-control-2.10.2/doc/man/lttng-sessiond.8 2018-02-05 20:47:46.760365381 +0000 +++ ltt-control-2.10.4/doc/man/lttng-sessiond.8 2018-04-30 18:49:29.176809705 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-sessiond .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-SESSIOND" "8" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-SESSIOND" "8" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -213,7 +213,7 @@ .RS 4 Listen on TCP port \fIPORT\fR -for agent application registrations (default: 5345)\&. +for agent application registrations (default: a port withinin the range [5345,\ \&5354])\&. .RE .PP \fB-a\fR \fIPATH\fR, \fB--apps-sock\fR=\fIPATH\fR diff -Nru ltt-control-2.10.2/doc/man/lttng-sessiond.8.txt ltt-control-2.10.4/doc/man/lttng-sessiond.8.txt --- ltt-control-2.10.2/doc/man/lttng-sessiond.8.txt 2018-02-05 20:46:09.491025923 +0000 +++ ltt-control-2.10.4/doc/man/lttng-sessiond.8.txt 2018-04-30 18:47:49.515521807 +0000 @@ -152,7 +152,8 @@ ~~~~~~~~~~~~~~~ option:--agent-tcp-port='PORT':: Listen on TCP port 'PORT' for agent application registrations - (default: {default_agent_tcp_port}). + (default: a port withinin the range + [{default_agent_tcp_port_range_begin},{nbsp}{default_agent_tcp_port_range_end}]). option:-a 'PATH', option:--apps-sock='PATH':: Set application Unix socket path to 'PATH'. diff -Nru ltt-control-2.10.2/doc/man/lttng-set-session.1 ltt-control-2.10.4/doc/man/lttng-set-session.1 --- ltt-control-2.10.2/doc/man/lttng-set-session.1 2018-02-05 20:47:20.449083852 +0000 +++ ltt-control-2.10.4/doc/man/lttng-set-session.1 2018-04-30 18:49:02.493536001 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-set-session .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-SET\-SESSION" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-SET\-SESSION" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-snapshot.1 ltt-control-2.10.4/doc/man/lttng-snapshot.1 --- ltt-control-2.10.2/doc/man/lttng-snapshot.1 2018-02-05 20:47:38.776583399 +0000 +++ ltt-control-2.10.4/doc/man/lttng-snapshot.1 2018-04-30 18:49:21.089029860 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-snapshot .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-SNAPSHOT" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-SNAPSHOT" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-start.1 ltt-control-2.10.4/doc/man/lttng-start.1 --- ltt-control-2.10.2/doc/man/lttng-start.1 2018-02-05 20:47:24.036985883 +0000 +++ ltt-control-2.10.4/doc/man/lttng-start.1 2018-04-30 18:49:05.965441506 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-start .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-START" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-START" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-status.1 ltt-control-2.10.4/doc/man/lttng-status.1 --- ltt-control-2.10.2/doc/man/lttng-status.1 2018-02-05 20:47:36.280651556 +0000 +++ ltt-control-2.10.4/doc/man/lttng-status.1 2018-04-30 18:49:18.673095621 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-status .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-STATUS" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-STATUS" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-stop.1 ltt-control-2.10.4/doc/man/lttng-stop.1 --- ltt-control-2.10.2/doc/man/lttng-stop.1 2018-02-05 20:47:25.192954319 +0000 +++ ltt-control-2.10.4/doc/man/lttng-stop.1 2018-04-30 18:49:07.101410587 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-stop .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-STOP" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-STOP" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-track.1 ltt-control-2.10.4/doc/man/lttng-track.1 --- ltt-control-2.10.2/doc/man/lttng-track.1 2018-02-05 20:47:33.900716544 +0000 +++ ltt-control-2.10.4/doc/man/lttng-track.1 2018-04-30 18:49:16.297160293 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-track .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-TRACK" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-TRACK" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-untrack.1 ltt-control-2.10.4/doc/man/lttng-untrack.1 --- ltt-control-2.10.2/doc/man/lttng-untrack.1 2018-02-05 20:47:35.140682685 +0000 +++ ltt-control-2.10.4/doc/man/lttng-untrack.1 2018-04-30 18:49:17.549126215 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-untrack .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-UNTRACK" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-UNTRACK" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-version.1 ltt-control-2.10.4/doc/man/lttng-version.1 --- ltt-control-2.10.2/doc/man/lttng-version.1 2018-02-05 20:47:26.320923519 +0000 +++ ltt-control-2.10.4/doc/man/lttng-version.1 2018-04-30 18:49:08.265378906 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-version .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-VERSION" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-VERSION" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/lttng-view.1 ltt-control-2.10.4/doc/man/lttng-view.1 --- ltt-control-2.10.2/doc/man/lttng-view.1 2018-02-05 20:47:27.496891408 +0000 +++ ltt-control-2.10.4/doc/man/lttng-view.1 2018-04-30 18:49:09.461346354 +0000 @@ -2,12 +2,12 @@ .\" Title: lttng-view .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/05/2018 +.\" Date: 04/30/2018 .\" Manual: LTTng Manual -.\" Source: LTTng 2.10.2 +.\" Source: LTTng 2.10.4 .\" Language: English .\" -.TH "LTTNG\-VIEW" "1" "02/05/2018" "LTTng 2\&.10\&.2" "LTTng Manual" +.TH "LTTNG\-VIEW" "1" "04/30/2018" "LTTng 2\&.10\&.4" "LTTng Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru ltt-control-2.10.2/doc/man/Makefile.in ltt-control-2.10.4/doc/man/Makefile.in --- ltt-control-2.10.2/doc/man/Makefile.in 2018-02-05 20:46:52.953834569 +0000 +++ ltt-control-2.10.4/doc/man/Makefile.in 2018-04-30 18:48:35.198278835 +0000 @@ -242,7 +242,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/extras/bindings/Makefile.in ltt-control-2.10.4/extras/bindings/Makefile.in --- ltt-control-2.10.2/extras/bindings/Makefile.in 2018-02-05 20:46:53.017832821 +0000 +++ ltt-control-2.10.4/extras/bindings/Makefile.in 2018-04-30 18:48:35.262277093 +0000 @@ -248,7 +248,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/extras/bindings/swig/Makefile.in ltt-control-2.10.4/extras/bindings/swig/Makefile.in --- ltt-control-2.10.2/extras/bindings/swig/Makefile.in 2018-02-05 20:46:53.053831839 +0000 +++ ltt-control-2.10.4/extras/bindings/swig/Makefile.in 2018-04-30 18:48:35.298276114 +0000 @@ -248,7 +248,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/extras/bindings/swig/python/Makefile.in ltt-control-2.10.4/extras/bindings/swig/python/Makefile.in --- ltt-control-2.10.2/extras/bindings/swig/python/Makefile.in 2018-02-05 20:46:53.097830638 +0000 +++ ltt-control-2.10.4/extras/bindings/swig/python/Makefile.in 2018-04-30 18:48:35.342274916 +0000 @@ -276,7 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/extras/core-handler/Makefile.in ltt-control-2.10.4/extras/core-handler/Makefile.in --- ltt-control-2.10.2/extras/core-handler/Makefile.in 2018-02-05 20:46:53.141829436 +0000 +++ ltt-control-2.10.4/extras/core-handler/Makefile.in 2018-04-30 18:48:35.382273829 +0000 @@ -241,7 +241,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/extras/Makefile.in ltt-control-2.10.4/extras/Makefile.in --- ltt-control-2.10.2/extras/Makefile.in 2018-02-05 20:46:52.985833696 +0000 +++ ltt-control-2.10.4/extras/Makefile.in 2018-04-30 18:48:35.230277965 +0000 @@ -248,7 +248,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/include/config.h.in ltt-control-2.10.4/include/config.h.in --- ltt-control-2.10.2/include/config.h.in 2018-02-05 20:47:15.069230748 +0000 +++ ltt-control-2.10.4/include/config.h.in 2018-04-30 18:48:57.073683510 +0000 @@ -81,8 +81,11 @@ /* DEFAULT_AGENT_BIND_ADDRESS */ #undef CONFIG_DEFAULT_AGENT_BIND_ADDRESS -/* DEFAULT_AGENT_TCP_PORT */ -#undef CONFIG_DEFAULT_AGENT_TCP_PORT +/* DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN */ +#undef CONFIG_DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN + +/* DEFAULT_AGENT_TCP_PORT_RANGE_END */ +#undef CONFIG_DEFAULT_AGENT_TCP_PORT_RANGE_END /* DEFAULT_APP_SOCKET_RW_TIMEOUT */ #undef CONFIG_DEFAULT_APP_SOCKET_RW_TIMEOUT diff -Nru ltt-control-2.10.2/include/lttng/condition/condition.h ltt-control-2.10.4/include/lttng/condition/condition.h --- ltt-control-2.10.2/include/lttng/condition/condition.h 2018-02-05 20:46:09.503025594 +0000 +++ ltt-control-2.10.4/include/lttng/condition/condition.h 2018-04-30 18:47:49.527521481 +0000 @@ -18,8 +18,6 @@ #ifndef LTTNG_CONDITION_H #define LTTNG_CONDITION_H -#include - #ifdef __cplusplus extern "C" { #endif diff -Nru ltt-control-2.10.2/include/lttng/lttng-error.h ltt-control-2.10.4/include/lttng/lttng-error.h --- ltt-control-2.10.2/include/lttng/lttng-error.h 2018-02-05 20:46:09.507025484 +0000 +++ ltt-control-2.10.4/include/lttng/lttng-error.h 2018-04-30 18:47:49.531521371 +0000 @@ -149,6 +149,7 @@ LTTNG_ERR_TRIGGER_EXISTS = 126, /* Trigger already registered. */ LTTNG_ERR_TRIGGER_NOT_FOUND = 127, /* Trigger not found. */ LTTNG_ERR_COMMAND_CANCELLED = 128, /* Command cancelled. */ + LTTNG_ERR_AGENT_TRACING_DISABLED = 139, /* Agent tracing disabled. */ /* MUST be last element */ LTTNG_ERR_NR, /* Last element */ diff -Nru ltt-control-2.10.2/include/Makefile.in ltt-control-2.10.4/include/Makefile.in --- ltt-control-2.10.2/include/Makefile.in 2018-02-05 20:46:53.185828235 +0000 +++ ltt-control-2.10.4/include/Makefile.in 2018-04-30 18:48:35.426272631 +0000 @@ -249,7 +249,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/Makefile.in ltt-control-2.10.4/Makefile.in --- ltt-control-2.10.2/Makefile.in 2018-02-05 20:46:52.861837081 +0000 +++ ltt-control-2.10.4/Makefile.in 2018-04-30 18:48:35.106281339 +0000 @@ -307,7 +307,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/bin/lttng/commands/add_context.c ltt-control-2.10.4/src/bin/lttng/commands/add_context.c --- ltt-control-2.10.2/src/bin/lttng/commands/add_context.c 2018-02-05 20:46:09.543024497 +0000 +++ ltt-control-2.10.4/src/bin/lttng/commands/add_context.c 2018-04-30 18:47:49.567520393 +0000 @@ -898,6 +898,7 @@ static poptContext pc; struct ctx_type *type, *tmptype; char *session_name = NULL; + const char *leftover = NULL; if (argc < 2) { ret = CMD_ERROR; @@ -944,6 +945,13 @@ } } + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + goto end; + } + ret = print_missing_or_multiple_domains(opt_kernel + opt_userspace + opt_jul + opt_log4j); if (ret) { diff -Nru ltt-control-2.10.2/src/bin/lttng/commands/create.c ltt-control-2.10.4/src/bin/lttng/commands/create.c --- ltt-control-2.10.2/src/bin/lttng/commands/create.c 2018-02-05 20:46:09.543024497 +0000 +++ ltt-control-2.10.4/src/bin/lttng/commands/create.c 2018-04-30 18:47:49.567520393 +0000 @@ -625,6 +625,7 @@ { int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1; char *opt_arg = NULL; + const char *leftover = NULL; static poptContext pc; pc = poptGetContext(NULL, argc, argv, long_options, 0); @@ -719,6 +720,13 @@ } opt_session_name = (char*) poptGetArg(pc); + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + goto end; + } + command_ret = create_session(); if (command_ret) { success = 0; diff -Nru ltt-control-2.10.2/src/bin/lttng/commands/destroy.c ltt-control-2.10.4/src/bin/lttng/commands/destroy.c --- ltt-control-2.10.2/src/bin/lttng/commands/destroy.c 2018-02-05 20:46:09.543024497 +0000 +++ ltt-control-2.10.4/src/bin/lttng/commands/destroy.c 2018-04-30 18:47:49.571520283 +0000 @@ -174,6 +174,7 @@ int ret = CMD_SUCCESS , i, command_ret = CMD_SUCCESS, success = 1; static poptContext pc; char *session_name = NULL; + const char *leftover = NULL; struct lttng_session *sessions; int count; @@ -280,6 +281,14 @@ } } + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + success = 0; + goto mi_closing; + } + mi_closing: /* Mi closing */ if (lttng_opt_mi) { diff -Nru ltt-control-2.10.2/src/bin/lttng/commands/disable_channels.c ltt-control-2.10.4/src/bin/lttng/commands/disable_channels.c --- ltt-control-2.10.2/src/bin/lttng/commands/disable_channels.c 2018-02-05 20:46:09.543024497 +0000 +++ ltt-control-2.10.4/src/bin/lttng/commands/disable_channels.c 2018-04-30 18:47:49.571520283 +0000 @@ -216,6 +216,7 @@ int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1; static poptContext pc; char *session_name = NULL; + const char *leftover = NULL; pc = poptGetContext(NULL, argc, argv, long_options, 0); poptReadDefaultConfig(pc, 0); @@ -249,6 +250,13 @@ ret = CMD_ERROR; goto end; } + + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + goto end; + } if (!opt_session_name) { session_name = get_session_name(); diff -Nru ltt-control-2.10.2/src/bin/lttng/commands/disable_events.c ltt-control-2.10.4/src/bin/lttng/commands/disable_events.c --- ltt-control-2.10.2/src/bin/lttng/commands/disable_events.c 2018-02-05 20:46:09.543024497 +0000 +++ ltt-control-2.10.4/src/bin/lttng/commands/disable_events.c 2018-04-30 18:47:49.571520283 +0000 @@ -328,6 +328,7 @@ int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1; static poptContext pc; char *session_name = NULL; + const char *leftover = NULL; int event_type = -1; pc = poptGetContext(NULL, argc, argv, long_options, 0); @@ -397,6 +398,13 @@ ret = CMD_ERROR; goto end; } + + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + goto end; + } if (!opt_session_name) { session_name = get_session_name(); diff -Nru ltt-control-2.10.2/src/bin/lttng/commands/enable_channels.c ltt-control-2.10.4/src/bin/lttng/commands/enable_channels.c --- ltt-control-2.10.2/src/bin/lttng/commands/enable_channels.c 2018-02-05 20:46:09.543024497 +0000 +++ ltt-control-2.10.4/src/bin/lttng/commands/enable_channels.c 2018-04-30 18:47:49.571520283 +0000 @@ -400,6 +400,7 @@ static poptContext pc; char *session_name = NULL; char *opt_arg = NULL; + const char *leftover = NULL; init_channel_config(); @@ -691,6 +692,14 @@ ret = CMD_ERROR; success = 0; goto mi_closing; + } + + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + success = 0; + goto mi_closing; } if (!opt_session_name) { diff -Nru ltt-control-2.10.2/src/bin/lttng/commands/enable_events.c ltt-control-2.10.4/src/bin/lttng/commands/enable_events.c --- ltt-control-2.10.2/src/bin/lttng/commands/enable_events.c 2018-02-05 20:46:09.543024497 +0000 +++ ltt-control-2.10.4/src/bin/lttng/commands/enable_events.c 2018-04-30 18:47:49.571520283 +0000 @@ -1264,6 +1264,7 @@ int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1; static poptContext pc; char *session_name = NULL; + const char *leftover = NULL; int event_type = -1; pc = poptGetContext(NULL, argc, argv, long_options, 0); @@ -1362,6 +1363,13 @@ ret = CMD_ERROR; goto end; } + + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + goto end; + } if (!opt_session_name) { session_name = get_session_name(); diff -Nru ltt-control-2.10.2/src/bin/lttng/commands/list.c ltt-control-2.10.4/src/bin/lttng/commands/list.c --- ltt-control-2.10.2/src/bin/lttng/commands/list.c 2018-02-05 20:46:09.547024387 +0000 +++ ltt-control-2.10.4/src/bin/lttng/commands/list.c 2018-04-30 18:47:49.571520283 +0000 @@ -1776,7 +1776,7 @@ int cmd_list(int argc, const char **argv) { int opt, ret = CMD_SUCCESS; - const char *session_name; + const char *session_name, *leftover = NULL; static poptContext pc; struct lttng_domain domain; struct lttng_domain *domains = NULL; @@ -1837,6 +1837,13 @@ session_name = poptGetArg(pc); DBG2("Session name: %s", session_name); + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + goto end; + } + if (opt_kernel) { domain.type = LTTNG_DOMAIN_KERNEL; } else if (opt_userspace) { diff -Nru ltt-control-2.10.2/src/bin/lttng/commands/load.c ltt-control-2.10.4/src/bin/lttng/commands/load.c --- ltt-control-2.10.2/src/bin/lttng/commands/load.c 2018-02-05 20:46:09.547024387 +0000 +++ ltt-control-2.10.4/src/bin/lttng/commands/load.c 2018-04-30 18:47:49.571520283 +0000 @@ -163,6 +163,7 @@ poptContext pc; struct lttng_load_session_attr *session_attr = NULL; char *input_path = NULL; + const char *leftover = NULL; pc = poptGetContext(NULL, argc, argv, load_opts, 0); poptReadDefaultConfig(pc, 0); @@ -206,6 +207,13 @@ } } + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + goto end; + } + /* Mi check */ if (lttng_opt_mi) { writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi); diff -Nru ltt-control-2.10.2/src/bin/lttng/commands/save.c ltt-control-2.10.4/src/bin/lttng/commands/save.c --- ltt-control-2.10.2/src/bin/lttng/commands/save.c 2018-02-05 20:46:09.547024387 +0000 +++ ltt-control-2.10.4/src/bin/lttng/commands/save.c 2018-04-30 18:47:49.571520283 +0000 @@ -127,7 +127,7 @@ { int ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success; int opt; - const char *session_name = NULL; + const char *session_name = NULL, *leftover = NULL; poptContext pc; struct lttng_save_session_attr *attr; @@ -164,6 +164,13 @@ } } + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + goto end; + } + attr = lttng_save_session_attr_create(); if (!attr) { ret = CMD_FATAL; diff -Nru ltt-control-2.10.2/src/bin/lttng/commands/start.c ltt-control-2.10.4/src/bin/lttng/commands/start.c --- ltt-control-2.10.2/src/bin/lttng/commands/start.c 2018-02-05 20:46:09.547024387 +0000 +++ ltt-control-2.10.4/src/bin/lttng/commands/start.c 2018-04-30 18:47:49.571520283 +0000 @@ -144,6 +144,7 @@ { int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1; static poptContext pc; + const char *leftover = NULL; pc = poptGetContext(NULL, argc, argv, long_options, 0); poptReadDefaultConfig(pc, 0); @@ -164,6 +165,13 @@ opt_session_name = (char*) poptGetArg(pc); + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + goto end; + } + /* Mi check */ if (lttng_opt_mi) { writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi); diff -Nru ltt-control-2.10.2/src/bin/lttng/commands/stop.c ltt-control-2.10.4/src/bin/lttng/commands/stop.c --- ltt-control-2.10.2/src/bin/lttng/commands/stop.c 2018-02-05 20:46:09.547024387 +0000 +++ ltt-control-2.10.4/src/bin/lttng/commands/stop.c 2018-04-30 18:47:49.571520283 +0000 @@ -172,6 +172,7 @@ { int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1; static poptContext pc; + const char *leftover = NULL; pc = poptGetContext(NULL, argc, argv, long_options, 0); poptReadDefaultConfig(pc, 0); @@ -228,6 +229,13 @@ opt_session_name = (char*) poptGetArg(pc); + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + goto end; + } + command_ret = stop_tracing(); if (command_ret) { success = 0; diff -Nru ltt-control-2.10.2/src/bin/lttng/commands/view.c ltt-control-2.10.4/src/bin/lttng/commands/view.c --- ltt-control-2.10.2/src/bin/lttng/commands/view.c 2018-02-05 20:46:09.547024387 +0000 +++ ltt-control-2.10.4/src/bin/lttng/commands/view.c 2018-04-30 18:47:49.571520283 +0000 @@ -415,6 +415,7 @@ { int opt, ret = CMD_SUCCESS; static poptContext pc; + const char *leftover = NULL; pc = poptGetContext(NULL, argc, argv, long_options, 0); poptReadDefaultConfig(pc, 0); @@ -439,6 +440,13 @@ opt_session_name = (char*) poptGetArg(pc); + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + goto end; + } + ret = view_trace(); end: diff -Nru ltt-control-2.10.2/src/bin/lttng/Makefile.in ltt-control-2.10.4/src/bin/lttng/Makefile.in --- ltt-control-2.10.2/src/bin/lttng/Makefile.in 2018-02-05 20:46:53.469820482 +0000 +++ ltt-control-2.10.4/src/bin/lttng/Makefile.in 2018-04-30 18:48:35.710264903 +0000 @@ -261,7 +261,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/bin/lttng-consumerd/Makefile.in ltt-control-2.10.4/src/bin/lttng-consumerd/Makefile.in --- ltt-control-2.10.2/src/bin/lttng-consumerd/Makefile.in 2018-02-05 20:46:53.297825177 +0000 +++ ltt-control-2.10.4/src/bin/lttng-consumerd/Makefile.in 2018-04-30 18:48:35.538269583 +0000 @@ -253,7 +253,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/bin/lttng-crash/Makefile.in ltt-control-2.10.4/src/bin/lttng-crash/Makefile.in --- ltt-control-2.10.2/src/bin/lttng-crash/Makefile.in 2018-02-05 20:46:53.337824085 +0000 +++ ltt-control-2.10.4/src/bin/lttng-crash/Makefile.in 2018-04-30 18:48:35.578268495 +0000 @@ -242,7 +242,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/bin/lttng-relayd/live.c ltt-control-2.10.4/src/bin/lttng-relayd/live.c --- ltt-control-2.10.2/src/bin/lttng-relayd/live.c 2018-02-05 20:46:09.519025155 +0000 +++ ltt-control-2.10.4/src/bin/lttng-relayd/live.c 2018-04-30 18:47:49.543521045 +0000 @@ -452,10 +452,11 @@ if (ret < 0) { goto error; } - DBG("Listening on sock %d for live", sock->fd); + DBG("Listening on sock %d for lttng-live", sock->fd); ret = sock->ops->bind(sock); if (ret < 0) { + PERROR("Failed to bind lttng-live socket"); goto error; } @@ -1483,6 +1484,7 @@ int viewer_get_packet(struct relay_connection *conn) { int ret; + off_t lseek_ret; char *reply = NULL; struct lttng_viewer_get_packet get_packet_info; struct lttng_viewer_trace_packet reply_header; @@ -1524,9 +1526,9 @@ } pthread_mutex_lock(&vstream->stream->lock); - ret = lseek(vstream->stream_fd->fd, be64toh(get_packet_info.offset), + lseek_ret = lseek(vstream->stream_fd->fd, be64toh(get_packet_info.offset), SEEK_SET); - if (ret < 0) { + if (lseek_ret < 0) { PERROR("lseek fd %d to offset %" PRIu64, vstream->stream_fd->fd, be64toh(get_packet_info.offset)); goto error; diff -Nru ltt-control-2.10.2/src/bin/lttng-relayd/main.c ltt-control-2.10.4/src/bin/lttng-relayd/main.c --- ltt-control-2.10.2/src/bin/lttng-relayd/main.c 2018-02-05 20:46:09.519025155 +0000 +++ ltt-control-2.10.4/src/bin/lttng-relayd/main.c 2018-04-30 18:47:49.543521045 +0000 @@ -749,6 +749,7 @@ ret = sock->ops->bind(sock); if (ret < 0) { + PERROR("Failed to bind socket"); goto error; } @@ -1601,6 +1602,7 @@ { int ret; struct lttcomm_relayd_version reply, msg; + bool compatible = true; conn->version_check_done = 1; @@ -1625,9 +1627,7 @@ if (reply.major != be32toh(msg.major)) { DBG("Incompatible major versions (%u vs %u), deleting session", reply.major, be32toh(msg.major)); - connection_put(conn); - ret = 0; - goto end; + compatible = false; } conn->major = reply.major; @@ -1646,6 +1646,11 @@ ERR("Relay sending version"); } + if (!compatible) { + ret = -1; + goto end; + } + DBG("Version check done using protocol %u.%u", conn->major, conn->minor); diff -Nru ltt-control-2.10.2/src/bin/lttng-relayd/Makefile.in ltt-control-2.10.4/src/bin/lttng-relayd/Makefile.in --- ltt-control-2.10.2/src/bin/lttng-relayd/Makefile.in 2018-02-05 20:46:53.377822994 +0000 +++ ltt-control-2.10.4/src/bin/lttng-relayd/Makefile.in 2018-04-30 18:48:35.622267298 +0000 @@ -258,7 +258,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/bin/lttng-relayd/tcp_keep_alive.c ltt-control-2.10.4/src/bin/lttng-relayd/tcp_keep_alive.c --- ltt-control-2.10.2/src/bin/lttng-relayd/tcp_keep_alive.c 2018-02-05 20:46:09.523025045 +0000 +++ ltt-control-2.10.4/src/bin/lttng-relayd/tcp_keep_alive.c 2018-04-30 18:47:49.547520936 +0000 @@ -36,7 +36,6 @@ /* Per-platform definitions of TCP socket options. */ #if defined (__linux__) -#define COMPAT_SOCKET_LEVEL SOL_TCP #define COMPAT_TCP_LEVEL SOL_TCP #define COMPAT_TCP_ABORT_THRESHOLD 0 /* Does not exist on linux. */ #define COMPAT_TCP_KEEPIDLE TCP_KEEPIDLE @@ -45,7 +44,6 @@ #elif defined (__sun__) /* ! defined (__linux__) */ -#define COMPAT_SOCKET_LEVEL SOL_SOCKET #define COMPAT_TCP_LEVEL IPPROTO_TCP #ifdef TCP_KEEPALIVE_THRESHOLD @@ -65,7 +63,6 @@ #else /* ! defined (__linux__) && ! defined (__sun__) */ -#define COMPAT_SOCKET_LEVEL 0 #define COMPAT_TCP_LEVEL 0 #define COMPAT_TCP_ABORT_THRESHOLD 0 #define COMPAT_TCP_KEEPIDLE 0 @@ -547,7 +544,8 @@ goto end; } - ret = setsockopt(socket_fd, COMPAT_SOCKET_LEVEL, SO_KEEPALIVE, &val, + DBG("TCP keep-alive enabled for socket %d", socket_fd); + ret = setsockopt(socket_fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)); if (ret < 0) { PERROR("setsockopt so_keepalive"); @@ -556,6 +554,7 @@ /* TCP keep-alive idle time */ if (support.idle_time_supported && config.idle_time > 0) { + DBG("TCP keep-alive keep idle: %d enabled for socket %d", config.idle_time, socket_fd); ret = setsockopt(socket_fd, COMPAT_TCP_LEVEL, COMPAT_TCP_KEEPIDLE, &config.idle_time, sizeof(config.idle_time)); if (ret < 0) { @@ -565,6 +564,7 @@ } /* TCP keep-alive probe interval */ if (support.probe_interval_supported && config.probe_interval > 0) { + DBG("TCP keep-alive probe_interval: %d enabled for socket %d", config.probe_interval, socket_fd); ret = setsockopt(socket_fd, COMPAT_TCP_LEVEL, COMPAT_TCP_KEEPINTVL, &config.probe_interval, sizeof(config.probe_interval)); if (ret < 0) { @@ -575,6 +575,7 @@ /* TCP keep-alive max probe count */ if (support.max_probe_count_supported && config.max_probe_count > 0) { + DBG("TCP keep-alive max_probe: %d enabled for socket %d", config.max_probe_count, socket_fd); ret = setsockopt(socket_fd, COMPAT_TCP_LEVEL, COMPAT_TCP_KEEPCNT, &config.max_probe_count, sizeof(config.max_probe_count)); if (ret < 0) { @@ -585,6 +586,7 @@ /* TCP keep-alive abort threshold */ if (support.abort_threshold_supported && config.abort_threshold > 0) { + DBG("TCP keep-alive abort threshold: %d enabled for socket %d", config.abort_threshold, socket_fd); ret = setsockopt(socket_fd, COMPAT_TCP_LEVEL, COMPAT_TCP_ABORT_THRESHOLD, &config.abort_threshold, sizeof(config.max_probe_count)); if (ret < 0) { diff -Nru ltt-control-2.10.2/src/bin/lttng-relayd/utils.c ltt-control-2.10.4/src/bin/lttng-relayd/utils.c --- ltt-control-2.10.2/src/bin/lttng-relayd/utils.c 2018-02-05 20:46:09.523025045 +0000 +++ ltt-control-2.10.4/src/bin/lttng-relayd/utils.c 2018-04-30 18:47:49.547520936 +0000 @@ -29,7 +29,7 @@ #include "lttng-relayd.h" #include "utils.h" -static char *create_output_path_auto(char *path_name) +static char *create_output_path_auto(const char *path_name) { int ret; char *traces_path = NULL; @@ -58,7 +58,7 @@ return traces_path; } -static char *create_output_path_noauto(char *path_name) +static char *create_output_path_noauto(const char *path_name) { int ret; char *traces_path = NULL; @@ -84,7 +84,7 @@ * * Return the allocated string containing the path name or else NULL. */ -char *create_output_path(char *path_name) +char *create_output_path(const char *path_name) { assert(path_name); diff -Nru ltt-control-2.10.2/src/bin/lttng-relayd/utils.h ltt-control-2.10.4/src/bin/lttng-relayd/utils.h --- ltt-control-2.10.2/src/bin/lttng-relayd/utils.h 2018-02-05 20:46:09.523025045 +0000 +++ ltt-control-2.10.4/src/bin/lttng-relayd/utils.h 2018-04-30 18:47:49.547520936 +0000 @@ -20,6 +20,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -char *create_output_path(char *path_name); +char *create_output_path(const char *path_name); #endif /* RELAYD_UTILS_H */ diff -Nru ltt-control-2.10.2/src/bin/lttng-sessiond/agent-thread.c ltt-control-2.10.4/src/bin/lttng-sessiond/agent-thread.c --- ltt-control-2.10.2/src/bin/lttng-sessiond/agent-thread.c 2018-02-05 20:46:09.523025045 +0000 +++ ltt-control-2.10.4/src/bin/lttng-sessiond/agent-thread.c 2018-04-30 18:47:49.547520936 +0000 @@ -32,6 +32,8 @@ #include "session.h" #include "utils.h" +static int agent_tracing_enabled = -1; + /* * Note that there is not port here. It's set after this URI is parsed so we * can let the user define a custom one. However, localhost is ALWAYS the @@ -81,6 +83,8 @@ int ret; struct lttng_uri *uri = NULL; struct lttcomm_sock *sock = NULL; + unsigned int port; + bool bind_succeeded = false; /* * This should never fail since the URI is hardcoded and the port is set @@ -88,8 +92,8 @@ */ ret = uri_parse(default_reg_uri, &uri); assert(ret); - assert(config.agent_tcp_port); - uri->port = config.agent_tcp_port; + assert(config.agent_tcp_port.begin > 0); + uri->port = config.agent_tcp_port.begin; sock = lttcomm_alloc_sock_from_uri(uri); uri_free(uri); @@ -103,11 +107,43 @@ goto error; } - ret = sock->ops->bind(sock); - if (ret < 0) { - WARN("Another session daemon is using this agent port. Agent support " - "will be deactivated to prevent interfering with the tracing."); - goto error; + for (port = config.agent_tcp_port.begin; + port <= config.agent_tcp_port.end; port++) { + ret = lttcomm_sock_set_port(sock, (uint16_t) port); + if (ret) { + ERR("[agent-thread] Failed to set port %u on socket", + port); + goto error; + } + DBG3("[agent-thread] Trying to bind on port %u", port); + ret = sock->ops->bind(sock); + if (!ret) { + bind_succeeded = true; + break; + } + + if (errno == EADDRINUSE) { + DBG("Failed to bind to port %u since it is already in use", + port); + } else { + PERROR("Failed to bind to port %u", port); + goto error; + } + } + + if (!bind_succeeded) { + if (config.agent_tcp_port.begin == config.agent_tcp_port.end) { + WARN("Another process is already using the agent port %i. " + "Agent support will be deactivated.", + config.agent_tcp_port.begin); + goto error; + } else { + WARN("All ports in the range [%i, %i] are already in use. " + "Agent support will be deactivated.", + config.agent_tcp_port.begin, + config.agent_tcp_port.end); + goto error; + } } ret = sock->ops->listen(sock, -1); @@ -116,7 +152,7 @@ } DBG("[agent-thread] Listening on TCP port %u and socket %d", - config.agent_tcp_port, sock->fd); + port, sock->fd); return sock; @@ -132,9 +168,19 @@ */ static void destroy_tcp_socket(struct lttcomm_sock *sock) { + int ret; + uint16_t port; + assert(sock); - DBG3("[agent-thread] Destroy TCP socket on port %u", config.agent_tcp_port); + ret = lttcomm_sock_get_port(sock, &port); + if (ret) { + ERR("[agent-thread] Failed to get port of agent TCP socket"); + port = 0; + } + + DBG3("[agent-thread] Destroy TCP socket on port %" PRIu16, + port); /* This will return gracefully if fd is invalid. */ sock->ops->close(sock); @@ -223,6 +269,24 @@ return ret; } +bool agent_tracing_is_enabled(void) +{ + int enabled; + + enabled = uatomic_read(&agent_tracing_enabled); + assert(enabled != -1); + return enabled == 1; +} + +/* + * Write agent TCP port using the rundir. + */ +static int write_agent_port(uint16_t port) +{ + return utils_create_pid_file((pid_t) port, + config.agent_port_file_path.value); +} + /* * This thread manage application notify communication. */ @@ -248,10 +312,31 @@ } reg_sock = init_tcp_socket(); - if (!reg_sock) { + if (reg_sock) { + uint16_t port; + + assert(lttcomm_sock_get_port(reg_sock, &port) == 0); + + ret = write_agent_port(port); + if (ret) { + ERR("[agent-thread] Failed to create agent port file: agent tracing will be unavailable"); + /* Don't prevent the launch of the sessiond on error. */ + sessiond_notify_ready(); + goto error; + } + } else { + /* Don't prevent the launch of the sessiond on error. */ + sessiond_notify_ready(); goto error_tcp_socket; } + /* + * Signal that the agent thread is ready. The command thread + * may start to query whether or not agent tracing is enabled. + */ + uatomic_set(&agent_tracing_enabled, 1); + sessiond_notify_ready(); + /* Add TCP socket to poll set. */ ret = lttng_poll_add(&events, reg_sock->fd, LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP); @@ -354,6 +439,7 @@ error_tcp_socket: lttng_poll_clean(&events); error_poll_create: + uatomic_set(&agent_tracing_enabled, 0); DBG("[agent-thread] is cleaning up and stopping."); rcu_thread_offline(); diff -Nru ltt-control-2.10.2/src/bin/lttng-sessiond/agent-thread.h ltt-control-2.10.4/src/bin/lttng-sessiond/agent-thread.h --- ltt-control-2.10.2/src/bin/lttng-sessiond/agent-thread.h 2018-02-05 20:46:09.523025045 +0000 +++ ltt-control-2.10.4/src/bin/lttng-sessiond/agent-thread.h 2018-04-30 18:47:49.547520936 +0000 @@ -15,12 +15,15 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include + #ifndef LTTNG_SESSIOND_AGENT_THREAD_H #define LTTNG_SESSIOND_AGENT_THREAD_H #ifdef HAVE_LIBLTTNG_UST_CTL void *agent_thread_manage_registration(void *data); +bool agent_tracing_is_enabled(void); #else /* HAVE_LIBLTTNG_UST_CTL */ @@ -29,6 +32,11 @@ { return NULL; } +static inline +bool agent_tracing_is_enabled(void) +{ + return false; +} #endif /* HAVE_LIBLTTNG_UST_CTL */ diff -Nru ltt-control-2.10.2/src/bin/lttng-sessiond/cmd.c ltt-control-2.10.4/src/bin/lttng-sessiond/cmd.c --- ltt-control-2.10.2/src/bin/lttng-sessiond/cmd.c 2018-02-05 20:46:09.527024935 +0000 +++ ltt-control-2.10.4/src/bin/lttng-sessiond/cmd.c 2018-04-30 18:47:49.551520828 +0000 @@ -51,6 +51,7 @@ #include "buffer-registry.h" #include "notification-thread.h" #include "notification-thread-commands.h" +#include "agent-thread.h" #include "cmd.h" @@ -877,8 +878,11 @@ /* Check relayd version */ ret = relayd_version_check(rsock); - if (ret < 0) { - ret = LTTNG_ERR_RELAYD_VERSION_FAIL; + if (ret == LTTNG_ERR_RELAYD_VERSION_FAIL) { + goto close_sock; + } else if (ret < 0) { + ERR("Unable to reach lttng-relayd"); + ret = LTTNG_ERR_RELAYD_CONNECT_FAIL; goto close_sock; } consumer->relay_major_version = rsock->major; @@ -907,6 +911,8 @@ /* * Connect to the relayd using URI and send the socket to the right consumer. + * + * The consumer socket lock must be held by the caller. */ static int send_consumer_relayd_socket(enum lttng_domain_type domain, unsigned int session_id, struct lttng_uri *relayd_uri, @@ -979,6 +985,8 @@ * Send both relayd sockets to a specific consumer and domain. This is a * helper function to facilitate sending the information to the consumer for a * session. + * + * The consumer socket lock must be held by the caller. */ static int send_consumer_relayd_sockets(enum lttng_domain_type domain, unsigned int session_id, struct consumer_output *consumer, @@ -1373,9 +1381,15 @@ break; } case LTTNG_DOMAIN_UST: + break; case LTTNG_DOMAIN_JUL: case LTTNG_DOMAIN_LOG4J: case LTTNG_DOMAIN_PYTHON: + if (!agent_tracing_is_enabled()) { + DBG("Attempted to enable a channel in an agent domain but the agent thread is not running"); + ret = LTTNG_ERR_AGENT_TRACING_DISABLED; + goto error; + } break; default: ret = LTTNG_ERR_UNKNOWN_DOMAIN; @@ -1650,6 +1664,16 @@ int ret, chan_kern_created = 0, chan_ust_created = 0; char *app_ctx_provider_name = NULL, *app_ctx_name = NULL; + /* + * Don't try to add a context if the session has been started at + * some point in time before. The tracer does not allow it and would + * result in a corrupted trace. + */ + if (session->has_been_started) { + ret = LTTNG_ERR_TRACE_ALREADY_STARTED; + goto end; + } + if (ctx->ctx == LTTNG_EVENT_CONTEXT_APP_CONTEXT) { app_ctx_provider_name = ctx->u.app_ctx.provider_name; app_ctx_name = ctx->u.app_ctx.ctx_name; @@ -2073,6 +2097,12 @@ assert(usess); + if (!agent_tracing_is_enabled()) { + DBG("Attempted to enable an event in an agent domain but the agent thread is not running"); + ret = LTTNG_ERR_AGENT_TRACING_DISABLED; + goto error; + } + agt = trace_ust_find_agent(usess, domain->type); if (!agt) { agt = agent_create(domain->type); @@ -3403,10 +3433,12 @@ int clear_metadata_file(int fd) { int ret; + off_t lseek_ret; - ret = lseek(fd, 0, SEEK_SET); - if (ret < 0) { + lseek_ret = lseek(fd, 0, SEEK_SET); + if (lseek_ret < 0) { PERROR("lseek"); + ret = -1; goto end; } @@ -3706,10 +3738,12 @@ rcu_read_lock(); cds_lfht_for_each_entry(snap_output->consumer->socks->ht, &iter.iter, socket, node.node) { + pthread_mutex_lock(socket->lock); ret = send_consumer_relayd_sockets(0, session->id, snap_output->consumer, socket, session->name, session->hostname, session->live_timer); + pthread_mutex_unlock(socket->lock); if (ret != LTTNG_OK) { rcu_read_unlock(); goto error; diff -Nru ltt-control-2.10.2/src/bin/lttng-sessiond/consumer.c ltt-control-2.10.4/src/bin/lttng-sessiond/consumer.c --- ltt-control-2.10.2/src/bin/lttng-sessiond/consumer.c 2018-02-05 20:46:09.527024935 +0000 +++ ltt-control-2.10.4/src/bin/lttng-sessiond/consumer.c 2018-04-30 18:47:49.551520828 +0000 @@ -731,6 +731,8 @@ /* * Send file descriptor to consumer via sock. + * + * The consumer socket lock must be held by the caller. */ int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd) { @@ -739,6 +741,7 @@ assert(fds); assert(sock); assert(nb_fd > 0); + assert(pthread_mutex_trylock(sock->lock) == EBUSY); ret = lttcomm_send_fds_unix_sock(*sock->fd_ptr, fds, nb_fd); if (ret < 0) { @@ -754,6 +757,8 @@ /* * Consumer send communication message structure to consumer. + * + * The consumer socket lock must be held by the caller. */ int consumer_send_msg(struct consumer_socket *sock, struct lttcomm_consumer_msg *msg) @@ -762,6 +767,7 @@ assert(msg); assert(sock); + assert(pthread_mutex_trylock(sock->lock) == EBUSY); ret = consumer_socket_send(sock, msg, sizeof(struct lttcomm_consumer_msg)); if (ret < 0) { @@ -776,6 +782,8 @@ /* * Consumer send channel communication message structure to consumer. + * + * The consumer socket lock must be held by the caller. */ int consumer_send_channel(struct consumer_socket *sock, struct lttcomm_consumer_msg *msg) @@ -990,6 +998,8 @@ /* * Send relayd socket to consumer associated with a session name. * + * The consumer socket lock must be held by the caller. + * * On success return positive value. On error, negative value. */ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock, @@ -1064,6 +1074,7 @@ memset(&msg, 0, sizeof(msg)); msg.cmd_type = LTTNG_CONSUMER_SET_CHANNEL_MONITOR_PIPE; + pthread_mutex_lock(consumer_sock->lock); DBG3("Sending set_channel_monitor_pipe command to consumer"); ret = consumer_send_msg(consumer_sock, &msg); if (ret < 0) { @@ -1079,6 +1090,7 @@ DBG2("Channel monitoring pipe successfully sent"); error: + pthread_mutex_unlock(consumer_sock->lock); return ret; } @@ -1436,7 +1448,9 @@ } health_code_update(); + pthread_mutex_lock(socket->lock); ret = consumer_send_msg(socket, &msg); + pthread_mutex_unlock(socket->lock); if (ret < 0) { goto error; } diff -Nru ltt-control-2.10.2/src/bin/lttng-sessiond/kernel.c ltt-control-2.10.4/src/bin/lttng-sessiond/kernel.c --- ltt-control-2.10.2/src/bin/lttng-sessiond/kernel.c 2018-02-05 20:46:09.527024935 +0000 +++ ltt-control-2.10.4/src/bin/lttng-sessiond/kernel.c 2018-04-30 18:47:49.555520718 +0000 @@ -1029,12 +1029,10 @@ /* For each channel, ask the consumer to snapshot it. */ cds_list_for_each_entry(chan, &ksess->channel_list.head, list) { - pthread_mutex_lock(socket->lock); ret = consumer_snapshot_channel(socket, chan->fd, output, 0, ksess->uid, ksess->gid, DEFAULT_KERNEL_TRACE_DIR, wait, nb_packets_per_stream); - pthread_mutex_unlock(socket->lock); if (ret < 0) { ret = LTTNG_ERR_KERN_CONSUMER_FAIL; (void) kernel_consumer_destroy_metadata(socket, @@ -1044,11 +1042,9 @@ } /* Snapshot metadata, */ - pthread_mutex_lock(socket->lock); ret = consumer_snapshot_channel(socket, ksess->metadata->fd, output, 1, ksess->uid, ksess->gid, DEFAULT_KERNEL_TRACE_DIR, wait, 0); - pthread_mutex_unlock(socket->lock); if (ret < 0) { ret = LTTNG_ERR_KERN_CONSUMER_FAIL; goto error_consumer; diff -Nru ltt-control-2.10.2/src/bin/lttng-sessiond/kernel-consumer.c ltt-control-2.10.4/src/bin/lttng-sessiond/kernel-consumer.c --- ltt-control-2.10.2/src/bin/lttng-sessiond/kernel-consumer.c 2018-02-05 20:46:09.527024935 +0000 +++ ltt-control-2.10.4/src/bin/lttng-sessiond/kernel-consumer.c 2018-04-30 18:47:49.555520718 +0000 @@ -178,6 +178,8 @@ /* * Sending metadata to the consumer with command ADD_CHANNEL and ADD_STREAM. + * + * The consumer socket lock must be held by the caller. */ int kernel_consumer_add_metadata(struct consumer_socket *sock, struct ltt_kernel_session *session, unsigned int monitor) @@ -336,6 +338,8 @@ /* * Send all stream fds of kernel channel to the consumer. + * + * The consumer socket lock must be held by the caller. */ int kernel_consumer_send_channel_stream(struct consumer_socket *sock, struct ltt_kernel_channel *channel, struct ltt_kernel_session *session, @@ -388,6 +392,8 @@ /* * Send all stream fds of the kernel session to the consumer. + * + * The consumer socket lock must be held by the caller. */ int kernel_consumer_send_session(struct consumer_socket *sock, struct ltt_kernel_session *session) diff -Nru ltt-control-2.10.2/src/bin/lttng-sessiond/main.c ltt-control-2.10.4/src/bin/lttng-sessiond/main.c --- ltt-control-2.10.2/src/bin/lttng-sessiond/main.c 2018-02-05 20:46:09.531024826 +0000 +++ ltt-control-2.10.4/src/bin/lttng-sessiond/main.c 2018-04-30 18:47:49.559520610 +0000 @@ -291,7 +291,7 @@ * NR_LTTNG_SESSIOND_READY must match the number of calls to * sessiond_notify_ready(). */ -#define NR_LTTNG_SESSIOND_READY 4 +#define NR_LTTNG_SESSIOND_READY 5 int lttng_sessiond_ready = NR_LTTNG_SESSIOND_READY; int sessiond_check_thread_quit_pipe(int fd, uint32_t events) @@ -600,21 +600,6 @@ } /* - * Cleanup lock file by deleting it and finaly closing it which will - * release the file system lock. - */ - if (lockfile_fd >= 0) { - ret = remove(config.lock_file_path.value); - if (ret < 0) { - PERROR("remove lock file"); - } - ret = close(lockfile_fd); - if (ret < 0) { - PERROR("close lock file"); - } - } - - /* * We do NOT rmdir rundir because there are other processes * using it, for instance lttng-relayd, which can start in * parallel with this teardown. @@ -1270,6 +1255,7 @@ if (!cmd_socket_wrapper) { goto error; } + cmd_socket_wrapper->lock = &consumer_data->lock; ret = consumer_send_channel_monitor_pipe(cmd_socket_wrapper, consumer_data->channel_monitor_pipe); @@ -4301,12 +4287,41 @@ } sessiond_notify_ready(); + ret = sem_post(&load_info->message_thread_ready); if (ret) { PERROR("sem_post message_thread_ready"); goto error; } + /* + * Wait until all support threads are initialized before accepting + * commands. + */ + while (uatomic_read(<tng_sessiond_ready) != 0) { + fd_set read_fds; + struct timeval timeout; + + FD_ZERO(&read_fds); + FD_SET(thread_quit_pipe[0], &read_fds); + memset(&timeout, 0, sizeof(timeout)); + timeout.tv_usec = 1000; + + /* + * If a support thread failed to launch, it may signal that + * we must exit and the sessiond would never be marked as + * "ready". + * + * The timeout is set to 1ms, which serves as a way to + * pace down this check. + */ + ret = select(thread_quit_pipe[0] + 1, &read_fds, NULL, NULL, + &timeout); + if (ret > 0 || (ret < 0 && errno != EINTR)) { + goto exit; + } + } + /* This testpoint is after we signal readiness to the parent. */ if (testpoint(sessiond_thread_manage_clients)) { goto error; @@ -4719,7 +4734,7 @@ } else if (string_match(optname, "no-kernel")) { config.no_kernel = true; } else if (string_match(optname, "quiet") || opt == 'q') { - lttng_opt_quiet = true; + config.quiet = true; } else if (string_match(optname, "verbose") || opt == 'v') { /* Verbose level can increase using multiple -v */ if (arg) { @@ -4838,8 +4853,8 @@ ERR("Port overflow in --agent-tcp-port parameter: %s", arg); return -1; } - config.agent_tcp_port = (uint32_t) v; - DBG3("Agent TCP port set to non default: %u", config.agent_tcp_port); + config.agent_tcp_port.begin = config.agent_tcp_port.end = (int) v; + DBG3("Agent TCP port set to non default: %i", (int) v); } } else if (string_match(optname, "load") || opt == 'l') { if (!arg || *arg == '\0') { @@ -5123,17 +5138,56 @@ } /* + * Create lockfile using the rundir and return its fd. + */ +static int create_lockfile(void) +{ + return utils_create_lock_file(config.lock_file_path.value); +} + +/* * Check if the global socket is available, and if a daemon is answering at the * other side. If yes, error is returned. + * + * Also attempts to create and hold the lock file. */ static int check_existing_daemon(void) { + int ret = 0; + /* Is there anybody out there ? */ if (lttng_session_daemon_alive()) { - return -EEXIST; + ret = -EEXIST; + goto end; } - return 0; + lockfile_fd = create_lockfile(); + if (lockfile_fd < 0) { + ret = -EEXIST; + goto end; + } +end: + return ret; +} + +static void sessiond_cleanup_lock_file(void) +{ + int ret; + + /* + * Cleanup lock file by deleting it and finaly closing it which will + * release the file system lock. + */ + if (lockfile_fd >= 0) { + ret = remove(config.lock_file_path.value); + if (ret < 0) { + PERROR("remove lock file"); + } + ret = close(lockfile_fd); + if (ret < 0) { + PERROR("close lock file"); + } + } } /* @@ -5392,23 +5446,6 @@ return utils_create_pid_file(getpid(), config.pid_file_path.value); } -/* - * Create lockfile using the rundir and return its fd. - */ -static int create_lockfile(void) -{ - return utils_create_lock_file(config.lock_file_path.value); -} - -/* - * Write agent TCP port using the rundir. - */ -static int write_agent_port(void) -{ - return utils_create_pid_file(config.agent_tcp_port, - config.agent_port_file_path.value); -} - static int set_clock_plugin_env(void) { int ret = 0; @@ -5520,6 +5557,18 @@ sessiond_config_log(&config); + if (create_lttng_rundir()) { + retval = -1; + goto exit_options; + } + + /* Abort launch if a session daemon is already running. */ + if (check_existing_daemon()) { + ERR("A session daemon is already running."); + retval = -1; + goto exit_options; + } + /* Daemonize */ if (config.daemonize || config.background) { int i; @@ -5534,9 +5583,12 @@ /* * We are in the child. Make sure all other file descriptors are * closed, in case we are called with more opened file - * descriptors than the standard ones. + * descriptors than the standard ones and the lock file. */ for (i = 3; i < sysconf(_SC_OPEN_MAX); i++) { + if (i == lockfile_fd) { + continue; + } (void) close(i); } } @@ -5575,12 +5627,6 @@ /* Check if daemon is UID = 0 */ is_root = !getuid(); - - if (create_lttng_rundir()) { - retval = -1; - goto exit_init_data; - } - if (is_root) { /* Create global run dir with root access */ @@ -5599,12 +5645,6 @@ } } - lockfile_fd = create_lockfile(); - if (lockfile_fd < 0) { - retval = -1; - goto exit_init_data; - } - /* Set consumer initial state */ kernel_consumerd_state = CONSUMER_STOPPED; ust_consumerd_state = CONSUMER_STOPPED; @@ -5636,19 +5676,6 @@ } /* - * See if daemon already exist. - */ - if (check_existing_daemon()) { - ERR("Already running daemon.\n"); - /* - * We do not goto exit because we must not cleanup() - * because a daemon is already running. - */ - retval = -1; - goto exit_init_data; - } - - /* * Init UST app hash table. Alloc hash table before this point since * cleanup() can get called after that point. */ @@ -5775,12 +5802,6 @@ retval = -1; goto exit_init_data; } - ret = write_agent_port(); - if (ret) { - ERR("Error in write_agent_port"); - retval = -1; - goto exit_init_data; - } /* Initialize communication library */ lttcomm_init(); @@ -6059,6 +6080,7 @@ exit_create_run_as_worker_cleanup: exit_options: + sessiond_cleanup_lock_file(); sessiond_cleanup_options(); exit_set_signal_handler: diff -Nru ltt-control-2.10.2/src/bin/lttng-sessiond/Makefile.in ltt-control-2.10.4/src/bin/lttng-sessiond/Makefile.in --- ltt-control-2.10.2/src/bin/lttng-sessiond/Makefile.in 2018-02-05 20:46:53.425821682 +0000 +++ ltt-control-2.10.4/src/bin/lttng-sessiond/Makefile.in 2018-04-30 18:48:35.666266100 +0000 @@ -296,7 +296,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/bin/lttng-sessiond/notification-thread-events.c ltt-control-2.10.4/src/bin/lttng-sessiond/notification-thread-events.c --- ltt-control-2.10.2/src/bin/lttng-sessiond/notification-thread-events.c 2018-02-05 20:46:09.535024716 +0000 +++ ltt-control-2.10.4/src/bin/lttng-sessiond/notification-thread-events.c 2018-04-30 18:47:49.559520610 +0000 @@ -295,7 +295,7 @@ val = condition->threshold_ratio.value * (double) UINT32_MAX; hash ^= hash_key_u64(&val, lttng_ht_seed); - } else if (condition->threshold_ratio.set) { + } else if (condition->threshold_bytes.set) { uint64_t val; val = condition->threshold_bytes.value; diff -Nru ltt-control-2.10.2/src/bin/lttng-sessiond/sessiond-config.c ltt-control-2.10.4/src/bin/lttng-sessiond/sessiond-config.c --- ltt-control-2.10.2/src/bin/lttng-sessiond/sessiond-config.c 2018-02-05 20:46:09.535024716 +0000 +++ ltt-control-2.10.4/src/bin/lttng-sessiond/sessiond-config.c 2018-04-30 18:47:49.563520501 +0000 @@ -32,7 +32,7 @@ .verbose = 0, .verbose_consumer = 0, - .agent_tcp_port = DEFAULT_AGENT_TCP_PORT, + .agent_tcp_port = { .begin = DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN, .end = DEFAULT_AGENT_TCP_PORT_RANGE_END }, .app_socket_timeout = DEFAULT_APP_SOCKET_RW_TIMEOUT, .no_kernel = false, @@ -494,7 +494,13 @@ DBG_NO_LOC("\tverbose: %i", config->verbose); DBG_NO_LOC("\tverbose consumer: %i", config->verbose_consumer); DBG_NO_LOC("\tquiet mode: %s", config->quiet ? "True" : "False"); - DBG_NO_LOC("\tagent_tcp_port: %i", config->agent_tcp_port); + if (config->agent_tcp_port.begin == config->agent_tcp_port.end) { + DBG_NO_LOC("\tagent_tcp_port: %i", config->agent_tcp_port.begin); + } else { + DBG_NO_LOC("\tagent_tcp_port: [%i, %i]", + config->agent_tcp_port.begin, + config->agent_tcp_port.end); + } DBG_NO_LOC("\tapplication socket timeout: %i", config->app_socket_timeout); DBG_NO_LOC("\tno-kernel: %s", config->no_kernel ? "True" : "False"); DBG_NO_LOC("\tbackground: %s", config->background ? "True" : "False"); diff -Nru ltt-control-2.10.2/src/bin/lttng-sessiond/sessiond-config.h ltt-control-2.10.4/src/bin/lttng-sessiond/sessiond-config.h --- ltt-control-2.10.2/src/bin/lttng-sessiond/sessiond-config.h 2018-02-05 20:46:09.535024716 +0000 +++ ltt-control-2.10.4/src/bin/lttng-sessiond/sessiond-config.h 2018-04-30 18:47:49.563520501 +0000 @@ -26,6 +26,10 @@ bool should_free; }; +struct config_int_range { + int begin, end; +}; + /* Config string takes ownership of value. */ LTTNG_HIDDEN void config_string_set(struct config_string *string, char *value); @@ -33,8 +37,8 @@ struct sessiond_config { int verbose; int verbose_consumer; - /* Agent TCP port for registration. Used by the agent thread. */ - int agent_tcp_port; + /* Agent TCP port range for registration. Used by the agent thread. */ + struct config_int_range agent_tcp_port; /* Socket timeout for receiving and sending (in seconds). */ int app_socket_timeout; diff -Nru ltt-control-2.10.2/src/bin/lttng-sessiond/ust-consumer.c ltt-control-2.10.4/src/bin/lttng-sessiond/ust-consumer.c --- ltt-control-2.10.2/src/bin/lttng-sessiond/ust-consumer.c 2018-02-05 20:46:09.539024606 +0000 +++ ltt-control-2.10.4/src/bin/lttng-sessiond/ust-consumer.c 2018-04-30 18:47:49.567520393 +0000 @@ -505,7 +505,9 @@ memset(&msg, 0, sizeof(msg)); msg.cmd_type = LTTNG_ERR_UND; + pthread_mutex_lock(socket->lock); (void) consumer_send_msg(socket, &msg); + pthread_mutex_unlock(socket->lock); /* * This is possible since the session might have been destroyed * during a consumer metadata request. So here, return gracefully diff -Nru ltt-control-2.10.2/src/bin/Makefile.in ltt-control-2.10.4/src/bin/Makefile.in --- ltt-control-2.10.2/src/bin/Makefile.in 2018-02-05 20:46:53.253826378 +0000 +++ ltt-control-2.10.4/src/bin/Makefile.in 2018-04-30 18:48:35.498270672 +0000 @@ -252,7 +252,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/common/compat/Makefile.in ltt-control-2.10.4/src/common/compat/Makefile.in --- ltt-control-2.10.2/src/common/compat/Makefile.in 2018-02-05 20:46:53.565817860 +0000 +++ ltt-control-2.10.4/src/common/compat/Makefile.in 2018-04-30 18:48:35.802262399 +0000 @@ -243,7 +243,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/common/config/Makefile.in ltt-control-2.10.4/src/common/config/Makefile.in --- ltt-control-2.10.2/src/common/config/Makefile.in 2018-02-05 20:46:53.605816769 +0000 +++ ltt-control-2.10.4/src/common/config/Makefile.in 2018-04-30 18:48:35.838261419 +0000 @@ -270,7 +270,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/common/consumer/consumer.c ltt-control-2.10.4/src/common/consumer/consumer.c --- ltt-control-2.10.2/src/common/consumer/consumer.c 2018-02-05 20:46:09.555024168 +0000 +++ ltt-control-2.10.4/src/common/consumer/consumer.c 2018-04-30 18:47:49.583519957 +0000 @@ -2159,7 +2159,7 @@ lttng_ht_add_unique_u64(ht, &stream->node); - lttng_ht_add_unique_u64(consumer_data.stream_per_chan_id_ht, + lttng_ht_add_u64(consumer_data.stream_per_chan_id_ht, &stream->node_channel_id); /* diff -Nru ltt-control-2.10.2/src/common/consumer/Makefile.in ltt-control-2.10.4/src/common/consumer/Makefile.in --- ltt-control-2.10.2/src/common/consumer/Makefile.in 2018-02-05 20:46:53.637815895 +0000 +++ ltt-control-2.10.4/src/common/consumer/Makefile.in 2018-04-30 18:48:35.870260549 +0000 @@ -249,7 +249,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/common/defaults.h ltt-control-2.10.4/src/common/defaults.h --- ltt-control-2.10.2/src/common/defaults.h 2018-02-05 20:46:09.559024058 +0000 +++ ltt-control-2.10.4/src/common/defaults.h 2018-04-30 18:47:49.583519957 +0000 @@ -269,8 +269,9 @@ #define DEFAULT_NETWORK_DATA_PORT CONFIG_DEFAULT_NETWORK_DATA_PORT #define DEFAULT_NETWORK_VIEWER_PORT CONFIG_DEFAULT_NETWORK_VIEWER_PORT -/* Agent registration TCP port. */ -#define DEFAULT_AGENT_TCP_PORT CONFIG_DEFAULT_AGENT_TCP_PORT +/* Agent registration TCP port range. */ +#define DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN CONFIG_DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN +#define DEFAULT_AGENT_TCP_PORT_RANGE_END CONFIG_DEFAULT_AGENT_TCP_PORT_RANGE_END /* * If a thread stalls for this amount of time, it will be considered bogus (bad diff -Nru ltt-control-2.10.2/src/common/error.c ltt-control-2.10.4/src/common/error.c --- ltt-control-2.10.2/src/common/error.c 2018-02-05 20:46:09.559024058 +0000 +++ ltt-control-2.10.4/src/common/error.c 2018-04-30 18:47:49.583519957 +0000 @@ -59,7 +59,7 @@ /* Format time in the TLS variable. */ ret = snprintf(URCU_TLS(error_log_time).str, sizeof(URCU_TLS(error_log_time).str), - "%02d:%02d:%02d.%06ld", + "%02d:%02d:%02d.%09ld", tm.tm_hour, tm.tm_min, tm.tm_sec, tp.tv_nsec); if (ret < 0) { goto error; @@ -190,6 +190,7 @@ [ ERROR_INDEX(LTTNG_ERR_TRIGGER_EXISTS) ] = "Trigger already registered", [ ERROR_INDEX(LTTNG_ERR_TRIGGER_NOT_FOUND) ] = "Trigger not found", [ ERROR_INDEX(LTTNG_ERR_COMMAND_CANCELLED) ] = "Command cancelled", + [ ERROR_INDEX(LTTNG_ERR_AGENT_TRACING_DISABLED) ] = "Session daemon agent tracing is disabled", /* Last element */ [ ERROR_INDEX(LTTNG_ERR_NR) ] = "Unknown error code" diff -Nru ltt-control-2.10.2/src/common/error.h ltt-control-2.10.4/src/common/error.h --- ltt-control-2.10.2/src/common/error.h 2018-02-05 20:46:09.559024058 +0000 +++ ltt-control-2.10.4/src/common/error.h 2018-04-30 18:47:49.583519957 +0000 @@ -48,8 +48,8 @@ * every time a log is fired. */ struct log_time { - /* Format: 00:00:00.000000 plus NULL byte. */ - char str[16]; + /* Format: 00:00:00.000000000 plus NULL byte. */ + char str[19]; }; extern DECLARE_URCU_TLS(struct log_time, error_log_time); diff -Nru ltt-control-2.10.2/src/common/hashtable/Makefile.in ltt-control-2.10.4/src/common/hashtable/Makefile.in --- ltt-control-2.10.2/src/common/hashtable/Makefile.in 2018-02-05 20:46:53.673814912 +0000 +++ ltt-control-2.10.4/src/common/hashtable/Makefile.in 2018-04-30 18:48:35.898259787 +0000 @@ -237,7 +237,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/common/health/Makefile.in ltt-control-2.10.4/src/common/health/Makefile.in --- ltt-control-2.10.2/src/common/health/Makefile.in 2018-02-05 20:46:53.705814038 +0000 +++ ltt-control-2.10.4/src/common/health/Makefile.in 2018-04-30 18:48:35.930258916 +0000 @@ -237,7 +237,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/common/index/Makefile.in ltt-control-2.10.4/src/common/index/Makefile.in --- ltt-control-2.10.2/src/common/index/Makefile.in 2018-02-05 20:46:53.733813274 +0000 +++ ltt-control-2.10.4/src/common/index/Makefile.in 2018-04-30 18:48:35.962258045 +0000 @@ -237,7 +237,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/common/kernel-consumer/kernel-consumer.c ltt-control-2.10.4/src/common/kernel-consumer/kernel-consumer.c --- ltt-control-2.10.2/src/common/kernel-consumer/kernel-consumer.c 2018-02-05 20:46:09.563023948 +0000 +++ ltt-control-2.10.4/src/common/kernel-consumer/kernel-consumer.c 2018-04-30 18:47:49.587519848 +0000 @@ -60,7 +60,11 @@ int infd = stream->wait_fd; ret = kernctl_snapshot(infd); - if (ret != 0) { + /* + * -EAGAIN is not an error, it just means that there is no data to + * be read. + */ + if (ret != 0 && ret != -EAGAIN) { PERROR("Getting sub-buffer snapshot."); } diff -Nru ltt-control-2.10.2/src/common/kernel-consumer/Makefile.in ltt-control-2.10.4/src/common/kernel-consumer/Makefile.in --- ltt-control-2.10.2/src/common/kernel-consumer/Makefile.in 2018-02-05 20:46:53.765812400 +0000 +++ ltt-control-2.10.4/src/common/kernel-consumer/Makefile.in 2018-04-30 18:48:35.990257283 +0000 @@ -239,7 +239,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/common/kernel-ctl/Makefile.in ltt-control-2.10.4/src/common/kernel-ctl/Makefile.in --- ltt-control-2.10.2/src/common/kernel-ctl/Makefile.in 2018-02-05 20:46:53.797811526 +0000 +++ ltt-control-2.10.4/src/common/kernel-ctl/Makefile.in 2018-04-30 18:48:36.022256413 +0000 @@ -237,7 +237,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/common/Makefile.in ltt-control-2.10.4/src/common/Makefile.in --- ltt-control-2.10.2/src/common/Makefile.in 2018-02-05 20:46:53.521819061 +0000 +++ ltt-control-2.10.4/src/common/Makefile.in 2018-04-30 18:48:35.758263596 +0000 @@ -300,7 +300,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/common/mi-lttng-3.0.xsd ltt-control-2.10.4/src/common/mi-lttng-3.0.xsd --- ltt-control-2.10.2/src/common/mi-lttng-3.0.xsd 2018-02-05 20:46:09.563023948 +0000 +++ ltt-control-2.10.4/src/common/mi-lttng-3.0.xsd 2018-04-30 18:47:49.587519848 +0000 @@ -73,8 +73,6 @@ - - @@ -114,6 +112,10 @@ + + + + diff -Nru ltt-control-2.10.2/src/common/mi-lttng.c ltt-control-2.10.4/src/common/mi-lttng.c --- ltt-control-2.10.2/src/common/mi-lttng.c 2018-02-05 20:46:09.563023948 +0000 +++ ltt-control-2.10.4/src/common/mi-lttng.c 2018-04-30 18:47:49.587519848 +0000 @@ -375,6 +375,14 @@ return config_event_context_hostname; case LTTNG_EVENT_CONTEXT_IP: return config_event_context_ip; + case LTTNG_EVENT_CONTEXT_INTERRUPTIBLE: + return config_event_context_interruptible; + case LTTNG_EVENT_CONTEXT_PREEMPTIBLE: + return config_event_context_preemptible; + case LTTNG_EVENT_CONTEXT_NEED_RESCHEDULE: + return config_event_context_need_reschedule; + case LTTNG_EVENT_CONTEXT_MIGRATABLE: + return config_event_context_migratable; default: return NULL; } diff -Nru ltt-control-2.10.2/src/common/relayd/Makefile.in ltt-control-2.10.4/src/common/relayd/Makefile.in --- ltt-control-2.10.2/src/common/relayd/Makefile.in 2018-02-05 20:46:53.825810762 +0000 +++ ltt-control-2.10.4/src/common/relayd/Makefile.in 2018-04-30 18:48:36.050255650 +0000 @@ -238,7 +238,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/common/relayd/relayd.c ltt-control-2.10.4/src/common/relayd/relayd.c --- ltt-control-2.10.2/src/common/relayd/relayd.c 2018-02-05 20:46:09.567023839 +0000 +++ ltt-control-2.10.4/src/common/relayd/relayd.c 2018-04-30 18:47:49.591519740 +0000 @@ -72,14 +72,14 @@ memcpy(buf + sizeof(header), data, size); } + DBG3("Relayd sending command %d of size %" PRIu64, (int) cmd, buf_size); ret = rsock->sock.ops->sendmsg(&rsock->sock, buf, buf_size, flags); if (ret < 0) { + PERROR("Failed to send command %d of size %" PRIu64, + (int) cmd, buf_size); ret = -errno; goto error; } - - DBG3("Relayd sending command %d of size %" PRIu64, cmd, buf_size); - error: free(buf); alloc_error: @@ -378,7 +378,8 @@ * If major versions are compatible, we assign minor_to_use to the * minor version of the procotol we are going to use for this session. * - * Return 0 if compatible else negative value. + * Return 0 if the two daemons are compatible, LTTNG_ERR_RELAYD_VERSION_FAIL + * otherwise, or a negative value on network errors. */ int relayd_version_check(struct lttcomm_relayd_sock *rsock) { @@ -420,7 +421,7 @@ */ if (msg.major != rsock->major) { /* Not compatible */ - ret = -1; + ret = LTTNG_ERR_RELAYD_VERSION_FAIL; DBG2("Relayd version is NOT compatible. Relayd version %u != %u (us)", msg.major, rsock->major); goto error; diff -Nru ltt-control-2.10.2/src/common/sessiond-comm/inet6.c ltt-control-2.10.4/src/common/sessiond-comm/inet6.c --- ltt-control-2.10.2/src/common/sessiond-comm/inet6.c 2018-02-05 20:46:09.567023839 +0000 +++ ltt-control-2.10.4/src/common/sessiond-comm/inet6.c 2018-04-30 18:47:49.591519740 +0000 @@ -98,15 +98,9 @@ LTTNG_HIDDEN int lttcomm_bind_inet6_sock(struct lttcomm_sock *sock) { - int ret; - - ret = bind(sock->fd, (const struct sockaddr *) &sock->sockaddr.addr.sin6, + return bind(sock->fd, + (const struct sockaddr *) &sock->sockaddr.addr.sin6, sizeof(sock->sockaddr.addr.sin6)); - if (ret < 0) { - PERROR("bind inet6"); - } - - return ret; } static @@ -174,6 +168,9 @@ goto success; } + DBG("Asynchronous connect for sock %d, performing polling with" + " timeout: %lums", sock->fd, timeout); + /* * Perform poll loop following EINPROGRESS recommendation from * connect(2) man page. @@ -200,12 +197,15 @@ ret = getsockopt(sock->fd, SOL_SOCKET, SO_ERROR, &optval, &optval_len); if (ret) { + PERROR("getsockopt"); goto error; } if (!optval) { connect_ret = 0; goto success; } else { + /* Get actual connect() errno from opt_val */ + errno = optval; goto error; } } diff -Nru ltt-control-2.10.2/src/common/sessiond-comm/inet.c ltt-control-2.10.4/src/common/sessiond-comm/inet.c --- ltt-control-2.10.2/src/common/sessiond-comm/inet.c 2018-02-05 20:46:09.567023839 +0000 +++ ltt-control-2.10.4/src/common/sessiond-comm/inet.c 2018-04-30 18:47:49.591519740 +0000 @@ -100,15 +100,9 @@ LTTNG_HIDDEN int lttcomm_bind_inet_sock(struct lttcomm_sock *sock) { - int ret; - - ret = bind(sock->fd, (const struct sockaddr *) &sock->sockaddr.addr.sin, + return bind(sock->fd, + (const struct sockaddr *) &sock->sockaddr.addr.sin, sizeof(sock->sockaddr.addr.sin)); - if (ret < 0) { - PERROR("bind inet"); - } - - return ret; } static @@ -176,6 +170,8 @@ goto success; } + DBG("Asynchronous connect for sock %d, performing polling with" + " timeout: %lums", sock->fd, timeout); /* * Perform poll loop following EINPROGRESS recommendation from * connect(2) man page. @@ -202,12 +198,15 @@ ret = getsockopt(sock->fd, SOL_SOCKET, SO_ERROR, &optval, &optval_len); if (ret) { + PERROR("getsockopt"); goto error; } if (!optval) { connect_ret = 0; goto success; } else { + /* Get actual connect() errno from opt_val */ + errno = optval; goto error; } } diff -Nru ltt-control-2.10.2/src/common/sessiond-comm/Makefile.in ltt-control-2.10.4/src/common/sessiond-comm/Makefile.in --- ltt-control-2.10.2/src/common/sessiond-comm/Makefile.in 2018-02-05 20:46:53.857809889 +0000 +++ ltt-control-2.10.4/src/common/sessiond-comm/Makefile.in 2018-04-30 18:48:36.082254780 +0000 @@ -237,7 +237,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/common/sessiond-comm/sessiond-comm.c ltt-control-2.10.4/src/common/sessiond-comm/sessiond-comm.c --- ltt-control-2.10.2/src/common/sessiond-comm/sessiond-comm.c 2018-02-05 20:46:09.567023839 +0000 +++ ltt-control-2.10.4/src/common/sessiond-comm/sessiond-comm.c 2018-04-30 18:47:49.591519740 +0000 @@ -26,6 +26,7 @@ #include #include #include +#include #include @@ -414,6 +415,53 @@ } LTTNG_HIDDEN +int lttcomm_sock_get_port(const struct lttcomm_sock *sock, uint16_t *port) +{ + assert(sock); + assert(port); + assert(sock->sockaddr.type == LTTCOMM_INET || + sock->sockaddr.type == LTTCOMM_INET6); + assert(sock->proto == LTTCOMM_SOCK_TCP || + sock->proto == LTTCOMM_SOCK_UDP); + + switch (sock->sockaddr.type) { + case LTTCOMM_INET: + *port = ntohs(sock->sockaddr.addr.sin.sin_port); + break; + case LTTCOMM_INET6: + *port = ntohs(sock->sockaddr.addr.sin6.sin6_port); + break; + default: + abort(); + } + + return 0; +} + +LTTNG_HIDDEN +int lttcomm_sock_set_port(struct lttcomm_sock *sock, uint16_t port) +{ + assert(sock); + assert(sock->sockaddr.type == LTTCOMM_INET || + sock->sockaddr.type == LTTCOMM_INET6); + assert(sock->proto == LTTCOMM_SOCK_TCP || + sock->proto == LTTCOMM_SOCK_UDP); + + switch (sock->sockaddr.type) { + case LTTCOMM_INET: + sock->sockaddr.addr.sin.sin_port = htons(port); + break; + case LTTCOMM_INET6: + sock->sockaddr.addr.sin6.sin6_port = htons(port); + break; + default: + abort(); + } + + return 0; +} + +LTTNG_HIDDEN void lttcomm_init(void) { const char *env; diff -Nru ltt-control-2.10.2/src/common/sessiond-comm/sessiond-comm.h ltt-control-2.10.4/src/common/sessiond-comm/sessiond-comm.h --- ltt-control-2.10.2/src/common/sessiond-comm/sessiond-comm.h 2018-02-05 20:46:09.567023839 +0000 +++ ltt-control-2.10.4/src/common/sessiond-comm/sessiond-comm.h 2018-04-30 18:47:49.591519740 +0000 @@ -604,30 +604,38 @@ #endif /* HAVE_LIBLTTNG_UST_CTL */ -extern const char *lttcomm_get_readable_code(enum lttcomm_return_code code); +LTTNG_HIDDEN const char *lttcomm_get_readable_code(enum lttcomm_return_code code); -extern int lttcomm_init_inet_sockaddr(struct lttcomm_sockaddr *sockaddr, +LTTNG_HIDDEN int lttcomm_init_inet_sockaddr(struct lttcomm_sockaddr *sockaddr, const char *ip, unsigned int port); -extern int lttcomm_init_inet6_sockaddr(struct lttcomm_sockaddr *sockaddr, +LTTNG_HIDDEN int lttcomm_init_inet6_sockaddr(struct lttcomm_sockaddr *sockaddr, const char *ip, unsigned int port); -extern struct lttcomm_sock *lttcomm_alloc_sock(enum lttcomm_sock_proto proto); -extern int lttcomm_create_sock(struct lttcomm_sock *sock); -extern struct lttcomm_sock *lttcomm_alloc_sock_from_uri(struct lttng_uri *uri); -extern void lttcomm_destroy_sock(struct lttcomm_sock *sock); -extern struct lttcomm_sock *lttcomm_alloc_copy_sock(struct lttcomm_sock *src); -extern void lttcomm_copy_sock(struct lttcomm_sock *dst, +LTTNG_HIDDEN struct lttcomm_sock *lttcomm_alloc_sock(enum lttcomm_sock_proto proto); +LTTNG_HIDDEN int lttcomm_create_sock(struct lttcomm_sock *sock); +LTTNG_HIDDEN struct lttcomm_sock *lttcomm_alloc_sock_from_uri(struct lttng_uri *uri); +LTTNG_HIDDEN void lttcomm_destroy_sock(struct lttcomm_sock *sock); +LTTNG_HIDDEN struct lttcomm_sock *lttcomm_alloc_copy_sock(struct lttcomm_sock *src); +LTTNG_HIDDEN void lttcomm_copy_sock(struct lttcomm_sock *dst, struct lttcomm_sock *src); /* Relayd socket object. */ -extern struct lttcomm_relayd_sock *lttcomm_alloc_relayd_sock( +LTTNG_HIDDEN struct lttcomm_relayd_sock *lttcomm_alloc_relayd_sock( struct lttng_uri *uri, uint32_t major, uint32_t minor); -extern int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int msec); -extern int lttcomm_setsockopt_snd_timeout(int sock, unsigned int msec); +LTTNG_HIDDEN int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int msec); +LTTNG_HIDDEN int lttcomm_setsockopt_snd_timeout(int sock, unsigned int msec); -extern void lttcomm_init(void); +LTTNG_HIDDEN int lttcomm_sock_get_port(const struct lttcomm_sock *sock, + uint16_t *port); +/* + * Set a port to an lttcomm_sock. This will have no effect is the socket is + * already bound. + */ +LTTNG_HIDDEN int lttcomm_sock_set_port(struct lttcomm_sock *sock, uint16_t port); + +LTTNG_HIDDEN void lttcomm_init(void); /* Get network timeout, in milliseconds */ -extern unsigned long lttcomm_get_network_timeout(void); +LTTNG_HIDDEN unsigned long lttcomm_get_network_timeout(void); #endif /* _LTTNG_SESSIOND_COMM_H */ diff -Nru ltt-control-2.10.2/src/common/string-utils/Makefile.in ltt-control-2.10.4/src/common/string-utils/Makefile.in --- ltt-control-2.10.2/src/common/string-utils/Makefile.in 2018-02-05 20:46:53.885809125 +0000 +++ ltt-control-2.10.4/src/common/string-utils/Makefile.in 2018-04-30 18:48:36.110254018 +0000 @@ -237,7 +237,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/common/testpoint/Makefile.in ltt-control-2.10.4/src/common/testpoint/Makefile.in --- ltt-control-2.10.2/src/common/testpoint/Makefile.in 2018-02-05 20:46:53.917808250 +0000 +++ ltt-control-2.10.4/src/common/testpoint/Makefile.in 2018-04-30 18:48:36.142253147 +0000 @@ -237,7 +237,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/common/ust-consumer/Makefile.in ltt-control-2.10.4/src/common/ust-consumer/Makefile.in --- ltt-control-2.10.2/src/common/ust-consumer/Makefile.in 2018-02-05 20:46:53.949807377 +0000 +++ ltt-control-2.10.4/src/common/ust-consumer/Makefile.in 2018-04-30 18:48:36.174252276 +0000 @@ -240,7 +240,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/common/ust-consumer/ust-consumer.c ltt-control-2.10.4/src/common/ust-consumer/ust-consumer.c --- ltt-control-2.10.2/src/common/ust-consumer/ust-consumer.c 2018-02-05 20:46:09.571023729 +0000 +++ ltt-control-2.10.4/src/common/ust-consumer/ust-consumer.c 2018-04-30 18:47:49.595519630 +0000 @@ -831,6 +831,7 @@ { int ret = 0; struct lttng_consumer_channel *channel; + unsigned int channel_monitor; DBG("UST consumer close metadata key %" PRIu64, chan_key); @@ -849,13 +850,48 @@ pthread_mutex_lock(&consumer_data.lock); pthread_mutex_lock(&channel->lock); - + channel_monitor = channel->monitor; if (cds_lfht_is_node_deleted(&channel->node.node)) { goto error_unlock; } lttng_ustconsumer_close_metadata(channel); + pthread_mutex_unlock(&channel->lock); + pthread_mutex_unlock(&consumer_data.lock); + + /* + * The ownership of a metadata channel depends on the type of + * session to which it belongs. In effect, the monitor flag is checked + * to determine if this metadata channel is in "snapshot" mode or not. + * + * In the non-snapshot case, the metadata channel is created along with + * a single stream which will remain present until the metadata channel + * is destroyed (on the destruction of its session). In this case, the + * metadata stream in "monitored" by the metadata poll thread and holds + * the ownership of its channel. + * + * Closing the metadata will cause the metadata stream's "metadata poll + * pipe" to be closed. Closing this pipe will wake-up the metadata poll + * thread which will teardown the metadata stream which, in return, + * deletes the metadata channel. + * + * In the snapshot case, the metadata stream is created and destroyed + * on every snapshot record. Since the channel doesn't have an owner + * other than the session daemon, it is safe to destroy it immediately + * on reception of the CLOSE_METADATA command. + */ + if (!channel_monitor) { + /* + * The channel and consumer_data locks must be + * released before this call since consumer_del_channel + * re-acquires the channel and consumer_data locks to teardown + * the channel and queue its reclamation by the "call_rcu" + * worker thread. + */ + consumer_del_channel(channel); + } + return ret; error_unlock: pthread_mutex_unlock(&channel->lock); pthread_mutex_unlock(&consumer_data.lock); diff -Nru ltt-control-2.10.2/src/common/utils.c ltt-control-2.10.4/src/common/utils.c --- ltt-control-2.10.2/src/common/utils.c 2018-02-05 20:46:09.571023729 +0000 +++ ltt-control-2.10.4/src/common/utils.c 2018-04-30 18:47:49.595519630 +0000 @@ -1382,15 +1382,17 @@ int utils_truncate_stream_file(int fd, off_t length) { int ret; + off_t lseek_ret; ret = ftruncate(fd, length); if (ret < 0) { PERROR("ftruncate"); goto end; } - ret = lseek(fd, length, SEEK_SET); - if (ret < 0) { + lseek_ret = lseek(fd, length, SEEK_SET); + if (lseek_ret < 0) { PERROR("lseek"); + ret = -1; goto end; } end: diff -Nru ltt-control-2.10.2/src/lib/lttng-ctl/channel.c ltt-control-2.10.4/src/lib/lttng-ctl/channel.c --- ltt-control-2.10.2/src/lib/lttng-ctl/channel.c 2018-02-05 20:46:09.571023729 +0000 +++ ltt-control-2.10.4/src/lib/lttng-ctl/channel.c 2018-04-30 18:47:49.595519630 +0000 @@ -215,6 +215,8 @@ goto end; } + pthread_mutex_lock(&channel->lock); + if (channel->pending_notifications.count) { struct pending_notification *pending_notification; @@ -232,11 +234,9 @@ cds_list_del(&pending_notification->node); channel->pending_notifications.count--; free(pending_notification); - goto end; + goto end_unlock; } - pthread_mutex_lock(&channel->lock); - ret = receive_message(channel); if (ret) { status = LTTNG_NOTIFICATION_CHANNEL_STATUS_ERROR; diff -Nru ltt-control-2.10.2/src/lib/lttng-ctl/filter/Makefile.in ltt-control-2.10.4/src/lib/lttng-ctl/filter/Makefile.in --- ltt-control-2.10.2/src/lib/lttng-ctl/filter/Makefile.in 2018-02-05 20:46:54.057804428 +0000 +++ ltt-control-2.10.4/src/lib/lttng-ctl/filter/Makefile.in 2018-04-30 18:48:36.282249337 +0000 @@ -286,7 +286,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/lib/lttng-ctl/Makefile.in ltt-control-2.10.4/src/lib/lttng-ctl/Makefile.in --- ltt-control-2.10.2/src/lib/lttng-ctl/Makefile.in 2018-02-05 20:46:54.009805739 +0000 +++ ltt-control-2.10.4/src/lib/lttng-ctl/Makefile.in 2018-04-30 18:48:36.230250752 +0000 @@ -320,7 +320,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/lib/Makefile.in ltt-control-2.10.4/src/lib/Makefile.in --- ltt-control-2.10.2/src/lib/Makefile.in 2018-02-05 20:46:53.973806722 +0000 +++ ltt-control-2.10.4/src/lib/Makefile.in 2018-04-30 18:48:36.198251624 +0000 @@ -248,7 +248,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/src/Makefile.in ltt-control-2.10.4/src/Makefile.in --- ltt-control-2.10.2/src/Makefile.in 2018-02-05 20:46:53.217827361 +0000 +++ ltt-control-2.10.4/src/Makefile.in 2018-04-30 18:48:35.462271652 +0000 @@ -248,7 +248,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/destructive/Makefile.in ltt-control-2.10.4/tests/destructive/Makefile.in --- ltt-control-2.10.2/tests/destructive/Makefile.in 2018-02-05 20:46:54.109803009 +0000 +++ ltt-control-2.10.4/tests/destructive/Makefile.in 2018-04-30 18:48:36.330248032 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/Makefile.in ltt-control-2.10.4/tests/Makefile.in --- ltt-control-2.10.2/tests/Makefile.in 2018-02-05 20:46:54.085803664 +0000 +++ ltt-control-2.10.4/tests/Makefile.in 2018-04-30 18:48:36.306248685 +0000 @@ -251,7 +251,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/perf/Makefile.in ltt-control-2.10.4/tests/perf/Makefile.in --- ltt-control-2.10.2/tests/perf/Makefile.in 2018-02-05 20:46:54.141802135 +0000 +++ ltt-control-2.10.4/tests/perf/Makefile.in 2018-04-30 18:48:36.362247160 +0000 @@ -243,7 +243,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/kernel/Makefile.in ltt-control-2.10.4/tests/regression/kernel/Makefile.in --- ltt-control-2.10.2/tests/regression/kernel/Makefile.in 2018-02-05 20:46:54.217800060 +0000 +++ ltt-control-2.10.4/tests/regression/kernel/Makefile.in 2018-04-30 18:48:36.438245093 +0000 @@ -244,7 +244,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/Makefile.in ltt-control-2.10.4/tests/regression/Makefile.in --- ltt-control-2.10.2/tests/regression/Makefile.in 2018-02-05 20:46:54.185800934 +0000 +++ ltt-control-2.10.4/tests/regression/Makefile.in 2018-04-30 18:48:36.406245963 +0000 @@ -476,7 +476,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/crash/Makefile.in ltt-control-2.10.4/tests/regression/tools/crash/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/crash/Makefile.in 2018-02-05 20:46:54.265798749 +0000 +++ ltt-control-2.10.4/tests/regression/tools/crash/Makefile.in 2018-04-30 18:48:36.486243786 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/exclusion/Makefile.in ltt-control-2.10.4/tests/regression/tools/exclusion/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/exclusion/Makefile.in 2018-02-05 20:46:54.293797985 +0000 +++ ltt-control-2.10.4/tests/regression/tools/exclusion/Makefile.in 2018-04-30 18:48:36.510243133 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/filtering/Makefile.in ltt-control-2.10.4/tests/regression/tools/filtering/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/filtering/Makefile.in 2018-02-05 20:46:54.325797111 +0000 +++ ltt-control-2.10.4/tests/regression/tools/filtering/Makefile.in 2018-04-30 18:48:36.542242263 +0000 @@ -245,7 +245,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/health/Makefile.in ltt-control-2.10.4/tests/regression/tools/health/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/health/Makefile.in 2018-02-05 20:46:54.361796129 +0000 +++ ltt-control-2.10.4/tests/regression/tools/health/Makefile.in 2018-04-30 18:48:36.582241174 +0000 @@ -281,7 +281,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/live/Makefile.in ltt-control-2.10.4/tests/regression/tools/live/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/live/Makefile.in 2018-02-05 20:46:54.393795255 +0000 +++ ltt-control-2.10.4/tests/regression/tools/live/Makefile.in 2018-04-30 18:48:36.610240411 +0000 @@ -243,7 +243,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/Makefile.in ltt-control-2.10.4/tests/regression/tools/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/Makefile.in 2018-02-05 20:46:54.241799405 +0000 +++ ltt-control-2.10.4/tests/regression/tools/Makefile.in 2018-04-30 18:48:36.462244440 +0000 @@ -248,7 +248,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/mi/Makefile.in ltt-control-2.10.4/tests/regression/tools/mi/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/mi/Makefile.in 2018-02-05 20:46:54.429794272 +0000 +++ ltt-control-2.10.4/tests/regression/tools/mi/Makefile.in 2018-04-30 18:48:36.646239432 +0000 @@ -244,7 +244,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/notification/base_client.c ltt-control-2.10.4/tests/regression/tools/notification/base_client.c --- ltt-control-2.10.2/tests/regression/tools/notification/base_client.c 2018-02-05 20:46:09.583023400 +0000 +++ ltt-control-2.10.4/tests/regression/tools/notification/base_client.c 2018-04-30 18:47:49.607519304 +0000 @@ -41,6 +41,7 @@ #include #include #include +#include static unsigned int nr_notifications = 0; static unsigned int nr_expected_notifications = 0; diff -Nru ltt-control-2.10.2/tests/regression/tools/notification/Makefile.in ltt-control-2.10.4/tests/regression/tools/notification/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/notification/Makefile.in 2018-02-05 20:46:54.465793289 +0000 +++ ltt-control-2.10.4/tests/regression/tools/notification/Makefile.in 2018-04-30 18:48:36.682238452 +0000 @@ -264,7 +264,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/notification/notification.c ltt-control-2.10.4/tests/regression/tools/notification/notification.c --- ltt-control-2.10.2/tests/regression/tools/notification/notification.c 2018-02-05 20:46:09.583023400 +0000 +++ ltt-control-2.10.4/tests/regression/tools/notification/notification.c 2018-04-30 18:47:49.607519304 +0000 @@ -50,6 +50,7 @@ #include #include #include +#include #include diff -Nru ltt-control-2.10.2/tests/regression/tools/regen-metadata/Makefile.in ltt-control-2.10.4/tests/regression/tools/regen-metadata/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/regen-metadata/Makefile.in 2018-02-05 20:46:54.489792634 +0000 +++ ltt-control-2.10.4/tests/regression/tools/regen-metadata/Makefile.in 2018-04-30 18:48:36.706237800 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/regen-statedump/Makefile.in ltt-control-2.10.4/tests/regression/tools/regen-statedump/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/regen-statedump/Makefile.in 2018-02-05 20:46:54.513791979 +0000 +++ ltt-control-2.10.4/tests/regression/tools/regen-statedump/Makefile.in 2018-04-30 18:48:36.730237147 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/save-load/configuration/Makefile.in ltt-control-2.10.4/tests/regression/tools/save-load/configuration/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/save-load/configuration/Makefile.in 2018-02-05 20:46:54.569790450 +0000 +++ ltt-control-2.10.4/tests/regression/tools/save-load/configuration/Makefile.in 2018-04-30 18:48:36.782235732 +0000 @@ -188,7 +188,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/save-load/Makefile.in ltt-control-2.10.4/tests/regression/tools/save-load/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/save-load/Makefile.in 2018-02-05 20:46:54.545791105 +0000 +++ ltt-control-2.10.4/tests/regression/tools/save-load/Makefile.in 2018-04-30 18:48:36.758236385 +0000 @@ -250,7 +250,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/snapshots/Makefile.in ltt-control-2.10.4/tests/regression/tools/snapshots/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/snapshots/Makefile.in 2018-02-05 20:46:54.593789795 +0000 +++ ltt-control-2.10.4/tests/regression/tools/snapshots/Makefile.in 2018-04-30 18:48:36.806235078 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/streaming/Makefile.in ltt-control-2.10.4/tests/regression/tools/streaming/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/streaming/Makefile.in 2018-02-05 20:46:54.617789140 +0000 +++ ltt-control-2.10.4/tests/regression/tools/streaming/Makefile.in 2018-04-30 18:48:36.830234425 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/tracefile-limits/Makefile.in ltt-control-2.10.4/tests/regression/tools/tracefile-limits/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/tracefile-limits/Makefile.in 2018-02-05 20:46:54.641788484 +0000 +++ ltt-control-2.10.4/tests/regression/tools/tracefile-limits/Makefile.in 2018-04-30 18:48:36.854233773 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/tools/wildcard/Makefile.in ltt-control-2.10.4/tests/regression/tools/wildcard/Makefile.in --- ltt-control-2.10.2/tests/regression/tools/wildcard/Makefile.in 2018-02-05 20:46:54.665787830 +0000 +++ ltt-control-2.10.4/tests/regression/tools/wildcard/Makefile.in 2018-04-30 18:48:36.878233119 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/baddr-statedump/Makefile.in ltt-control-2.10.4/tests/regression/ust/baddr-statedump/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/baddr-statedump/Makefile.in 2018-02-05 20:46:54.725786191 +0000 +++ ltt-control-2.10.4/tests/regression/ust/baddr-statedump/Makefile.in 2018-04-30 18:48:36.938231486 +0000 @@ -241,7 +241,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/before-after/Makefile.in ltt-control-2.10.4/tests/regression/ust/before-after/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/before-after/Makefile.in 2018-02-05 20:46:54.749785536 +0000 +++ ltt-control-2.10.4/tests/regression/ust/before-after/Makefile.in 2018-04-30 18:48:36.962230834 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/blocking/Makefile.in ltt-control-2.10.4/tests/regression/ust/blocking/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/blocking/Makefile.in 2018-02-05 20:46:54.773784880 +0000 +++ ltt-control-2.10.4/tests/regression/ust/blocking/Makefile.in 2018-04-30 18:48:36.986230181 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/buffers-pid/Makefile.in ltt-control-2.10.4/tests/regression/ust/buffers-pid/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/buffers-pid/Makefile.in 2018-02-05 20:46:54.801784116 +0000 +++ ltt-control-2.10.4/tests/regression/ust/buffers-pid/Makefile.in 2018-04-30 18:48:37.010229527 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/clock-override/Makefile.in ltt-control-2.10.4/tests/regression/ust/clock-override/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/clock-override/Makefile.in 2018-02-05 20:46:54.833783242 +0000 +++ ltt-control-2.10.4/tests/regression/ust/clock-override/Makefile.in 2018-04-30 18:48:37.042228657 +0000 @@ -250,7 +250,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/daemon/Makefile.in ltt-control-2.10.4/tests/regression/ust/daemon/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/daemon/Makefile.in 2018-02-05 20:46:54.865782369 +0000 +++ ltt-control-2.10.4/tests/regression/ust/daemon/Makefile.in 2018-04-30 18:48:37.074227785 +0000 @@ -242,7 +242,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/exit-fast/Makefile.in ltt-control-2.10.4/tests/regression/ust/exit-fast/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/exit-fast/Makefile.in 2018-02-05 20:46:54.897781496 +0000 +++ ltt-control-2.10.4/tests/regression/ust/exit-fast/Makefile.in 2018-04-30 18:48:37.106226914 +0000 @@ -242,7 +242,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/fork/Makefile.in ltt-control-2.10.4/tests/regression/ust/fork/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/fork/Makefile.in 2018-02-05 20:46:54.933780512 +0000 +++ ltt-control-2.10.4/tests/regression/ust/fork/Makefile.in 2018-04-30 18:48:37.138226044 +0000 @@ -245,7 +245,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/getcpu-override/Makefile.in ltt-control-2.10.4/tests/regression/ust/getcpu-override/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/getcpu-override/Makefile.in 2018-02-05 20:46:54.965779639 +0000 +++ ltt-control-2.10.4/tests/regression/ust/getcpu-override/Makefile.in 2018-04-30 18:48:37.170225173 +0000 @@ -250,7 +250,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/high-throughput/Makefile.in ltt-control-2.10.4/tests/regression/ust/high-throughput/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/high-throughput/Makefile.in 2018-02-05 20:46:54.997778765 +0000 +++ ltt-control-2.10.4/tests/regression/ust/high-throughput/Makefile.in 2018-04-30 18:48:37.202224303 +0000 @@ -241,7 +241,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/java-jul/Makefile.in ltt-control-2.10.4/tests/regression/ust/java-jul/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/java-jul/Makefile.in 2018-02-05 20:46:55.025778000 +0000 +++ ltt-control-2.10.4/tests/regression/ust/java-jul/Makefile.in 2018-04-30 18:48:37.230223541 +0000 @@ -194,7 +194,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/java-log4j/Makefile.in ltt-control-2.10.4/tests/regression/ust/java-log4j/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/java-log4j/Makefile.in 2018-02-05 20:46:55.049777345 +0000 +++ ltt-control-2.10.4/tests/regression/ust/java-log4j/Makefile.in 2018-04-30 18:48:37.254222888 +0000 @@ -194,7 +194,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/libc-wrapper/Makefile.in ltt-control-2.10.4/tests/regression/ust/libc-wrapper/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/libc-wrapper/Makefile.in 2018-02-05 20:46:55.081776472 +0000 +++ ltt-control-2.10.4/tests/regression/ust/libc-wrapper/Makefile.in 2018-04-30 18:48:37.286222016 +0000 @@ -241,7 +241,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/linking/Makefile.in ltt-control-2.10.4/tests/regression/ust/linking/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/linking/Makefile.in 2018-02-05 20:46:55.129775161 +0000 +++ ltt-control-2.10.4/tests/regression/ust/linking/Makefile.in 2018-04-30 18:48:37.334220711 +0000 @@ -316,7 +316,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/low-throughput/Makefile.in ltt-control-2.10.4/tests/regression/ust/low-throughput/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/low-throughput/Makefile.in 2018-02-05 20:46:55.161774287 +0000 +++ ltt-control-2.10.4/tests/regression/ust/low-throughput/Makefile.in 2018-04-30 18:48:37.366219839 +0000 @@ -241,7 +241,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/Makefile.in ltt-control-2.10.4/tests/regression/ust/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/Makefile.in 2018-02-05 20:46:54.693787064 +0000 +++ ltt-control-2.10.4/tests/regression/ust/Makefile.in 2018-04-30 18:48:36.906232358 +0000 @@ -254,7 +254,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/multi-session/Makefile.in ltt-control-2.10.4/tests/regression/ust/multi-session/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/multi-session/Makefile.in 2018-02-05 20:46:55.193773414 +0000 +++ ltt-control-2.10.4/tests/regression/ust/multi-session/Makefile.in 2018-04-30 18:48:37.398218969 +0000 @@ -241,7 +241,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/nprocesses/Makefile.in ltt-control-2.10.4/tests/regression/ust/nprocesses/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/nprocesses/Makefile.in 2018-02-05 20:46:55.221772649 +0000 +++ ltt-control-2.10.4/tests/regression/ust/nprocesses/Makefile.in 2018-04-30 18:48:37.422218316 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/overlap/demo/Makefile.in ltt-control-2.10.4/tests/regression/ust/overlap/demo/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/overlap/demo/Makefile.in 2018-02-05 20:46:55.281771011 +0000 +++ ltt-control-2.10.4/tests/regression/ust/overlap/demo/Makefile.in 2018-04-30 18:48:37.482216682 +0000 @@ -276,7 +276,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/overlap/Makefile.in ltt-control-2.10.4/tests/regression/ust/overlap/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/overlap/Makefile.in 2018-02-05 20:46:55.245771994 +0000 +++ ltt-control-2.10.4/tests/regression/ust/overlap/Makefile.in 2018-04-30 18:48:37.446217662 +0000 @@ -250,7 +250,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/periodical-metadata-flush/Makefile.in ltt-control-2.10.4/tests/regression/ust/periodical-metadata-flush/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/periodical-metadata-flush/Makefile.in 2018-02-05 20:46:55.309770247 +0000 +++ ltt-control-2.10.4/tests/regression/ust/periodical-metadata-flush/Makefile.in 2018-04-30 18:48:37.510215920 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/python-logging/Makefile.in ltt-control-2.10.4/tests/regression/ust/python-logging/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/python-logging/Makefile.in 2018-02-05 20:46:55.333769592 +0000 +++ ltt-control-2.10.4/tests/regression/ust/python-logging/Makefile.in 2018-04-30 18:48:37.530215377 +0000 @@ -191,7 +191,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/rotation-destroy-flush/Makefile.in ltt-control-2.10.4/tests/regression/ust/rotation-destroy-flush/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/rotation-destroy-flush/Makefile.in 2018-02-05 20:46:55.357768936 +0000 +++ ltt-control-2.10.4/tests/regression/ust/rotation-destroy-flush/Makefile.in 2018-04-30 18:48:37.554214723 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/type-declarations/Makefile.in ltt-control-2.10.4/tests/regression/ust/type-declarations/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/type-declarations/Makefile.in 2018-02-05 20:46:55.389768063 +0000 +++ ltt-control-2.10.4/tests/regression/ust/type-declarations/Makefile.in 2018-04-30 18:48:37.586213853 +0000 @@ -242,7 +242,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/regression/ust/ust-dl/Makefile.in ltt-control-2.10.4/tests/regression/ust/ust-dl/Makefile.in --- ltt-control-2.10.2/tests/regression/ust/ust-dl/Makefile.in 2018-02-05 20:46:55.429766970 +0000 +++ ltt-control-2.10.4/tests/regression/ust/ust-dl/Makefile.in 2018-04-30 18:48:37.626212765 +0000 @@ -282,7 +282,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/stress/Makefile.in ltt-control-2.10.4/tests/stress/Makefile.in --- ltt-control-2.10.2/tests/stress/Makefile.in 2018-02-05 20:46:55.453766315 +0000 +++ ltt-control-2.10.4/tests/stress/Makefile.in 2018-04-30 18:48:37.650212111 +0000 @@ -190,7 +190,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/unit/ini_config/Makefile.in ltt-control-2.10.4/tests/unit/ini_config/Makefile.in --- ltt-control-2.10.2/tests/unit/ini_config/Makefile.in 2018-02-05 20:46:55.533764131 +0000 +++ ltt-control-2.10.4/tests/unit/ini_config/Makefile.in 2018-04-30 18:48:37.734209826 +0000 @@ -240,7 +240,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/unit/Makefile.in ltt-control-2.10.4/tests/unit/Makefile.in --- ltt-control-2.10.2/tests/unit/Makefile.in 2018-02-05 20:46:55.501765005 +0000 +++ ltt-control-2.10.4/tests/unit/Makefile.in 2018-04-30 18:48:37.702210696 +0000 @@ -544,7 +544,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/utils/Makefile.in ltt-control-2.10.4/tests/utils/Makefile.in --- ltt-control-2.10.2/tests/utils/Makefile.in 2018-02-05 20:46:55.569763148 +0000 +++ ltt-control-2.10.4/tests/utils/Makefile.in 2018-04-30 18:48:37.766208954 +0000 @@ -282,7 +282,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/utils/tap/Makefile.in ltt-control-2.10.4/tests/utils/tap/Makefile.in --- ltt-control-2.10.2/tests/utils/tap/Makefile.in 2018-02-05 20:46:55.597762384 +0000 +++ ltt-control-2.10.4/tests/utils/tap/Makefile.in 2018-04-30 18:48:37.798208084 +0000 @@ -240,7 +240,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/utils/testapp/gen-ust-events/gen-ust-events.c ltt-control-2.10.4/tests/utils/testapp/gen-ust-events/gen-ust-events.c --- ltt-control-2.10.2/tests/utils/testapp/gen-ust-events/gen-ust-events.c 2018-02-05 20:46:09.603022852 +0000 +++ ltt-control-2.10.4/tests/utils/testapp/gen-ust-events/gen-ust-events.c 2018-04-30 18:47:49.627518760 +0000 @@ -32,6 +32,7 @@ #include #include #include "utils.h" +#include "signal-helper.h" #define TRACEPOINT_DEFINE #include "tp.h" @@ -90,6 +91,11 @@ char *after_first_event_file_path = NULL; char *before_last_event_file_path = NULL; + if (set_signal_handler()) { + ret = -1; + goto end; + } + if (argc >= 2) { /* * If nr_iter is negative, do an infinite tracing loop. @@ -133,6 +139,9 @@ goto end; } } + if (should_quit) { + break; + } } end: diff -Nru ltt-control-2.10.2/tests/utils/testapp/gen-ust-events/Makefile.am ltt-control-2.10.4/tests/utils/testapp/gen-ust-events/Makefile.am --- ltt-control-2.10.2/tests/utils/testapp/gen-ust-events/Makefile.am 2018-02-05 20:46:09.603022852 +0000 +++ ltt-control-2.10.4/tests/utils/testapp/gen-ust-events/Makefile.am 2018-04-30 18:47:49.627518760 +0000 @@ -1,4 +1,5 @@ -AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(srcdir) +AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(srcdir) \ + -I$(top_srcdir)/tests/utils/testapp if HAVE_LIBLTTNG_UST_CTL noinst_PROGRAMS = gen-ust-events diff -Nru ltt-control-2.10.2/tests/utils/testapp/gen-ust-events/Makefile.in ltt-control-2.10.4/tests/utils/testapp/gen-ust-events/Makefile.in --- ltt-control-2.10.2/tests/utils/testapp/gen-ust-events/Makefile.in 2018-02-05 20:46:55.657760746 +0000 +++ ltt-control-2.10.4/tests/utils/testapp/gen-ust-events/Makefile.in 2018-04-30 18:48:37.854206560 +0000 @@ -199,7 +199,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ -AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/tests/utils -I$(srcdir) +AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/tests/utils -I$(srcdir) \ + -I$(top_srcdir)/tests/utils/testapp AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ASCIIDOC = @ASCIIDOC@ @@ -243,7 +244,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c ltt-control-2.10.4/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c --- ltt-control-2.10.2/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c 2018-02-05 20:46:09.603022852 +0000 +++ ltt-control-2.10.4/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c 2018-04-30 18:47:49.627518760 +0000 @@ -26,6 +26,7 @@ #include #include #include "utils.h" +#include "signal-helper.h" #define TRACEPOINT_DEFINE #include "tp.h" @@ -40,6 +41,11 @@ unsigned int nr_iter = 100; useconds_t nr_usec = 0; + if (set_signal_handler()) { + ret = -1; + goto end; + } + if (argc >= 2) { nr_iter = atoi(argv[1]); } @@ -67,6 +73,9 @@ goto end; } } + if (should_quit) { + break; + } } end: diff -Nru ltt-control-2.10.2/tests/utils/testapp/gen-ust-nevents/Makefile.am ltt-control-2.10.4/tests/utils/testapp/gen-ust-nevents/Makefile.am --- ltt-control-2.10.2/tests/utils/testapp/gen-ust-nevents/Makefile.am 2018-02-05 20:46:09.603022852 +0000 +++ ltt-control-2.10.4/tests/utils/testapp/gen-ust-nevents/Makefile.am 2018-04-30 18:47:49.627518760 +0000 @@ -1,4 +1,5 @@ -AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/tests/utils +AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/tests/utils \ + -I$(top_srcdir)/tests/utils/testapp if HAVE_LIBLTTNG_UST_CTL noinst_PROGRAMS = gen-ust-nevents diff -Nru ltt-control-2.10.2/tests/utils/testapp/gen-ust-nevents/Makefile.in ltt-control-2.10.4/tests/utils/testapp/gen-ust-nevents/Makefile.in --- ltt-control-2.10.2/tests/utils/testapp/gen-ust-nevents/Makefile.in 2018-02-05 20:46:55.721758999 +0000 +++ ltt-control-2.10.4/tests/utils/testapp/gen-ust-nevents/Makefile.in 2018-04-30 18:48:37.918204818 +0000 @@ -200,7 +200,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ -AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(srcdir) -I$(top_srcdir)/tests/utils +AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(srcdir) -I$(top_srcdir)/tests/utils \ + -I$(top_srcdir)/tests/utils/testapp AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ASCIIDOC = @ASCIIDOC@ @@ -244,7 +245,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/utils/testapp/gen-ust-nevents-str/gen-ust-nevents-str.c ltt-control-2.10.4/tests/utils/testapp/gen-ust-nevents-str/gen-ust-nevents-str.c --- ltt-control-2.10.2/tests/utils/testapp/gen-ust-nevents-str/gen-ust-nevents-str.c 2018-02-05 20:46:09.603022852 +0000 +++ ltt-control-2.10.4/tests/utils/testapp/gen-ust-nevents-str/gen-ust-nevents-str.c 2018-04-30 18:47:49.627518760 +0000 @@ -17,6 +17,7 @@ #define _LGPL_SOURCE #include +#include "signal-helper.h" #define TRACEPOINT_DEFINE #include "tp.h" @@ -27,6 +28,10 @@ int i; int arg_i; + if (set_signal_handler()) { + return 1; + } + if (argc <= 3) { fprintf(stderr, "Usage: %s COUNT STRING [STRING]...\n", argv[0]); @@ -48,6 +53,9 @@ if (arg_i == argc) { arg_i = 2; } + if (should_quit) { + break; + } } return 0; diff -Nru ltt-control-2.10.2/tests/utils/testapp/gen-ust-nevents-str/Makefile.am ltt-control-2.10.4/tests/utils/testapp/gen-ust-nevents-str/Makefile.am --- ltt-control-2.10.2/tests/utils/testapp/gen-ust-nevents-str/Makefile.am 2018-02-05 20:46:09.603022852 +0000 +++ ltt-control-2.10.4/tests/utils/testapp/gen-ust-nevents-str/Makefile.am 2018-04-30 18:47:49.627518760 +0000 @@ -1,4 +1,5 @@ -AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/tests/utils +AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/tests/utils \ + -I$(top_srcdir)/tests/utils/testapp if HAVE_LIBLTTNG_UST_CTL noinst_PROGRAMS = gen-ust-nevents-str diff -Nru ltt-control-2.10.2/tests/utils/testapp/gen-ust-nevents-str/Makefile.in ltt-control-2.10.4/tests/utils/testapp/gen-ust-nevents-str/Makefile.in --- ltt-control-2.10.2/tests/utils/testapp/gen-ust-nevents-str/Makefile.in 2018-02-05 20:46:55.689759872 +0000 +++ ltt-control-2.10.4/tests/utils/testapp/gen-ust-nevents-str/Makefile.in 2018-04-30 18:48:37.886205690 +0000 @@ -200,7 +200,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ -AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(srcdir) -I$(top_srcdir)/tests/utils +AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(srcdir) -I$(top_srcdir)/tests/utils \ + -I$(top_srcdir)/tests/utils/testapp AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ASCIIDOC = @ASCIIDOC@ @@ -244,7 +245,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/utils/testapp/gen-ust-tracef/gen-ust-tracef.c ltt-control-2.10.4/tests/utils/testapp/gen-ust-tracef/gen-ust-tracef.c --- ltt-control-2.10.2/tests/utils/testapp/gen-ust-tracef/gen-ust-tracef.c 2018-02-05 20:46:09.603022852 +0000 +++ ltt-control-2.10.4/tests/utils/testapp/gen-ust-tracef/gen-ust-tracef.c 2018-04-30 18:47:49.627518760 +0000 @@ -29,6 +29,7 @@ #include #include +#include "signal-helper.h" const char *str = "test string"; @@ -54,6 +55,10 @@ useconds_t nr_usec = 0; char *tmp_file_path = NULL; + if (set_signal_handler()) { + return 1; + } + if (argc >= 2) { nr_iter = atoi(argv[1]); } @@ -78,6 +83,9 @@ create_file(tmp_file_path); } usleep(nr_usec); + if (should_quit) { + break; + } } return 0; diff -Nru ltt-control-2.10.2/tests/utils/testapp/gen-ust-tracef/Makefile.am ltt-control-2.10.4/tests/utils/testapp/gen-ust-tracef/Makefile.am --- ltt-control-2.10.2/tests/utils/testapp/gen-ust-tracef/Makefile.am 2018-02-05 20:46:09.603022852 +0000 +++ ltt-control-2.10.4/tests/utils/testapp/gen-ust-tracef/Makefile.am 2018-04-30 18:47:49.627518760 +0000 @@ -1,4 +1,5 @@ -AM_CPPFLAGS += -I$(srcdir) +AM_CPPFLAGS += -I$(srcdir) \ + -I$(top_srcdir)/tests/utils/testapp if HAVE_LIBLTTNG_UST_CTL noinst_PROGRAMS = gen-ust-tracef diff -Nru ltt-control-2.10.2/tests/utils/testapp/gen-ust-tracef/Makefile.in ltt-control-2.10.4/tests/utils/testapp/gen-ust-tracef/Makefile.in --- ltt-control-2.10.2/tests/utils/testapp/gen-ust-tracef/Makefile.in 2018-02-05 20:46:55.753758125 +0000 +++ ltt-control-2.10.4/tests/utils/testapp/gen-ust-tracef/Makefile.in 2018-04-30 18:48:37.950203948 +0000 @@ -198,7 +198,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ -AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(srcdir) +AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(srcdir) \ + -I$(top_srcdir)/tests/utils/testapp AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ASCIIDOC = @ASCIIDOC@ @@ -242,7 +243,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ diff -Nru ltt-control-2.10.2/tests/utils/testapp/Makefile.am ltt-control-2.10.4/tests/utils/testapp/Makefile.am --- ltt-control-2.10.2/tests/utils/testapp/Makefile.am 2018-02-05 20:46:09.603022852 +0000 +++ ltt-control-2.10.4/tests/utils/testapp/Makefile.am 2018-04-30 18:47:49.627518760 +0000 @@ -1,2 +1,3 @@ SUBDIRS = gen-ust-events gen-ust-nevents gen-ust-nevents-str gen-ust-tracef +noinst_HEADERS = signal-helper.h diff -Nru ltt-control-2.10.2/tests/utils/testapp/Makefile.in ltt-control-2.10.4/tests/utils/testapp/Makefile.in --- ltt-control-2.10.2/tests/utils/testapp/Makefile.in 2018-02-05 20:46:55.625761620 +0000 +++ ltt-control-2.10.4/tests/utils/testapp/Makefile.in 2018-04-30 18:48:37.826207322 +0000 @@ -13,6 +13,7 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -114,7 +115,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = @@ -146,6 +148,7 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +HEADERS = $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -248,7 +251,8 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFAULT_AGENT_BIND_ADDRESS = @DEFAULT_AGENT_BIND_ADDRESS@ -DEFAULT_AGENT_TCP_PORT = @DEFAULT_AGENT_TCP_PORT@ +DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN = @DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN@ +DEFAULT_AGENT_TCP_PORT_RANGE_END = @DEFAULT_AGENT_TCP_PORT_RANGE_END@ DEFAULT_APP_SOCKET_RW_TIMEOUT = @DEFAULT_APP_SOCKET_RW_TIMEOUT@ DEFAULT_CHANNEL_SUBBUF_SIZE = @DEFAULT_CHANNEL_SUBBUF_SIZE@ DEFAULT_CHANNEL_TRACEFILE_COUNT = @DEFAULT_CHANNEL_TRACEFILE_COUNT@ @@ -461,6 +465,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = gen-ust-events gen-ust-nevents gen-ust-nevents-str gen-ust-tracef +noinst_HEADERS = signal-helper.h all: all-recursive .SUFFIXES: @@ -656,7 +661,7 @@ done check-am: all-am check: check-recursive -all-am: Makefile +all-am: Makefile $(HEADERS) installdirs: installdirs-recursive installdirs-am: install: install-recursive diff -Nru ltt-control-2.10.2/tests/utils/testapp/signal-helper.h ltt-control-2.10.4/tests/utils/testapp/signal-helper.h --- ltt-control-2.10.2/tests/utils/testapp/signal-helper.h 1970-01-01 00:00:00.000000000 +0000 +++ ltt-control-2.10.4/tests/utils/testapp/signal-helper.h 2018-04-30 18:47:49.627518760 +0000 @@ -0,0 +1,57 @@ +/* + * Copyright (C) - 2018 Jérémie Galarneau + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation; version 2.1 of the License. + * + * This library 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 Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef LTTNG_TESTAPP_SIGNAL_HELPER_H +#define LTTNG_TESTAPP_SIGNAL_HELPER_H + +#include + +static volatile int should_quit; + +static +void sighandler(int sig) +{ + if (sig == SIGTERM) { + should_quit = 1; + } +} + +static +int set_signal_handler(void) +{ + int ret; + struct sigaction sa = { + .sa_flags = 0, + .sa_handler = sighandler, + }; + + ret = sigemptyset(&sa.sa_mask); + if (ret) { + perror("sigemptyset"); + goto end; + } + + ret = sigaction(SIGTERM, &sa, NULL); + if (ret) { + perror("sigaction"); + goto end; + } +end: + return ret; +} + +#endif /* LTTNG_TESTAPP_SIGNAL_HELPER_H */ diff -Nru ltt-control-2.10.2/tests/utils/utils.sh ltt-control-2.10.4/tests/utils/utils.sh --- ltt-control-2.10.2/tests/utils/utils.sh 2018-02-05 20:46:09.603022852 +0000 +++ ltt-control-2.10.4/tests/utils/utils.sh 2018-04-30 18:47:49.631518651 +0000 @@ -1498,7 +1498,14 @@ skip 0 "Babeltrace binary not found. Skipping trace validation" fi - traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | wc -l) + events=$($BABELTRACE_BIN $trace_path 2>/dev/null) + ret=$? + if [ $ret -ne 0 ]; then + fail "Failed to parse trace" + return $ret + fi + + traced=$(echo -n "$events" | wc -l) if [ "$traced" -eq 0 ]; then pass "Validate empty trace" else diff -Nru ltt-control-2.10.2/tests/utils/warn_processes.sh ltt-control-2.10.4/tests/utils/warn_processes.sh --- ltt-control-2.10.2/tests/utils/warn_processes.sh 2018-02-05 20:46:09.603022852 +0000 +++ ltt-control-2.10.4/tests/utils/warn_processes.sh 2018-04-30 18:47:49.631518651 +0000 @@ -6,7 +6,7 @@ exit fi -color_warn='\E[1;33m' +color_error='\E[1;91m' color_reset='\E[0m' color_bold='\E[1m' @@ -15,11 +15,13 @@ if [ $? -eq 0 ]; then pids="$(cut -d ' ' -f 1 <<< "$lttng_processes" | tr '\n' ' ')" - echo -e "${color_warn}Warning: the following LTTng processes were detected running on the system:$color_reset" + echo -e "${color_error}Error: the following LTTng processes were detected running on the system:$color_reset" echo echo "$lttng_processes" echo echo -e "Here's how to kill them: ${color_bold}kill -9 $pids$color_reset" - echo -e "${color_warn}If you leave them alive, some tests could fail.$color_reset" echo + echo "The test suite will not run in the presence of those processes since its result may not be reliable." + echo + exit 1 fi