projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sessiond: return 'invalid protocol' error on reception error
[lttng-tools.git]
/
src
/
common
/
userspace-probe.c
diff --git
a/src/common/userspace-probe.c
b/src/common/userspace-probe.c
index 5e66f41c146e6cf9615e75ad71ec9951e949643d..609ffc1ac22874cb5d944a2ced6adcc0cf07e2b2 100644
(file)
--- a/
src/common/userspace-probe.c
+++ b/
src/common/userspace-probe.c
@@
-20,14
+20,14
@@
#include <sys/unistd.h>
static
#include <sys/unistd.h>
static
-int lttng_userspace_probe_location_function_set_binary_fd(
+int lttng_userspace_probe_location_function_set_binary_fd
_handle
(
struct lttng_userspace_probe_location *location,
struct lttng_userspace_probe_location *location,
- struct fd_handle *binary_fd);
+ struct fd_handle *binary_fd
_handle
);
static
static
-int lttng_userspace_probe_location_tracepoint_set_binary_fd(
+int lttng_userspace_probe_location_tracepoint_set_binary_fd
_handle
(
struct lttng_userspace_probe_location *location,
struct lttng_userspace_probe_location *location,
- struct fd_handle *binary_fd);
+ struct fd_handle *binary_fd
_handle
);
enum lttng_userspace_probe_location_lookup_method_type
lttng_userspace_probe_location_lookup_method_get_type(
enum lttng_userspace_probe_location_lookup_method_type
lttng_userspace_probe_location_lookup_method_get_type(
@@
-105,7
+105,7
@@
void lttng_userspace_probe_location_function_destroy(
free(location_function->function_name);
free(location_function->binary_path);
free(location_function->function_name);
free(location_function->binary_path);
- fd_handle_put(location_function->binary_fd);
+ fd_handle_put(location_function->binary_fd
_handle
);
free(location);
}
free(location);
}
@@
-126,7
+126,7
@@
void lttng_userspace_probe_location_tracepoint_destroy(
free(location_tracepoint->probe_name);
free(location_tracepoint->provider_name);
free(location_tracepoint->binary_path);
free(location_tracepoint->probe_name);
free(location_tracepoint->provider_name);
free(location_tracepoint->binary_path);
- fd_handle_put(location_tracepoint->binary_fd);
+ fd_handle_put(location_tracepoint->binary_fd
_handle
);
free(location);
}
free(location);
}
@@
-227,8
+227,8
@@
static bool lttng_userspace_probe_location_function_is_equal(
goto end;
}
goto end;
}
- is_equal = fd_is_equal(a->binary_fd
? fd_handle_get_fd(a->binary_fd
) : -1,
- b->binary_fd
? fd_handle_get_fd(b->binary_fd
) : -1);
+ is_equal = fd_is_equal(a->binary_fd
_handle ? fd_handle_get_fd(a->binary_fd_handle
) : -1,
+ b->binary_fd
_handle ? fd_handle_get_fd(b->binary_fd_handle
) : -1);
end:
return is_equal;
}
end:
return is_equal;
}
@@
-281,7
+281,7
@@
lttng_userspace_probe_location_function_create_no_check(const char *binary_path,
location->function_name = function_name_copy;
location->binary_path = binary_path_copy;
location->function_name = function_name_copy;
location->binary_path = binary_path_copy;
- location->binary_fd = binary_fd_handle;
+ location->binary_fd
_handle
= binary_fd_handle;
binary_fd_handle = NULL;
location->instrumentation_type =
LTTNG_USERSPACE_PROBE_LOCATION_FUNCTION_INSTRUMENTATION_TYPE_ENTRY;
binary_fd_handle = NULL;
location->instrumentation_type =
LTTNG_USERSPACE_PROBE_LOCATION_FUNCTION_INSTRUMENTATION_TYPE_ENTRY;
@@
-335,8
+335,8
@@
static bool lttng_userspace_probe_location_tracepoint_is_equal(
goto end;
}
goto end;
}
- is_equal = fd_is_equal(a->binary_fd
? fd_handle_get_fd(a->binary_fd
) : -1,
- b->binary_fd
? fd_handle_get_fd(b->binary_fd
) : -1);
+ is_equal = fd_is_equal(a->binary_fd
_handle ? fd_handle_get_fd(a->binary_fd_handle
) : -1,
+ b->binary_fd
_handle ? fd_handle_get_fd(b->binary_fd_handle
) : -1);
end:
return is_equal;
end:
return is_equal;
@@
-399,7
+399,7
@@
lttng_userspace_probe_location_tracepoint_create_no_check(const char *binary_pat
location->probe_name = probe_name_copy;
location->provider_name = provider_name_copy;
location->binary_path = binary_path_copy;
location->probe_name = probe_name_copy;
location->provider_name = provider_name_copy;
location->binary_path = binary_path_copy;
- location->binary_fd = binary_fd_handle;
+ location->binary_fd
_handle
= binary_fd_handle;
binary_fd_handle = NULL;
ret = &location->parent;
binary_fd_handle = NULL;
ret = &location->parent;
@@
-430,7
+430,7
@@
lttng_userspace_probe_location_function_create(const char *binary_path,
struct lttng_userspace_probe_location *ret = NULL;
if (!binary_path || !function_name) {
struct lttng_userspace_probe_location *ret = NULL;
if (!binary_path || !function_name) {
- ERR("Invalid argument(s)
"
);
+ ERR("Invalid argument(s)
passed to '%s'", __FUNCTION__
);
goto end;
}
goto end;
}
@@
-458,7
+458,7
@@
lttng_userspace_probe_location_tracepoint_create(const char *binary_path,
struct lttng_userspace_probe_location *ret = NULL;
if (!binary_path || !probe_name || !provider_name) {
struct lttng_userspace_probe_location *ret = NULL;
if (!binary_path || !probe_name || !provider_name) {
- ERR("Invalid argument(s)
"
);
+ ERR("Invalid argument(s)
passed to '%s'", __FUNCTION__
);
goto end;
}
goto end;
}
@@
-588,8
+588,8
@@
lttng_userspace_probe_location_function_copy(
}
/* Set the duplicated fd to the new probe_location */
}
/* Set the duplicated fd to the new probe_location */
- if (lttng_userspace_probe_location_function_set_binary_fd(new_location,
- function_location->binary_fd) < 0) {
+ if (lttng_userspace_probe_location_function_set_binary_fd
_handle
(new_location,
+ function_location->binary_fd
_handle
) < 0) {
goto destroy_probe_location;
}
goto destroy_probe_location;
}
@@
-668,8
+668,8
@@
lttng_userspace_probe_location_tracepoint_copy(
}
/* Set the duplicated fd to the new probe_location */
}
/* Set the duplicated fd to the new probe_location */
- if (lttng_userspace_probe_location_tracepoint_set_binary_fd(new_location,
- tracepoint_location->binary_fd) < 0) {
+ if (lttng_userspace_probe_location_tracepoint_set_binary_fd
_handle
(new_location,
+ tracepoint_location->binary_fd
_handle
) < 0) {
goto destroy_probe_location;
}
goto destroy_probe_location;
}
@@
-693,7
+693,7
@@
const char *lttng_userspace_probe_location_function_get_binary_path(
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION) {
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION) {
- ERR("Invalid argument(s)
"
);
+ ERR("Invalid argument(s)
passed to '%s'", __FUNCTION__
);
goto end;
}
goto end;
}
@@
-713,7
+713,7
@@
const char *lttng_userspace_probe_location_tracepoint_get_binary_path(
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT) {
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT) {
- ERR("Invalid argument(s)
"
);
+ ERR("Invalid argument(s)
passed to '%s'", __FUNCTION__
);
goto end;
}
goto end;
}
@@
-733,7
+733,7
@@
const char *lttng_userspace_probe_location_function_get_function_name(
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION) {
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION) {
- ERR("Invalid argument(s)
"
);
+ ERR("Invalid argument(s)
passed to '%s'", __FUNCTION__
);
goto end;
}
goto end;
}
@@
-752,7
+752,7
@@
const char *lttng_userspace_probe_location_tracepoint_get_probe_name(
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT) {
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT) {
- ERR("Invalid argument(s)
"
);
+ ERR("Invalid argument(s)
passed to '%s'", __FUNCTION__
);
goto end;
}
goto end;
}
@@
-771,7
+771,7
@@
const char *lttng_userspace_probe_location_tracepoint_get_provider_name(
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT) {
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT) {
- ERR("Invalid argument(s)
"
);
+ ERR("Invalid argument(s)
passed to '%s'", __FUNCTION__
);
goto end;
}
goto end;
}
@@
-790,14
+790,14
@@
int lttng_userspace_probe_location_function_get_binary_fd(
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION) {
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION) {
- ERR("Invalid argument(s)
"
);
+ ERR("Invalid argument(s)
passed to '%s'", __FUNCTION__
);
goto end;
}
function_location = container_of(location,
struct lttng_userspace_probe_location_function, parent);
goto end;
}
function_location = container_of(location,
struct lttng_userspace_probe_location_function, parent);
- ret = function_location->binary_fd ?
- fd_handle_get_fd(function_location->binary_fd) : -1;
+ ret = function_location->binary_fd
_handle
?
+ fd_handle_get_fd(function_location->binary_fd
_handle
) : -1;
end:
return ret;
}
end:
return ret;
}
@@
-811,7
+811,7
@@
lttng_userspace_probe_location_function_get_instrumentation_type(
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION) {
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION) {
- ERR("Invalid argument(s)
"
);
+ ERR("Invalid argument(s)
passed to '%s'", __FUNCTION__
);
type = LTTNG_USERSPACE_PROBE_LOCATION_FUNCTION_INSTRUMENTATION_TYPE_UNKNOWN;
goto end;
}
type = LTTNG_USERSPACE_PROBE_LOCATION_FUNCTION_INSTRUMENTATION_TYPE_UNKNOWN;
goto end;
}
@@
-836,7
+836,7
@@
lttng_userspace_probe_location_function_set_instrumentation_type(
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION ||
instrumentation_type !=
LTTNG_USERSPACE_PROBE_LOCATION_FUNCTION_INSTRUMENTATION_TYPE_ENTRY) {
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION ||
instrumentation_type !=
LTTNG_USERSPACE_PROBE_LOCATION_FUNCTION_INSTRUMENTATION_TYPE_ENTRY) {
- ERR("Invalid argument(s)
"
);
+ ERR("Invalid argument(s)
passed to '%s'", __FUNCTION__
);
status = LTTNG_USERSPACE_PROBE_LOCATION_STATUS_INVALID;
goto end;
}
status = LTTNG_USERSPACE_PROBE_LOCATION_STATUS_INVALID;
goto end;
}
@@
-856,14
+856,14
@@
int lttng_userspace_probe_location_tracepoint_get_binary_fd(
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT) {
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT) {
- ERR("Invalid argument(s)
"
);
+ ERR("Invalid argument(s)
passed to '%s'", __FUNCTION__
);
goto end;
}
tracepoint_location = container_of(location,
struct lttng_userspace_probe_location_tracepoint, parent);
goto end;
}
tracepoint_location = container_of(location,
struct lttng_userspace_probe_location_tracepoint, parent);
- ret = tracepoint_location->binary_fd ?
- fd_handle_get_fd(tracepoint_location->binary_fd) : -1;
+ ret = tracepoint_location->binary_fd
_handle
?
+ fd_handle_get_fd(tracepoint_location->binary_fd
_handle
) : -1;
end:
return ret;
}
end:
return ret;
}
@@
-876,7
+876,7
@@
lttng_userspace_probe_location_function_get_lookup_method(
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION) {
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION) {
- ERR("Invalid argument(s)
"
);
+ ERR("Invalid argument(s)
passed to '%s'", __FUNCTION__
);
goto end;
}
goto end;
}
@@
-893,7
+893,7
@@
lttng_userspace_probe_location_tracepoint_get_lookup_method(
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT) {
if (!location || lttng_userspace_probe_location_get_type(location) !=
LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT) {
- ERR("Invalid argument(s)
"
);
+ ERR("Invalid argument(s)
passed to '%s'", __FUNCTION__
);
goto end;
}
goto end;
}
@@
-970,7
+970,7
@@
int lttng_userspace_probe_location_function_serialize(
goto end;
}
goto end;
}
- if (payload &&
location_function->binary_fd < 0
) {
+ if (payload &&
!location_function->binary_fd_handle
) {
ret = -LTTNG_ERR_INVALID;
goto end;
}
ret = -LTTNG_ERR_INVALID;
goto end;
}
@@
-1012,7
+1012,7
@@
int lttng_userspace_probe_location_function_serialize(
goto end;
}
ret = lttng_payload_push_fd_handle(
goto end;
}
ret = lttng_payload_push_fd_handle(
- payload, location_function->binary_fd);
+ payload, location_function->binary_fd
_handle
);
if (ret) {
ret = -LTTNG_ERR_INVALID;
goto end;
if (ret) {
ret = -LTTNG_ERR_INVALID;
goto end;
@@
-1049,7
+1049,7
@@
int lttng_userspace_probe_location_tracepoint_serialize(
goto end;
}
goto end;
}
- if (payload &&
location_tracepoint->binary_fd < 0
) {
+ if (payload &&
!location_tracepoint->binary_fd_handle
) {
ret = -LTTNG_ERR_INVALID;
goto end;
}
ret = -LTTNG_ERR_INVALID;
goto end;
}
@@
-1106,7
+1106,7
@@
int lttng_userspace_probe_location_tracepoint_serialize(
goto end;
}
ret = lttng_payload_push_fd_handle(
goto end;
}
ret = lttng_payload_push_fd_handle(
- payload, location_tracepoint->binary_fd);
+ payload, location_tracepoint->binary_fd
_handle
);
if (ret) {
ret = -LTTNG_ERR_INVALID;
goto end;
if (ret) {
ret = -LTTNG_ERR_INVALID;
goto end;
@@
-1130,7
+1130,7
@@
int lttng_userspace_probe_location_serialize(
struct lttng_userspace_probe_location_comm location_generic_comm;
if (!location) {
struct lttng_userspace_probe_location_comm location_generic_comm;
if (!location) {
- ERR("Invalid argument(s)
"
);
+ ERR("Invalid argument(s)
passed to '%s'", __FUNCTION__
);
ret = -LTTNG_ERR_INVALID;
goto end;
}
ret = -LTTNG_ERR_INVALID;
goto end;
}
@@
-1187,7
+1187,7
@@
int lttng_userspace_probe_location_function_create_from_payload(
char *function_name = NULL, *binary_path = NULL;
int ret = 0;
size_t expected_size;
char *function_name = NULL, *binary_path = NULL;
int ret = 0;
size_t expected_size;
- struct fd_handle *binary_fd = lttng_payload_view_pop_fd_handle(view);
+ struct fd_handle *binary_fd
_handle
= lttng_payload_view_pop_fd_handle(view);
assert(location);
assert(location);
@@
-1212,11
+1212,14
@@
int lttng_userspace_probe_location_function_create_from_payload(
binary_path_src = function_name_src +
location_function_comm->function_name_len;
binary_path_src = function_name_src +
location_function_comm->function_name_len;
- if (function_name_src[location_function_comm->function_name_len - 1] != '\0') {
+ if (!lttng_buffer_view_contains_string(&view->buffer, function_name_src,
+ location_function_comm->function_name_len)) {
ret = -LTTNG_ERR_INVALID;
goto end;
}
ret = -LTTNG_ERR_INVALID;
goto end;
}
- if (binary_path_src[location_function_comm->binary_path_len - 1] != '\0') {
+
+ if (!lttng_buffer_view_contains_string(&view->buffer, binary_path_src,
+ location_function_comm->binary_path_len)) {
ret = -LTTNG_ERR_INVALID;
goto end;
}
ret = -LTTNG_ERR_INVALID;
goto end;
}
@@
-1242,8
+1245,8
@@
int lttng_userspace_probe_location_function_create_from_payload(
goto end;
}
goto end;
}
- ret = lttng_userspace_probe_location_function_set_binary_fd(
- *location, binary_fd);
+ ret = lttng_userspace_probe_location_function_set_binary_fd
_handle
(
+ *location, binary_fd
_handle
);
if (ret) {
ret = -LTTNG_ERR_INVALID;
goto end;
if (ret) {
ret = -LTTNG_ERR_INVALID;
goto end;
@@
-1251,7
+1254,7
@@
int lttng_userspace_probe_location_function_create_from_payload(
ret = (int) expected_size;
end:
ret = (int) expected_size;
end:
- fd_handle_put(binary_fd);
+ fd_handle_put(binary_fd
_handle
);
free(function_name);
free(binary_path);
return ret;
free(function_name);
free(binary_path);
return ret;
@@
-1267,11
+1270,11
@@
int lttng_userspace_probe_location_tracepoint_create_from_payload(
char *probe_name = NULL, *provider_name = NULL, *binary_path = NULL;
int ret = 0;
size_t expected_size;
char *probe_name = NULL, *provider_name = NULL, *binary_path = NULL;
int ret = 0;
size_t expected_size;
- struct fd_handle *binary_fd = lttng_payload_view_pop_fd_handle(view);
+ struct fd_handle *binary_fd
_handle
= lttng_payload_view_pop_fd_handle(view);
assert(location);
assert(location);
- if (
binary_fd < 0
) {
+ if (
!binary_fd_handle
) {
ret = -LTTNG_ERR_INVALID;
goto end;
}
ret = -LTTNG_ERR_INVALID;
goto end;
}
@@
-1300,17
+1303,20
@@
int lttng_userspace_probe_location_tracepoint_create_from_payload(
binary_path_src = provider_name_src +
location_tracepoint_comm->provider_name_len;
binary_path_src = provider_name_src +
location_tracepoint_comm->provider_name_len;
- if (probe_name_src[location_tracepoint_comm->probe_name_len - 1] != '\0') {
+ if (!lttng_buffer_view_contains_string(&view->buffer, probe_name_src,
+ location_tracepoint_comm->probe_name_len)) {
ret = -LTTNG_ERR_INVALID;
goto end;
}
ret = -LTTNG_ERR_INVALID;
goto end;
}
- if (provider_name_src[location_tracepoint_comm->provider_name_len - 1] != '\0') {
+ if (!lttng_buffer_view_contains_string(&view->buffer, provider_name_src,
+ location_tracepoint_comm->provider_name_len)) {
ret = -LTTNG_ERR_INVALID;
goto end;
}
ret = -LTTNG_ERR_INVALID;
goto end;
}
- if (binary_path_src[location_tracepoint_comm->binary_path_len - 1] != '\0') {
+ if (!lttng_buffer_view_contains_string(&view->buffer, binary_path_src,
+ location_tracepoint_comm->binary_path_len)) {
ret = -LTTNG_ERR_INVALID;
goto end;
}
ret = -LTTNG_ERR_INVALID;
goto end;
}
@@
-1339,8
+1345,8
@@
int lttng_userspace_probe_location_tracepoint_create_from_payload(
goto end;
}
goto end;
}
- ret = lttng_userspace_probe_location_tracepoint_set_binary_fd(
- *location, binary_fd);
+ ret = lttng_userspace_probe_location_tracepoint_set_binary_fd
_handle
(
+ *location, binary_fd
_handle
);
if (ret) {
ret = -LTTNG_ERR_INVALID;
goto end;
if (ret) {
ret = -LTTNG_ERR_INVALID;
goto end;
@@
-1348,7
+1354,7
@@
int lttng_userspace_probe_location_tracepoint_create_from_payload(
ret = (int) expected_size;
end:
ret = (int) expected_size;
end:
- fd_handle_put(binary_fd);
+ fd_handle_put(binary_fd
_handle
);
free(probe_name);
free(provider_name);
free(binary_path);
free(probe_name);
free(provider_name);
free(binary_path);
@@
-1411,22
+1417,25
@@
int lttng_userspace_probe_location_create_from_payload(
struct lttng_userspace_probe_location **location)
{
struct lttng_userspace_probe_location_lookup_method *lookup_method;
struct lttng_userspace_probe_location **location)
{
struct lttng_userspace_probe_location_lookup_method *lookup_method;
- struct lttng_userspace_probe_location_comm *probe_location_comm;
enum lttng_userspace_probe_location_type type;
int consumed = 0;
int ret;
enum lttng_userspace_probe_location_type type;
int consumed = 0;
int ret;
+ struct lttng_userspace_probe_location_comm *probe_location_comm;
+ struct lttng_payload_view probe_location_comm_view =
+ lttng_payload_view_from_view(
+ view, 0, sizeof(*probe_location_comm));
assert(view);
assert(location);
lookup_method = NULL;
assert(view);
assert(location);
lookup_method = NULL;
- if (
view->buffer.size <= sizeof(*probe_location_comm
)) {
+ if (
!lttng_payload_view_is_valid(&probe_location_comm_view
)) {
ret = -LTTNG_ERR_INVALID;
goto end;
}
ret = -LTTNG_ERR_INVALID;
goto end;
}
- probe_location_comm = (typeof(probe_location_comm))
view->
buffer.data;
+ probe_location_comm = (typeof(probe_location_comm))
probe_location_comm_view.
buffer.data;
type = (enum lttng_userspace_probe_location_type) probe_location_comm->type;
consumed += sizeof(*probe_location_comm);
type = (enum lttng_userspace_probe_location_type) probe_location_comm->type;
consumed += sizeof(*probe_location_comm);
@@
-1489,7
+1498,7
@@
end:
}
static
}
static
-int lttng_userspace_probe_location_function_set_binary_fd(
+int lttng_userspace_probe_location_function_set_binary_fd
_handle
(
struct lttng_userspace_probe_location *location,
struct fd_handle *binary_fd)
{
struct lttng_userspace_probe_location *location,
struct fd_handle *binary_fd)
{
@@
-1501,14
+1510,14
@@
int lttng_userspace_probe_location_function_set_binary_fd(
function_location = container_of(location,
struct lttng_userspace_probe_location_function, parent);
function_location = container_of(location,
struct lttng_userspace_probe_location_function, parent);
- fd_handle_put(function_location->binary_fd);
+ fd_handle_put(function_location->binary_fd
_handle
);
fd_handle_get(binary_fd);
fd_handle_get(binary_fd);
- function_location->binary_fd = binary_fd;
+ function_location->binary_fd
_handle
= binary_fd;
return ret;
}
static
return ret;
}
static
-int lttng_userspace_probe_location_tracepoint_set_binary_fd(
+int lttng_userspace_probe_location_tracepoint_set_binary_fd
_handle
(
struct lttng_userspace_probe_location *location,
struct fd_handle *binary_fd)
{
struct lttng_userspace_probe_location *location,
struct fd_handle *binary_fd)
{
@@
-1520,9
+1529,9
@@
int lttng_userspace_probe_location_tracepoint_set_binary_fd(
tracepoint_location = container_of(location,
struct lttng_userspace_probe_location_tracepoint, parent);
tracepoint_location = container_of(location,
struct lttng_userspace_probe_location_tracepoint, parent);
- fd_handle_put(tracepoint_location->binary_fd);
+ fd_handle_put(tracepoint_location->binary_fd
_handle
);
fd_handle_get(binary_fd);
fd_handle_get(binary_fd);
- tracepoint_location->binary_fd = binary_fd;
+ tracepoint_location->binary_fd
_handle
= binary_fd;
return ret;
}
return ret;
}
@@
-1606,7
+1615,7
@@
int lttng_userspace_probe_location_function_flatten(
flat_probe.function_name = flat_probe_start + sizeof(flat_probe);
flat_probe.binary_path = flat_probe.function_name + function_name_len;
flat_probe.function_name = flat_probe_start + sizeof(flat_probe);
flat_probe.binary_path = flat_probe.function_name + function_name_len;
- flat_probe.binary_fd = NULL;
+ flat_probe.binary_fd
_handle
= NULL;
ret = lttng_dynamic_buffer_append(buffer, &flat_probe,
sizeof(flat_probe));
if (ret) {
ret = lttng_dynamic_buffer_append(buffer, &flat_probe,
sizeof(flat_probe));
if (ret) {
@@
-1741,7
+1750,7
@@
int lttng_userspace_probe_location_tracepoint_flatten(
flat_probe.probe_name = flat_probe_start + sizeof(flat_probe);
flat_probe.provider_name = flat_probe.probe_name + probe_name_len;
flat_probe.binary_path = flat_probe.provider_name + provider_name_len;
flat_probe.probe_name = flat_probe_start + sizeof(flat_probe);
flat_probe.provider_name = flat_probe.probe_name + probe_name_len;
flat_probe.binary_path = flat_probe.provider_name + provider_name_len;
- flat_probe.binary_fd = NULL;
+ flat_probe.binary_fd
_handle
= NULL;
ret = lttng_dynamic_buffer_append(buffer, &flat_probe, sizeof(flat_probe));
if (ret) {
goto end;
ret = lttng_dynamic_buffer_append(buffer, &flat_probe, sizeof(flat_probe));
if (ret) {
goto end;
This page took
0.030769 seconds
and
4
git commands to generate.