/*
- * 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>
#include <sys/types.h>
#include <unistd.h>
-#include <lttng/ust-elf.h>
-#include <helper.h>
+#include <ust-elf.h>
+#include <ust-helper.h>
#include "lttng-tracer-core.h"
#include "lttng-ust-statedump.h"
#include "jhash.h"
+#include "getenv.h"
+#include "compat.h"
+#include "ust-events-internal.h"
#define TRACEPOINT_DEFINE
#include "ust_lib.h" /* Only define. */
#define UST_DL_STATE_TABLE_SIZE (1 << UST_DL_STATE_HASH_BITS)
struct cds_hlist_head dl_state_table[UST_DL_STATE_TABLE_SIZE];
-typedef void (*tracepoint_cb)(struct lttng_session *session, void *priv);
+typedef void (*tracepoint_cb)(struct lttng_ust_session *session, void *priv);
static
struct lttng_ust_dl_node *alloc_dl_node(const struct bin_info_data *bin_data)
void trace_statedump_event(tracepoint_cb tp_cb, void *owner, void *priv)
{
struct cds_list_head *sessionsp;
- struct lttng_session *session;
+ struct lttng_ust_session_private *session_priv;
- sessionsp = _lttng_get_sessions();
- cds_list_for_each_entry(session, sessionsp, node) {
- if (session->owner != owner)
+ sessionsp = lttng_get_sessions();
+ cds_list_for_each_entry(session_priv, sessionsp, node) {
+ if (session_priv->owner != owner)
continue;
- if (!session->statedump_pending)
+ if (!session_priv->statedump_pending)
continue;
- tp_cb(session, priv);
+ tp_cb(session_priv->pub, priv);
}
}
static
-void trace_bin_info_cb(struct lttng_session *session, void *priv)
+void trace_bin_info_cb(struct lttng_ust_session *session, void *priv)
{
struct bin_info_data *bin_data = (struct bin_info_data *) priv;
}
static
-void trace_build_id_cb(struct lttng_session *session, void *priv)
+void trace_build_id_cb(struct lttng_ust_session *session, void *priv)
{
struct bin_info_data *bin_data = (struct bin_info_data *) priv;
}
static
-void trace_debug_link_cb(struct lttng_session *session, void *priv)
+void trace_debug_link_cb(struct lttng_ust_session *session, void *priv)
{
struct bin_info_data *bin_data = (struct bin_info_data *) priv;
}
static
-void trace_start_cb(struct lttng_session *session, void *priv)
+void procname_cb(struct lttng_ust_session *session, void *priv)
+{
+ char *procname = (char *) priv;
+ tracepoint(lttng_ust_statedump, procname, session, procname);
+}
+
+static
+void trace_start_cb(struct lttng_ust_session *session, void *priv __attribute__((unused)))
{
tracepoint(lttng_ust_statedump, start, session);
}
static
-void trace_end_cb(struct lttng_session *session, void *priv)
+void trace_end_cb(struct lttng_ust_session *session, void *priv __attribute__((unused)))
{
tracepoint(lttng_ust_statedump, end, session);
}
{
unsigned int i;
+ if (data->cancel)
+ goto end;
/*
* Iterate on hash table.
* For each marked, traced, do nothing.
}
}
}
+end:
ust_unlock();
}
static
-int extract_bin_info_events(struct dl_phdr_info *info, size_t size, void *_data)
+int extract_bin_info_events(struct dl_phdr_info *info, size_t size __attribute__((unused)), void *_data)
{
int j, ret = 0;
struct dl_iterate_data *data = _data;
{
struct dl_iterate_data data;
- if (getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
+ if (lttng_ust_getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
return;
/*
static
int do_baddr_statedump(void *owner)
{
- if (getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
+ if (lttng_ust_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_ust_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)
trace_statedump_start(owner);
ust_unlock();
+ do_procname_statedump(owner);
do_baddr_statedump(owner);
ust_lock_nocheck();
projects / lttng-ust.git / blobdiff