projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove leftover structure in ust-abi.h
[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 d9339e91cd958135cd3fc83c2dcd3ae1a1f7d12d..da2852f893b41aaf47879bf0397a9693cc5e21e8 100644
(file)
--- a/
tests/ust-basic-tracing/ust-basic-tracing.c
+++ b/
tests/ust-basic-tracing/ust-basic-tracing.c
@@
-36,20
+36,13
@@
#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"
#define MAX_NR_STREAMS 64
#define MAX_NR_EVENTS 128
#include "../../libringbuffer/backend.h"
#include "../../libringbuffer/frontend.h"
#define MAX_NR_STREAMS 64
#define MAX_NR_EVENTS 128
-struct lttng_ust_object_data {
- int handle;
- int shm_fd;
- int wait_fd;
- uint64_t memory_map_size;
-};
-
static int session_handle;
static struct lttng_ust_object_data metadata_stream_data;
static struct lttng_ust_object_data metadata_data;
static int session_handle;
static struct lttng_ust_object_data metadata_stream_data;
static struct lttng_ust_object_data metadata_data;
@@
-151,10
+144,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;
@@
-195,7
+188,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;
@@
-205,13
+198,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);
@@
-259,7
+252,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);
}
@@
-281,7
+274,7
@@
int consume_buffers(const char *outputpath)
int k, ret;
mode_t old_umask;
char pathname[PATH_MAX];
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);
snprintf(pathname, PATH_MAX - 1, "%s", outputpath);
old_umask = umask(0);
This page took
0.025898 seconds
and
4
git commands to generate.