X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/b34a548a5dfd2f0b068fd835a4cd51680d851068..1968cb90e13a25eac384cc901a3f6d31d4cb708a:/lincan/src/can_queue.c

diff --git a/lincan/src/can_queue.c b/lincan/src/can_queue.c
index 96c37a4..c4130aa 100644
--- a/lincan/src/can_queue.c
+++ b/lincan/src/can_queue.c
@@ -313,6 +313,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 +334,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);
@@ -477,6 +493,7 @@ int canque_flush(struct canque_edge_t *qedge)
 int canqueue_ends_init_gen(struct canque_ends_t *qends)
 {
 	int i;
+	qends->ends_flags=0;
 	for(i=CANQUEUE_PRIO_NR;--i>=0;){
 		INIT_LIST_HEAD(&qends->active[i]);
 	}
@@ -635,4 +652,45 @@ int canqueue_ends_kill_outlist(struct canque_ends_t *qends)
 }
 
 
+/**
+ * canqueue_ends_filt_conjuction - computes conjunction of incoming edges filters filters
+ * @qends: pointer to ends structure
+ * @filt: pointer the filter structure filled by computed filters conjunction
+ *
+ * Return Value: Number of incoming edges
+ */
+int canqueue_ends_filt_conjuction(struct canque_ends_t *qends, struct canfilt_t *filt)
+{
+	struct canque_edge_t *edge;
+	int cnt=0;
+	unsigned long filtid=0;
+	unsigned long filtmask=~0;
+	unsigned long local_only=canque_filtid2internal(0,MSG_LOCAL);
+
+	canque_for_each_inedge(qends, edge){
+		/* skip edges processing only local messages */
+		if(edge->filtid & edge->filtmask & local_only)
+			continue;
+
+		if(!cnt++)
+			filtid = edge->filtid;
+		else
+			filtmask &= ~(filtid ^ edge->filtid);
+	
+		filtmask &= edge->filtmask;
+	}
+	
+	filt->id = filtid & MSG_ID_MASK;
+	filt->mask = filtmask & MSG_ID_MASK;
+	filtid >>= 28;
+	filtmask >>= 28;
+	filt->flags = filtid & MSG_EXT;
+	if(filtmask & (MSG_EXT))
+		filt->flags |= MSG_EXT_MASK;
+	if(filtid & (MSG_RTR<<1))
+		filt->flags |= MSG_RTR<<1;
+	if(filtmask & (MSG_RTR<<1))
+		filt->flags |= MSG_RTR_MASK;
+	return cnt;
+}