]> rtime.felk.cvut.cz Git - lincan.git/blobdiff - lincan/src/can_queue.c
Added support for fasync system call and replacement of spinXXX by can_spinXXX
[lincan.git] / lincan / src / can_queue.c
index ef0600596b1be57030730ee5cc11a923dddf7fd3..c0f1a6dc7e0a8926c5670dd6103115f5c99e7fe2 100644 (file)
@@ -47,9 +47,9 @@ atomic_t edge_num_cnt;
 int canque_fifo_flush_slots(struct canque_fifo_t *fifo)
 {
        int ret;
-       unsigned long flags;
+       can_spin_irqflags_t flags;
        struct canque_slot_t *slot;
-       spin_lock_irqsave(&fifo->fifo_lock, flags);
+       can_spin_lock_irqsave(&fifo->fifo_lock, flags);
        slot=fifo->head;
        if(slot){
                *fifo->tail=fifo->flist;
@@ -59,7 +59,7 @@ int canque_fifo_flush_slots(struct canque_fifo_t *fifo)
        }
        canque_fifo_clear_fl(fifo,FULL);
        ret=canque_fifo_test_and_set_fl(fifo,EMPTY)?0:1;
-       spin_unlock_irqrestore(&fifo->fifo_lock, flags);
+       can_spin_unlock_irqrestore(&fifo->fifo_lock, flags);
        return ret;
 }
 
@@ -318,34 +318,34 @@ int canque_filter_msg2edges(struct canque_ends_t *qends, struct canmsg_t *msg)
 int canque_test_outslot(struct canque_ends_t *qends,
        struct canque_edge_t **qedgep, struct canque_slot_t **slotp)
 {
-       unsigned long flags;
+       can_spin_irqflags_t flags;
        int prio;
        struct canque_edge_t *edge;
        int ret;
        
-       spin_lock_irqsave(&qends->ends_lock, flags);
+       can_spin_lock_irqsave(&qends->ends_lock, flags);
        for(prio=CANQUEUE_PRIO_NR;--prio>=0;){
                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)) {
                                canque_edge_incref(edge);
-                               spin_unlock_irqrestore(&qends->ends_lock, flags);
+                               can_spin_unlock_irqrestore(&qends->ends_lock, flags);
                                *qedgep=edge;
                                DEBUGQUE("canque_test_outslot found edge %d\n",edge->edge_num);
                                ret=canque_fifo_test_outslot(&edge->fifo, slotp);
                                if(ret>=0)
                                        return ret;
-                               spin_lock_irqsave(&qends->ends_lock, flags);
+                               can_spin_lock_irqsave(&qends->ends_lock, flags);
                        }
-                       spin_lock(&edge->fifo.fifo_lock);
+                       can_spin_lock(&edge->fifo.fifo_lock);
                        if(canque_fifo_test_and_set_fl(&edge->fifo,INACTIVE)) {
                                list_del(&edge->activepeers);
                                list_add(&edge->activepeers,&qends->idle);
                        }
-                       spin_unlock(&edge->fifo.fifo_lock);
+                       can_spin_unlock(&edge->fifo.fifo_lock);
                }
        }
-       spin_unlock_irqrestore(&qends->ends_lock, flags);
+       can_spin_unlock_irqrestore(&qends->ends_lock, flags);
        *qedgep=NULL;
        DEBUGQUE("canque_test_outslot no ready slot\n");
        return -1;
