X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/2827b727d2910a3b48f9de7d67b3a67f59e256c7..c759ac4ffabb78a8863d9bced695980077eeb319:/lincan/src/can_queue.c

diff --git a/lincan/src/can_queue.c b/lincan/src/can_queue.c
index b0c027e..d90b9c5 100644
--- a/lincan/src/can_queue.c
+++ b/lincan/src/can_queue.c
@@ -3,7 +3,7 @@
  * New CAN queues by Pavel Pisa - OCERA team member
  * email:pisa@cmp.felk.cvut.cz
  * This software is released under the GPL-License.
- * Version lincan-0.2  9 Jul 2003
+ * Version lincan-0.3  17 Jun 2004
  */
 
 #include "../include/can.h"
@@ -97,6 +97,11 @@ int canque_fifo_init_slots(struct canque_fifo_t *fifo)
  list_entry(ptr, type, member)
 */
 
+void __canque_edge_decref(struct canque_edge_t *edge)
+{
+	__canque_edge_decref_body(edge);
+}
+
 /**
  * canque_get_inslot - finds one outgoing edge and allocates slot from it
  * @qends: ends structure belonging to calling communication object
@@ -313,6 +318,20 @@ int canque_test_outslot(struct canque_ends_t *qends,
 		while(!list_empty(&qends->active[prio])){
 			edge=list_entry(qends->active[prio].next,struct canque_edge_t,activepeers);
 			if(!canque_fifo_test_fl(&edge->fifo,DEAD)) {
+				/* The first test on unlocked FIFO */
+				if(canque_fifo_test_fl(&edge->fifo,EMPTY)) {
+					can_spin_lock(&edge->fifo.fifo_lock);
+					/* Test has to be repeated to ensure that EMPTY
+					   state has not been nagated when locking FIFO */
+					if(canque_fifo_test_fl(&edge->fifo,EMPTY)) {
+						canque_fifo_set_fl(&edge->fifo,INACTIVE);
+						list_del(&edge->activepeers);
+						list_add(&edge->activepeers,&qends->idle);
+						can_spin_unlock(&edge->fifo.fifo_lock);
+						continue;
+					}
+					can_spin_unlock(&edge->fifo.fifo_lock);
+				}
 				canque_edge_incref(edge);
 				can_spin_unlock_irqrestore(&qends->ends_lock, flags);
 				*qedgep=edge;
@@ -320,14 +339,16 @@ int canque_test_outslot(struct canque_ends_t *qends,
 				ret=canque_fifo_test_outslot(&edge->fifo, slotp);
 				if(ret>=0)
 					return ret;
+
+				canque_edge_decref(edge);
 				can_spin_lock_irqsave(&qends->ends_lock, flags);
-			}
-			can_spin_lock(&edge->fifo.fifo_lock);
-			if(canque_fifo_test_and_set_fl(&edge->fifo,INACTIVE)) {
+			} else {
+				can_spin_lock(&edge->fifo.fifo_lock);
+				canque_fifo_set_fl(&edge->fifo,INACTIVE);
 				list_del(&edge->activepeers);
 				list_add(&edge->activepeers,&qends->idle);
+				can_spin_unlock(&edge->fifo.fifo_lock);
 			}
-			can_spin_unlock(&edge->fifo.fifo_lock);
 		}
 	}
 	can_spin_unlock_irqrestore(&qends->ends_lock, flags);
@@ -503,8 +524,7 @@ int canqueue_connect_edge(struct canque_edge_t *qedge, struct canque_ends_t *ine
 	if(qedge == NULL) return -1;
 	DEBUGQUE("canqueue_connect_edge %d\n",qedge->edge_num);
 	canque_edge_incref(qedge);
-	can_spin_lock_irqsave(&inends->ends_lock, flags);
-	can_spin_lock(&outends->ends_lock);
+	flags=canque_edge_lock_both_ends(inends, outends);
 	can_spin_lock(&qedge->fifo.fifo_lock);
 	qedge->inends=inends;
 	list_add(&qedge->inpeers,&inends->inlist);
@@ -512,8 +532,7 @@ int canqueue_connect_edge(struct canque_edge_t *qedge, struct canque_ends_t *ine
 	list_add(&qedge->outpeers,&outends->outlist);
 	list_add(&qedge->activepeers,&outends->idle);
 	can_spin_unlock(&qedge->fifo.fifo_lock);
-	can_spin_unlock(&outends->ends_lock);
-	can_spin_unlock_irqrestore(&inends->ends_lock, flags);
+	canque_edge_unlock_both_ends(inends, outends, flags);
 	canque_notify_bothends(qedge, CANQUEUE_NOTIFY_ATTACH);
 
 	if(canque_fifo_test_and_set_fl(&qedge->fifo, READY))
@@ -535,9 +554,17 @@ int canqueue_disconnect_edge(struct canque_edge_t *qedge)
 	struct canque_ends_t *inends, *outends;
 
 	inends=qedge->inends;
-	if(inends) can_spin_lock_irqsave(&inends->ends_lock,flags);
 	outends=qedge->outends;
-	if(outends) can_spin_lock(&outends->ends_lock);
+
+	if(inends && outends) {
+		flags=canque_edge_lock_both_ends(inends, outends);
+	} else {
+		DEBUGQUE("canqueue_disconnect_edge called with not fully connected edge");
+		if(inends) can_spin_lock_irqsave(&inends->ends_lock,flags);
+		if(outends) can_spin_lock(&outends->ends_lock);
+		flags=0;
+	}
+	
 	can_spin_lock(&qedge->fifo.fifo_lock);
 	if(atomic_read(&qedge->edge_used)==0) {
 		if(qedge->outends){
@@ -553,8 +580,14 @@ int canqueue_disconnect_edge(struct canque_edge_t *qedge)
 		ret=1;
 	} else ret=-1;
 	can_spin_unlock(&qedge->fifo.fifo_lock);
-	if(outends) can_spin_unlock(&outends->ends_lock);
-	if(inends) can_spin_unlock_irqrestore(&inends->ends_lock,flags);
+
+	if(inends && outends) {
+		canque_edge_unlock_both_ends(inends, outends, flags);
+	} else {
+		if(outends) can_spin_unlock(&outends->ends_lock);
+		if(inends) can_spin_unlock_irqrestore(&inends->ends_lock,flags);
+	}
+
 	DEBUGQUE("canqueue_disconnect_edge %d returned %d\n",qedge->edge_num,ret);
 	return ret;
 }
@@ -678,3 +711,40 @@ int canqueue_ends_filt_conjuction(struct canque_ends_t *qends, struct canfilt_t
 	return cnt;
 }
 
+
+/**
+ * canqueue_ends_flush_inlist - flushes all messages in incoming edges
+ * @qends: pointer to ends structure
+ *
+ * Return Value: Negative value informs about unsuccessful result
+ */
+int canqueue_ends_flush_inlist(struct canque_ends_t *qends)
+{
+	struct canque_edge_t *edge;
+	
+	canque_for_each_inedge(qends, edge){
+		canque_flush(edge);
+	}
+	return 0;
+}
+
+
+/**
+ * canqueue_ends_flush_outlist - flushes all messages in outgoing edges
+ * @qends: pointer to ends structure
+ *
+ * Return Value: Negative value informs about unsuccessful result
+ */
+int canqueue_ends_flush_outlist(struct canque_ends_t *qends)
+{
+	struct canque_edge_t *edge;
+	
+	canque_for_each_outedge(qends, edge){
+		canque_flush(edge);
+	}
+	return 0;
+}
+
+
+
+