X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fust-multi-test%2Fust-multi-test.c;h=3f00f7edfcfd9ae3b5ffff9333c685c03f1178ef;hb=7bc53e94a229963972aa78880b361b1510fdd268;hp=130da70450637d3d689260a0d02e8df21f5262b6;hpb=61f02aea2c4336e2789e2dc97380835b17e5a427;p=lttng-ust.git diff --git a/tests/ust-multi-test/ust-multi-test.c b/tests/ust-multi-test/ust-multi-test.c index 130da704..3f00f7ed 100644 --- a/tests/ust-multi-test/ust-multi-test.c +++ b/tests/ust-multi-test/ust-multi-test.c @@ -4,21 +4,22 @@ * Copyright (C) 2011 - Mathieu Desnoyers * Copyright (C) 2011 - David Goulet * - * 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 #include #include @@ -27,6 +28,8 @@ #include #include #include +#include +#include #include #include #include @@ -36,9 +39,10 @@ #include #include -#include +#include #include <../../libringbuffer/backend.h> #include <../../libringbuffer/frontend.h> +#include "../../liblttng-ust/compat.h" /* For ENODATA */ #define NR_SESSIONS 4 #define NR_CHANNELS 1 @@ -51,13 +55,6 @@ const char *evname[] = { "ust_tests_hello_dontexist", }; -struct lttng_ust_object_data { - int handle; - int shm_fd; - int wait_fd; - uint64_t memory_map_size; -}; - static int session_handle[NR_SESSIONS]; static struct lttng_ust_object_data metadata_stream_data[NR_SESSIONS]; static struct lttng_ust_object_data metadata_data[NR_SESSIONS]; @@ -95,7 +92,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; @@ -158,10 +155,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; @@ -202,7 +199,7 @@ error_destroy: } static -void unmap_channel(struct shm_handle *handle) +void unmap_channel(struct lttng_ust_shm_handle *handle) { struct channel *chan; @@ -212,13 +209,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); @@ -233,7 +230,7 @@ int consume_stream(struct 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"); @@ -266,7 +263,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); } @@ -290,7 +287,7 @@ int consume_buffers(void) for (i = 0; i < NR_SESSIONS; i++) { char pathname[PATH_MAX]; - struct shm_handle *handle; + struct lttng_ust_shm_handle *handle; snprintf(pathname, PATH_MAX - 1, "/tmp/testtrace%u", i); old_umask = umask(0); @@ -370,7 +367,7 @@ int send_app_msgs(int sock) return ret; metadata_data[i].handle = lur.ret_val; printf("received metadata handle %u\n", metadata_data[i].handle); - if (lur.ret_code == USTCOMM_OK) { + if (lur.ret_code == LTTNG_UST_OK) { ssize_t len; metadata_data[i].memory_map_size = lur.u.channel.memory_map_size; @@ -412,7 +409,7 @@ int send_app_msgs(int sock) return ret; channel_data[i][j].handle = lur.ret_val; printf("received channel handle %u\n", channel_data[i][j].handle); - if (lur.ret_code == USTCOMM_OK) { + if (lur.ret_code == LTTNG_UST_OK) { ssize_t len; channel_data[i][j].memory_map_size = lur.u.channel.memory_map_size;