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

moved pvType.h from misc to pv.

Browse Source 
Made changes to make it clear that is defining the pvData primitive types for pvData.
This commit is contained in:
Marty Kraimer
2011-01-28 08:22:46 -05:00
parent 62e0495c3d
commit ad9633c8f6
10 changed files with 312 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure/RELEASE
View File

@@ -22,7 +22,7 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
#SNCSEQ=$(EPICS_BASE)/../modules/soft/seq
# EPICS_BASE usually appears last so other apps can override stuff:
EPICS_BASE=/opt/epics/base
EPICS_BASE=/home/install/epics/base
#Capfast users may need the following definitions
#CAPFAST_TEMPLATES=

505
documentation/pvDataCpp.html
View File

File diff suppressed because it is too large Load Diff

2
pvDataApp/Makefile
View File

@@ -5,7 +5,6 @@ PVDATA = $(TOP)/pvDataApp/
SRC_DIRS += $(PVDATA)/misc
INC += pvType.h
INC += noDefaultMethods.h
INC += linkedListVoid.h
INC += linkedList.h
@@ -46,6 +45,7 @@ LIBSRCS += StatusCreateFactory.cpp
SRC_DIRS += $(PVDATA)/pv
INC += pvType.h
INC += pvIntrospect.h
INC += pvData.h
INC += convert.h

28
pvDataApp/misc/pvType.h
View File

@@ -1,28 +0,0 @@
/* pvType.h */
/**
* Copyright - See the COPYRIGHT that is included with this distribution.
* EPICS pvDataCPP is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
*/
#include <string>
#ifndef PVTYPE_H
#define PVTYPE_H
namespace epics { namespace pvData {
typedef signed char int8;
typedef short int16;
typedef int int32;
typedef long long int64;
typedef unsigned int uint32;
typedef unsigned long long uint64;
typedef std::string String;
typedef std::string * StringBuilder;
typedef String* StringArray;
}}
#endif /* PVTYPE_H */

9
pvDataApp/pv/pvData.h
View File

@@ -9,6 +9,7 @@
#include <map>
#ifndef PVDATA_H
#define PVDATA_H
#include "pvType.h"
#include "pvIntrospect.h"
#include "noDefaultMethods.h"
#include "requester.h"
@@ -49,14 +50,6 @@ typedef PVStructure * PVStructurePtr;
typedef PVStructurePtr* PVStructurePtrArray;
typedef PVField* PVFieldPtr;
typedef PVFieldPtr * PVFieldPtrArray;
typedef bool * BooleanArray;
typedef int8 * ByteArray;
typedef int16 * ShortArray;
typedef int32 * IntArray;
typedef int64 * LongArray;
typedef float * FloatArray;
typedef double * DoubleArray;
//typedef String * StringArray; already defined in pvType.h
class PVAuxInfo : private NoDefaultMethods {
public:

46
pvDataApp/pv/pvType.h Normal file
View File

@@ -0,0 +1,46 @@
/* pvType.h */
/**
* Copyright - See the COPYRIGHT that is included with this distribution.
* EPICS pvDataCPP is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
*/
/* Definitions for the primitive types for pvData.
* It also defines the arrays of the primitive types
*/
#include <string>
#include <stdint.h>
#ifndef PVTYPE_H
#define PVTYPE_H
namespace epics { namespace pvData {
typedef bool boolean;
typedef int8_t int8;
typedef int16_t int16;
typedef int32_t int32;
typedef int64_t int64;
typedef uint32_t uint32;
typedef uint64_t uint64;
// float and double are types
typedef std::string String;
typedef bool * BooleanArray;
typedef int8 * ByteArray;
typedef int16 * ShortArray;
typedef int32 * IntArray;
typedef int64 * LongArray;
typedef float * FloatArray;
typedef double * DoubleArray;
typedef String* StringArray;
// convenience definition for toString methods
typedef std::string * StringBuilder;
}}
#endif /* PVTYPE_H */

24
test/testLinkedListAux
View File

@@ -1,20 +1,20 @@
Time test
diff 23.579571 milliSeconds
time per iteration 23.579571 microseconds
time per addTail/removeHead 0.011790 microseconds
diff 24.740621 milliSeconds
time per iteration 24.740621 microseconds
time per addTail/removeHead 0.012370 microseconds
Time test locked
diff 179.506759 milliSeconds
time per iteration 179.506759 microseconds
time per addTail/removeHead 0.089753 microseconds
diff 188.817816 milliSeconds
time per iteration 188.817816 microseconds
time per addTail/removeHead 0.094409 microseconds
Time std::list test
diff 632.658369 milliSeconds
time per iteration 632.658369 microseconds
time per addTail/removeHead 0.316329 microseconds
diff 629.679579 milliSeconds
time per iteration 629.679579 microseconds
time per addTail/removeHead 0.314840 microseconds
Time std::list test locked
diff 789.969392 milliSeconds
time per iteration 789.969392 microseconds
time per addTail/removeHead 0.394985 microseconds
diff 787.049712 milliSeconds
time per iteration 787.049712 microseconds
time per addTail/removeHead 0.393525 microseconds

2
test/testThreadAux
View File

@@ -1 +1 @@
time per call 32.876347 microseconds
time per call 30.779267 microseconds

8
test/testTimeStampAux
View File

@@ -1,5 +1,5 @@
current 1295532583 699024477 milliSec 1295532583699
2011.01.20 09:09:43 699024477 nanoSeconds isDst false
current 1296220855 236718062 milliSec 1296220855236
2011.01.28 08:20:55 236718062 nanoSeconds isDst false
fromTime_t
current 1295532583 0 milliSec 1295532583000
2011.01.20 09:09:43 0 nanoSeconds isDst false
current 1296220855 0 milliSec 1296220855000
2011.01.28 08:20:55 0 nanoSeconds isDst false

12
test/testTimerAux
View File

@@ -1,6 +1,6 @@
one requested 0.400000 diff 0.400259 seconds
two requested 0.200000 diff 0.200178 seconds
one requested 0.200000 diff 0.200145 seconds
two requested 0.400000 diff 0.400165 seconds
one requested 0.000000 diff 0.000136 seconds
two requested 0.000000 diff 0.000173 seconds
one requested 0.400000 diff 0.400272 seconds
two requested 0.200000 diff 0.200259 seconds
one requested 0.200000 diff 0.200247 seconds
two requested 0.400000 diff 0.400347 seconds
one requested 0.000000 diff 0.000073 seconds
two requested 0.000000 diff 0.000098 seconds