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

fix EPICS_HOST_ARCH=linux-x86 problem in pvDataCPP/test

Browse Source 
add auxFd in testLinkedList.cpp so that test dopes not show extra info
This commit is contained in:
Marty Kraimer
2010-11-10 06:37:18 -05:00
parent 2b3701ab1c
commit 8f082c5ea6
9 changed files with 58 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
pvDataApp/miscTest/testLinkedList.cpp
View File

@@ -270,7 +270,7 @@ static void testOrderedQueue(FILE * fd ) {
for(int i=0; i<numNodes; i++) delete basics[i];
}
static void testTime() {
static void testTime(FILE *auxFd) {
epicsTimeStamp startTime;
epicsTimeStamp endTime;
int numNodes = 1000;
@@ -280,7 +280,7 @@ static void testTime() {
for(int i=0; i<numNodes; i++) {
basics[i] = new Basic(i);
}
printf("\nTime test\n");
fprintf(auxFd,"\nTime test\n");
int ntimes = 1000;
epicsTimeGetCurrent(&startTime);
for(int i=0; i<ntimes; i++) {
@@ -291,19 +291,19 @@ static void testTime() {
epicsTimeGetCurrent(&endTime);
double diff = epicsTimeDiffInSeconds(&endTime,&startTime);
diff *= 1000.0;
printf("diff %f milliSeconds\n",diff);
fprintf(auxFd,"diff %f milliSeconds\n",diff);
diff = diff/1000.0; // convert from milliseconds to seconds
diff = diff/ntimes; // seconds per outer loop
diff = diff*1e6; // converty to microseconds
printf("time per iteration %f microseconds\n",diff);
fprintf(auxFd,"time per iteration %f microseconds\n",diff);
diff = diff/(numNodes*2); // convert to per addTail/removeHead
printf("time per addTail/removeHead %f microseconds\n",diff);
fprintf(auxFd,"time per addTail/removeHead %f microseconds\n",diff);
assert(basicList->isEmpty());
delete basicList;
for(int i=0; i<numNodes; i++) delete basics[i];
}
static void testTimeLocked() {
static void testTimeLocked(FILE *auxFd) {
epicsTimeStamp startTime;
epicsTimeStamp endTime;
Mutex *mutex = new Mutex();
@@ -314,7 +314,7 @@ static void testTimeLocked() {
for(int i=0; i<numNodes; i++) {
basics[i] = new Basic(i);
}
printf("\nTime test locked\n");
fprintf(auxFd,"\nTime test locked\n");
int ntimes = 1000;
epicsTimeGetCurrent(&startTime);
for(int i=0; i<ntimes; i++) {
@@ -335,20 +335,20 @@ static void testTimeLocked() {
epicsTimeGetCurrent(&endTime);
double diff = epicsTimeDiffInSeconds(&endTime,&startTime);
diff *= 1000.0;
printf("diff %f milliSeconds\n",diff);
fprintf(auxFd,"diff %f milliSeconds\n",diff);
diff = diff/1000.0; // convert from milliseconds to seconds
diff = diff/ntimes; // seconds per outer loop
diff = diff*1e6; // converty to microseconds
printf("time per iteration %f microseconds\n",diff);
fprintf(auxFd,"time per iteration %f microseconds\n",diff);
diff = diff/(numNodes*2); // convert to per addTail/removeHead
printf("time per addTail/removeHead %f microseconds\n",diff);
fprintf(auxFd,"time per addTail/removeHead %f microseconds\n",diff);
assert(basicList->isEmpty());
delete basicList;
for(int i=0; i<numNodes; i++) delete basics[i];
}
typedef std::list<Basic *> stdList;
static void testArrayListTime() {
static void testArrayListTime(FILE *auxFd) {
epicsTimeStamp startTime;
epicsTimeStamp endTime;
int numNodes = 1000;
@@ -358,7 +358,7 @@ static void testArrayListTime() {
for(int i=0; i<numNodes; i++) {
basics[i] = new Basic(i);
}
printf("\nTime ArrayList test\n");
fprintf(auxFd,"\nTime ArrayList test\n");
int ntimes = 1000;
epicsTimeGetCurrent(&startTime);
for(int i=0; i<ntimes; i++) {
@@ -371,17 +371,17 @@ static void testArrayListTime() {
epicsTimeGetCurrent(&endTime);
double diff = epicsTimeDiffInSeconds(&endTime,&startTime);
diff *= 1000.0;
printf("diff %f milliSeconds\n",diff);
fprintf(auxFd,"diff %f milliSeconds\n",diff);
diff = diff/1000.0; // convert from milliseconds to seconds
diff = diff/ntimes; // seconds per outer loop
diff = diff*1e6; // converty to microseconds
printf("time per iteration %f microseconds\n",diff);
fprintf(auxFd,"time per iteration %f microseconds\n",diff);
diff = diff/(numNodes*2); // convert to per addTail/removeHead
printf("time per addTail/removeHead %f microseconds\n",diff);
fprintf(auxFd,"time per addTail/removeHead %f microseconds\n",diff);
for(int i=0; i<numNodes; i++) delete basics[i];
}
static void testArrayListTimeLocked() {
static void testArrayListTimeLocked(FILE *auxFd) {
epicsTimeStamp startTime;
epicsTimeStamp endTime;
int numNodes = 1000;
@@ -392,7 +392,7 @@ static void testArrayListTimeLocked() {
for(int i=0; i<numNodes; i++) {
basics[i] = new Basic(i);
}
printf("\nTime ArrayList test locked\n");
fprintf(auxFd,"\nTime ArrayList test locked\n");
int ntimes = 1000;
epicsTimeGetCurrent(&startTime);
for(int i=0; i<ntimes; i++) {
@@ -409,13 +409,13 @@ static void testArrayListTimeLocked() {
epicsTimeGetCurrent(&endTime);
double diff = epicsTimeDiffInSeconds(&endTime,&startTime);
diff *= 1000.0;
printf("diff %f milliSeconds\n",diff);
fprintf(auxFd,"diff %f milliSeconds\n",diff);
diff = diff/1000.0; // convert from milliseconds to seconds
diff = diff/ntimes; // seconds per outer loop
diff = diff*1e6; // converty to microseconds
printf("time per iteration %f microseconds\n",diff);
fprintf(auxFd,"time per iteration %f microseconds\n",diff);
diff = diff/(numNodes*2); // convert to per addTail/removeHead
printf("time per addTail/removeHead %f microseconds\n",diff);
fprintf(auxFd,"time per addTail/removeHead %f microseconds\n",diff);
for(int i=0; i<numNodes; i++) delete basics[i];
}
@@ -426,16 +426,22 @@ int main(int argc, char *argv[]) {
if(fileName!=0 && fileName[0]!=0) {
fd = fopen(fileName,"w+");
}
char *auxFileName = 0;
if(argc>2) auxFileName = argv[2];
FILE *auxFd = stdout;
if(auxFileName!=0 && auxFileName[0]!=0) {
auxFd = fopen(auxFileName,"w+");
}
testBasic(fd);
testQueue(fd);
testStack(fd);
testList(fd);
testRandomInsertRemove(fd);
testOrderedQueue(fd);
testTime();
testTimeLocked();
testArrayListTime();
testArrayListTimeLocked();
testTime(auxFd);
testTimeLocked(auxFd);
testArrayListTime(auxFd);
testArrayListTimeLocked(auxFd);
int totalConstructList = LinkedListVoid::getTotalConstruct();
int totalDestructList = LinkedListVoid::getTotalDestruct();
int totalConstructListNode = LinkedListVoidNode::getTotalConstruct();

2
test/testAll.pl
View File

@@ -1,6 +1,6 @@
eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*-
if $running_under_some_shell; # testIntTypes.pl
$EPICS_HOST_ARCH = "linux-x86";
use Env;
system ("./testPVType.pl");
system ("./testIntrospect.pl");
system ("./testPVData.pl");

2
test/testIntrospect.pl
View File

@@ -1,6 +1,6 @@
eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*-
if $running_under_some_shell; # testIntrospect.pl
$EPICS_HOST_ARCH = "linux-x86";
use Env;
system ("rm testIntrospect");
system ("rm testIntrospectDiff");
system ("../bin/${EPICS_HOST_ARCH}/testIntrospect testIntrospect");

4
test/testLinkedList.pl
View File

@@ -1,9 +1,9 @@
eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*-
if $running_under_some_shell; # testLinkedList.pl
$EPICS_HOST_ARCH = "linux-x86";
use Env;
system ("rm testLinkedList");
system ("rm testLinkedListDiff");
system ("../bin/${EPICS_HOST_ARCH}/testLinkedList testLinkedList");
system ("../bin/${EPICS_HOST_ARCH}/testLinkedList testLinkedList testLinkedListAux");
system ("diff testLinkedList testLinkedListGold >> testLinkedListDiff");
if(-z "testLinkedListDiff") {
print "testLinkedList OK\n";

20
test/testLinkedListAux Normal file
View File

@@ -0,0 +1,20 @@
Time test
diff 23.646940 milliSeconds
time per iteration 23.646940 microseconds
time per addTail/removeHead 0.011823 microseconds
Time test locked
diff 183.897825 milliSeconds
time per iteration 183.897825 microseconds
time per addTail/removeHead 0.091949 microseconds
Time ArrayList test
diff 652.546057 milliSeconds
time per iteration 652.546057 microseconds
time per addTail/removeHead 0.326273 microseconds
Time ArrayList test locked
diff 814.756660 milliSeconds
time per iteration 814.756660 microseconds
time per addTail/removeHead 0.407378 microseconds

2
test/testPVAuxInfo.pl
View File

@@ -1,6 +1,6 @@
eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*-
if $running_under_some_shell; # testPVAuxInfo.pl
$EPICS_HOST_ARCH = "linux-x86";
use Env;
system ("rm testPVAuxInfo");
system ("rm testPVAuxInfoDiff");
system ("../bin/${EPICS_HOST_ARCH}/testPVAuxInfo testPVAuxInfo");

2
test/testPVData.pl
View File

@@ -1,6 +1,6 @@
eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*-
if $running_under_some_shell; # testPVData.pl
$EPICS_HOST_ARCH = "linux-x86";
use Env;
system ("rm testPVData");
system ("rm testPVDataDiff");
system ("../bin/${EPICS_HOST_ARCH}/testPVData testPVData");

2
test/testPVStructureArray.pl
View File

@@ -1,6 +1,6 @@
eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*-
if $running_under_some_shell; # testPVStructureArray.pl
$EPICS_HOST_ARCH = "linux-x86";
use Env;
system ("rm testPVStructureArray");
system ("rm testPVStructureArrayDiff");
system ("../bin/${EPICS_HOST_ARCH}/testPVStructureArray testPVStructureArray");

2
test/testPVType.pl
View File

@@ -1,6 +1,6 @@
eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*-
if $running_under_some_shell; # testPVType.pl
$EPICS_HOST_ARCH = "linux-x86";
use Env;
system ("rm testPVType");
system ("rm testPVTypeDiff");
system ("../bin/${EPICS_HOST_ARCH}/testPVType testPVType");