projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Set thread stack size to ulimit soft value
[lttng-tools.git]
/
src
/
bin
/
lttng-consumerd
/
lttng-consumerd.c
diff --git
a/src/bin/lttng-consumerd/lttng-consumerd.c
b/src/bin/lttng-consumerd/lttng-consumerd.c
index 7ecbe7a3439a9f148719289a703da8014968357a..1636b9c0d22777798ff220df010c4bc5ca6c9634 100644
(file)
--- a/
src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/
src/bin/lttng-consumerd/lttng-consumerd.c
@@
-16,7
+16,6
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <fcntl.h>
#include <getopt.h>
#define _LGPL_SOURCE
#include <fcntl.h>
#include <getopt.h>
@@
-38,14
+37,13
@@
#include <unistd.h>
#include <sys/mman.h>
#include <assert.h>
#include <unistd.h>
#include <sys/mman.h>
#include <assert.h>
-#include <config.h>
#include <urcu/compiler.h>
#include <ulimit.h>
#include <common/defaults.h>
#include <common/common.h>
#include <urcu/compiler.h>
#include <ulimit.h>
#include <common/defaults.h>
#include <common/common.h>
-#include <common/consumer.h>
-#include <common/consumer-timer.h>
+#include <common/consumer
/consumer
.h>
+#include <common/consumer
/consumer
-timer.h>
#include <common/compat/poll.h>
#include <common/compat/getenv.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/compat/poll.h>
#include <common/compat/getenv.h>
#include <common/sessiond-comm/sessiond-comm.h>
@@
-103,7
+101,7
@@
static void sighandler(int sig)
/*
* Ignore SIGPIPE because it should not stop the consumer whenever a
/*
* Ignore SIGPIPE because it should not stop the consumer whenever a
- * SIGPIPE is ca
tched
through a FD operation.
+ * SIGPIPE is ca
ught
through a FD operation.
*/
if (sig == SIGPIPE) {
return;
*/
if (sig == SIGPIPE) {
return;
@@
-364,12
+362,6
@@
int main(int argc, char **argv)
goto exit_health_consumerd_cleanup;
}
goto exit_health_consumerd_cleanup;
}
- /* Set up max poll set size */
- if (lttng_poll_set_max_size()) {
- retval = -1;
- goto exit_init_data;
- }
-
if (*command_sock_path == '\0') {
switch (opt_type) {
case LTTNG_CONSUMER_KERNEL:
if (*command_sock_path == '\0') {
switch (opt_type) {
case LTTNG_CONSUMER_KERNEL:
@@
-500,7
+492,7
@@
int main(int argc, char **argv)
}
/* Create thread to manage the client socket */
}
/* Create thread to manage the client socket */
- 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;
@@
-519,7
+511,7
@@
int main(int argc, char **argv)
cmm_smp_mb(); /* Read ready before following operations */
/* Create thread to manage channels */
cmm_smp_mb(); /* Read ready before following operations */
/* Create thread to manage channels */
- ret = pthread_create(&channel_thread,
NULL
,
+ ret = pthread_create(&channel_thread,
default_pthread_attr()
,
consumer_thread_channel_poll,
(void *) ctx);
if (ret) {
consumer_thread_channel_poll,
(void *) ctx);
if (ret) {
@@
-530,7
+522,7
@@
int main(int argc, char **argv)
}
/* Create thread to manage the polling/writing of trace metadata */
}
/* Create thread to manage the polling/writing of trace metadata */
- ret = pthread_create(&metadata_thread,
NULL
,
+ ret = pthread_create(&metadata_thread,
default_pthread_attr()
,
consumer_thread_metadata_poll,
(void *) ctx);
if (ret) {
consumer_thread_metadata_poll,
(void *) ctx);
if (ret) {
@@
-541,8
+533,8
@@
int main(int argc, char **argv)
}
/* Create thread to manage the polling/writing of trace data */
}
/* Create thread to manage the polling/writing of trace data */
- ret = pthread_create(&data_thread,
NULL, consumer_thread_data_poll
,
- (void *) ctx);
+ ret = pthread_create(&data_thread,
default_pthread_attr()
,
+
consumer_thread_data_poll,
(void *) ctx);
if (ret) {
errno = ret;
PERROR("pthread_create");
if (ret) {
errno = ret;
PERROR("pthread_create");
@@
-551,7
+543,7
@@
int main(int argc, char **argv)
}
/* Create the thread to manage the receive of fd */
}
/* Create the thread to manage the receive of fd */
- ret = pthread_create(&sessiond_thread,
NULL
,
+ ret = pthread_create(&sessiond_thread,
default_pthread_attr()
,
consumer_thread_sessiond_poll,
(void *) ctx);
if (ret) {
consumer_thread_sessiond_poll,
(void *) ctx);
if (ret) {
@@
-565,7
+557,7
@@
int main(int argc, char **argv)
* Create the thread to manage the UST metadata periodic timer and
* live timer.
*/
* Create the thread to manage the UST metadata periodic timer and
* live timer.
*/
- ret = pthread_create(&metadata_timer_thread,
NULL
,
+ ret = pthread_create(&metadata_timer_thread,
default_pthread_attr()
,
consumer_timer_thread, (void *) ctx);
if (ret) {
errno = ret;
consumer_timer_thread, (void *) ctx);
if (ret) {
errno = ret;
@@
-642,13
+634,14
@@
exit_init_data:
if (health_consumerd) {
health_app_destroy(health_consumerd);
}
if (health_consumerd) {
health_app_destroy(health_consumerd);
}
-exit_health_consumerd_cleanup:
+ /* Ensure all prior call_rcu are done. */
+ rcu_barrier();
-exit_options:
+ run_as_destroy_worker();
+exit_health_consumerd_cleanup:
+exit_options:
exit_set_signal_handler:
exit_set_signal_handler:
- /* Ensure all prior call_rcu are done. */
- rcu_barrier();
if (!retval) {
exit(EXIT_SUCCESS);
if (!retval) {
exit(EXIT_SUCCESS);
This page took
0.025591 seconds
and
4
git commands to generate.