X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fust-basic-tracing%2Fust-basic-tracing.c;h=88260181d929f5e767f73788bda29fd1e1e2308d;hb=94ec8e331f91214a23fd99a6ca6b773c2fa4d362;hp=da2852f893b41aaf47879bf0397a9693cc5e21e8;hpb=ef9ff354212ff4b038e1a5b6a7ed0ffe1b949663;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 da2852f8..88260181 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>
@@ -37,8 +40,10 @@
 #include <sys/socket.h>
 
 #include <ust-comm.h>
+#include <lttng/ust-error.h>
 #include "../../libringbuffer/backend.h"
 #include "../../libringbuffer/frontend.h"
+#include "../../liblttng-ust/compat.h"	/* For ENODATA */
 
 #define MAX_NR_STREAMS	64
 #define MAX_NR_EVENTS	128
@@ -81,7 +86,7 @@ int open_streams(int sock, int channel_handle, struct lttng_ust_object_data *str
 			stream_datas[k].handle = lur.ret_val;
 			printf("received stream handle %u\n",
 				stream_datas[k].handle);
-			if (lur.ret_code == USTCOMM_OK) {
+			if (lur.ret_code == LTTNG_UST_OK) {
 				ssize_t len;
 
 				stream_datas[k].memory_map_size = lur.u.stream.memory_map_size;
@@ -98,7 +103,7 @@ int open_streams(int sock, int channel_handle, struct lttng_ust_object_data *str
 			}
 			k++;
 		}
-		if (ret == -ENOENT)
+		if (ret == -LTTNG_UST_ERR_NOENT)
 			break;
 		if (ret)
 			return ret;
@@ -219,7 +224,7 @@ int consume_stream(struct lttng_ust_shm_handle *handle, int cpu, char *outfile)
 	}
 
 	/* copy */
-	outfd = open(outfile, O_WRONLY | O_CREAT | O_LARGEFILE | O_TRUNC,
+	outfd = open(outfile, O_WRONLY | O_CREAT | O_TRUNC,
 			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
 	if (outfd < 0) {
 		perror("open output");
@@ -352,7 +357,7 @@ int send_app_msgs(int sock, const char *outputpath,
 		return ret;
 	metadata_data.handle = lur.ret_val;
 	printf("received metadata handle %u\n", metadata_data.handle);
-	if (lur.ret_code == USTCOMM_OK) {
+	if (lur.ret_code == LTTNG_UST_OK) {
 		ssize_t len;
 
 		metadata_data.memory_map_size = lur.u.channel.memory_map_size;
@@ -393,7 +398,7 @@ int send_app_msgs(int sock, const char *outputpath,
 		return ret;
 	channel_data.handle = lur.ret_val;
 	printf("received channel handle %u\n", channel_data.handle);
-	if (lur.ret_code == USTCOMM_OK) {
+	if (lur.ret_code == LTTNG_UST_OK) {
 		ssize_t len;
 
 		channel_data.memory_map_size = lur.u.channel.memory_map_size;
@@ -818,6 +823,7 @@ int main(int argc, const char **argv)
 			pid_t ppid;
 			uid_t uid;
 			gid_t gid;
+			uint32_t bits_per_long;
 			char name[16];	/* Process name */
 		} reg_msg;
 		char bufname[17];