bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in ec_master_queue_datagram() introduced in c9d32805d984.

This commit is contained in:
Florian Pose 2011-07-21 18:25:38 +02:00
parent 8e5a96aa45
commit e80332d61a
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
master/master.c
View File

@ -841,6 +841,8 @@ void ec_master_queue_datagram(
ec_datagram_t *datagram /**< datagram */
)
{
ec_datagram_t *queued_datagram;
switch (datagram->state) {
case EC_DATAGRAM_QUEUED:
datagram->skip_count++;
@ -855,12 +857,28 @@ void ec_master_queue_datagram(
break;
default:
list_add_tail(&datagram->queue, &master->datagram_queue);
datagram->state = EC_DATAGRAM_QUEUED;
break;
}
}
/* It is possible, that a datagram in the queue is re-initialized with the
* ec_datagram_<type>() methods and then shall be queued with this method.
* In that case, the state is already reset to EC_DATAGRAM_INIT. Check if
* the datagram is queued to avoid duplicate queuing (which results in an
* infinite loop!). Set the state to EC_DATAGRAM_QUEUED again, probably
* causing an unmatched datagram. */
list_for_each_entry(queued_datagram, &master->datagram_queue, queue) {
if (queued_datagram == datagram) {
datagram->skip_count++;
EC_MASTER_DBG(master, 1, "Skipping re-initialized datagram %p.\n",
datagram);
datagram->state = EC_DATAGRAM_QUEUED;
return;
}
}
list_add_tail(&datagram->queue, &master->datagram_queue);
datagram->state = EC_DATAGRAM_QUEUED;
}
/*****************************************************************************/