projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Force usage of assert() condition when NDEBUG is defined
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
rotation-thread.c
diff --git
a/src/bin/lttng-sessiond/rotation-thread.c
b/src/bin/lttng-sessiond/rotation-thread.c
index 89a148a74c2bdd1393bb274afb4ae9f0f545caa1..3373443f099bfaf064af8774f7fb92f3f7fb3e0d 100644
(file)
--- a/
src/bin/lttng-sessiond/rotation-thread.c
+++ b/
src/bin/lttng-sessiond/rotation-thread.c
@@
-24,6
+24,7
@@
#include <common/kernel-ctl/kernel-ctl.h>
#include <lttng/notification/channel-internal.h>
#include <lttng/rotate-internal.h>
#include <common/kernel-ctl/kernel-ctl.h>
#include <lttng/notification/channel-internal.h>
#include <lttng/rotate-internal.h>
+#include <lttng/location-internal.h>
#include "rotation-thread.h"
#include "lttng-sessiond.h"
#include "rotation-thread.h"
#include "lttng-sessiond.h"
@@
-110,7
+111,7
@@
void rotation_thread_timer_queue_destroy(
lttng_pipe_destroy(queue->event_pipe);
pthread_mutex_lock(&queue->lock);
lttng_pipe_destroy(queue->event_pipe);
pthread_mutex_lock(&queue->lock);
-
assert
(cds_list_empty(&queue->list));
+
LTTNG_ASSERT
(cds_list_empty(&queue->list));
pthread_mutex_unlock(&queue->lock);
pthread_mutex_destroy(&queue->lock);
free(queue);
pthread_mutex_unlock(&queue->lock);
pthread_mutex_destroy(&queue->lock);
free(queue);
@@
-324,7
+325,7
@@
void check_session_rotation_pending_on_consumers(struct ltt_session *session,
bool chunk_exists_on_peer = false;
enum lttng_trace_chunk_status chunk_status;
bool chunk_exists_on_peer = false;
enum lttng_trace_chunk_status chunk_status;
-
assert
(session->chunk_being_archived);
+
LTTNG_ASSERT
(session->chunk_being_archived);
/*
* Check for a local pending rotation on all consumers (32-bit
/*
* Check for a local pending rotation on all consumers (32-bit
@@
-397,7
+398,7
@@
end:
chunk_status = lttng_trace_chunk_get_id(
session->chunk_being_archived,
&chunk_being_archived_id);
chunk_status = lttng_trace_chunk_get_id(
session->chunk_being_archived,
&chunk_being_archived_id);
-
assert
(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
+
LTTNG_ASSERT
(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
DBG("Rotation of trace archive %" PRIu64 " of session \"%s\" is complete on all consumers",
chunk_being_archived_id,
session->name);
DBG("Rotation of trace archive %" PRIu64 " of session \"%s\" is complete on all consumers",
chunk_being_archived_id,
session->name);
@@
-436,7
+437,7
@@
int check_session_rotation_pending(struct ltt_session *session,
chunk_status = lttng_trace_chunk_get_id(session->chunk_being_archived,
&chunk_being_archived_id);
chunk_status = lttng_trace_chunk_get_id(session->chunk_being_archived,
&chunk_being_archived_id);
-
assert
(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
+
LTTNG_ASSERT
(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
DBG("Checking for pending rotation on session \"%s\", trace archive %" PRIu64,
session->name, chunk_being_archived_id);
DBG("Checking for pending rotation on session \"%s\", trace archive %" PRIu64,
session->name, chunk_being_archived_id);
@@
-467,7
+468,7
@@
int check_session_rotation_pending(struct ltt_session *session,
*/
chunk_status = lttng_trace_chunk_get_name(session->chunk_being_archived,
&archived_chunk_name, NULL);
*/
chunk_status = lttng_trace_chunk_get_name(session->chunk_being_archived,
&archived_chunk_name, NULL);
-
assert
(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
+
LTTNG_ASSERT
(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
free(session->last_archived_chunk_name);
session->last_archived_chunk_name = strdup(archived_chunk_name);
if (!session->last_archived_chunk_name) {
free(session->last_archived_chunk_name);
session->last_archived_chunk_name = strdup(archived_chunk_name);
if (!session->last_archived_chunk_name) {
@@
-477,7
+478,6
@@
int check_session_rotation_pending(struct ltt_session *session,
if (!session->quiet_rotation) {
location = session_get_trace_archive_location(session);
if (!session->quiet_rotation) {
location = session_get_trace_archive_location(session);
- /* Ownership of location is transferred. */
ret = notification_thread_command_session_rotation_completed(
notification_thread_handle,
session->name,
ret = notification_thread_command_session_rotation_completed(
notification_thread_handle,
session->name,
@@
-485,6
+485,7
@@
int check_session_rotation_pending(struct ltt_session *session,
session->gid,
session->last_archived_chunk_id.value,
location);
session->gid,
session->last_archived_chunk_id.value,
location);
+ lttng_trace_archive_location_put(location);
if (ret != LTTNG_OK) {
ERR("Failed to notify notification thread of completed rotation for session %s",
session->name);
if (ret != LTTNG_OK) {
ERR("Failed to notify notification thread of completed rotation for session %s",
session->name);
@@
-497,7
+498,7
@@
check_ongoing_rotation:
chunk_status = lttng_trace_chunk_get_id(
session->chunk_being_archived,
&chunk_being_archived_id);
chunk_status = lttng_trace_chunk_get_id(
session->chunk_being_archived,
&chunk_being_archived_id);
-
assert
(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
+
LTTNG_ASSERT
(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
DBG("Rotation of trace archive %" PRIu64 " is still pending for session %s",
chunk_being_archived_id, session->name);
DBG("Rotation of trace archive %" PRIu64 " is still pending for session %s",
chunk_being_archived_id, session->name);
This page took
0.025298 seconds
and
4
git commands to generate.