projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Add signature check in tracepoint activation
[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 130da70450637d3d689260a0d02e8df21f5262b6..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>
@@
-51,13
+54,6
@@
const char *evname[] = {
"ust_tests_hello_dontexist",
};
"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];
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];
@@
-158,10
+154,10
@@
int close_streams(int sock, struct lttng_ust_object_data *stream_datas, int nr_c
}
static
}
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 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;
struct channel *chan;
int k, ret;
@@
-202,7
+198,7
@@
error_destroy:
}
static
}
static
-void unmap_channel(struct shm_handle *handle)
+void unmap_channel(struct
lttng_ust_
shm_handle *handle)
{
struct channel *chan;
{
struct channel *chan;
@@
-212,13
+208,13
@@
void unmap_channel(struct shm_handle *handle)
}
static
}
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 channel *chan;
- struct lib_ring_buffer *buf;
+ struct l
ttng_ust_l
ib_ring_buffer *buf;
int outfd, ret;
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);
@@
-266,7
+262,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: 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);
}
@@
-290,7
+286,7
@@
int consume_buffers(void)
for (i = 0; i < NR_SESSIONS; i++) {
char pathname[PATH_MAX];
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);
snprintf(pathname, PATH_MAX - 1, "/tmp/testtrace%u", i);
old_umask = umask(0);
This page took
0.033968 seconds
and
4
git commands to generate.