epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

libCom/test: fix ringPointerTest compile issues on vxWorks and MSVC

Browse Source 
Remove C GNU-isms
1) mixing code/variable defs
2) arithmetic on void*
This commit is contained in:
Michael Davidsaver
2014-11-17 18:55:47 -05:00
parent 66fbbbb19a
commit f9d0fd351d
1 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libCom/test/ringPointerTest.c
+41 -36
View File
@@ -26,14 +26,37 @@
#include "epicsUnitTest.h"
#include "testMain.h"
static
void *int2ptr(size_t i)
{
char *zero = 0;
i = i|(i<<16);
return zero+i;
}
static int foundCorruption;
static
size_t ptr2int(void *p)
{
char *zero = 0, *p2 = p;
size_t i = p2-zero;
if((i&0xffff)!=((i>>16)&0xffff)) {
testDiag("Pointer value corruption %p", p);
foundCorruption = 1;
}
return i&0xffff;
}
static void testSingle(void)
{
void *i;
int i;
const int rsize = 100;
void * const zero = 0; /* avoid warnings about int<->pointer casting */
void *addr = 0;
epicsRingPointerId ring = epicsRingPointerCreate(rsize);
foundCorruption = 0;
testDiag("Testing operations w/o threading");
testOk1(epicsRingPointerIsEmpty(ring));
@@ -44,7 +67,7 @@ static void testSingle(void)
testOk1(epicsRingPointerPop(ring)==NULL);
addr = zero+1;
addr = int2ptr(1);
testOk1(epicsRingPointerPush(ring, addr)==1);
testOk1(!epicsRingPointerIsEmpty(ring));
@@ -54,15 +77,16 @@ static void testSingle(void)
testOk1(epicsRingPointerGetUsed(ring)==1);
testDiag("Fill it up");
for(i=zero+2; i<zero+2*rsize; i++) {
addr = i;
int ret = epicsRingPointerPush(ring, addr);
for(i=2; i<2*rsize; i++) {
int ret;
addr = int2ptr(i);
ret = epicsRingPointerPush(ring, addr);
if(!ret)
break;
}
/* Note: +1 because we started with 1 */
testOk(i==zero+rsize+1, "%p == %p", i, zero+rsize+1);
testOk(i==rsize+1, "%d == %d", i, rsize+1);
testOk1(!epicsRingPointerIsEmpty(ring));
testOk1(epicsRingPointerIsFull(ring));
testOk1(epicsRingPointerGetFree(ring)==0);
@@ -70,13 +94,15 @@ static void testSingle(void)
testOk1(epicsRingPointerGetUsed(ring)==rsize);
testDiag("Drain it out");
for(i=zero+1; i<zero+2*rsize; i++) {
for(i=1; i<2*rsize; i++) {
addr = epicsRingPointerPop(ring);
if(addr==NULL || addr!=i)
if(addr==NULL || ptr2int(addr)!=i)
break;
}
testOk(i==zero+rsize+1, "%p == %p", i, zero+rsize+1);
testOk1(!foundCorruption);
testOk(i==rsize+1, "%d == %d", i, rsize+1);
testOk1(epicsRingPointerIsEmpty(ring));
testOk1(!epicsRingPointerIsFull(ring));
testOk1(epicsRingPointerGetFree(ring)==rsize);
@@ -84,9 +110,10 @@ static void testSingle(void)
testOk1(epicsRingPointerGetUsed(ring)==0);
testDiag("Fill it up again");
for(i=zero+2; i<zero+2*rsize; i++) {
addr = i;
int ret = epicsRingPointerPush(ring, addr);
for(i=2; i<2*rsize; i++) {
int ret;
addr = int2ptr(i);
ret = epicsRingPointerPush(ring, addr);
if(!ret)
break;
}
@@ -104,28 +131,6 @@ static void testSingle(void)
epicsRingPointerDelete(ring);
}
static
void *int2ptr(size_t i)
{
void *zero = 0;
i = i|(i<<16);
return zero+i;
}
static int foundCorruption;
static
size_t ptr2int(void *p)
{
void *zero = 0;
size_t i = p-zero;
if((i&0xffff)!=((i>>16)&0xffff)) {
testDiag("Pointer value corruption %p", p);
foundCorruption = 1;
}
return i&0xffff;
}
typedef struct {
epicsRingPointerId ring;
epicsEventId sync, wait;
@@ -229,7 +234,7 @@ static void testPair(int locked)
MAIN(ringPointerTest)
{
testPlan(36);
testPlan(37);
testSingle();
testPair(0);
testPair(1);