[maemo-commits] [maemo-commits] r12793 - in projects/haf/trunk/dbus/debian: . patches
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Jul 23 18:13:10 EEST 2007
- Previous message: [maemo-commits] r12792 - in projects/haf/trunk/dbus/debian: . patches
- Next message: [maemo-commits] r12794 - in projects/haf/trunk/dbus/debian: . patches
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: kihamala
Date: 2007-07-23 18:13:08 +0300 (Mon, 23 Jul 2007)
New Revision: 12793
Added:
projects/haf/trunk/dbus/debian/patches/09-remove-max-match-limit.patch
projects/haf/trunk/dbus/debian/patches/14-increase-default-limits.patch
projects/haf/trunk/dbus/debian/patches/15-increase-session-limits.patch
Removed:
projects/haf/trunk/dbus/debian/patches/09-remove-max-match-limit.patch
Modified:
projects/haf/trunk/dbus/debian/changelog
Log:
fixes from upstream to raise default resource limits
Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog 2007-07-23 14:46:31 UTC (rev 12792)
+++ projects/haf/trunk/dbus/debian/changelog 2007-07-23 15:13:08 UTC (rev 12793)
@@ -5,6 +5,8 @@
https://bugs.freedesktop.org/show_bug.cgi?id=9164.
* Fix from the CVS for a connection lock bug (separate bits in a bitfield
used as locks).
+ * Fix from the CVS to increase default limits in config-parser.c.
+ * Fix from the CVS to increase default limits in session.conf.in.
* Patch from Leonid to enable hard-floats. Fixes: NB#61974
-- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com> Mon, 23 Jul 2007 17:31:21 +0300
Deleted: projects/haf/trunk/dbus/debian/patches/09-remove-max-match-limit.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/09-remove-max-match-limit.patch 2007-07-23 14:46:31 UTC (rev 12792)
+++ projects/haf/trunk/dbus/debian/patches/09-remove-max-match-limit.patch 2007-07-23 15:13:08 UTC (rev 12793)
@@ -1,21 +0,0 @@
-diff -pur dbus/bus/driver.c dbus.new/bus/driver.c
---- dbus/bus/driver.c 2006-05-05 18:59:25.000000000 +0300
-+++ dbus.new/bus/driver.c 2006-09-18 15:11:34.466016136 +0300
-@@ -734,17 +734,6 @@ bus_driver_handle_add_match (DBusConnect
- text = NULL;
- rule = NULL;
-
-- if (bus_connection_get_n_match_rules (connection) >=
-- bus_context_get_max_match_rules_per_connection (bus_transaction_get_context (transaction)))
-- {
-- dbus_set_error (error, DBUS_ERROR_LIMITS_EXCEEDED,
-- "Connection \"%s\" is not allowed to add more match rules "
-- "(increase limits in configuration file if required)",
-- bus_connection_is_active (connection) ?
-- bus_connection_get_name (connection) :
-- "(inactive)");
-- goto failed;
-- }
-
- if (!dbus_message_get_args (message, error,
- DBUS_TYPE_STRING, &text,
Added: projects/haf/trunk/dbus/debian/patches/09-remove-max-match-limit.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/09-remove-max-match-limit.patch 2007-07-23 14:46:31 UTC (rev 12792)
+++ projects/haf/trunk/dbus/debian/patches/09-remove-max-match-limit.patch 2007-07-23 15:13:08 UTC (rev 12793)
@@ -0,0 +1,21 @@
+diff -pur dbus/bus/driver.c dbus.new/bus/driver.c
+--- dbus/bus/driver.c 2006-05-05 18:59:25.000000000 +0300
++++ dbus.new/bus/driver.c 2006-09-18 15:11:34.466016136 +0300
+@@ -734,17 +734,6 @@ bus_driver_handle_add_match (DBusConnect
+ text = NULL;
+ rule = NULL;
+
+- if (bus_connection_get_n_match_rules (connection) >=
+- bus_context_get_max_match_rules_per_connection (bus_transaction_get_context (transaction)))
+- {
+- dbus_set_error (error, DBUS_ERROR_LIMITS_EXCEEDED,
+- "Connection \"%s\" is not allowed to add more match rules "
+- "(increase limits in configuration file if required)",
+- bus_connection_is_active (connection) ?
+- bus_connection_get_name (connection) :
+- "(inactive)");
+- goto failed;
+- }
+
+ if (!dbus_message_get_args (message, error,
+ DBUS_TYPE_STRING, &text,
Added: projects/haf/trunk/dbus/debian/patches/14-increase-default-limits.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/14-increase-default-limits.patch 2007-07-23 14:46:31 UTC (rev 12792)
+++ projects/haf/trunk/dbus/debian/patches/14-increase-default-limits.patch 2007-07-23 15:13:08 UTC (rev 12793)
@@ -0,0 +1,47 @@
+diff -pur dbus-1.0.2/bus/config-parser.c dbus-1.0.2.new/bus/config-parser.c
+--- dbus-1.0.2/bus/config-parser.c 2006-12-11 21:21:21.000000000 +0200
++++ dbus-1.0.2.new/bus/config-parser.c 2007-07-23 18:05:23.808116480 +0300
+@@ -460,8 +460,8 @@ bus_config_parser_new (const DBusString
+ {
+
+ /* Make up some numbers! woot! */
+- parser->limits.max_incoming_bytes = _DBUS_ONE_MEGABYTE * 63;
+- parser->limits.max_outgoing_bytes = _DBUS_ONE_MEGABYTE * 63;
++ parser->limits.max_incoming_bytes = _DBUS_ONE_MEGABYTE * 127;
++ parser->limits.max_outgoing_bytes = _DBUS_ONE_MEGABYTE * 127;
+ parser->limits.max_message_size = _DBUS_ONE_MEGABYTE * 32;
+
+ /* Making this long means the user has to wait longer for an error
+@@ -476,22 +476,26 @@ bus_config_parser_new (const DBusString
+ */
+ parser->limits.auth_timeout = 30000; /* 30 seconds */
+
+- parser->limits.max_incomplete_connections = 32;
+- parser->limits.max_connections_per_user = 128;
++ parser->limits.max_incomplete_connections = 64;
++ parser->limits.max_connections_per_user = 256;
+
+ /* Note that max_completed_connections / max_connections_per_user
+ * is the number of users that would have to work together to
+ * DOS all the other users.
+ */
+- parser->limits.max_completed_connections = 1024;
++ parser->limits.max_completed_connections = 2048;
+
+- parser->limits.max_pending_activations = 256;
+- parser->limits.max_services_per_connection = 256;
++ parser->limits.max_pending_activations = 512;
++ parser->limits.max_services_per_connection = 512;
+
+ parser->limits.max_match_rules_per_connection = 512;
+
+ parser->limits.reply_timeout = 5 * 60 * 1000; /* 5 minutes */
+- parser->limits.max_replies_per_connection = 32;
++
++ /* this is effectively a limit on message queue size for messages
++ * that require a reply
++ */
++ parser->limits.max_replies_per_connection = 1024*8;
+ }
+
+ parser->refcount = 1;
Added: projects/haf/trunk/dbus/debian/patches/15-increase-session-limits.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/15-increase-session-limits.patch 2007-07-23 14:46:31 UTC (rev 12792)
+++ projects/haf/trunk/dbus/debian/patches/15-increase-session-limits.patch 2007-07-23 15:13:08 UTC (rev 12793)
@@ -0,0 +1,31 @@
+diff -pur dbus-1.0.2/bus/session.conf.in dbus-1.0.2.new/bus/session.conf.in
+--- dbus-1.0.2/bus/session.conf.in 2006-12-11 21:21:25.000000000 +0200
++++ dbus-1.0.2.new/bus/session.conf.in 2007-07-23 18:09:47.388046240 +0300
+@@ -27,4 +27,27 @@
+
+ <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
+
++ <!-- For the session bus, override the default relatively-low limits
++ with essentially infinite limits, since the bus is just running
++ as the user anyway, using up bus resources is not something we need
++ to worry about. In some cases, we do set the limits lower than
++ "all available memory" if exceeding the limit is almost certainly a bug,
++ having the bus enforce a limit is nicer than a huge memory leak. But the
++ intent is that these limits should never be hit. -->
++
++ <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max -->
++ <limit name="max_incoming_bytes">1000000000</limit>
++ <limit name="max_outgoing_bytes">1000000000</limit>
++ <limit name="max_message_size">1000000000</limit>
++ <limit name="service_start_timeout">120000</limit>
++ <limit name="auth_timeout">240000</limit>
++ <limit name="max_completed_connections">100000</limit>
++ <limit name="max_incomplete_connections">10000</limit>
++ <limit name="max_connections_per_user">100000</limit>
++ <limit name="max_pending_service_starts">10000</limit>
++ <limit name="max_names_per_connection">50000</limit>
++ <limit name="max_match_rules_per_connection">50000</limit>
++ <limit name="max_replies_per_connection">50000</limit>
++ <limit name="reply_timeout">300000</limit>
++
+ </busconfig>
- Previous message: [maemo-commits] r12792 - in projects/haf/trunk/dbus/debian: . patches
- Next message: [maemo-commits] r12794 - in projects/haf/trunk/dbus/debian: . patches
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]