diff options
author | Jon Trowbridge <trow@ximian.com> | 2001-09-15 14:05:29 +0800 |
---|---|---|
committer | Jon Trowbridge <trow@src.gnome.org> | 2001-09-15 14:05:29 +0800 |
commit | 25d7fddd4ef5c143cf1746922ec331f3b2948954 (patch) | |
tree | 0f4980996e2214eb50c266fcaf315adc17017e79 /addressbook/backend/ebook/e-book-listener.c | |
parent | 3328dab5cb971ebd87792b085d3d4fa36275ab18 (diff) | |
download | gsoc2013-evolution-25d7fddd4ef5c143cf1746922ec331f3b2948954.tar gsoc2013-evolution-25d7fddd4ef5c143cf1746922ec331f3b2948954.tar.gz gsoc2013-evolution-25d7fddd4ef5c143cf1746922ec331f3b2948954.tar.bz2 gsoc2013-evolution-25d7fddd4ef5c143cf1746922ec331f3b2948954.tar.lz gsoc2013-evolution-25d7fddd4ef5c143cf1746922ec331f3b2948954.tar.xz gsoc2013-evolution-25d7fddd4ef5c143cf1746922ec331f3b2948954.tar.zst gsoc2013-evolution-25d7fddd4ef5c143cf1746922ec331f3b2948954.zip |
Make "stop" do nothing but set the stopped flag, as in
2001-09-15 Jon Trowbridge <trow@ximian.com>
* backend/ebook/e-book-listener.c (e_book_listener_stop): Make
"stop" do nothing but set the stopped flag, as in
e-book-view-listener.c.
(e_book_listener_destroy): Clean up our queue here, rather than in
e_book_listener_stop.
(response_free): Added. Move the rather lengthy bit of code
needed to free a EBookListenerResponse into one place.
(e_book_listener_check_queue): Properly deal with the stopped
flag.
(e_book_listener_queue_response): If the stopped flag is set, just
drop the incoming response.
* backend/ebook/e-book-view-listener.c
(e_book_view_listener_stop): Make "stop" do nothing but set the
stopped flag.
(e_book_view_listener_destroy): Move all of the clean-up that used
to be in e_book_view_listener_stop here. This considerably simplifies
the logic required to avoid various race conditions.
(e_book_view_listener_check_queue): Properly deal with the stopped flag.
(e_book_view_listener_queue_response): Drop all incoming responses if
we are stopped.
2001-09-14 Jon Trowbridge <trow@ximian.com>
* backend/pas/pas-book.c (pas_book_queue_request): Hold a
reference to the book on behalf of our idle function.
(pas_book_check_queue): When we are finished, drop the reference
we've been holding on behalf of the idle function.
* backend/pas/pas-backend-file.c
(pas_backend_file_process_create_card): Hold a reference to the
book_view while sending our notifications.
(pas_backend_file_process_remove_card): Hold a reference to the
book_view while sending our notifications.
* gui/contact-editor/e-contact-quick-add.c (quick_add_unref): Remove
debugging spew.
* backend/ebook/e-book-util.c: Remove a lot of unused code that
worked around bugs that have long since been fixed.
(simple_query_disconnect): Added. Breaks out the part of
simple_query_free that disconnect signals.
(simple_query_free): Replace code w/ a call to
simple_query_disconnect.
(simple_query_sequence_complete_cb): Call simple_query_disconnect
before executing the callback, so that our callbacks don't get
triggered by any book changes that might occur during that
callback.
* backend/ebook/e-book-view-listener.c
(e_book_view_listener_check_queue): Changed to be consistent with
e_book_listener_check_queue.
(e_book_view_listener_queue_response): Also changed to use a
high-frequency timeout.
* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
OK, I've agonized over this stupid little function, and it should
now be race-free.
(e_book_listener_queue_response): We process our response queue in
a high-frequency timeout rather than an idle. Using an idle
function leads to some tricky race conditions and bad interactions
with bonobo's semi-broken attempts to take over event processing.
(e_book_view_listener_stop): Manually disable our timeout and
clean up.
svn path=/trunk/; revision=12851
Diffstat (limited to 'addressbook/backend/ebook/e-book-listener.c')
-rw-r--r-- | addressbook/backend/ebook/e-book-listener.c | 195 |
1 files changed, 102 insertions, 93 deletions
diff --git a/addressbook/backend/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c index 86b2e5cb9d..a66701847d 100644 --- a/addressbook/backend/ebook/e-book-listener.c +++ b/addressbook/backend/ebook/e-book-listener.c @@ -27,43 +27,92 @@ POA_GNOME_Evolution_Addressbook_BookListener__vepv e_book_listener_vepv; struct _EBookListenerPrivate { GList *response_queue; - gint idle_id; - gboolean idle_lock; + gint timeout_id; - guint stopped : 1; + guint timeout_lock : 1; + guint stopped : 1; }; -static gboolean -e_book_listener_check_queue (EBookListener *listener) +static void +response_free (EBookListenerResponse *resp) { - if (listener->priv->idle_lock) - return TRUE; - - listener->priv->idle_lock = TRUE; + if (resp == NULL) + return; - if (listener->priv->stopped) { - listener->priv->idle_id = 0; - goto exit_gracefully; + g_free (resp->msg); + g_free (resp->id); + + if (resp->book != CORBA_OBJECT_NIL) { + CORBA_Environment ev; + + CORBA_exception_init (&ev); + + bonobo_object_release_unref (resp->book, &ev); + + if (ev._major != CORBA_NO_EXCEPTION) { + g_warning ("e_book_listener_destroy: " + "Exception destroying book " + "in response queue!\n"); + } + + CORBA_exception_free (&ev); } - if (listener->priv->response_queue != NULL) { - gtk_signal_emit (GTK_OBJECT (listener), e_book_listener_signals [RESPONSES_QUEUED]); + if (resp->cursor != CORBA_OBJECT_NIL) { + CORBA_Environment ev; + + CORBA_exception_init (&ev); + + bonobo_object_release_unref (resp->cursor, &ev); + + if (ev._major != CORBA_NO_EXCEPTION) { + g_warning ("e_book_listener_destroy: " + "Exception destroying cursor " + "in response queue!\n"); + } + + CORBA_exception_free (&ev); } - if (listener->priv->response_queue == NULL) { - listener->priv->idle_id = 0; + if (resp->book_view != CORBA_OBJECT_NIL) { + CORBA_Environment ev; + + CORBA_exception_init (&ev); + + bonobo_object_release_unref (resp->book_view, &ev); + + if (ev._major != CORBA_NO_EXCEPTION) { + g_warning ("e_book_listener_destroy: " + "Exception destroying book_view " + "in response queue!\n"); + } + + CORBA_exception_free (&ev); } + + g_free (resp); +} - exit_gracefully: +static gboolean +e_book_listener_check_queue (EBookListener *listener) +{ + if (listener->priv->timeout_lock) + return TRUE; - listener->priv->idle_lock = FALSE; - - /* Only drop the reference when we exit for the last time. */ - if (listener->priv->idle_id == 0) { - gtk_object_unref (GTK_OBJECT (listener)); + listener->priv->timeout_lock = TRUE; + + if (listener->priv->response_queue != NULL && !listener->priv->stopped) { + gtk_signal_emit (GTK_OBJECT (listener), e_book_listener_signals [RESPONSES_QUEUED]); + } + + if (listener->priv->response_queue == NULL || listener->priv->stopped) { + listener->priv->timeout_id = 0; + listener->priv->timeout_lock = FALSE; + bonobo_object_unref (BONOBO_OBJECT (listener)); /* release the timeout's reference */ return FALSE; } + listener->priv->timeout_lock = FALSE; return TRUE; } @@ -71,16 +120,24 @@ static void e_book_listener_queue_response (EBookListener *listener, EBookListenerResponse *response) { - listener->priv->response_queue = - g_list_append (listener->priv->response_queue, - response); + if (response == NULL) + return; + + if (listener->priv->stopped) { + response_free (response); + return; + } + + listener->priv->response_queue = g_list_append (listener->priv->response_queue, response); - if (listener->priv->idle_id == 0) { + if (listener->priv->timeout_id == 0) { - /* Hold a reference to the listener until the idle function is finished. */ - gtk_object_ref (GTK_OBJECT (listener)); + /* 20 == an arbitrary small integer */ + listener->priv->timeout_id = g_timeout_add (20, (GSourceFunc) e_book_listener_check_queue, listener); - listener->priv->idle_id = g_idle_add ((GSourceFunc) e_book_listener_check_queue, listener); + /* Hold a reference on behalf of the timeout */ + bonobo_object_ref (BONOBO_OBJECT (listener)); + } } @@ -655,79 +712,31 @@ e_book_listener_init (EBookListener *listener) void e_book_listener_stop (EBookListener *listener) { + g_return_if_fail (E_IS_BOOK_LISTENER (listener)); + + listener->priv->stopped = TRUE; +} + +static void +e_book_listener_destroy (GtkObject *object) +{ + EBookListener *listener = E_BOOK_LISTENER (object); GList *l; - if (listener->priv->stopped) - return; + /* Remove our response queue handler: In theory, this can never happen since we + always hold a reference to the listener while the timeout is running. */ + if (listener->priv->timeout_id) { + g_source_remove (listener->priv->timeout_id); + } + /* Clean up anything still sitting in response_queue */ for (l = listener->priv->response_queue; l != NULL; l = l->next) { EBookListenerResponse *resp = l->data; - g_free (resp->msg); - g_free (resp->id); - - if (resp->book != CORBA_OBJECT_NIL) { - CORBA_Environment ev; - - CORBA_exception_init (&ev); - - bonobo_object_release_unref (resp->book, &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - g_warning ("e_book_listener_destroy: " - "Exception destroying book " - "in response queue!\n"); - } - - CORBA_exception_free (&ev); - } - - if (resp->cursor != CORBA_OBJECT_NIL) { - CORBA_Environment ev; - - CORBA_exception_init (&ev); - - bonobo_object_release_unref (resp->cursor, &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - g_warning ("e_book_listener_destroy: " - "Exception destroying cursor " - "in response queue!\n"); - } - - CORBA_exception_free (&ev); - } - - if (resp->book_view != CORBA_OBJECT_NIL) { - CORBA_Environment ev; - - CORBA_exception_init (&ev); - - bonobo_object_release_unref (resp->book_view, &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - g_warning ("e_book_listener_destroy: " - "Exception destroying book_view " - "in response queue!\n"); - } - - CORBA_exception_free (&ev); - } - - g_free (resp); + response_free (resp); } g_list_free (listener->priv->response_queue); - listener->priv->response_queue = NULL; - - listener->priv->stopped = TRUE; -} - -static void -e_book_listener_destroy (GtkObject *object) -{ - EBookListener *listener = E_BOOK_LISTENER (object); - e_book_listener_stop (listener); g_free (listener->priv); GTK_OBJECT_CLASS (e_book_listener_parent_class)->destroy (object); |