X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fust-basic-tracing%2Fust-basic-tracing.c;h=004974b53d6080fea71732657391a0003af2febf;hb=dca09eabc445534e3ec180ac3fbd544fe83db5f3;hp=42e824243a658ec50c9e27adf0cf3fb801002363;hpb=57773204abc43ed7d4350ac0d641ddbbda1e441e;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 42e82424..004974b5 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 * 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 @@ -28,6 +29,8 @@ #include #include #include +#include +#include #include #include #include @@ -36,25 +39,19 @@ #include #include -#include "lttng-ust-comm.h" +#include #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 -struct object_data { - int handle; - int shm_fd; - int wait_fd; - uint64_t memory_map_size; -}; - static int session_handle; -static struct object_data metadata_stream_data; -static struct object_data metadata_data; -static struct object_data channel_data; -static struct object_data stream_data[MAX_NR_STREAMS]; +static struct lttng_ust_object_data metadata_stream_data; +static struct lttng_ust_object_data metadata_data; +static struct lttng_ust_object_data channel_data; +static struct lttng_ust_object_data stream_data[MAX_NR_STREAMS]; static int event_handle[MAX_NR_EVENTS]; static int context_handle; @@ -70,7 +67,7 @@ static void handle_signals(int signo) } static -int open_streams(int sock, int channel_handle, struct object_data *stream_datas, +int open_streams(int sock, int channel_handle, struct lttng_ust_object_data *stream_datas, int nr_check) { int ret, k = 0; @@ -114,7 +111,7 @@ int open_streams(int sock, int channel_handle, struct object_data *stream_datas, } static -int close_streams(int sock, struct object_data *stream_datas, int nr_check) +int close_streams(int sock, struct lttng_ust_object_data *stream_datas, int nr_check) { int ret, k; @@ -151,10 +148,10 @@ int close_streams(int sock, struct object_data *stream_datas, int nr_check) } static -struct shm_handle *map_channel(struct object_data *chan_data, - struct object_data *stream_datas, int nr_check) +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; @@ -171,7 +168,7 @@ struct shm_handle *map_channel(struct object_data *chan_data, chan = shmp(handle, handle->chan); for (k = 0; k < nr_check; k++) { - struct object_data *stream_data = &stream_datas[k]; + struct lttng_ust_object_data *stream_data = &stream_datas[k]; if (!stream_data->handle) break; @@ -195,7 +192,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 +202,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); @@ -226,7 +223,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"); @@ -259,7 +256,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 +278,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);