diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-02-26 08:59:32 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-02-26 08:59:32 +0000 |
| commit | c6a71674d65e1755c080e3176bec7f754c2c6491 (patch) | |
| tree | 99e685b1b05afdd9cea36e9a5317e5e99ce76875 | |
| parent | 84bdbb54e5be689618401e308d9f20322f93efef (diff) | |
| download | gvfs-c6a71674d65e1755c080e3176bec7f754c2c6491.tar.gz | |
Use standard lock instead of recursive lock.
2008-02-26 Alexander Larsson <alexl@redhat.com>
* client/gdaemonvolumemonitor.c:
Use standard lock instead of recursive lock.
svn path=/trunk/; revision=1383
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | client/gdaemonvolumemonitor.c | 23 |
2 files changed, 17 insertions, 11 deletions
@@ -1,3 +1,8 @@ +2008-02-26 Alexander Larsson <alexl@redhat.com> + + * client/gdaemonvolumemonitor.c: + Use standard lock instead of recursive lock. + 2008-02-25 David Zeuthen <davidz@redhat.com> * configure.ac: fix typo in AC_ARG_ENABLE for gphoto2 diff --git a/client/gdaemonvolumemonitor.c b/client/gdaemonvolumemonitor.c index 8179031e..9431304e 100644 --- a/client/gdaemonvolumemonitor.c +++ b/client/gdaemonvolumemonitor.c @@ -33,7 +33,8 @@ #include "gdaemonvfs.h" #include "gmounttracker.h" -static GStaticRecMutex _the_daemon_volume_monitor_mutex = G_STATIC_REC_MUTEX_INIT; +G_LOCK_DEFINE_STATIC(_the_daemon_volume_monitor); + static GDaemonVolumeMonitor *_the_daemon_volume_monitor; struct _GDaemonVolumeMonitor { @@ -51,14 +52,14 @@ get_mounts (GVolumeMonitor *volume_monitor) GDaemonVolumeMonitor *monitor; GList *l; - g_static_rec_mutex_lock (&_the_daemon_volume_monitor_mutex); + G_LOCK (_the_daemon_volume_monitor); monitor = G_DAEMON_VOLUME_MONITOR (volume_monitor); l = g_list_copy (monitor->mounts); g_list_foreach (l, (GFunc)g_object_ref, NULL); - g_static_rec_mutex_unlock (&_the_daemon_volume_monitor_mutex); + G_UNLOCK (_the_daemon_volume_monitor); return l; } @@ -122,7 +123,7 @@ g_daemon_volume_monitor_find_mount_by_mount_info (GMountInfo *mount_info) return NULL; } - g_static_rec_mutex_lock (&_the_daemon_volume_monitor_mutex); + G_LOCK (_the_daemon_volume_monitor); daemon_mount = find_mount_by_mount_info (_the_daemon_volume_monitor, mount_info); if (daemon_mount != NULL) @@ -130,7 +131,7 @@ g_daemon_volume_monitor_find_mount_by_mount_info (GMountInfo *mount_info) g_object_ref (daemon_mount); } - g_static_rec_mutex_unlock (&_the_daemon_volume_monitor_mutex); + G_UNLOCK (_the_daemon_volume_monitor); return daemon_mount; } @@ -141,7 +142,7 @@ mount_added (GDaemonVolumeMonitor *daemon_monitor, GMountInfo *mount_info) GDaemonMount *mount; GVolume *volume; - g_static_rec_mutex_lock (&_the_daemon_volume_monitor_mutex); + G_LOCK (_the_daemon_volume_monitor); mount = find_mount_by_mount_info (daemon_monitor, mount_info); if (mount) @@ -161,7 +162,7 @@ mount_added (GDaemonVolumeMonitor *daemon_monitor, GMountInfo *mount_info) } out: - g_static_rec_mutex_unlock (&_the_daemon_volume_monitor_mutex); + G_UNLOCK (_the_daemon_volume_monitor); } static void @@ -169,7 +170,7 @@ mount_removed (GDaemonVolumeMonitor *daemon_monitor, GMountInfo *mount_info) { GDaemonMount *mount; - g_static_rec_mutex_lock (&_the_daemon_volume_monitor_mutex); + G_LOCK (_the_daemon_volume_monitor); mount = find_mount_by_mount_info (daemon_monitor, mount_info); if (!mount) @@ -185,7 +186,7 @@ mount_removed (GDaemonVolumeMonitor *daemon_monitor, GMountInfo *mount_info) g_object_unref (mount); out: - g_static_rec_mutex_unlock (&_the_daemon_volume_monitor_mutex); + G_UNLOCK (_the_daemon_volume_monitor); } static void @@ -230,7 +231,7 @@ g_daemon_volume_monitor_finalize (GObject *object) { GDaemonVolumeMonitor *monitor; - g_static_rec_mutex_lock (&_the_daemon_volume_monitor_mutex); + G_LOCK (_the_daemon_volume_monitor); monitor = G_DAEMON_VOLUME_MONITOR (object); @@ -247,7 +248,7 @@ g_daemon_volume_monitor_finalize (GObject *object) _the_daemon_volume_monitor = NULL; - g_static_rec_mutex_unlock (&_the_daemon_volume_monitor_mutex); + G_UNLOCK (_the_daemon_volume_monitor); } static void |