X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-statedump.c;h=d0094c41958ede12895e54899cf99666deaa3ff9;hb=3046e0bf3ba02bb4d29db5410bfcb6d6aca9ae6f;hp=171cbaec0a666a83699d952cb31767c7ec3234bf;hpb=c362addf1c50e1d3202a26ff96738b71b4f9a531;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-statedump.c b/liblttng-ust/lttng-ust-statedump.c
index 171cbaec..d0094c41 100644
--- a/liblttng-ust/lttng-ust-statedump.c
+++ b/liblttng-ust/lttng-ust-statedump.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <link.h>
 #include <limits.h>
@@ -34,6 +33,8 @@
 #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 +246,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 +421,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 +450,7 @@ void iter_end(struct dl_iterate_data *data, void *ip)
 			}
 		}
 	}
+end:
 	ust_unlock();
 }
 
@@ -548,7 +559,7 @@ 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;
 
 	/*
@@ -582,13 +593,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)
@@ -607,6 +628,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();