projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move lttng_session unique_ptr to lttng/session-internal.hpp
[lttng-tools.git]
/
tests
/
regression
/
tools
/
live
/
live_test.cpp
diff --git
a/tests/regression/tools/live/live_test.cpp
b/tests/regression/tools/live/live_test.cpp
index ab95135e4753d19cea1f5e1e8d9c4d97b54bc56b..9c9838ac7f337f6860ad4fb57519b5e83a6139c9 100644
(file)
--- a/
tests/regression/tools/live/live_test.cpp
+++ b/
tests/regression/tools/live/live_test.cpp
@@
-138,7
+138,7
@@
end:
return ret;
}
return ret;
}
-static int establish_connection(
void
)
+static int establish_connection()
{
struct lttng_viewer_cmd cmd;
struct lttng_viewer_connect connect;
{
struct lttng_viewer_cmd cmd;
struct lttng_viewer_connect connect;
@@
-229,7
+229,7
@@
error:
return -1;
}
return -1;
}
-static int create_viewer_session(
void
)
+static int create_viewer_session()
{
struct lttng_viewer_cmd cmd;
struct lttng_viewer_create_session_response resp;
{
struct lttng_viewer_cmd cmd;
struct lttng_viewer_create_session_response resp;
@@
-337,8
+337,12
@@
static int attach_session(uint64_t id)
session->streams[i].ctf_trace_id = be64toh(stream.ctf_trace_id);
session->streams[i].first_read = 1;
session->streams[i].ctf_trace_id = be64toh(stream.ctf_trace_id);
session->streams[i].first_read = 1;
- session->streams[i].mmap_base = mmap(
- NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ session->streams[i].mmap_base = mmap(nullptr,
+ mmap_size,
+ PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS,
+ -1,
+ 0);
if (session->streams[i].mmap_base == MAP_FAILED) {
diag("mmap error");
goto error;
if (session->streams[i].mmap_base == MAP_FAILED) {
diag("mmap error");
goto error;
@@
-354,7
+358,7
@@
error:
return -1;
}
return -1;
}
-static int get_metadata(
void
)
+static int get_metadata()
{
struct lttng_viewer_cmd cmd;
struct lttng_viewer_get_metadata rq;
{
struct lttng_viewer_cmd cmd;
struct lttng_viewer_get_metadata rq;
@@
-362,7
+366,7
@@
static int get_metadata(void)
ssize_t ret_len;
int ret;
uint64_t i;
ssize_t ret_len;
int ret;
uint64_t i;
- char *data =
NULL
;
+ char *data =
nullptr
;
uint64_t len = 0;
int metadata_stream_id = -1;
uint64_t len = 0;
int metadata_stream_id = -1;
@@
-449,7
+453,7
@@
error:
return -1;
}
return -1;
}
-static int get_next_index(
void
)
+static int get_next_index()
{
struct lttng_viewer_cmd cmd;
struct lttng_viewer_get_next_index rq;
{
struct lttng_viewer_cmd cmd;
struct lttng_viewer_get_next_index rq;
@@
-661,7
+665,7
@@
error:
return ret;
}
return ret;
}
-int main(
void
)
+int main()
{
int ret;
uint64_t session_id;
{
int ret;
uint64_t session_id;
This page took
0.023857 seconds
and
4
git commands to generate.