libs
/
SOEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #496 from alexkalmuk/fix-red-test-timespec-overflow 

Fix red test timespec overflow
This commit is contained in:
nakarlsson 2021-04-06 14:49:15 +02:00 committed by GitHub
parent b5f58d2130 52cb5fd5da
commit 25e36e44f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/linux/red_test/red_test.c
View File

@ -20,6 +20,7 @@
#include <time.h>
#include <pthread.h>
#include <math.h>
#include <inttypes.h>
#include "ethercat.h"
@ -52,6 +53,7 @@ void redtest(char *ifname, char *ifname2)
printf("Starting Redundant test\n");
/* initialise SOEM, bind socket to ifname */
(void) ifname2;
// if (ec_init_redundant(ifname, ifname2))
if (ec_init(ifname))
{
@ -73,8 +75,8 @@ void redtest(char *ifname, char *ifname2)
printf("Slave:%d Name:%s Output size:%3dbits Input size:%3dbits State:%2d delay:%d.%d\n",
cnt, ec_slave[cnt].name, ec_slave[cnt].Obits, ec_slave[cnt].Ibits,
ec_slave[cnt].state, (int)ec_slave[cnt].pdelay, ec_slave[cnt].hasdc);
printf(" Out:%8.8x,%4d In:%8.8x,%4d\n",
(int)ec_slave[cnt].outputs, ec_slave[cnt].Obytes, (int)ec_slave[cnt].inputs, ec_slave[cnt].Ibytes);
printf(" Out:%p,%4d In:%p,%4d\n",
ec_slave[cnt].outputs, ec_slave[cnt].Obytes, ec_slave[cnt].inputs, ec_slave[cnt].Ibytes);
/* check for EL2004 or EL2008 */
if( !digout && ((ec_slave[cnt].eep_id == 0x0af83052) || (ec_slave[cnt].eep_id == 0x07d83052)))
{
@ -105,7 +107,7 @@ void redtest(char *ifname, char *ifname2)
/* acyclic loop 5000 x 20ms = 10s */
for(i = 1; i <= 5000; i++)
{
printf("Processdata cycle %5d , Wck %3d, DCtime %12lld, dt %12lld, O:",
printf("Processdata cycle %5d , Wck %3d, DCtime %12"PRId64", dt %12"PRId64", O:",
dorun, wkc , ec_DCtime, gl_delta);
for(j = 0 ; j < oloop; j++)
{
@ -196,6 +198,10 @@ OSAL_THREAD_FUNC_RT ecatthread(void *ptr)
clock_gettime(CLOCK_MONOTONIC, &ts);
ht = (ts.tv_nsec / 1000000) + 1; /* round to nearest ms */
ts.tv_nsec = ht * 1000000;
if (ts.tv_nsec >= NSEC_PER_SEC) {
ts.tv_sec++;
ts.tv_nsec -= NSEC_PER_SEC;
}
cycletime = *(int*)ptr * 1000; /* cycletime in ns */
toff = 0;
dorun = 0;
@ -228,6 +234,8 @@ OSAL_THREAD_FUNC ecatcheck( void *ptr )
{
int slave;
(void) ptr;
while(1)
{
if( inOP && ((wkc < expectedWKC) || ec_group[currentgroup].docheckstate))