X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fust-basic-tracing%2Fust-basic-tracing.c;h=57c025ee15e59081cadf0d2c401e0059f7b0fa46;hb=e92f3e285939848f248af08f11a39a04a7fcf852;hp=d9339e91cd958135cd3fc83c2dcd3ae1a1f7d12d;hpb=61f02aea2c4336e2789e2dc97380835b17e5a427;p=lttng-ust.git

diff --git a/tests/ust-basic-tracing/ust-basic-tracing.c b/tests/ust-basic-tracing/ust-basic-tracing.c
index d9339e91..57c025ee 100644
--- a/tests/ust-basic-tracing/ust-basic-tracing.c
+++ b/tests/ust-basic-tracing/ust-basic-tracing.c
@@ -4,21 +4,22 @@
  * Copyright (C) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * 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.
+ * 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.
  */
 
 #define _LARGEFILE64_SOURCE
+#define _GNU_SOURCE
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,6 +29,8 @@
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <limits.h>
@@ -36,20 +39,13 @@
 #include <assert.h>
 #include <sys/socket.h>
 
-#include <ust/lttng-ust-comm.h>
+#include <ust-comm.h>
 #include "../../libringbuffer/backend.h"
 #include "../../libringbuffer/frontend.h"
 
 #define MAX_NR_STREAMS	64
 #define MAX_NR_EVENTS	128
 
-struct lttng_ust_object_data {
-	int handle;
-	int shm_fd;
-	int wait_fd;
-	uint64_t memory_map_size;
-};
-
 static int session_handle;
 static struct lttng_ust_object_data metadata_stream_data;
 static struct lttng_ust_object_data metadata_data;
@@ -151,10 +147,10 @@ int close_streams(int sock, struct lttng_ust_object_data *stream_datas, int nr_c
 }
 
 static
-struct shm_handle *map_channel(struct lttng_ust_object_data *chan_data,
+struct lttng_ust_shm_handle *map_channel(struct lttng_ust_object_data *chan_data,
 		struct lttng_ust_object_data *stream_datas, int nr_check)
 {
-	struct shm_handle *handle;
+	struct lttng_ust_shm_handle *handle;
 	struct channel *chan;
 	int k, ret;
 
@@ -195,7 +191,7 @@ error_destroy:
 }
 
 static
-void unmap_channel(struct shm_handle *handle)
+void unmap_channel(struct lttng_ust_shm_handle *handle)
 {
 	struct channel *chan;
 
@@ -205,13 +201,13 @@ void unmap_channel(struct shm_handle *handle)
 }
 
 static
-int consume_stream(struct shm_handle *handle, int cpu, char *outfile)
+int consume_stream(struct lttng_ust_shm_handle *handle, int cpu, char *outfile)
 {
 	struct channel *chan;
-	struct lib_ring_buffer *buf;
+	struct lttng_ust_lib_ring_buffer *buf;
 	int outfd, ret;
-	int shm_fd, wait_fd;
-	uint64_t memory_map_size;
+	int *shm_fd, *wait_fd;
+	uint64_t *memory_map_size;
 
 	chan = shmp(handle, handle->chan);
 
@@ -259,7 +255,7 @@ int consume_stream(struct shm_handle *handle, int cpu, char *outfile)
 		printf("WRITE: copy %lu bytes\n", read_size);
 		copy_size = write(outfd, ptr, read_size);
 		if (copy_size < read_size) {
-			printf("write issue: copied %zd, expected %lu\n", copy_size, read_size);
+			printf("write issue: copied %lu, expected %lu\n", copy_size, read_size);
 		}
 		lib_ring_buffer_put_next_subbuf(buf, handle);
 	}
@@ -281,7 +277,7 @@ int consume_buffers(const char *outputpath)
 	int k, ret;
 	mode_t old_umask;
 	char pathname[PATH_MAX];
-	struct shm_handle *handle;
+	struct lttng_ust_shm_handle *handle;
 
 	snprintf(pathname, PATH_MAX - 1, "%s", outputpath);
 	old_umask = umask(0);