diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-03-04 00:16:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-04 00:16:31 +0000 |
| commit | 00eaae3aaa6ea3ca2c9c00e0559fa6937ce33e37 (patch) | |
| tree | b84f667fbad3bff7256e05b526a87e6c56baaebc | |
| parent | b497340cb1c36b92fb298c52f041e1f9bdd990f2 (diff) | |
| parent | 556c9c245de257efe8bda09ff23d2c4f7add5e49 (diff) | |
| download | system_core-00eaae3aaa6ea3ca2c9c00e0559fa6937ce33e37.zip system_core-00eaae3aaa6ea3ca2c9c00e0559fa6937ce33e37.tar.gz system_core-00eaae3aaa6ea3ca2c9c00e0559fa6937ce33e37.tar.bz2 | |
am 556c9c24: am 858d0dd1: Merge "set /proc/sys/net/unix/max_dgram_qlen to large value"
* commit '556c9c245de257efe8bda09ff23d2c4f7add5e49':
set /proc/sys/net/unix/max_dgram_qlen to large value
| -rw-r--r-- | include/sysutils/SocketListener.h | 1 | ||||
| -rw-r--r-- | libsysutils/src/SocketListener.cpp | 6 | ||||
| -rw-r--r-- | logd/main.cpp | 3 | ||||
| -rw-r--r-- | rootdir/init.rc | 1 |
4 files changed, 9 insertions, 2 deletions
diff --git a/include/sysutils/SocketListener.h b/include/sysutils/SocketListener.h index c204a0f..bc93b86 100644 --- a/include/sysutils/SocketListener.h +++ b/include/sysutils/SocketListener.h @@ -38,6 +38,7 @@ public: virtual ~SocketListener(); int startListener(); + int startListener(int backlog); int stopListener(); void sendBroadcast(int code, const char *msg, bool addErrno); diff --git a/libsysutils/src/SocketListener.cpp b/libsysutils/src/SocketListener.cpp index 5c75206..527a6a0 100644 --- a/libsysutils/src/SocketListener.cpp +++ b/libsysutils/src/SocketListener.cpp @@ -70,6 +70,10 @@ SocketListener::~SocketListener() { } int SocketListener::startListener() { + return startListener(4); +} + +int SocketListener::startListener(int backlog) { if (!mSocketName && mSock == -1) { SLOGE("Failed to start unbound listener"); @@ -84,7 +88,7 @@ int SocketListener::startListener() { SLOGV("got mSock = %d for %s", mSock, mSocketName); } - if (mListen && listen(mSock, 4) < 0) { + if (mListen && listen(mSock, backlog) < 0) { SLOGE("Unable to listen on socket (%s)", strerror(errno)); return -1; } else if (!mListen) diff --git a/logd/main.cpp b/logd/main.cpp index 1891206..6216b95 100644 --- a/logd/main.cpp +++ b/logd/main.cpp @@ -105,7 +105,8 @@ int main() { // and LogReader is notified to send updates to connected clients. LogListener *swl = new LogListener(logBuf, reader); - if (swl->startListener()) { + // Backlog and /proc/sys/net/unix/max_dgram_qlen set to large value + if (swl->startListener(300)) { exit(1); } diff --git a/rootdir/init.rc b/rootdir/init.rc index 7d15132..1619100 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -104,6 +104,7 @@ loglevel 3 write /proc/sys/kernel/dmesg_restrict 1 write /proc/sys/vm/mmap_min_addr 32768 write /proc/sys/net/ipv4/ping_group_range "0 2147483647" + write /proc/sys/net/unix/max_dgram_qlen 300 write /proc/sys/kernel/sched_rt_runtime_us 950000 write /proc/sys/kernel/sched_rt_period_us 1000000 |