mapperd: Always sleep before checking request state.

[archipelago] / xseg / peers / user / monitor.c

diff --git a/xseg/peers/user/monitor.c b/xseg/peers/user/monitor.c
index 70cc8b4..1a845d5 100644 (file)
--- a/xseg/peers/user/monitor.c
+++ b/xseg/peers/user/monitor.c
@@ -1,9 +1,43 @@
+/*
+ * Copyright 2012 GRNET S.A. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer.
+ *   2. Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials
+ *      provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and
+ * documentation are those of the authors and should not be
+ * interpreted as representing official policies, either expressed
+ * or implied, of GRNET S.A.
+ */
+
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <pthread.h>
 #include <xseg/xseg.h>
-#include <mpeer.h>
+#include <peer.h>
 #include <sys/time.h>
 
 #define INPUT_BUF_SIZE 256
@@ -18,7 +52,10 @@ struct monitor_io {
        void *src_priv;
 };
 
-
+void custom_peer_usage()
+{
+       return;
+}
 
 static int forward(struct peerd *peer, struct peer_req *pr)
 {
@@ -47,7 +84,8 @@ static int complete_forwarded(struct peerd *peer, struct peer_req *pr)
        return 0;
 }
 
-int dispatch(struct peerd *peer, struct peer_req *pr, struct xseg_request *xreq)
+int dispatch(struct peerd *peer, struct peer_req *pr, struct xseg_request *xreq,
+               enum dispatch_reason reason)
 {
        struct xseg_request *req = pr->req;
        if (req->state & (XS_SERVED | XS_FAILED)){
@@ -64,19 +102,19 @@ int dispatch(struct peerd *peer, struct peer_req *pr, struct xseg_request *xreq)
 int mpause(struct peerd *peer)
 {
        struct xseg *xseg = peer->xseg;
-       struct xseg_port *port = xseg_get_port(xseg, peer->portno);
+       struct xseg_port *port = xseg_get_port(xseg, peer->portno_start);
        if (!port)
                return -1;
        
-       xlock_acquire(&port->rq_lock, peer->portno);
-       xlock_acquire(&port->pq_lock, peer->portno);
+       xlock_acquire(&port->rq_lock, peer->portno_start);
+       xlock_acquire(&port->pq_lock, peer->portno_start);
        return 0;
 }
 
 int munpause(struct peerd *peer)
 {
        struct xseg *xseg = peer->xseg;
-       struct xseg_port *port = xseg_get_port(xseg, peer->portno);
+       struct xseg_port *port = xseg_get_port(xseg, peer->portno_start);
        if (!port)
                return -1;
        
@@ -180,3 +218,8 @@ int custom_peer_init(struct peerd *peer, int argc, char *argv[])
 
        return 0;
 }
+
+void custom_peer_finalize(struct peerd *peer)
+{
+       return;
+}