X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-ctl%2Fustctl.c;h=aaad99acf1bf5a87b68a50bd7508c08cb5ca6cf9;hb=a9ff648cc4cc06d28b522d705c467d45ab916a9d;hp=195f29c03cd211eac3a3fc354e56cd88a574dc4a;hpb=f76a0a7517f00d890581f42a98e4f7a896a64fa7;p=lttng-ust.git

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 195f29c0..aaad99ac 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -200,7 +200,6 @@ int ustctl_create_event(int sock, struct lttng_ust_event *ev,
 	lum.u.event.instrumentation = ev->instrumentation;
 	lum.u.event.loglevel_type = ev->loglevel_type;
 	lum.u.event.loglevel = ev->loglevel;
-	lum.u.event.disabled = ev->disabled;
 	ret = ustcomm_send_app_cmd(sock, &lum, &lur);
 	if (ret) {
 		free(event_data);
@@ -996,7 +995,8 @@ struct ustctl_consumer_channel *
 			attr->subbuf_size, attr->num_subbuf,
 			attr->switch_timer_interval,
 			attr->read_timer_interval,
-			attr->uuid, attr->chan_id);
+			attr->uuid, attr->chan_id,
+			attr->shm_path[0] == '\0' ? NULL : attr->shm_path);
 	if (!chan->chan) {
 		goto chan_error;
 	}
@@ -1639,6 +1639,22 @@ int ustctl_get_current_timestamp(struct ustctl_consumer_stream *stream,
 	return client_cb->current_timestamp(buf, handle, ts);
 }
 
+#if defined(__x86_64__) || defined(__i386__)
+
+int ustctl_has_perf_counters(void)
+{
+	return 1;
+}
+
+#else
+
+int ustctl_has_perf_counters(void)
+{
+	return 0;
+}
+
+#endif
+
 /*
  * Returns 0 on success, negative error value on error.
  */