Skip to content

Commit 0359c1e

Browse files
committed
Revert "module_main: make module_stdout_mutex recursive"
This reverts commit 3e5c5b7. We are not actually supposed to call module_report_event_begin/end inside module_speak... Better make the module hang (which is easy to see in gdb) rather than the server hang (which requires understanding that begin/end can only happen after the 200 ack).
1 parent 28f8f2d commit 0359c1e

1 file changed

Lines changed: 1 addition & 7 deletions

File tree

src/modules/module_main.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* module_main.c - Main file of output modules.
33
*
4-
* Copyright (C) 2020-2021, 2025 Samuel Thibault <samuel.thibault@ens-lyon.org>
4+
* Copyright (C) 2020-2021 Samuel Thibault <samuel.thibault@ens-lyon.org>
55
* All rights reserved.
66
*
77
* Redistribution and use in source and binary forms, with or without
@@ -42,16 +42,10 @@ int main(int argc, char *argv[])
4242
char *configfile = NULL;
4343
char *line, *msg = NULL;
4444
int ret;
45-
pthread_mutexattr_t attr;
4645

4746
if (argc >= 2)
4847
configfile = argv[1];
4948

50-
/* To make it convenient for some async modules to make some sync calls. */
51-
pthread_mutexattr_init(&attr);
52-
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
53-
pthread_mutex_init(&module_stdout_mutex, &attr);
54-
5549
/* Read configuration */
5650
ret = module_config(configfile);
5751
if (ret) {

0 commit comments

Comments
 (0)