projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove run-as compat wrapper from internal code
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index 578ab2ffad92329b584c5494e5b51135635e5c1f..2752e9ff37be7f142a76eebd902a51a530c14217 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-760,12
+760,6
@@
static void sessiond_cleanup_options(void)
free(kmod_extra_probes_list);
run_as_destroy_worker();
free(kmod_extra_probes_list);
run_as_destroy_worker();
-
- /* <fun> */
- DBG("%c[%d;%dm*** assert failed :-) *** ==> %c[%dm%c[%d;%dm"
- "Matthew, BEET driven development works!%c[%dm",
- 27, 1, 31, 27, 0, 27, 1, 33, 27, 0);
- /* </fun> */
}
/*
}
/*
@@
-1357,7
+1351,6
@@
restart:
consumer_data->metadata_sock.lock = zmalloc(sizeof(pthread_mutex_t));
if (consumer_data->metadata_sock.lock == NULL) {
PERROR("zmalloc pthread mutex");
consumer_data->metadata_sock.lock = zmalloc(sizeof(pthread_mutex_t));
if (consumer_data->metadata_sock.lock == NULL) {
PERROR("zmalloc pthread mutex");
- ret = -1;
goto error;
}
pthread_mutex_init(consumer_data->metadata_sock.lock, NULL);
goto error;
}
pthread_mutex_init(consumer_data->metadata_sock.lock, NULL);
@@
-2202,10
+2195,12
@@
static void *thread_registration_apps(void *data)
* lttcomm_setsockopt_snd_timeout expect msec as
* parameter.
*/
* lttcomm_setsockopt_snd_timeout expect msec as
* parameter.
*/
- (void) lttcomm_setsockopt_rcv_timeout(sock,
- app_socket_timeout * 1000);
- (void) lttcomm_setsockopt_snd_timeout(sock,
- app_socket_timeout * 1000);
+ if (app_socket_timeout >= 0) {
+ (void) lttcomm_setsockopt_rcv_timeout(sock,
+ app_socket_timeout * 1000);
+ (void) lttcomm_setsockopt_snd_timeout(sock,
+ app_socket_timeout * 1000);
+ }
/*
* Set the CLOEXEC flag. Return code is useless because
/*
* Set the CLOEXEC flag. Return code is useless because
@@
-2366,8
+2361,8
@@
static int spawn_consumer_thread(struct consumer_data *consumer_data)
goto error;
}
goto error;
}
- ret = pthread_create(&consumer_data->thread,
NULL, thread_manage_consumer
,
- consumer_data);
+ ret = pthread_create(&consumer_data->thread,
default_pthread_attr()
,
+
thread_manage_consumer,
consumer_data);
if (ret) {
errno = ret;
PERROR("pthread_create consumer");
if (ret) {
errno = ret;
PERROR("pthread_create consumer");
@@
-2379,7
+2374,7
@@
static int spawn_consumer_thread(struct consumer_data *consumer_data)
pthread_mutex_lock(&consumer_data->cond_mutex);
/* Get time for sem_timedwait absolute timeout */
pthread_mutex_lock(&consumer_data->cond_mutex);
/* Get time for sem_timedwait absolute timeout */
- clock_ret = clock_gettime(CLOCK_MONOTONIC, &timeout);
+ clock_ret =
lttng_
clock_gettime(CLOCK_MONOTONIC, &timeout);
/*
* Set the timeout for the condition timed wait even if the clock gettime
* call fails since we might loop on that call and we want to avoid to
/*
* Set the timeout for the condition timed wait even if the clock gettime
* call fails since we might loop on that call and we want to avoid to
@@
-3004,7
+2999,8
@@
static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
case LTTNG_SNAPSHOT_RECORD:
case LTTNG_SAVE_SESSION:
case LTTNG_SET_SESSION_SHM_PATH:
case LTTNG_SNAPSHOT_RECORD:
case LTTNG_SAVE_SESSION:
case LTTNG_SET_SESSION_SHM_PATH:
- case LTTNG_METADATA_REGENERATE:
+ case LTTNG_REGENERATE_METADATA:
+ case LTTNG_REGENERATE_STATEDUMP:
need_domain = 0;
break;
default:
need_domain = 0;
break;
default:
@@
-3062,7
+3058,6
@@
static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
case LTTNG_CREATE_SESSION:
case LTTNG_CREATE_SESSION_SNAPSHOT:
case LTTNG_CREATE_SESSION_LIVE:
case LTTNG_CREATE_SESSION:
case LTTNG_CREATE_SESSION_SNAPSHOT:
case LTTNG_CREATE_SESSION_LIVE:
- case LTTNG_CALIBRATE:
case LTTNG_LIST_SESSIONS:
case LTTNG_LIST_TRACEPOINTS:
case LTTNG_LIST_SYSCALLS:
case LTTNG_LIST_SESSIONS:
case LTTNG_LIST_TRACEPOINTS:
case LTTNG_LIST_SYSCALLS:
@@
-3904,12
+3899,6
@@
error_add_context:
ret = LTTNG_OK;
break;
}
ret = LTTNG_OK;
break;
}
- case LTTNG_CALIBRATE:
- {
- ret = cmd_calibrate(cmd_ctx->lsm->domain.type,
- &cmd_ctx->lsm->u.calibrate);
- break;
- }
case LTTNG_REGISTER_CONSUMER:
{
struct consumer_data *cdata;
case LTTNG_REGISTER_CONSUMER:
{
struct consumer_data *cdata;
@@
-4115,9
+4104,14
@@
error_add_context:
cmd_ctx->lsm->u.set_shm_path.shm_path);
break;
}
cmd_ctx->lsm->u.set_shm_path.shm_path);
break;
}
- case LTTNG_METADATA_REGENERATE:
+ case LTTNG_REGENERATE_METADATA:
+ {
+ ret = cmd_regenerate_metadata(cmd_ctx->session);
+ break;
+ }
+ case LTTNG_REGENERATE_STATEDUMP:
{
{
- ret = cmd_
metadata_regenerate
(cmd_ctx->session);
+ ret = cmd_
regenerate_statedump
(cmd_ctx->session);
break;
}
default:
break;
}
default:
@@
-4286,7
+4280,6
@@
restart:
if (ret) {
PERROR("close");
}
if (ret) {
PERROR("close");
}
- new_sock = -1;
continue;
}
continue;
}
@@
-4315,7
+4308,6
@@
restart:
if (ret) {
PERROR("close");
}
if (ret) {
PERROR("close");
}
- new_sock = -1;
}
exit:
}
exit:
@@
-5371,9
+5363,6
@@
error:
static void sighandler(int sig)
{
switch (sig) {
static void sighandler(int sig)
{
switch (sig) {
- case SIGPIPE:
- DBG("SIGPIPE caught");
- return;
case SIGINT:
DBG("SIGINT caught");
stop_threads();
case SIGINT:
DBG("SIGINT caught");
stop_threads();
@@
-5405,9
+5394,10
@@
static int set_signal_handler(void)
return ret;
}
return ret;
}
- sa.sa_handler = sighandler;
sa.sa_mask = sigset;
sa.sa_flags = 0;
sa.sa_mask = sigset;
sa.sa_flags = 0;
+
+ sa.sa_handler = sighandler;
if ((ret = sigaction(SIGTERM, &sa, NULL)) < 0) {
PERROR("sigaction");
return ret;
if ((ret = sigaction(SIGTERM, &sa, NULL)) < 0) {
PERROR("sigaction");
return ret;
@@
-5418,12
+5408,13
@@
static int set_signal_handler(void)
return ret;
}
return ret;
}
- if ((ret = sigaction(SIG
PIPE
, &sa, NULL)) < 0) {
+ if ((ret = sigaction(SIG
USR1
, &sa, NULL)) < 0) {
PERROR("sigaction");
return ret;
}
PERROR("sigaction");
return ret;
}
- if ((ret = sigaction(SIGUSR1, &sa, NULL)) < 0) {
+ sa.sa_handler = SIG_IGN;
+ if ((ret = sigaction(SIGPIPE, &sa, NULL)) < 0) {
PERROR("sigaction");
return ret;
}
PERROR("sigaction");
return ret;
}
@@
-5980,7
+5971,7
@@
int main(int argc, char **argv)
load_info->path = opt_load_session_path;
/* Create health-check thread */
load_info->path = opt_load_session_path;
/* Create health-check thread */
- ret = pthread_create(&health_thread,
NULL
,
+ ret = pthread_create(&health_thread,
default_pthread_attr()
,
thread_manage_health, (void *) NULL);
if (ret) {
errno = ret;
thread_manage_health, (void *) NULL);
if (ret) {
errno = ret;
@@
-5990,7
+5981,7
@@
int main(int argc, char **argv)
}
/* Create thread to manage the client socket */
}
/* Create thread to manage the client socket */
- ret = pthread_create(&client_thread,
NULL
,
+ ret = pthread_create(&client_thread,
default_pthread_attr()
,
thread_manage_clients, (void *) NULL);
if (ret) {
errno = ret;
thread_manage_clients, (void *) NULL);
if (ret) {
errno = ret;
@@
-6000,7
+5991,7
@@
int main(int argc, char **argv)
}
/* Create thread to dispatch registration */
}
/* Create thread to dispatch registration */
- ret = pthread_create(&dispatch_thread,
NULL
,
+ ret = pthread_create(&dispatch_thread,
default_pthread_attr()
,
thread_dispatch_ust_registration, (void *) NULL);
if (ret) {
errno = ret;
thread_dispatch_ust_registration, (void *) NULL);
if (ret) {
errno = ret;
@@
-6010,7
+6001,7
@@
int main(int argc, char **argv)
}
/* Create thread to manage application registration. */
}
/* Create thread to manage application registration. */
- ret = pthread_create(®_apps_thread,
NULL
,
+ ret = pthread_create(®_apps_thread,
default_pthread_attr()
,
thread_registration_apps, (void *) NULL);
if (ret) {
errno = ret;
thread_registration_apps, (void *) NULL);
if (ret) {
errno = ret;
@@
-6020,7
+6011,7
@@
int main(int argc, char **argv)
}
/* Create thread to manage application socket */
}
/* Create thread to manage application socket */
- ret = pthread_create(&apps_thread,
NULL
,
+ ret = pthread_create(&apps_thread,
default_pthread_attr()
,
thread_manage_apps, (void *) NULL);
if (ret) {
errno = ret;
thread_manage_apps, (void *) NULL);
if (ret) {
errno = ret;
@@
-6030,7
+6021,7
@@
int main(int argc, char **argv)
}
/* Create thread to manage application notify socket */
}
/* Create thread to manage application notify socket */
- ret = pthread_create(&apps_notify_thread,
NULL
,
+ ret = pthread_create(&apps_notify_thread,
default_pthread_attr()
,
ust_thread_manage_notify, (void *) NULL);
if (ret) {
errno = ret;
ust_thread_manage_notify, (void *) NULL);
if (ret) {
errno = ret;
@@
-6040,7
+6031,7
@@
int main(int argc, char **argv)
}
/* Create agent registration thread. */
}
/* Create agent registration thread. */
- ret = pthread_create(&agent_reg_thread,
NULL
,
+ ret = pthread_create(&agent_reg_thread,
default_pthread_attr()
,
agent_thread_manage_registration, (void *) NULL);
if (ret) {
errno = ret;
agent_thread_manage_registration, (void *) NULL);
if (ret) {
errno = ret;
@@
-6052,7
+6043,7
@@
int main(int argc, char **argv)
/* Don't start this thread if kernel tracing is not requested nor root */
if (is_root && !opt_no_kernel) {
/* Create kernel thread to manage kernel event */
/* Don't start this thread if kernel tracing is not requested nor root */
if (is_root && !opt_no_kernel) {
/* Create kernel thread to manage kernel event */
- ret = pthread_create(&kernel_thread,
NULL
,
+ ret = pthread_create(&kernel_thread,
default_pthread_attr()
,
thread_manage_kernel, (void *) NULL);
if (ret) {
errno = ret;
thread_manage_kernel, (void *) NULL);
if (ret) {
errno = ret;
@@
-6063,8
+6054,8
@@
int main(int argc, char **argv)
}
/* Create session loading thread. */
}
/* Create session loading thread. */
- ret = pthread_create(&load_session_thread,
NULL, thread_load_session
,
- load_info);
+ ret = pthread_create(&load_session_thread,
default_pthread_attr()
,
+
thread_load_session,
load_info);
if (ret) {
errno = ret;
PERROR("pthread_create load_session_thread");
if (ret) {
errno = ret;
PERROR("pthread_create load_session_thread");
This page took
0.028284 seconds
and
4
git commands to generate.