koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use pthread on OpenBSD

Browse Source 
since OpenBSD pthread does not support pthread_condattr_setpshared().
This patch could also stay in the OpenBSD ports tree or depend on a
configure test macro rather than defined __OpenBSD__.
This commit is contained in:
Christopher Zimmermann
2016-06-11 13:05:29 +02:00
parent 87e90229bc
commit 1322af1e4f
4 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/log.c
View File

@ -20,7 +20,9 @@
#include <sys/mman.h>
#include <sys/stat.h>
#include <errno.h>
#if !defined(__OpenBSD__)
#include <pthread.h>
#endif
#include "util.h"
#include "log.h"
@ -157,11 +159,13 @@ void open_logbuffer(void) {
header = (i3_shmlog_header *)logbuffer;
#if !defined(__OpenBSD__)
pthread_condattr_t cond_attr;
pthread_condattr_init(&cond_attr);
if (pthread_condattr_setpshared(&cond_attr, PTHREAD_PROCESS_SHARED) != 0)
fprintf(stderr, "pthread_condattr_setpshared() failed, i3-dump-log -f will not work!\n");
pthread_cond_init(&(header->condvar), &cond_attr);
#endif
logwalk = logbuffer + sizeof(i3_shmlog_header);
loglastwrap = logbuffer + logbuffer_size;
@ -277,8 +281,10 @@ static void vlog(const bool print, const char *fmt, va_list args) {
store_log_markers();
#if !defined(__OpenBSD__)
/* Wake up all (i3-dump-log) processes waiting for condvar. */
pthread_cond_broadcast(&(header->condvar));
#endif
if (print)
fwrite(message, len, 1, stdout);