X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=a9f9967a3b49ee04d3fab5beba7b3d27c268c627;hb=e32d7f274604b77bcd83c24994e88df3761ed658;hp=3256a1e9b6581899380cb47f16cb35b10a90b32c;hpb=ed1e52a3cc41925b701cd1343ace4c450ff836d9;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 3256a1e9b..a9f9967a3 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -431,7 +431,12 @@ end:
 		session->rotation_pending_local = false;
 	}
 	if (ret) {
-		session->rotation_state = LTTNG_ROTATION_STATE_ERROR;
+		ret = session_reset_rotation_state(session,
+				LTTNG_ROTATION_STATE_ERROR);
+		if (ret) {
+			ERR("Failed to reset rotation state of session \"%s\"",
+					session->name);
+		}
 	}
 	return 0;
 }
@@ -491,14 +496,19 @@ int check_session_rotation_pending_relay(struct ltt_session *session)
 		ERR("[rotation-thread] Encountered an error when checking if rotation of trace archive %" PRIu64 " of session \"%s\" is pending on the relay",
 				session->current_archive_id - 1,
 				session->name);
-		session->rotation_state = LTTNG_ROTATION_STATE_ERROR;
+		ret = session_reset_rotation_state(session,
+				LTTNG_ROTATION_STATE_ERROR);
+		if (ret) {
+			ERR("Failed to reset rotation state of session \"%s\"",
+					session->name);
+		}
 		rotation_completed = false;
 	}
 
 	rcu_read_unlock();
 
 	if (rotation_completed) {
-		DBG("[rotation-thread] Totation of trace archive %" PRIu64 " of session \"%s\" is complete on the relay",
+		DBG("[rotation-thread] Rotation of trace archive %" PRIu64 " of session \"%s\" is complete on the relay",
 				session->current_archive_id - 1,
 				session->name);
 		session->rotation_pending_relay = false;
@@ -555,7 +565,12 @@ int check_session_rotation_pending(struct ltt_session *session,
 	/* Rename the completed trace archive's location. */
 	now = time(NULL);
 	if (now == (time_t) -1) {
-		session->rotation_state = LTTNG_ROTATION_STATE_ERROR;
+		ret = session_reset_rotation_state(session,
+				LTTNG_ROTATION_STATE_ERROR);
+		if (ret) {
+			ERR("Failed to reset rotation state of session \"%s\"",
+					session->name);
+		}
 		ret = LTTNG_ERR_UNK;
 		goto end;
 	}
@@ -691,7 +706,6 @@ int handle_job_queue(struct rotation_thread_handle *handle,
 {
 	int ret = 0;
 	int fd = lttng_pipe_get_readfd(queue->event_pipe);
-	struct ltt_session *session;
 	char buf;
 
 	ret = lttng_read(fd, &buf, 1);
@@ -702,6 +716,7 @@ int handle_job_queue(struct rotation_thread_handle *handle,
 	}
 
 	for (;;) {
+		struct ltt_session *session;
 		struct rotation_thread_job *job;
 
 		/* Take the queue lock only to pop an element from the list. */
@@ -732,12 +747,14 @@ int handle_job_queue(struct rotation_thread_handle *handle,
 			 */
 			session_unlock_list();
 			free(job);
+			session_put(session);
 			continue;
 		}
 
 		session_lock(session);
 	        ret = run_job(job, session, handle->notification_thread_handle);
 		session_unlock(session);
+		session_put(session);
 		session_unlock_list();
 		free(job);
 		if (ret) {
@@ -826,6 +843,7 @@ int handle_condition(const struct lttng_condition *condition,
 
 end_unlock:
 	session_unlock(session);
+	session_put(session);
 end:
 	return ret;
 }
@@ -845,7 +863,7 @@ int handle_notification_channel(int fd,
 	status = lttng_notification_channel_has_pending_notification(
 			rotate_notification_channel, &notification_pending);
 	if (status != LTTNG_NOTIFICATION_CHANNEL_STATUS_OK) {
-		ERR("[rotation-thread ]Error occured while checking for pending notification");
+		ERR("[rotation-thread ]Error occurred while checking for pending notification");
 		ret = -1;
 		goto end;
 	}
@@ -963,7 +981,7 @@ void *thread_rotation(void *data)
 				ret = handle_notification_channel(fd, handle,
 						&thread);
 				if (ret) {
-					ERR("[rotation-thread] Error occured while handling activity on notification channel socket");
+					ERR("[rotation-thread] Error occurred while handling activity on notification channel socket");
 					goto error;
 				}
 			}