summaryrefslogtreecommitdiffstats
path: root/meta/packages/lttng/lttng-control-0.6
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/lttng/lttng-control-0.6')
-rw-r--r--meta/packages/lttng/lttng-control-0.6/lttctl_sti-r0.patch134
1 files changed, 134 insertions, 0 deletions
diff --git a/meta/packages/lttng/lttng-control-0.6/lttctl_sti-r0.patch b/meta/packages/lttng/lttng-control-0.6/lttctl_sti-r0.patch
new file mode 100644
index 0000000000..f1e45ac159
--- /dev/null
+++ b/meta/packages/lttng/lttng-control-0.6/lttctl_sti-r0.patch
@@ -0,0 +1,134 @@
1Index: ltt-control-0.6-28042006/liblttctl/liblttctl.c
2===================================================================
3--- ltt-control-0.6-28042006.orig/liblttctl/liblttctl.c 2006-03-11 17:30:32.000000000 +0000
4+++ ltt-control-0.6-28042006/liblttctl/liblttctl.c 2006-05-12 11:21:13.000000000 +0100
5@@ -298,7 +298,7 @@
6
7
8 int lttctl_create_trace(const struct lttctl_handle *h,
9- char *name, enum trace_mode mode, unsigned subbuf_size, unsigned n_subbufs)
10+ char *name, enum trace_mode mode, enum ltt_trace_type type, unsigned subbuf_size, unsigned n_subbufs)
11 {
12 int err;
13
14@@ -324,6 +324,7 @@
15 req.msg.args.new_trace.mode = mode;
16 req.msg.args.new_trace.subbuf_size = subbuf_size;
17 req.msg.args.new_trace.n_subbufs = n_subbufs;
18+ req.msg.args.new_trace.type = type;
19
20 err = lttctl_netlink_sendto(h, (void *)&req, req.nlh.nlmsg_len);
21 if(err < 0) goto senderr;
22Index: ltt-control-0.6-28042006/liblttctl/lttctl.h
23===================================================================
24--- ltt-control-0.6-28042006.orig/liblttctl/lttctl.h 2006-03-11 17:30:32.000000000 +0000
25+++ ltt-control-0.6-28042006/liblttctl/lttctl.h 2006-05-12 11:20:46.000000000 +0100
26@@ -45,6 +45,12 @@
27 LTT_TRACE_FLIGHT
28 };
29
30+enum ltt_trace_type {
31+ LTT_TYPE_RELAYFS,
32+ LTT_TYPE_STI,
33+ LTT_TYPE_STIRELAYFS
34+};
35+
36 typedef struct lttctl_peer_msg {
37 char trace_name[NAME_MAX];
38 enum trace_op op;
39@@ -53,6 +59,7 @@
40 enum trace_mode mode;
41 unsigned subbuf_size;
42 unsigned n_subbufs;
43+ enum ltt_trace_type type;
44 } new_trace;
45 } args;
46 } lttctl_peer_msg_t;
47@@ -76,7 +83,7 @@
48
49
50 int lttctl_create_trace(const struct lttctl_handle *h,
51- char *name, enum trace_mode mode, unsigned subbuf_size, unsigned n_subbufs);
52+ char *name, enum trace_mode mode, enum ltt_trace_type type, unsigned subbuf_size, unsigned n_subbufs);
53
54 int lttctl_destroy_trace(const struct lttctl_handle *handle, char *name);
55
56Index: ltt-control-0.6-28042006/lttctl/lttctl.c
57===================================================================
58--- ltt-control-0.6-28042006.orig/lttctl/lttctl.c 2006-03-11 17:30:27.000000000 +0000
59+++ ltt-control-0.6-28042006/lttctl/lttctl.c 2006-05-12 11:19:53.000000000 +0100
60@@ -40,11 +40,13 @@
61 };
62
63 static char *trace_name = NULL;
64+static char *trace_type = NULL;
65 static char *mode_name = NULL;
66 static unsigned subbuf_size = 0;
67 static unsigned n_subbufs = 0;
68 static unsigned append_trace = 0;
69 static enum trace_mode mode = LTT_TRACE_NORMAL;
70+static enum ltt_trace_type type = LTT_TYPE_RELAYFS;
71 static enum trace_ctl_op op = CTL_OP_NONE;
72 static char *channel_root = NULL;
73 static char *trace_root = NULL;
74@@ -81,6 +83,7 @@
75 printf(" (optionnaly, you can set LTT_DAEMON\n");
76 printf(" and the LTT_FACILITIES env. vars.)\n");
77 printf("-t Trace root path. (ex. /root/traces/example_trace)\n");
78+ printf("-T Type of trace (ex. relayfs, sti, stirelayfs)\n");
79 printf("-l LTT channels root path. (ex. /mnt/relayfs/ltt)\n");
80 printf("-z Size of the subbuffers (will be rounded to next page size)\n");
81 printf("-x Number of subbuffers\n");
82@@ -217,6 +220,27 @@
83 argn++;
84 }
85 break;
86+ case 'T':
87+ if(argn+1 < argc) {
88+ trace_type = argv[argn+1];
89+ argn++;
90+ if(strcmp(trace_type, "relayfs") == 0)
91+ type = LTT_TYPE_RELAYFS;
92+ else if(strcmp(trace_type, "sti") == 0)
93+ type = LTT_TYPE_STI;
94+ else if(strcmp(trace_type, "stirelayfs") == 0)
95+ type = LTT_TYPE_STIRELAYFS;
96+ else {
97+ printf("Invalid trace type '%s'.\n", argv[argn]);
98+ printf("\n");
99+ ret = EINVAL;
100+ }
101+ } else {
102+ printf("Specify a trace type after -T.\n");
103+ printf("\n");
104+ ret = EINVAL;
105+ }
106+ break;
107 default:
108 printf("Invalid argument '%s'.\n", argv[argn]);
109 printf("\n");
110@@ -390,7 +414,7 @@
111 strcat(channel_path, trace_name);
112
113
114- ret = lttctl_create_trace(handle, trace_name, mode, subbuf_size, n_subbufs);
115+ ret = lttctl_create_trace(handle, trace_name, mode, type, subbuf_size, n_subbufs);
116 if(ret != 0) goto create_error;
117
118 act.sa_handler = sigchld_handler;
119@@ -466,13 +490,13 @@
120
121 switch(op) {
122 case CTL_OP_CREATE_START:
123- ret = lttctl_create_trace(handle, trace_name, mode, subbuf_size,
124+ ret = lttctl_create_trace(handle, trace_name, mode, type, subbuf_size,
125 n_subbufs);
126 if(!ret)
127 ret = lttctl_start(handle, trace_name);
128 break;
129 case CTL_OP_CREATE:
130- ret = lttctl_create_trace(handle, trace_name, mode, subbuf_size,
131+ ret = lttctl_create_trace(handle, trace_name, mode, type, subbuf_size,
132 n_subbufs);
133 break;
134 case CTL_OP_DESTROY: