* 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"
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
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;
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);
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);
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))
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){
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;
}
/**
* canqueue_ends_filt_conjuction - computes conjunction of incoming edges filters filters
* @qends: pointer to ends structure
- * @qends: pointer the filter structure filled by computed filters conjunction
+ * @filt: pointer the filter structure filled by computed filters conjunction
*
* Return Value: Number of incoming edges
*/
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;
+}
+
+
+
+