projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build: Replace use of deprecated AM_PATH_XML2
[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 afd0cc6e14f3cdf5d9ff6793ad4c0d60b917adcc..5e19f379fbb05675a7d809d7878caa39c5c82b18 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);
@@
-2379,7
+2372,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
@@
-3005,6
+2998,7
@@
static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
case LTTNG_SAVE_SESSION:
case LTTNG_SET_SESSION_SHM_PATH:
case LTTNG_REGENERATE_METADATA:
case LTTNG_SAVE_SESSION:
case LTTNG_SET_SESSION_SHM_PATH:
case LTTNG_REGENERATE_METADATA:
+ case LTTNG_REGENERATE_STATEDUMP:
need_domain = 0;
break;
default:
need_domain = 0;
break;
default:
@@
-4120,6
+4114,11
@@
error_add_context:
ret = cmd_regenerate_metadata(cmd_ctx->session);
break;
}
ret = cmd_regenerate_metadata(cmd_ctx->session);
break;
}
+ case LTTNG_REGENERATE_STATEDUMP:
+ {
+ ret = cmd_regenerate_statedump(cmd_ctx->session);
+ break;
+ }
default:
ret = LTTNG_ERR_UND;
break;
default:
ret = LTTNG_ERR_UND;
break;
@@
-4286,7
+4285,6
@@
restart:
if (ret) {
PERROR("close");
}
if (ret) {
PERROR("close");
}
- new_sock = -1;
continue;
}
continue;
}
@@
-4315,7
+4313,6
@@
restart:
if (ret) {
PERROR("close");
}
if (ret) {
PERROR("close");
}
- new_sock = -1;
}
exit:
}
exit:
This page took
0.0258 seconds
and
5
git commands to generate.