/*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- * Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- * 2013 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <signal.h>
struct thread_notifiers {
struct lttng_pipe *quit_pipe;
struct consumer_data *consumer_data;
- sem_t ready;
+ sem_t ready;
int initialization_result;
};
static void mark_thread_intialization_as_failed(
struct thread_notifiers *notifiers)
{
- ERR("Consumer management thread entering error state");
+ ERR("Consumer management thread entering error state");
notifiers->initialization_result = -1;
sem_post(¬ifiers->ready);
}
/*
* This thread manage the consumer error sent back to the session daemon.
*/
-void *thread_consumer_management(void *data)
+static void *thread_consumer_management(void *data)
{
int sock = -1, i, ret, pollfd, err = -1, should_quit = 0;
uint32_t revents, nb_fd;
rcu_register_thread();
rcu_thread_online();
- health_register(health_sessiond, HEALTH_SESSIOND_TYPE_CONSUMER);
+ health_register(the_health_sessiond, HEALTH_SESSIOND_TYPE_CONSUMER);
health_code_update();
cmd_socket_wrapper->lock = &consumer_data->lock;
pthread_mutex_lock(cmd_socket_wrapper->lock);
- ret = consumer_init(cmd_socket_wrapper, sessiond_uuid);
+ ret = consumer_init(cmd_socket_wrapper, the_sessiond_uuid);
if (ret) {
ERR("Failed to send sessiond uuid to consumer daemon");
mark_thread_intialization_as_failed(notifiers);
/* Immediately set the consumerd state to stopped */
if (consumer_data->type == LTTNG_CONSUMER_KERNEL) {
- uatomic_set(&kernel_consumerd_state, CONSUMER_ERROR);
+ uatomic_set(&the_kernel_consumerd_state, CONSUMER_ERROR);
} else if (consumer_data->type == LTTNG_CONSUMER64_UST ||
consumer_data->type == LTTNG_CONSUMER32_UST) {
- uatomic_set(&ust_consumerd_state, CONSUMER_ERROR);
+ uatomic_set(&the_ust_consumerd_state, CONSUMER_ERROR);
} else {
/* Code flow error... */
- assert(0);
+ abort();
}
if (consumer_data->err_sock >= 0) {
health_error();
ERR("Health error occurred in %s", __func__);
}
- health_unregister(health_sessiond);
+ health_unregister(the_health_sessiond);
DBG("consumer thread cleanup completed");
rcu_thread_offline();