#include <sys/types.h>
#include <sys/unistd.h>
+static
+int lttng_userspace_probe_location_function_set_binary_fd_handle(
+ struct lttng_userspace_probe_location *location,
+ struct fd_handle *binary_fd_handle);
+
+static
+int lttng_userspace_probe_location_tracepoint_set_binary_fd_handle(
+ struct lttng_userspace_probe_location *location,
+ struct fd_handle *binary_fd_handle);
+
enum lttng_userspace_probe_location_lookup_method_type
lttng_userspace_probe_location_lookup_method_get_type(
const struct lttng_userspace_probe_location_lookup_method *lookup_method)
free(location_function->function_name);
free(location_function->binary_path);
- if (location_function->binary_fd >= 0) {
- if (close(location_function->binary_fd)) {
- PERROR("close");
- }
- }
+ fd_handle_put(location_function->binary_fd_handle);
free(location);
}
free(location_tracepoint->probe_name);
free(location_tracepoint->provider_name);
free(location_tracepoint->binary_path);
- if (location_tracepoint->binary_fd >= 0) {
- if (close(location_tracepoint->binary_fd)) {
- PERROR("close");
- }
- }
+ fd_handle_put(location_tracepoint->binary_fd_handle);
free(location);
}
goto end;
}
- is_equal = fd_is_equal(a->binary_fd, b->binary_fd);
+ 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;
}
bool open_binary)
{
int binary_fd = -1;
+ struct fd_handle *binary_fd_handle = NULL;
char *function_name_copy = NULL, *binary_path_copy = NULL;
struct lttng_userspace_probe_location *ret = NULL;
struct lttng_userspace_probe_location_function *location;
PERROR("Error opening the binary");
goto error;
}
- } else {
+
+ binary_fd_handle = fd_handle_create(binary_fd);
+ if (!binary_fd) {
+ goto error;
+ }
+
+ /* Ownership transferred to fd_handle. */
binary_fd = -1;
}
location->function_name = function_name_copy;
location->binary_path = binary_path_copy;
- location->binary_fd = binary_fd;
+ location->binary_fd_handle = binary_fd_handle;
+ binary_fd_handle = NULL;
location->instrumentation_type =
LTTNG_USERSPACE_PROBE_LOCATION_FUNCTION_INSTRUMENTATION_TYPE_ENTRY;
PERROR("Error closing binary fd in error path");
}
}
+ fd_handle_put(binary_fd_handle);
end:
return ret;
}
goto end;
}
- is_equal = fd_is_equal(a->binary_fd, b->binary_fd);
+ 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;
bool open_binary)
{
int binary_fd = -1;
+ struct fd_handle *binary_fd_handle = NULL;
char *probe_name_copy = NULL;
char *provider_name_copy = NULL;
char *binary_path_copy = NULL;
PERROR("open");
goto error;
}
- } else {
+
+ binary_fd_handle = fd_handle_create(binary_fd);
+ if (!binary_fd) {
+ goto error;
+ }
+
+ /* Ownership transferred to fd_handle. */
binary_fd = -1;
}
location->probe_name = probe_name_copy;
location->provider_name = provider_name_copy;
location->binary_path = binary_path_copy;
- location->binary_fd = binary_fd;
+ location->binary_fd_handle = binary_fd_handle;
+ binary_fd_handle = NULL;
ret = &location->parent;
ret->lookup_method = lookup_method;
PERROR("Error closing binary fd in error path");
}
}
+ fd_handle_put(binary_fd_handle);
end:
return ret;
}
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;
}
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;
}
struct lttng_userspace_probe_location_lookup_method *lookup_method = NULL;
const char *binary_path = NULL;
const char *function_name = NULL;
- int fd, new_fd;
+ struct lttng_userspace_probe_location_function *function_location;
assert(location);
assert(location->type == LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION);
+ function_location = container_of(
+ location, typeof(*function_location), parent);
/* Get probe location fields */
binary_path = lttng_userspace_probe_location_function_get_binary_path(location);
goto error;
}
- /* Duplicate the binary fd */
- fd = lttng_userspace_probe_location_function_get_binary_fd(location);
- if (fd == -1) {
- ERR("Error getting file descriptor to binary");
- goto error;
- }
-
- new_fd = dup(fd);
- if (new_fd == -1) {
- PERROR("Error duplicating file descriptor to binary");
- goto error;
- }
-
/*
* Duplicate probe location method fields
*/
lttng_userspace_probe_location_lookup_method_function_elf_copy(
location->lookup_method);
if (!lookup_method) {
- goto close_fd;
+ goto error;
}
break;
default:
/* Invalid probe location lookup method. */
- goto close_fd;
+ goto error;
}
/* Create the probe_location */
}
/* Set the duplicated fd to the new probe_location */
- if (lttng_userspace_probe_location_function_set_binary_fd(new_location, new_fd) < 0) {
+ if (lttng_userspace_probe_location_function_set_binary_fd_handle(new_location,
+ function_location->binary_fd_handle) < 0) {
goto destroy_probe_location;
}
lttng_userspace_probe_location_destroy(new_location);
destroy_lookup_method:
lttng_userspace_probe_location_lookup_method_destroy(lookup_method);
-close_fd:
- if (close(new_fd) < 0) {
- PERROR("Error closing duplicated file descriptor in error path");
- }
error:
new_location = NULL;
end:
const char *binary_path = NULL;
const char *probe_name = NULL;
const char *provider_name = NULL;
- int fd, new_fd;
+ struct lttng_userspace_probe_location_tracepoint *tracepoint_location;
assert(location);
assert(location->type == LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT);
+ tracepoint_location = container_of(
+ location, typeof(*tracepoint_location), parent);
- /* Get probe location fields */
+ /* Get probe location fields */
binary_path = lttng_userspace_probe_location_tracepoint_get_binary_path(location);
if (!binary_path) {
ERR("Userspace probe binary path is NULL");
goto error;
}
- /* Duplicate the binary fd */
- fd = lttng_userspace_probe_location_tracepoint_get_binary_fd(location);
- if (fd == -1) {
- ERR("Error getting file descriptor to binary");
- goto error;
- }
-
- new_fd = dup(fd);
- if (new_fd == -1) {
- PERROR("Error duplicating file descriptor to binary");
- goto error;
- }
-
/*
* Duplicate probe location method fields
*/
lttng_userspace_probe_location_lookup_method_tracepoint_sdt_copy(
location->lookup_method);
if (!lookup_method) {
- goto close_fd;
+ goto error;
}
break;
default:
/* Invalid probe location lookup method. */
- goto close_fd;
+ goto error;
}
/* Create the probe_location */
}
/* Set the duplicated fd to the new probe_location */
- if (lttng_userspace_probe_location_tracepoint_set_binary_fd(new_location, new_fd) < 0) {
+ if (lttng_userspace_probe_location_tracepoint_set_binary_fd_handle(new_location,
+ tracepoint_location->binary_fd_handle) < 0) {
goto destroy_probe_location;
}
lttng_userspace_probe_location_destroy(new_location);
destroy_lookup_method:
lttng_userspace_probe_location_lookup_method_destroy(lookup_method);
-close_fd:
- if (close(new_fd) < 0) {
- PERROR("Error closing duplicated file descriptor in error path");
- }
error:
new_location = NULL;
end:
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;
}
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;
}
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;
}
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;
}
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;
}
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);
- ret = function_location->binary_fd;
+ ret = function_location->binary_fd_handle ?
+ fd_handle_get_fd(function_location->binary_fd_handle) : -1;
end:
return ret;
}
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;
}
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;
}
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);
- ret = tracepoint_location->binary_fd;
+ ret = tracepoint_location->binary_fd_handle ?
+ fd_handle_get_fd(tracepoint_location->binary_fd_handle) : -1;
end:
return ret;
}
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;
}
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;
}
- 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;
}
- ret = lttng_payload_push_fd(
- payload, location_function->binary_fd);
+ ret = lttng_payload_push_fd_handle(
+ payload, location_function->binary_fd_handle);
if (ret) {
ret = -LTTNG_ERR_INVALID;
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;
}
- ret = lttng_payload_push_fd(
- payload, location_tracepoint->binary_fd);
+ ret = lttng_payload_push_fd_handle(
+ payload, location_tracepoint->binary_fd_handle);
if (ret) {
ret = -LTTNG_ERR_INVALID;
goto end;
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;
}
char *function_name = NULL, *binary_path = NULL;
int ret = 0;
size_t expected_size;
- const int binary_fd = lttng_payload_view_pop_fd(view);
+ struct fd_handle *binary_fd_handle = lttng_payload_view_pop_fd_handle(view);
assert(location);
- if (binary_fd < 0) {
- ret = -LTTNG_ERR_INVALID;
- goto end;
- }
-
if (view->buffer.size < sizeof(*location_function_comm)) {
ret = -LTTNG_ERR_INVALID;
goto end;
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;
}
- 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;
}
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) {
- const int close_ret = close(binary_fd);
-
- if (close_ret) {
- PERROR("Failed to close userspace probe function binary fd");
- }
ret = -LTTNG_ERR_INVALID;
goto end;
}
ret = (int) expected_size;
end:
+ fd_handle_put(binary_fd_handle);
free(function_name);
free(binary_path);
return ret;
char *probe_name = NULL, *provider_name = NULL, *binary_path = NULL;
int ret = 0;
size_t expected_size;
- const int binary_fd = lttng_payload_view_pop_fd(view);
+ struct fd_handle *binary_fd_handle = lttng_payload_view_pop_fd_handle(view);
assert(location);
- if (binary_fd < 0) {
+ if (!binary_fd_handle) {
ret = -LTTNG_ERR_INVALID;
goto end;
}
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;
}
- 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;
}
- 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;
}
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) {
- const int close_ret = close(binary_fd);
-
- if (close_ret) {
- PERROR("Failed to close userspace probe tracepoint binary fd");
- }
ret = -LTTNG_ERR_INVALID;
goto end;
}
ret = (int) expected_size;
end:
+ fd_handle_put(binary_fd_handle);
free(probe_name);
free(provider_name);
free(binary_path);
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;
+ 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;
- if (view->buffer.size <= sizeof(*probe_location_comm)) {
+ if (!lttng_payload_view_is_valid(&probe_location_comm_view)) {
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);
return ret;
}
-LTTNG_HIDDEN
-int lttng_userspace_probe_location_function_set_binary_fd(
- struct lttng_userspace_probe_location *location, int binary_fd)
+static
+int lttng_userspace_probe_location_function_set_binary_fd_handle(
+ struct lttng_userspace_probe_location *location,
+ struct fd_handle *binary_fd)
{
int ret = 0;
struct lttng_userspace_probe_location_function *function_location;
function_location = container_of(location,
struct lttng_userspace_probe_location_function, parent);
- if (function_location->binary_fd >= 0) {
- ret = close(function_location->binary_fd);
- if (ret) {
- PERROR("close");
- ret = -LTTNG_ERR_INVALID;
- goto end;
- }
- }
-
- function_location->binary_fd = binary_fd;
-end:
+ fd_handle_put(function_location->binary_fd_handle);
+ fd_handle_get(binary_fd);
+ function_location->binary_fd_handle = binary_fd;
return ret;
}
-LTTNG_HIDDEN
-int lttng_userspace_probe_location_tracepoint_set_binary_fd(
- struct lttng_userspace_probe_location *location, int binary_fd)
+static
+int lttng_userspace_probe_location_tracepoint_set_binary_fd_handle(
+ struct lttng_userspace_probe_location *location,
+ struct fd_handle *binary_fd)
{
int ret = 0;
struct lttng_userspace_probe_location_tracepoint *tracepoint_location;
tracepoint_location = container_of(location,
struct lttng_userspace_probe_location_tracepoint, parent);
- if (tracepoint_location->binary_fd >= 0) {
- ret = close(tracepoint_location->binary_fd);
- if (ret) {
- PERROR("close");
- ret = -LTTNG_ERR_INVALID;
- goto end;
- }
- }
-
- tracepoint_location->binary_fd = binary_fd;
-end:
+ fd_handle_put(tracepoint_location->binary_fd_handle);
+ fd_handle_get(binary_fd);
+ tracepoint_location->binary_fd_handle = binary_fd;
return ret;
}
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 = -1;
+ flat_probe.binary_fd_handle = NULL;
ret = lttng_dynamic_buffer_append(buffer, &flat_probe,
sizeof(flat_probe));
if (ret) {
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 = -1;
+ flat_probe.binary_fd_handle = NULL;
ret = lttng_dynamic_buffer_append(buffer, &flat_probe, sizeof(flat_probe));
if (ret) {
goto end;
projects / lttng-tools.git / blobdiff