2005-08-03 Havoc Pennington <hp@redhat.com>

* dbus/dbus-sysdeps.c (_dbus_read_credentials_unix_socket): fix
	typo, from Julien Puydt

	* bus/connection.c (bus_connection_disconnected): we were always
	doing a wait_for_memory due to a buggy loop, found by Timo Hoenig
This commit is contained in:
Havoc Pennington 2005-08-03 17:42:56 +00:00
parent 8a56c704eb
commit e3fa86b54a
4 changed files with 12 additions and 8 deletions

View file

@ -1,3 +1,11 @@
2005-08-03 Havoc Pennington <hp@redhat.com>
* dbus/dbus-sysdeps.c (_dbus_read_credentials_unix_socket): fix
typo, from Julien Puydt
* bus/connection.c (bus_connection_disconnected): we were always
doing a wait_for_memory due to a buggy loop, found by Timo Hoenig
2005-08-01 Colin Walters <walters@verbum.org>
Patch from Joe Markus Clarke:

View file

@ -199,12 +199,8 @@ bus_connection_disconnected (DBusConnection *connection)
dbus_error_init (&error);
transaction = NULL;
while (transaction == NULL)
{
transaction = bus_transaction_new (d->connections->context);
_dbus_wait_for_memory ();
}
while ((transaction = bus_transaction_new (d->connections->context)) == NULL)
_dbus_wait_for_memory ();
if (!bus_service_remove_owner (service, connection,
transaction, &error))

View file

@ -892,7 +892,7 @@ _dbus_read_credentials_unix_socket (int client_fd,
}
#ifdef HAVE_CMSGCRED
if (cmsg->hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS)
if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS)
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"Message from recvmsg() was not SCM_CREDS");

View file

@ -48,7 +48,7 @@
*/
#define N_CLIENT_THREADS 1
/* It seems like at least 750000 or so iterations reduces the variability to sane levels */
#define N_ITERATIONS 25000
#define N_ITERATIONS 2000
#define N_PROGRESS_UPDATES 20
/* Don't make PAYLOAD_SIZE too huge because it gets used as a static buffer size */
#define PAYLOAD_SIZE 0