Structured comments updated.

[lincan.git] / lincan / include / can_queue.h

diff --git a/lincan/include/can_queue.h b/lincan/include/can_queue.h
index aacfd846f2b52ebfada182ef72a91897a8810d5b..c3df3ad4fab73ab5fd5fc460ae58d9a1220aa191 100644 (file)
--- a/lincan/include/can_queue.h
+++ b/lincan/include/can_queue.h
@@ -1,7 +1,7 @@
 #ifndef _CAN_QUEUE_H
 #define _CAN_QUEUE_H
 
-#include "./can.h"
+#include "./canmsg.h"
 #include "./constants.h"
 #include "./can_sysdep.h"
 
@@ -39,7 +39,7 @@
  * @flist: pointer to list of the free slots associated with queue
  * @entry: pointer to the memory allocated for the list slots.
  * @fifo_lock: the lock to ensure atomicity of slot manipulation operations.
- * @slotnr:  number of allocated slots
+ * @slotsnr:  number of allocated slots
  *
  * This structure represents CAN FIFO queue. It is implemented as 
  * a single linked list of slots prepared for processing. The empty slots
@@ -319,6 +319,8 @@ struct canque_edge_t {
  *     with ready messages. The array is indexed by the edges priorities. 
  * @idle: the list of the edges directed to the ends structure with empty FIFOs.
  * @inlist: the list of outgoing edges input sides.
+ * @outlist: the list of all incoming edges output sides. Each of there edges
+ *     is listed on one of @active or @idle lists.
  * @ends_lock: the lock synchronizing operations between threads accessing
  *     same ends structure.
  * @notify: pointer to notify procedure. The next state changes are notified.
@@ -362,8 +364,11 @@ struct canque_ends_t {
                struct {
                        rtl_spinlock_t rtl_lock;
                        rtl_wait_t rtl_readq;
+                       atomic_t   rtl_readq_age;
                        rtl_wait_t rtl_writeq;
+                       atomic_t   rtl_writeq_age;
                        rtl_wait_t rtl_emptyq;
+                       atomic_t   rtl_emptyq_age;
                        unsigned long pend_flags;
                } rtlinfo;
            #endif /*CAN_WITH_RTL*/
@@ -522,6 +527,8 @@ int canqueue_ends_kill_inlist(struct canque_ends_t *qends, int send_rest);
 
 int canqueue_ends_kill_outlist(struct canque_ends_t *qends);
 
+int canqueue_ends_filt_conjuction(struct canque_ends_t *qends, struct canfilt_t *filt);
+
 /* edge reference and traversal functions */
 
 void canque_edge_do_dead(struct canque_edge_t *edge, int dead_fl);
@@ -544,8 +551,9 @@ void canque_edge_decref(struct canque_edge_t *edge)
        can_spin_lock(&outends->ends_lock);
        if(atomic_dec_and_test(&edge->edge_used)) {
                dead_fl=canque_fifo_test_and_set_fl(&edge->fifo,DEAD);
-               /*This should not be there, but it cannot be outside of the lock :-(*/
-               canque_notify_bothends(edge,CANQUEUE_NOTIFY_NOUSR);
+               /* Because of former evolution of edge references 
+                  management notify of CANQUEUE_NOTIFY_NOUSR could
+                  be moved to canque_edge_do_dead :-) */
                can_spin_unlock(&outends->ends_lock);
                can_spin_unlock_irqrestore(&inends->ends_lock, flags);
                canque_edge_do_dead(edge, dead_fl);
@@ -687,7 +695,16 @@ void canqueue_ends_dispose_postpone(struct canque_ends_t *qends);
 void canqueue_kern_initialize(void);
 
 #ifdef CAN_WITH_RTL
-/* RT-Linux specific functions */
+
+extern struct tasklet_struct canque_dead_tl;   /*publication required only for RTL*/
+
+/* RT-Linux specific functions and variables */
+
+extern int canqueue_rtl_irq;
+
+extern unsigned long canqueue_rtl2lin_pend;
+
+#define CAN_RTL2LIN_PEND_DEAD_b 0
 
 void canqueue_rtl_initialize(void);
 void canqueue_rtl_done(void);
@@ -699,8 +716,19 @@ struct canque_edge_t *canque_new_edge_rtl(int slotsnr);
 
 void canque_dispose_edge_rtl(struct canque_edge_t *qedge);
 
+int canque_get_inslot4id_wait_rtl(struct canque_ends_t *qends,
+       struct canque_edge_t **qedgep, struct canque_slot_t **slotp,
+       int cmd, unsigned long id, int prio);
+
+int canque_get_outslot_wait_rtl(struct canque_ends_t *qends,
+       struct canque_edge_t **qedgep, struct canque_slot_t **slotp);
+
+int canque_sync_wait_rtl(struct canque_ends_t *qends, struct canque_edge_t *qedge);
+
 void canque_ends_free_rtl(struct canque_ends_t *qends);
 
+int canqueue_ends_init_rtl(struct canque_ends_t *qends);
+
 int canqueue_ends_dispose_rtl(struct canque_ends_t *qends, int sync);
 
 #else /*CAN_WITH_RTL*/