summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-01-27 18:57:37 +0100
committerLennart Poettering <lennart@poettering.net>2012-01-27 18:57:37 +0100
commitbb99a35a873c35e80b0b47fe045081022660374d (patch)
tree63dc43ca84690ee6abff7548293c3619aef1587a /src
parent632117b71fdd2d1b9da7418d00ec21c18d60dedd (diff)
log: increase socket buffers for logging by default
Diffstat (limited to 'src')
-rw-r--r--src/journal/journal-send.c8
-rw-r--r--src/log.c4
-rw-r--r--src/util.c36
-rw-r--r--src/util.h3
4 files changed, 50 insertions, 1 deletions
diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index 00029fe0b3..b5b4fbfa0d 100644
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -30,6 +30,8 @@
#include "util.h"
#include "socket-util.h"
+#define SNDBUF_SIZE (8*1024*1024)
+
/* We open a single fd, and we'll share it with the current process,
* all its threads, and all its subprocesses. This means we need to
* initialize it atomically, and need to operate on it atomically
@@ -47,6 +49,8 @@ retry:
if (fd < 0)
return -errno;
+ fd_inc_sndbuf(fd, SNDBUF_SIZE);
+
if (!__sync_bool_compare_and_swap(&fd_plus_one, 0, fd+1)) {
close_nointr_nofail(fd);
goto retry;
@@ -219,7 +223,7 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) {
if (k >= 0)
return 0;
- if (errno != EMSGSIZE)
+ if (errno != EMSGSIZE && errno != ENOBUFS)
return -errno;
/* Message doesn't fit... Let's dump the data in a temporary
@@ -294,6 +298,8 @@ _public_ int sd_journal_stream_fd(const char *identifier, int priority, int leve
return -errno;
}
+ fd_inc_sndbuf(fd, SNDBUF_SIZE);
+
if (!identifier)
identifier = "";
diff --git a/src/log.c b/src/log.c
index 0594f7fde5..c37ab22640 100644
--- a/src/log.c
+++ b/src/log.c
@@ -33,6 +33,8 @@
#include "macro.h"
#include "socket-util.h"
+#define SNDBUF_SIZE (8*1024*1024)
+
static LogTarget log_target = LOG_TARGET_CONSOLE;
static int log_max_level = LOG_INFO;
@@ -127,6 +129,8 @@ static int create_log_socket(int type) {
if (fd < 0)
return -errno;
+ fd_inc_sndbuf(fd, SNDBUF_SIZE);
+
return fd;
}
diff --git a/src/util.c b/src/util.c
index c9ad831c6c..5fe22d2e50 100644
--- a/src/util.c
+++ b/src/util.c
@@ -6279,3 +6279,39 @@ void* memdup(const void *p, size_t l) {
memcpy(r, p, l);
return r;
}
+
+int fd_inc_sndbuf(int fd, size_t n) {
+ int r, value;
+ socklen_t l = sizeof(value);
+
+ r = getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &value, &l);
+ if (r >= 0 &&
+ l == sizeof(value) &&
+ (size_t) value >= n*2)
+ return 0;
+
+ value = (int) n;
+ r = setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &value, sizeof(value));
+ if (r < 0)
+ return -errno;
+
+ return 1;
+}
+
+int fd_inc_rcvbuf(int fd, size_t n) {
+ int r, value;
+ socklen_t l = sizeof(value);
+
+ r = getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &value, &l);
+ if (r >= 0 &&
+ l == sizeof(value) &&
+ (size_t) value >= n*2)
+ return 0;
+
+ value = (int) n;
+ r = setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &value, sizeof(value));
+ if (r < 0)
+ return -errno;
+
+ return 1;
+}
diff --git a/src/util.h b/src/util.h
index 202d07a854..dcfc16d460 100644
--- a/src/util.h
+++ b/src/util.h
@@ -536,4 +536,7 @@ int rtc_open(int flags);
int is_kernel_thread(pid_t pid);
+int fd_inc_sndbuf(int fd, size_t n);
+int fd_inc_rcvbuf(int fd, size_t n);
+
#endif