projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into benchmark
[lttng-tools.git]
/
ltt-sessiond
/
ust-ctl.c
diff --git
a/ltt-sessiond/ust-ctl.c
b/ltt-sessiond/ust-ctl.c
index 7bdf7967b20aa7ff41a5577b48e46f1d0930c13a..fe65fafe2c6f3d00a930c5108595657d91522000 100644
(file)
--- a/
ltt-sessiond/ust-ctl.c
+++ b/
ltt-sessiond/ust-ctl.c
@@
-3,8
+3,8
@@
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation;
either
version 2
- * of the License
, or (at your option) any later version
.
+ * as published by the Free Software Foundation;
only
version 2
+ * of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-23,15
+23,11
@@
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
-#include <ust/ustctl.h>
-
-#include "liblttsessiondcomm.h"
+#include <lttng-sessiond-comm.h>
#include "lttngerr.h"
#include "lttngerr.h"
-#include "ltt-sessiond.h"
-#include "session.h"
#include "ust-ctl.h"
#include "ust-ctl.h"
-#include "trace.h"
+#ifdef DISABLED
/*
* find_session_ust_trace_by_pid
*
/*
* find_session_ust_trace_by_pid
*
@@
-61,7
+57,7
@@
static struct ltt_ust_trace *find_session_ust_trace_by_pid(
*/
int get_trace_count_per_session(struct ltt_session *session)
{
*/
int get_trace_count_per_session(struct ltt_session *session)
{
- return session->ust_trace_count
+ session->kern_session_count
;
+ return session->ust_trace_count;
}
/*
}
/*
@@
-70,6
+66,7
@@
int get_trace_count_per_session(struct ltt_session *session)
* Fill the lttng_trace array of all the
* available trace of the session.
*/
* Fill the lttng_trace array of all the
* available trace of the session.
*/
+/*
void get_traces_per_session(struct ltt_session *session, struct lttng_trace *traces)
{
int i = 0;
void get_traces_per_session(struct ltt_session *session, struct lttng_trace *traces)
{
int i = 0;
@@
-78,7
+75,6
@@
void get_traces_per_session(struct ltt_session *session, struct lttng_trace *tra
DBG("Getting userspace traces for session %s", session->name);
DBG("Getting userspace traces for session %s", session->name);
- /* Getting userspace traces */
cds_list_for_each_entry(ust_iter, &session->ust_traces, list) {
trace.type = USERSPACE;
trace.pid = ust_iter->pid;
cds_list_for_each_entry(ust_iter, &session->ust_traces, list) {
trace.type = USERSPACE;
trace.pid = ust_iter->pid;
@@
-91,13
+87,14
@@
void get_traces_per_session(struct ltt_session *session, struct lttng_trace *tra
DBG("Getting kernel traces for session %s", session->name);
DBG("Getting kernel traces for session %s", session->name);
- /* Getting kernel traces */
if (session->kern_session_count > 0) {
trace.type = KERNEL;
if (session->kern_session_count > 0) {
trace.type = KERNEL;
- strncpy(trace.name, "kernel", 6);
+ strncpy(trace.name, "kernel", sizeof(trace.name));
+ trace.name[sizeof(trace.name) - 1] = '\0';
memcpy(&traces[i], &trace, sizeof(trace));
}
}
memcpy(&traces[i], &trace, sizeof(trace));
}
}
+*/
/*
* ust_create_trace
/*
* ust_create_trace
@@
-210,4
+207,5
@@
int ust_stop_trace(struct command_ctx *cmd_ctx)
error:
return ret;
}
error:
return ret;
}
+#endif
This page took
0.031783 seconds
and
4
git commands to generate.