diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-05-20 01:32:46 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-05-20 02:09:32 +0200 |
| commit | bfad32422f1f78bce4de1e88a4afb5cc295bb877 (patch) | |
| tree | 6c5a5eaa9b653c0b52ad897fb9da727f5c510973 /dbus/dbus-transport-socket.c | |
| parent | ec901d786f6de6e6f870279e2d955f491619c559 (diff) | |
unix-fd: add logic to count unix fds the same way as allocated memory
This make all counters count both bytes of memory and unix fds.
Diffstat (limited to 'dbus/dbus-transport-socket.c')
| -rw-r--r-- | dbus/dbus-transport-socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c index 76699506..8e13baeb 100644 --- a/dbus/dbus-transport-socket.c +++ b/dbus/dbus-transport-socket.c @@ -191,7 +191,8 @@ check_read_watch (DBusTransport *transport) if (_dbus_transport_get_is_authenticated (transport)) need_read_watch = - _dbus_counter_get_value (transport->live_messages_size) < transport->max_live_messages_size; + (_dbus_counter_get_size_value (transport->live_messages) < transport->max_live_messages_size) && + (_dbus_counter_get_unix_fd_value (transport->live_messages) < transport->max_live_messages_unix_fds); else { if (transport->receive_credentials_pending) |