X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-ctl.h;h=8917d0e0e4c9af33e944c4d3713f97a40a1ec743;hb=616d3093e1c34557aca7e9f6149338f43cf91886;hp=0945e4ef6765d949dd20a1222a59a9af505b98bb;hpb=20d630cf340f4a14f4d3340f50143ef551643a83;p=lttng-ust.git

diff --git a/include/lttng/ust-ctl.h b/include/lttng/ust-ctl.h
index 0945e4ef..8917d0e0 100644
--- a/include/lttng/ust-ctl.h
+++ b/include/lttng/ust-ctl.h
@@ -2,19 +2,18 @@
  * Copyright (C) 2011 - Julien Desfossez <julien.desfossez@polymtl.ca>
  *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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; only version 2
- * of the 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; version 2 of the License only.
  *
  * This program 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 General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef _LTTNG_UST_CTL_H
@@ -22,17 +21,12 @@
 
 #include <lttng/ust-abi.h>
 
-struct ustctl_tracepoint_iter {
-	char name[LTTNG_UST_SYM_NAME_LEN];	/* provider:name */
-	char loglevel[LTTNG_UST_SYM_NAME_LEN];	/* provider:loglevel */
-	int64_t loglevel_value;
-};
-
 int ustctl_register_done(int sock);
 int ustctl_create_session(int sock);
 int ustctl_open_metadata(int sock, int session_handle,
 		struct lttng_ust_channel_attr *chops,
 		struct lttng_ust_object_data **metadata_data);
+int ustctl_open_wait_pipe(int sock, struct lttng_ust_object_data *channel_data);
 int ustctl_create_channel(int sock, int session_handle,
 		struct lttng_ust_channel_attr *chops,
 		struct lttng_ust_object_data **channel_data);
@@ -60,13 +54,13 @@ int ustctl_tracepoint_list(int sock);
  * handle. End is iteration is reached when -ENOENT is returned.
  */
 int ustctl_tracepoint_list_get(int sock, int tp_list_handle,
-		struct ustctl_tracepoint_iter *iter);
+		struct lttng_ust_tracepoint_iter *iter);
 
 int ustctl_tracer_version(int sock, struct lttng_ust_tracer_version *v);
 int ustctl_wait_quiescent(int sock);
 
-/* not implemented yet */
-struct lttng_ust_calibrate;
+int ustctl_sock_flush_buffer(int sock, struct lttng_ust_object_data *object);
+
 int ustctl_calibrate(int sock, struct lttng_ust_calibrate *calibrate);
 
 /*
@@ -135,7 +129,9 @@ void ustctl_flush_buffer(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf,
 		int producer_active);
 
-/* Release object created by members of this API */
+/* Release object created by members of this API. */
 int ustctl_release_object(int sock, struct lttng_ust_object_data *data);
+/* Release handle returned by create session. */
+int ustctl_release_handle(int sock, int handle);
 
 #endif /* _LTTNG_UST_CTL_H */