meta-tizen-adaptation-oe-core/recipes-core/dbus/files/0006-Remove-unused-global-mutexes-for-win_fds-sid_atom_ca.patch

   1 From: Simon McVittie <simon.mcvittie@collabora.co.uk>
   2 Date: Tue, 16 Apr 2013 12:14:02 +0100
   3 Subject: Remove unused global mutexes for win_fds, sid_atom_cache
   4
   5 Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54972
   6 Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
   7 Reviewed-by: Alban Crequy <alban.crequy@collabora.co.uk>
   8 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
   9 Applied-upstream: 1.7.4, commit:d35f64339e401a7a47c1b088ef26e3dcb202cb9d
  10 Bug-Tizen: TZPC-1971
  11 Reviewed-by: Anas Nashif <anas.nashif@intel.com>
  12 Change-Id: I9619eaf477eaf1763133772b95e3845dd7c2b62e
  13 ---
  14  dbus/dbus-internals.h | 10 ++++------
  15  dbus/dbus-sysdeps.c   |  2 --
  16  dbus/dbus-threads.c   |  2 --
  17  3 files changed, 4 insertions(+), 10 deletions(-)
  18
  19 diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
  20 index eaf9603..336d22e 100644
  21 --- a/dbus/dbus-internals.h
  22 +++ b/dbus/dbus-internals.h
  23 @@ -309,25 +309,23 @@ extern int _dbus_current_generation;
  24  #define _DBUS_LOCK(name)                _dbus_rmutex_lock   (_dbus_lock_##name)
  25  #define _DBUS_UNLOCK(name)              _dbus_rmutex_unlock (_dbus_lock_##name)
  26
  27 -/* 1-5 */
  28 +/* index 0-4 */
  29  _DBUS_DECLARE_GLOBAL_LOCK (list);
  30  _DBUS_DECLARE_GLOBAL_LOCK (connection_slots);
  31  _DBUS_DECLARE_GLOBAL_LOCK (pending_call_slots);
  32  _DBUS_DECLARE_GLOBAL_LOCK (server_slots);
  33  _DBUS_DECLARE_GLOBAL_LOCK (message_slots);
  34 -/* 5-10 */
  35 +/* index 5-9 */
  36  _DBUS_DECLARE_GLOBAL_LOCK (bus);
  37  _DBUS_DECLARE_GLOBAL_LOCK (bus_datas);
  38  _DBUS_DECLARE_GLOBAL_LOCK (shutdown_funcs);
  39  _DBUS_DECLARE_GLOBAL_LOCK (system_users);
  40  _DBUS_DECLARE_GLOBAL_LOCK (message_cache);
  41 -/* 10-14 */
  42 +/* index 10-11 */
  43  _DBUS_DECLARE_GLOBAL_LOCK (shared_connections);
  44 -_DBUS_DECLARE_GLOBAL_LOCK (win_fds);
  45 -_DBUS_DECLARE_GLOBAL_LOCK (sid_atom_cache);
  46  _DBUS_DECLARE_GLOBAL_LOCK (machine_uuid);
  47
  48 -#define _DBUS_N_GLOBAL_LOCKS (14)
  49 +#define _DBUS_N_GLOBAL_LOCKS (12)
  50
  51  dbus_bool_t _dbus_threads_init_debug (void);
  52
  53 diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
  54 index 04fb8d7..4e14ac3 100644
  55 --- a/dbus/dbus-sysdeps.c
  56 +++ b/dbus/dbus-sysdeps.c
  57 @@ -46,8 +46,6 @@
  58  #include <errno.h>
  59  #endif
  60
  61 -_DBUS_DEFINE_GLOBAL_LOCK (win_fds);
  62 -_DBUS_DEFINE_GLOBAL_LOCK (sid_atom_cache);
  63  _DBUS_DEFINE_GLOBAL_LOCK (system_users);
  64
  65  #ifdef DBUS_WIN
  66 diff --git a/dbus/dbus-threads.c b/dbus/dbus-threads.c
  67 index 9a505de..9fbbae5 100644
  68 --- a/dbus/dbus-threads.c
  69 +++ b/dbus/dbus-threads.c
  70 @@ -489,8 +489,6 @@ init_locks (void)
  71    DBusRMutex ***dynamic_global_locks;
  72    DBusRMutex **global_locks[] = {
  73  #define LOCK_ADDR(name) (& _dbus_lock_##name)
  74 -    LOCK_ADDR (win_fds),
  75 -    LOCK_ADDR (sid_atom_cache),
  76      LOCK_ADDR (list),
  77      LOCK_ADDR (connection_slots),
  78      LOCK_ADDR (pending_call_slots),