← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnome-online-accounts/saucy

« back to all changes in this revision

Viewing changes to debian/patches/revert-deadlock-fix.patch

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-09-18 21:04:18 UTC
  • mfrom: (0.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20130918210418-g3npeubg1uhgi2j5
Tags: 3.8.3-1ubuntu1
* Sync with Debian. Remaining changes:
  - debian/patches/drop-google-password-interface*.patch:
    + Now that Google CalDav supports OAuth v2 for CalDav and
      evolution-data-server has been updated for it, drop the
      password-based UI that didn't work with Google Two-Factor
      Authentication anyway (patches backported from git)
  - debian/patches/drop-google-password-interface-4.patch:
    + Backport another commit to fix Google CardDAV support
  - debian/patches/revert-deadlock-fix.patch:
    + Backport revert of 3.8.3 commit that could cause 100% cpu use

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/revert-deadlock-fix.patch
 
1
From 7436669dde08abd5d4c6fe4716f43263b3567161 Mon Sep 17 00:00:00 2001
 
2
From: Ray Strode <rstrode@redhat.com>
 
3
Date: Mon, 16 Sep 2013 01:31:48 +0000
 
4
Subject: Revert "goaidentity: Fix deadlock in goaalarm on_cancelled"
 
5
 
 
6
This reverts commit f4c04ad49c29d8f619cb80ef480daa9d4ecdfa38.
 
7
 
 
8
It's changes which threads code runs on and is probably causing
 
9
100% cpu issues.
 
10
 
 
11
https://bugzilla.gnome.org/show_bug.cgi?id=705395
 
12
---
 
13
diff --git a/src/goaidentity/goaalarm.c b/src/goaidentity/goaalarm.c
 
14
index 9ccb3b6..c8992cd 100644
 
15
--- a/src/goaidentity/goaalarm.c
 
16
+++ b/src/goaidentity/goaalarm.c
 
17
@@ -256,31 +256,12 @@ goa_alarm_init (GoaAlarm *self)
 
18
   g_rec_mutex_init (&self->priv->lock);
 
19
 }
 
20
 
 
21
-static gboolean
 
22
-async_alarm_cancel_idle_cb (gpointer user_data)
 
23
-{
 
24
-  GoaAlarm *self = user_data;
 
25
-
 
26
-  clear_scheduled_wakeups (self);
 
27
-  return G_SOURCE_REMOVE;
 
28
-}
 
29
-
 
30
 static void
 
31
 on_cancelled (GCancellable *cancellable, gpointer user_data)
 
32
 {
 
33
   GoaAlarm *self = GOA_ALARM (user_data);
 
34
-  GMainContext *main_context;
 
35
-  GSource *idle_source;
 
36
-
 
37
-  main_context = g_main_context_ref_thread_default ();
 
38
 
 
39
-  idle_source = g_idle_source_new ();
 
40
-  g_source_set_priority (idle_source, G_PRIORITY_HIGH_IDLE);
 
41
-  g_source_set_callback (idle_source, async_alarm_cancel_idle_cb, g_object_ref (self), g_object_unref);
 
42
-  g_source_attach (idle_source, main_context);
 
43
-  g_source_unref (idle_source);
 
44
-
 
45
-  g_main_context_unref (main_context);
 
46
+  clear_scheduled_wakeups (self);
 
47
 }
 
48
 
 
49
 static void
 
50