summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--runtime/stream.c7
-rw-r--r--runtime/wti.c1
2 files changed, 5 insertions, 3 deletions
diff --git a/runtime/stream.c b/runtime/stream.c
index a0571a61..605a9771 100644
--- a/runtime/stream.c
+++ b/runtime/stream.c
@@ -48,7 +48,9 @@
#include "stream.h"
#include "unicode-helper.h"
#include "module-template.h"
-#include <sys/prctl.h>
+#if HAVE_SYS_PRCTL_H
+# include <sys/prctl.h>
+#endif
#define inline
@@ -891,9 +893,11 @@ asyncWriterThread(void *pPtr)
ISOBJ_TYPE_assert(pThis, strm);
BEGINfunc
+# if HAVE_PRCTL && defined PR_SET_NAME
if(prctl(PR_SET_NAME, "rs:asyn strmwr", 0, 0, 0) != 0) {
DBGPRINTF("prctl failed, not setting thread name for '%s'\n", "stream writer");
}
+#endif
while(1) { /* loop broken inside */
d_pthread_mutex_lock(&pThis->mut);
@@ -904,7 +908,6 @@ asyncWriterThread(void *pPtr)
goto finalize_it; /* break main loop */
}
if(bTimedOut && pThis->iBufPtr > 0) {
-RUNLOG_STR("XXX: we had a timeout in stream writer");
/* if we timed out, we need to flush pending data */
strmFlush(pThis);
bTimedOut = 0;
diff --git a/runtime/wti.c b/runtime/wti.c
index 156d8116..abdf4add 100644
--- a/runtime/wti.c
+++ b/runtime/wti.c
@@ -41,7 +41,6 @@
#ifdef OS_SOLARIS
# include <sched.h>
-# define pthread_yield() sched_yield()
#endif
#include "rsyslog.h"