@@ -366,16 +366,16 @@ int canque_free_outslot(struct canque_ends_t *qends,
        struct canque_edge_t *qedge, struct canque_slot_t *slot)
 {
        int ret;
-       unsigned long flags;
+       can_spin_irqflags_t flags;
        ret=canque_fifo_free_outslot(&qedge->fifo, slot);
        if(ret&CAN_FIFOF_EMPTY){
                canque_notify_inends(qedge,CANQUEUE_NOTIFY_EMPTY);
        }
        if(ret&CAN_FIFOF_FULL)
                canque_notify_inends(qedge,CANQUEUE_NOTIFY_SPACE);
-       spin_lock_irqsave(&qends->ends_lock, flags);
+       can_spin_lock_irqsave(&qends->ends_lock, flags);
        if((ret&CAN_FIFOF_EMPTY) || CANQUE_ROUNDROB ){
-               spin_lock(&qedge->fifo.fifo_lock);
+               can_spin_lock(&qedge->fifo.fifo_lock);
                if(canque_fifo_test_fl(&qedge->fifo,EMPTY)){
                        canque_fifo_set_fl(&qedge->fifo,INACTIVE);
                        list_del(&qedge->activepeers);
@@ -384,9 +384,9 @@ int canque_free_outslot(struct canque_ends_t *qends,
                        list_del(&qedge->activepeers);
                        list_add_tail(&qedge->activepeers,&qends->active[qedge->edge_prio]);
                }
-               spin_unlock(&qedge->fifo.fifo_lock);
+               can_spin_unlock(&qedge->fifo.fifo_lock);
        }
-       spin_unlock_irqrestore(&qends->ends_lock, flags);
+       can_spin_unlock_irqrestore(&qends->ends_lock, flags);
        canque_edge_decref(qedge);
        DEBUGQUE("canque_free_outslot for edge %d returned %d\n",qedge->edge_num,ret);
        return ret;
@@ -425,9 +425,9 @@ int canque_set_filt(struct canque_edge_t *qedge,
        unsigned long filtid, unsigned long filtmask, int filtflags)
 {
        int ret;
-       unsigned long flags;
+       can_spin_irqflags_t flags;
 
-       spin_lock_irqsave(&qedge->fifo.fifo_lock,flags);
+       can_spin_lock_irqsave(&qedge->fifo.fifo_lock,flags);
        
        if(!(filtflags&MSG_PROCESSLOCAL) && (processlocal<2))
                filtflags |= MSG_LOCAL_MASK;
@@ -438,13 +438,13 @@ int canque_set_filt(struct canque_edge_t *qedge,
        if(canque_fifo_test_fl(&qedge->fifo,DEAD)) ret=-1;
        else ret=canque_fifo_test_and_set_fl(&qedge->fifo,BLOCK)?1:0;
 
-       spin_unlock_irqrestore(&qedge->fifo.fifo_lock,flags);
+       can_spin_unlock_irqrestore(&qedge->fifo.fifo_lock,flags);
        if(ret>=0){
                canque_notify_bothends(qedge,CANQUEUE_NOTIFY_FILTCH);
        }
-       spin_lock_irqsave(&qedge->fifo.fifo_lock,flags);
+       can_spin_lock_irqsave(&qedge->fifo.fifo_lock,flags);
        if(!ret) canque_fifo_clear_fl(&qedge->fifo,BLOCK);
-       spin_unlock_irqrestore(&qedge->fifo.fifo_lock,flags);
+       can_spin_unlock_irqrestore(&qedge->fifo.fifo_lock,flags);
        
        DEBUGQUE("canque_set_filt for edge %d, ID %ld, mask %ld, flags %d returned %d\n",
                  qedge->edge_num,filtid,filtmask,filtflags,ret);
@@ -464,20 +464,20 @@ int canque_set_filt(struct canque_edge_t *qedge,
 int canque_flush(struct canque_edge_t *qedge)
 {
        int ret;
-       unsigned long flags;
+       can_spin_irqflags_t flags;
 
        ret=canque_fifo_flush_slots(&qedge->fifo);
        if(ret){
                canque_notify_inends(qedge,CANQUEUE_NOTIFY_EMPTY);
                canque_notify_inends(qedge,CANQUEUE_NOTIFY_SPACE);
-               spin_lock_irqsave(&qedge->outends->ends_lock, flags);
-               spin_lock(&qedge->fifo.fifo_lock);
+               can_spin_lock_irqsave(&qedge->outends->ends_lock, flags);
+               can_spin_lock(&qedge->fifo.fifo_lock);
                if(canque_fifo_test_fl(&qedge->fifo,EMPTY)){
                        list_del(&qedge->activepeers);
                        list_add(&qedge->activepeers,&qedge->outends->idle);
                }
-               spin_unlock(&qedge->fifo.fifo_lock);
-               spin_unlock_irqrestore(&qedge->outends->ends_lock, flags);
+               can_spin_unlock(&qedge->fifo.fifo_lock);
+               can_spin_unlock_irqrestore(&qedge->outends->ends_lock, flags);
        }
        DEBUGQUE("canque_flush for edge %d returned %d\n",qedge->edge_num,ret);
        return ret;
@@ -498,7 +498,7 @@ int canqueue_ends_init_gen(struct canque_ends_t *qends)
        INIT_LIST_HEAD(&qends->idle);
        INIT_LIST_HEAD(&qends->inlist);
        INIT_LIST_HEAD(&qends->outlist);
-       spin_lock_init(&qends->ends_lock);
+       can_spin_lock_init(&qends->ends_lock);
        return 0;
 }
 
@@ -513,21 +513,21 @@ int canqueue_ends_init_gen(struct canque_ends_t *qends)
  */
 int canqueue_connect_edge(struct canque_edge_t *qedge, struct canque_ends_t *inends, struct canque_ends_t *outends)
 {
-       unsigned long flags;
+       can_spin_irqflags_t flags;
        if(qedge == NULL) return -1;
        DEBUGQUE("canqueue_connect_edge %d\n",qedge->edge_num);
        canque_edge_incref(qedge);
-       spin_lock_irqsave(&inends->ends_lock, flags);
-       spin_lock(&outends->ends_lock);
-       spin_lock(&qedge->fifo.fifo_lock);
+       can_spin_lock_irqsave(&inends->ends_lock, flags);
+       can_spin_lock(&outends->ends_lock);
+       can_spin_lock(&qedge->fifo.fifo_lock);
        qedge->inends=inends;
        list_add(&qedge->inpeers,&inends->inlist);
        qedge->outends=outends;
        list_add(&qedge->outpeers,&outends->outlist);
        list_add(&qedge->activepeers,&outends->idle);
-       spin_unlock(&qedge->fifo.fifo_lock);
-       spin_unlock(&outends->ends_lock);
-       spin_unlock_irqrestore(&inends->ends_lock, flags);
+       can_spin_unlock(&qedge->fifo.fifo_lock);
+       can_spin_unlock(&outends->ends_lock);
+       can_spin_unlock_irqrestore(&inends->ends_lock, flags);
        canque_notify_bothends(qedge, CANQUEUE_NOTIFY_ATTACH);
 
        if(canque_fifo_test_and_set_fl(&qedge->fifo, READY))
@@ -545,14 +545,14 @@ int canqueue_connect_edge(struct canque_edge_t *qedge, struct canque_ends_t *ine
 int canqueue_disconnect_edge(struct canque_edge_t *qedge)
 {
        int ret;
-       unsigned long flags;
+       can_spin_irqflags_t flags;
        struct canque_ends_t *inends, *outends;
 
        inends=qedge->inends;
-       if(inends) spin_lock_irqsave(&inends->ends_lock,flags);
+       if(inends) can_spin_lock_irqsave(&inends->ends_lock,flags);
        outends=qedge->outends;
-       if(outends) spin_lock(&outends->ends_lock);
-       spin_lock(&qedge->fifo.fifo_lock);
+       if(outends) can_spin_lock(&outends->ends_lock);
+       can_spin_lock(&qedge->fifo.fifo_lock);
        if(atomic_read(&qedge->edge_used)==0) {
                if(qedge->outends){
                        list_del(&qedge->activepeers);
@@ -566,9 +566,9 @@ int canqueue_disconnect_edge(struct canque_edge_t *qedge)
                }
                ret=1;
        } else ret=-1;
-       spin_unlock(&qedge->fifo.fifo_lock);
-       if(outends) spin_unlock(&outends->ends_lock);
-       if(inends) spin_unlock_irqrestore(&inends->ends_lock,flags);
+       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);
        DEBUGQUE("canqueue_disconnect_edge %d returned %d\n",qedge->edge_num,ret);
        return ret;
 }
@@ -602,3 +602,52 @@ void canqueue_block_outlist(struct canque_ends_t *qends)
 }
 
 
+/**
+ * canqueue_ends_kill_inlist - sends request to die to all outgoing edges
+ * @qends: pointer to ends structure
+ * @send_rest: select, whether already allocated slots should be processed
+ *     by FIFO output side
+ *
+ * Return Value: Non-zero value means, that not all edges could be immediately
+ *     disconnected and that ends structure memory release has to be delayed
+ */
+int canqueue_ends_kill_inlist(struct canque_ends_t *qends, int send_rest)
+{
+       struct canque_edge_t *edge;
+       
+       canque_for_each_inedge(qends, edge){
+               canque_notify_bothends(edge, CANQUEUE_NOTIFY_DEAD_WANTED);
+               if(send_rest){
+                       canque_edge_incref(edge);
+                       if(!canque_fifo_test_and_set_fl(&edge->fifo, FREEONEMPTY)){
+                               if(!canque_fifo_test_fl(&edge->fifo, EMPTY))
+                                       continue;
+                               if(!canque_fifo_test_and_clear_fl(&edge->fifo, FREEONEMPTY))
+                                       continue;
+                       }
+                       canque_edge_decref(edge);
+               }
+       }
+       return list_empty(&qends->inlist)?0:1;
+}
+
+
+/**
+ * canqueue_ends_kill_outlist - sends request to die to all incoming edges
+ * @qends: pointer to ends structure
+ *
+ * Return Value: Non-zero value means, that not all edges could be immediately
+ *     disconnected and that ends structure memory release has to be delayed
+ */
+int canqueue_ends_kill_outlist(struct canque_ends_t *qends)
+{
+       struct canque_edge_t *edge;
+       
+       canque_for_each_outedge(qends, edge){
+               canque_notify_bothends(edge, CANQUEUE_NOTIFY_DEAD_WANTED);
+       }
+       return list_empty(&qends->outlist)?0:1;
+}
+
+
+