From: ppisa <ppisa>
Date: Fri, 23 Jan 2004 04:18:30 +0000 (+0000)
Subject: Added missing indication CAN_ENDSF_MEM_RTL for RTL pool malloc.
X-Git-Tag: CLT_COMM_CAN_pre_canmsg_change~3
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/c29d86ce91159cc6ddcb4266903f0aafe9992e01

Added missing indication CAN_ENDSF_MEM_RTL for RTL pool malloc.
This fixes serious bug in RTL LinCAN mode.
Some more small updates added.
The call canque_notify_bothends(edge,CANQUEUE_NOTIFY_NOUSR)
invoked without locks hold now.
---

diff --git a/lincan/include/can_queue.h b/lincan/include/can_queue.h
index b8cbb09..8821dca 100644
--- a/lincan/include/can_queue.h
+++ b/lincan/include/can_queue.h
@@ -547,8 +547,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);
diff --git a/lincan/src/can_quekern.c b/lincan/src/can_quekern.c
index 093886c..5089e5c 100644
--- a/lincan/src/can_quekern.c
+++ b/lincan/src/can_quekern.c
@@ -15,14 +15,14 @@
 extern atomic_t edge_num_cnt;
 
 #ifdef CAN_DEBUG
-	#define DEBUGQUE(fmt,args...) can_printk(KERN_ERR "can_queue (debug): " fmt,\
+	#define DEBUGQUE(fmt,args...) can_printk(KERN_ERR "can_quekern (debug): " fmt,\
 	##args)
 
 #else
 	#define DEBUGQUE(fmt,args...)
 #endif
 
-#define ERRMSGQUE(fmt,args...) can_printk(KERN_ERR "can_queue: " fmt,\
+#define ERRMSGQUE(fmt,args...) can_printk(KERN_ERR "can_quekern: " fmt,\
 	##args)
 
 
@@ -128,6 +128,27 @@ void canque_edge_do_dead(struct canque_edge_t *edge, int dead_fl)
 	
 	if(dead_fl) return;
 	
+	canque_notify_bothends(edge,CANQUEUE_NOTIFY_NOUSR);
+    #ifdef CAN_WITH_RTL
+	/* The problem of the above call is, that in RT-Linux to Linux notify
+	   case is edge scheduled for delayed notify delivery, this needs
+	   to be reflected there */
+	if(atomic_read(&edge->edge_used)>0){
+		can_spin_lock_irqsave(&edge->inends->ends_lock, flags);
+		can_spin_lock(&edge->outends->ends_lock);
+		if(atomic_read(&edge->edge_used)>0){
+			/* left edge to live for a while, banshee comes again in a while */
+			canque_fifo_clear_fl(&edge->fifo,DEAD);
+			can_spin_unlock(&edge->outends->ends_lock);
+			can_spin_unlock_irqrestore(&edge->inends->ends_lock, flags);
+			can_printk(KERN_ERR "can_quertl (debug): canque_edge_do_dead postponed\n");
+			return;
+		}
+		can_spin_unlock(&edge->outends->ends_lock);
+		can_spin_unlock_irqrestore(&edge->inends->ends_lock, flags);
+	}
+    #endif /*CAN_WITH_RTL*/
+	
 	if(canqueue_disconnect_edge(edge)<0){
 		ERRMSGQUE("canque_edge_do_dead: canqueue_disconnect_edge failed !!!\n");
 		return;
diff --git a/lincan/src/can_quertl.c b/lincan/src/can_quertl.c
index 0a6fa40..dc59f8e 100644
--- a/lincan/src/can_quertl.c
+++ b/lincan/src/can_quertl.c
@@ -374,6 +374,7 @@ int canqueue_ends_init_rtl(struct canque_ends_t *qends)
 	rtl_wait_init(&(qends->endinfo.rtlinfo.rtl_emptyq));
 	
 	qends->notify=canqueue_notify_rtl;
+	qends->endinfo.rtlinfo.pend_flags=0;
 	return 0;
 }
 
diff --git a/lincan/src/can_queue.c b/lincan/src/can_queue.c
index 96c37a4..f061f4f 100644
--- a/lincan/src/can_queue.c
+++ b/lincan/src/can_queue.c
@@ -477,6 +477,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]);
 	}
diff --git a/lincan/src/open_rtl.c b/lincan/src/open_rtl.c
index 230e3eb..2730ee3 100644
--- a/lincan/src/open_rtl.c
+++ b/lincan/src/open_rtl.c
@@ -52,6 +52,8 @@ int can_open_rtl_common(struct canuser_t *canuser, int open_flags)
 	qends = (struct canque_ends_t *)rt_malloc(sizeof(struct canque_ends_t));
 	if(qends == NULL) goto no_qends;
 	canqueue_ends_init_rtl(qends);
+	/* mark memory as allocated from RTL memory pool */
+	qends->ends_flags|=CAN_ENDSF_MEM_RTL;
 	canuser->qends = qends;
 	
 	can_spin_lock_irqsave(&canuser_manipulation_lock, iflags);
diff --git a/lincan/utils/readburst_rtl.c b/lincan/utils/readburst_rtl.c
index 9f03cbf..afb0eed 100644
--- a/lincan/utils/readburst_rtl.c
+++ b/lincan/utils/readburst_rtl.c
@@ -124,6 +124,8 @@ int readburst_main(void *arg)
 			printf("\n");
 			i++;
 		}
+		pthread_testcancel();
+
 	}
 	/* close(fd); is called by cleanup handler*/
         pthread_cleanup_pop(1);
@@ -154,4 +156,7 @@ int init_module(void) {
 
 void cleanup_module(void) {
         pthread_delete_np (t1);
+	
+	/*pthread_cancel(t1);
+	pthread_join(t1, NULL);*/
 }
diff --git a/lincan/utils/sendburst_rtl.c b/lincan/utils/sendburst_rtl.c
index 45a69fd..94a3e04 100644
--- a/lincan/utils/sendburst_rtl.c
+++ b/lincan/utils/sendburst_rtl.c
@@ -115,5 +115,8 @@ int init_module(void) {
 }
 
 void cleanup_module(void) {
-        pthread_delete_np (t1);
+        /*pthread_delete_np (t1);*/
+	
+	pthread_cancel(t1);
+	pthread_join(t1, NULL);
 }