projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make lttng-gen-tp work on python 2.6
[lttng-ust.git]
/
tests
/
ust-multi-test
/
ust-multi-test.c
diff --git
a/tests/ust-multi-test/ust-multi-test.c
b/tests/ust-multi-test/ust-multi-test.c
index d0ff92779d805ccd78df386e93f9f9c37491f0dc..5975789f8a95372f9fe0803bb2caa9eb0fbe0bcc 100644
(file)
--- a/
tests/ust-multi-test/ust-multi-test.c
+++ b/
tests/ust-multi-test/ust-multi-test.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>
@@
-27,6
+28,8
@@
#include <unistd.h>
#include <sys/wait.h>
#include <sys/types.h>
#include <unistd.h>
#include <sys/wait.h>
#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/mman.h>
@@
-36,7
+39,7
@@
#include <assert.h>
#include <sys/socket.h>
#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>
#include <../../libringbuffer/backend.h>
#include <../../libringbuffer/frontend.h>
@@
-210,8
+213,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);
@@
-259,7
+262,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.023702 seconds
and
4
git commands to generate.