Added mutex to protect request send from multiple threads

[frescor/forb.git] / src / peer.c

diff --git a/src/peer.c b/src/peer.c
index 321e729c53c07a3f5472bbf729167311a1518ec6..ea04c0c94ccb41f7f88aa8b3867b68aeacf350cf 100644 (file)
--- a/src/peer.c
+++ b/src/peer.c
@@ -44,8 +44,18 @@
 /* covered by the GNU Public License.                                    */
 /**************************************************************************/
 
+/**
+ * @file   peer.c
+ * @author Michal Sojka <sojkam1@fel.cvut.cz>
+ * @date   Sun Oct 12 17:30:27 2008
+ * 
+ * @brief  Implementation of peer manipulation functions.
+ * 
+ * 
+ */
+
 #include "peer.h"
-#include "misc.h"
+#include "forb_utils.h"
 #include "proto.h"
 
 GAVL_CUST_NODE_INT_IMP(forb_peer_nolock,/* cust_prefix */
@@ -53,7 +63,7 @@ GAVL_CUST_NODE_INT_IMP(forb_peer_nolock,/* cust_prefix */
                       forb_peer_t,     /* cust_item_t */
                       forb_server_id,  /* cust_key_t */
                       peers,           /* cust_root_node */
-                      node,            /* cust_item_node */
+                      gnode,           /* cust_item_node */
                       server_id,       /* cust_item_key */
                       forb_server_id_cmp);/* cust_cmp_fnc */
 
@@ -69,6 +79,7 @@ forb_peer_new(void)
                memset(peer, 0, sizeof(*peer));
                fosa_cond_init(&peer->cond);
                forb_ref_init(&peer->ref);
+               fosa_mutex_init(&peer->send_lock, 0);
        }
        return peer;
 }
@@ -77,9 +88,13 @@ void
 forb_peer_release(forb_ref_t *ref)
 {
        forb_peer_t *peer = container_of(ref, forb_peer_t, ref);
-       if (peer->port->proto->peer_destroy) {
-               peer->port->proto->peer_destroy(peer);
+       if (peer->port &&
+           peer->port->desc.proto->peer_destroy) {
+               peer->port->desc.proto->peer_destroy(peer);
        }
+       if (peer->addr)
+               forb_free(peer->addr);
+       
        forb_free(peer);
 }
 
@@ -87,39 +102,47 @@ void
 forb_peer_delete_by_port(forb_t *forb, forb_port_t *port)
 {
        forb_peer_t *peer;
-       fosa_mutex_lock(&port->forb->peer_mutex);
-       /* FIXME: Is gavl_cust_for_each() deletion safe? What about
-        * recursive locking of mutex. */
-#warning Delete during GAVL traversal is probably not correct.
-       gavl_cust_for_each(forb_peer_nolock, forb, peer) {
-               if (peer->port == port) {
-                       forb_peer_nolock_delete(forb, peer);
-                       forb_peer_put(peer);
-               }
+       ul_list_for_each_cut(forb_port_peer, port, peer) {
+               forb_peer_delete(forb, peer);
+               forb_peer_put(peer);
        }
-       fosa_mutex_unlock(&port->forb->peer_mutex);
 }
 
+/** 
+ * Finds the peer with given @a server_id. If the peer is not
+ * currently known (not yet discovered or not available), this
+ * function waits at maximum @a timeout for the peer to be discovered.
+ * 
+ * @param forb 
+ * @param server_id 
+ * @param timeout 
+ * 
+ * @return The peer structure or NULL if the peer is not known even
+ * after the timeout elapses.
+ * 
+ * @note After the returned peer is not needed, forb_peer_put() must
+ * called on it.
+ */
 forb_peer_t *
 forb_peer_find_timed(forb_t *forb, forb_server_id *server_id,
                     fosa_abs_time_t *timeout)
 {
        forb_peer_t *peer;
+       bool peer_allocated = false;
        
        fosa_mutex_lock(&forb->peer_mutex);
        peer = forb_peer_nolock_find(forb, server_id);
        if (!peer && !timeout) goto unlock;
        if (peer) {
                forb_peer_get(peer);
-       }
-       if (!peer) {
+       } else {
                /* We are the first who want to contact this peer */
                peer = forb_peer_new();
                if (!peer) goto unlock;
                peer->server_id = *server_id;
                peer->state = FORB_PEER_WANTED;
-               forb_peer_get(peer);
-               forb_peer_nolock_insert(forb, peer);
+               forb_peer_nolock_insert(forb, forb_peer_get(peer));
+               peer_allocated = true;
        }
        while (peer->state == FORB_PEER_WANTED) {
                int ret;
@@ -128,11 +151,13 @@ forb_peer_find_timed(forb_t *forb, forb_server_id *server_id,
                                          &forb->peer_mutex,
                                          timeout);
                if (ret == FOSA_ETIMEDOUT) {
+                       /* No peer discovered within timeout */
+                       if (peer_allocated) {
+                               forb_peer_nolock_delete(forb, peer);
+                               forb_peer_put(peer);
+                       }
                        forb_peer_put(peer);
                        peer = NULL;
-                       /* TODO: How to remove the peer from the tree?
-                        * We should check refcnt and if equal to 1,
-                        * we should remove it.  */
                        break;
                }
        }