[farsight2/master] msnconnection: Document locking

Olivier Crête olivier.crete at collabora.co.uk
Tue Jul 14 09:50:42 PDT 2009


---
 gst/fsmsnconference/fs-msn-connection.c |    2 --
 gst/fsmsnconference/fs-msn-connection.h |    9 +++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/gst/fsmsnconference/fs-msn-connection.c b/gst/fsmsnconference/fs-msn-connection.c
index bf91e9f..b920e16 100644
--- a/gst/fsmsnconference/fs-msn-connection.c
+++ b/gst/fsmsnconference/fs-msn-connection.c
@@ -171,8 +171,6 @@ fs_msn_connection_init (FsMsnConnection *self)
 {
   /* member init */
 
-  self->disposed = FALSE;
-
   self->poll_timeout = GST_CLOCK_TIME_NONE;
   self->poll = gst_poll_new (TRUE);
   gst_poll_set_flushing (self->poll, FALSE);
diff --git a/gst/fsmsnconference/fs-msn-connection.h b/gst/fsmsnconference/fs-msn-connection.h
index 0f74490..29c8170 100644
--- a/gst/fsmsnconference/fs-msn-connection.h
+++ b/gst/fsmsnconference/fs-msn-connection.h
@@ -65,16 +65,17 @@ struct _FsMsnConnection
 {
   GObject parent;
 
+  /* All variables that are not protected by the lock are read-only */
+
   gchar *local_recipient_id;
-  gchar *remote_recipient_id;
+  gchar *remote_recipient_id; /* protected by lock */
   gint session_id;
   gint initial_port;
 
-  GThread *polling_thread;
-  GstClockTime poll_timeout;
+  GThread *polling_thread; /* protected by lock */
+  GstClockTime poll_timeout; /* protected by lock */
   GstPoll *poll;
   GArray *pollfds;
-  gboolean disposed;
   GStaticRecMutex mutex;
 };
 
-- 
1.5.6.5




More information about the farsight-commits mailing list