X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-statedump.c;h=9d48e59ba24fadaede0774aa3fb130d1286aaa98;hb=8665f6a432525473b9dcba296394e68a8f49d9f2;hp=644af303aa9ceae55bae10d899571d8999e02b26;hpb=8002ea62058fd7e44575f7056a26c6b257948d03;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-statedump.c b/liblttng-ust/lttng-ust-statedump.c
index 644af303..9d48e59b 100644
--- a/liblttng-ust/lttng-ust-statedump.c
+++ b/liblttng-ust/lttng-ust-statedump.c
@@ -1,24 +1,11 @@
 /*
- * Copyright (C) 2013  Paul Woegerer <paul_woegerer@mentor.com>
- * Copyright (C) 2015  Antoine Busque <abusque@efficios.com>
- * Copyright (C) 2016  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  *
- * 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; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * 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
+ * Copyright (C) 2013 Paul Woegerer <paul_woegerer@mentor.com>
+ * Copyright (C) 2015 Antoine Busque <abusque@efficios.com>
+ * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <link.h>
 #include <limits.h>
@@ -30,10 +17,12 @@
 #include <unistd.h>
 
 #include <lttng/ust-elf.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include "lttng-tracer-core.h"
 #include "lttng-ust-statedump.h"
 #include "jhash.h"
+#include "getenv.h"
+#include "compat.h"
 
 #define TRACEPOINT_DEFINE
 #include "ust_lib.h"				/* Only define. */
@@ -245,6 +234,13 @@ void trace_debug_link_cb(struct lttng_session *session, void *priv)
 		bin_data->dbg_file, bin_data->crc);
 }
 
+static
+void procname_cb(struct lttng_session *session, void *priv)
+{
+	char *procname = (char *) priv;
+	tracepoint(lttng_ust_statedump, procname, session, procname);
+}
+
 static
 void trace_start_cb(struct lttng_session *session, void *priv)
 {
@@ -413,6 +409,8 @@ void iter_end(struct dl_iterate_data *data, void *ip)
 {
 	unsigned int i;
 
+	if (data->cancel)
+		goto end;
 	/*
 	 * Iterate on hash table.
 	 * For each marked, traced, do nothing.
@@ -440,6 +438,7 @@ void iter_end(struct dl_iterate_data *data, void *ip)
 			}
 		}
 	}
+end:
 	ust_unlock();
 }
 
@@ -548,9 +547,15 @@ void lttng_ust_dl_update(void *ip)
 {
 	struct dl_iterate_data data;
 
-	if (getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
+	if (lttng_getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
 		return;
 
+	/*
+	 * Fixup lttng-ust TLS when called from dlopen/dlclose
+	 * instrumentation.
+	 */
+	lttng_ust_fixup_tls();
+
 	data.exec_found = 0;
 	data.first = true;
 	data.cancel = false;
@@ -576,13 +581,23 @@ void lttng_ust_dl_update(void *ip)
 static
 int do_baddr_statedump(void *owner)
 {
-	if (getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
+	if (lttng_getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
 		return 0;
 	lttng_ust_dl_update(LTTNG_UST_CALLER_IP());
 	ust_dl_table_statedump(owner);
 	return 0;
 }
 
+static
+int do_procname_statedump(void *owner)
+{
+	if (lttng_getenv("LTTNG_UST_WITHOUT_PROCNAME_STATEDUMP"))
+		return 0;
+
+	trace_statedump_event(procname_cb, owner, lttng_ust_sockinfo_get_procname(owner));
+	return 0;
+}
+
 /*
  * Generate a statedump of a given traced application. A statedump is
  * delimited by start and end events. For a given (process, session)
@@ -601,6 +616,7 @@ int do_lttng_ust_statedump(void *owner)
 	trace_statedump_start(owner);
 	ust_unlock();
 
+	do_procname_statedump(owner);
 	do_baddr_statedump(owner);
 
 	ust_lock_nocheck();