diff options
author | Alexander Larsson <alexl@redhat.com> | 2003-02-15 16:25:08 +0000 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2003-02-15 16:25:08 +0000 |
commit | fe4018941190f8bf020e4a8ed2999c212e0e113d (patch) | |
tree | 37f34a8405a5d1bc765a72b4457e47c212c0ca5f /test/watch.c | |
parent | ece62d7c14aab02ee0b3d3d6e15a22b663ef8da2 (diff) |
2003-02-15 Alexander Larsson <alexl@redhat.com>
* dbus/dbus-threads.c:
* dbus/dbus-threads.h:
Add condvars. Remove static mutext from API.
Implement static mutexes by initializing them from threads_init.
* glib/dbus-gthread.c:
* qt/dbus-qthread.cpp:
Update with the thread api changes.
* dbus/dbus-list.c:
* dbus/dbus-list.h:
Turn StaticMutex into normal mutex + init function.
Export new functions _dbus_list_alloc_link, _dbus_list_free_link,
_dbus_list_append_link, _dbus_list_prepend_link
* dbus/dbus-sysdeps.c:
* dbus/dbus-sysdeps.h:
New type dbus_atomic_t, and new functions _dbus_atomic_inc,
_dbus_atomic_dec. Only slow fallback implementation at the moment.
* dbus/dbus-protocol.h:
Add DBUS_MESSAGE_LOCAL_DISCONNECT define
* dbus/dbus-message.c:
Make ref/unref atomic.
Fix some docs.
* dbus/dbus-connection-internal.h:
* dbus/dbus-connection.c:
* dbus/dbus-connection.h:
Make threadsafe.
Change _peek to _borrow,_return & _steal_borrowed.
Change disconnect callback to event.
Make dbus_connection_dispatch_messages reentrant.
* dbus/dbus-transport.c:
Don't ref the connection on calls to the transport
implementation.
* dbus/dbus-message-handler.c:
Make threadsafe.
* glib/dbus-gmain.c:
Don't use peek_message anymore
* test/Makefile.am:
* test/debug-thread.c:
* test/debug-thread.h:
Simple thread implementation that asserts() on deadlocks in
single-threaded code.
* test/bus-test.c:
(main) Call debug_threads_init.
* test/watch.c:
Use disconnect message instead of disconnect callback.
* bus/connection.c:
* bus/connection.h:
Don't call dbus_connection_set_disconnect_function. Instead export
bus_connection_disconnect.
* bus/dispatch.c:
Call bus_connection_disconnect when we get a disconnected message.
Diffstat (limited to 'test/watch.c')
-rw-r--r-- | test/watch.c | 71 |
1 files changed, 40 insertions, 31 deletions
diff --git a/test/watch.c b/test/watch.c index a885a75c..1a31e64b 100644 --- a/test/watch.c +++ b/test/watch.c @@ -131,6 +131,17 @@ remove_server_watch (DBusWatch *watch, static int count = 0; static void +disconnect (DBusConnection *connection) +{ + fprintf (stderr, "Disconnected\n"); + + _dbus_list_remove (&connections, connection); + dbus_connection_unref (connection); + quit_mainloop (); +} + + +static void check_messages (void) { DBusList *link; @@ -141,28 +152,37 @@ check_messages (void) DBusList *next = _dbus_list_get_next_link (&connections, link); DBusConnection *connection = link->data; DBusMessage *message; + const char *name; while ((message = dbus_connection_pop_message (connection))) { DBusMessage *reply; - fprintf (stderr, "Received message %d, sending reply\n", count); - - reply = dbus_message_new ("org.freedesktop.DBus.Test", "org.freedesktop.DBus.Test"); - dbus_connection_send_message (connection, - reply, - NULL, - NULL); - dbus_message_unref (reply); - - dbus_message_unref (message); - - count += 1; - if (count > 100) - { - printf ("Saw %d messages, exiting\n", count); - quit_mainloop (); - } + name = dbus_message_get_name (message); + if (name && strcmp (name, DBUS_MESSAGE_LOCAL_DISCONNECT) == 0) + { + disconnect (connection); + } + else + { + fprintf (stderr, "Received message %d, sending reply\n", count); + + reply = dbus_message_new ("org.freedesktop.DBus.Test", "org.freedesktop.DBus.Test"); + dbus_connection_send_message (connection, + reply, + NULL, + NULL); + dbus_message_unref (reply); + + dbus_message_unref (message); + + count += 1; + if (count > 100) + { + printf ("Saw %d messages, exiting\n", count); + quit_mainloop (); + } + } } link = next; @@ -185,6 +205,9 @@ do_mainloop (void) int initial_watch_serial; check_messages (); + + if (exited) + break; FD_ZERO (&read_set); FD_ZERO (&write_set); @@ -297,16 +320,6 @@ quit_mainloop (void) exited = TRUE; } -static void -disconnect_handler (DBusConnection *connection, - void *data) -{ - fprintf (stderr, "Disconnected\n"); - - _dbus_list_remove (&connections, connection); - dbus_connection_unref (connection); - quit_mainloop (); -} void setup_connection (DBusConnection *connection) @@ -317,10 +330,6 @@ setup_connection (DBusConnection *connection) connection, NULL); - dbus_connection_set_disconnect_function (connection, - disconnect_handler, - NULL, NULL); - dbus_connection_ref (connection); _dbus_list_append (&connections, connection); } |