Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I423545aa9de0521b861926b29e21b187500e5fd0
if (ret) {
PERROR("Failed to close lttng-sessiond command socket");
}
if (ret) {
PERROR("Failed to close lttng-sessiond command socket");
}
- }
- lttng_poll_clean(&handle->communication.events);
+ }
+ lttng_poll_clean(&handle->communication.events);
lttng_dynamic_buffer_reset(&handle->communication.buffer);
free(handle);
}
lttng_dynamic_buffer_reset(&handle->communication.buffer);
free(handle);
}
ret = lttng_poll_add(&handle->communication.events, sessiond_socket,
LPOLLIN | LPOLLHUP | LPOLLRDHUP | LPOLLERR);
ret = lttng_poll_add(&handle->communication.events, sessiond_socket,
LPOLLIN | LPOLLHUP | LPOLLRDHUP | LPOLLERR);
handle->communication.bytes_left_to_receive =
sizeof(struct lttcomm_lttng_msg);
handle->communication.bytes_left_to_receive =
sizeof(struct lttcomm_lttng_msg);
const bool has_timeout = timeout_ms > 0;
struct timespec initial_time;
const bool has_timeout = timeout_ms > 0;
struct timespec initial_time;
- if (handle->communication.state == COMMUNICATION_STATE_ERROR) {
+ if (handle->communication.state == COMMUNICATION_STATE_ERROR) {
status = LTTNG_CLEAR_HANDLE_STATUS_ERROR;
goto end;
} else if (handle->communication.state == COMMUNICATION_STATE_END) {
status = LTTNG_CLEAR_HANDLE_STATUS_COMPLETED;
goto end;
}
status = LTTNG_CLEAR_HANDLE_STATUS_ERROR;
goto end;
} else if (handle->communication.state == COMMUNICATION_STATE_END) {
status = LTTNG_CLEAR_HANDLE_STATUS_COMPLETED;
goto end;
}
ret = lttng_clock_gettime(CLOCK_MONOTONIC, &initial_time);
if (ret) {
status = LTTNG_CLEAR_HANDLE_STATUS_ERROR;
goto end;
}
time_left_ms = (unsigned long) timeout_ms;
ret = lttng_clock_gettime(CLOCK_MONOTONIC, &initial_time);
if (ret) {
status = LTTNG_CLEAR_HANDLE_STATUS_ERROR;
goto end;
}
time_left_ms = (unsigned long) timeout_ms;
- while (handle->communication.state != COMMUNICATION_STATE_END &&
+ while (handle->communication.state != COMMUNICATION_STATE_END &&
(time_left_ms || !has_timeout)) {
int ret;
uint32_t revents;
(time_left_ms || !has_timeout)) {
int ret;
uint32_t revents;
- struct timespec current_time, diff;
+ struct timespec current_time, diff;
- ret = lttng_poll_wait(&handle->communication.events,
+ ret = lttng_poll_wait(&handle->communication.events,
has_timeout ? time_left_ms : -1);
has_timeout ? time_left_ms : -1);
/* timeout */
break;
} else if (ret < 0) {
/* timeout */
break;
} else if (ret < 0) {