projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into dev
[lttng-ust.git]
/
tests
/
ust-basic-tracing
/
ust-basic-tracing.c
diff --git
a/tests/ust-basic-tracing/ust-basic-tracing.c
b/tests/ust-basic-tracing/ust-basic-tracing.c
index ea0636bca03ada62cb2792184dda6bb3a31579b1..0705a48c5975f3934229ec02ae1edc6846ae4a7d 100644
(file)
--- a/
tests/ust-basic-tracing/ust-basic-tracing.c
+++ b/
tests/ust-basic-tracing/ust-basic-tracing.c
@@
-19,6
+19,7
@@
*/
#define _LARGEFILE64_SOURCE
*/
#define _LARGEFILE64_SOURCE
+#define _GNU_SOURCE
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#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/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>
#include <fcntl.h>
#include <sys/mman.h>
#include <limits.h>
@@
-39,6
+42,7
@@
#include <ust-comm.h>
#include "../../libringbuffer/backend.h"
#include "../../libringbuffer/frontend.h"
#include <ust-comm.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
#define MAX_NR_STREAMS 64
#define MAX_NR_EVENTS 128
@@
-203,8
+207,8
@@
int consume_stream(struct lttng_ust_shm_handle *handle, int cpu, char *outfile)
struct channel *chan;
struct lttng_ust_lib_ring_buffer *buf;
int outfd, ret;
struct channel *chan;
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);
chan = shmp(handle, handle->chan);
@@
-219,7
+223,7
@@
int consume_stream(struct lttng_ust_shm_handle *handle, int cpu, char *outfile)
}
/* copy */
}
/* 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");
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
if (outfd < 0) {
perror("open output");
@@
-252,7
+256,7
@@
int consume_stream(struct lttng_ust_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: 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);
}
}
lib_ring_buffer_put_next_subbuf(buf, handle);
}
This page took
0.043958 seconds
and
4
git commands to generate.