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
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;
}