Dirk Zimoch has proposed merging ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0.
Commit message:
Cleanup whitespace
Requested reviews:
EPICS Core Developers (epics-core)
For more details, see:
https://code.launchpad.net/~dirk.zimoch/epics-base/+git/epics-base/+merge/382303
This is purely cosmetic:
1. There was a mess with tab character usage. Indention with spaces and tabs was mixed inconsistently sometimes with obviously different assumptions on tab width, even in the same file. This results in irregular, hard to read indents. Please stop using tabs in source code.
2. Clean up of space at end of line.
3. Clean up of empty lines at end of file.
Can we please have a coding style guide?
--
The attached diff has been truncated due to its size.
Your team EPICS Core Developers is requested to review the proposed merge of ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0.
diff --git a/modules/ca/src/client/CASG.cpp b/modules/ca/src/client/CASG.cpp
index 4ffb414..9eb44e6 100644
--- a/modules/ca/src/client/CASG.cpp
+++ b/modules/ca/src/client/CASG.cpp
@@ -209,23 +209,23 @@ bool CASG::ioComplete (
return this->ioPendingList.count () == 0u;
}
-void CASG::put ( epicsGuard < epicsMutex > & guard, chid pChan,
+void CASG::put ( epicsGuard < epicsMutex > & guard, chid pChan,
unsigned type, arrayElementCount count, const void * pValue )
{
guard.assertIdenticalMutex ( this->client.mutexRef() );
sgAutoPtr < syncGroupWriteNotify > pNotify ( guard, *this );
- pNotify = syncGroupWriteNotify::factory (
+ pNotify = syncGroupWriteNotify::factory (
this->freeListWriteOP, *this, & CASG :: recycleWriteNotifyIO, pChan );
pNotify->begin ( guard, type, count, pValue );
pNotify.release ();
}
-void CASG::get ( epicsGuard < epicsMutex > & guard, chid pChan,
+void CASG::get ( epicsGuard < epicsMutex > & guard, chid pChan,
unsigned type, arrayElementCount count, void *pValue )
{
guard.assertIdenticalMutex ( this->client.mutexRef() );
sgAutoPtr < syncGroupReadNotify > pNotify ( guard, *this );
- pNotify = syncGroupReadNotify::factory (
+ pNotify = syncGroupReadNotify::factory (
this->freeListReadOP, *this, & CASG :: recycleReadNotifyIO, pChan, pValue );
pNotify->begin ( guard, type, count );
pNotify.release ();
@@ -242,14 +242,14 @@ void CASG::completionNotify (
}
}
-void CASG :: recycleReadNotifyIO ( epicsGuard < epicsMutex > & guard,
+void CASG :: recycleReadNotifyIO ( epicsGuard < epicsMutex > & guard,
syncGroupReadNotify & io )
{
guard.assertIdenticalMutex ( this->client.mutexRef() );
this->freeListReadOP.release ( & io );
}
-void CASG :: recycleWriteNotifyIO ( epicsGuard < epicsMutex > & guard,
+void CASG :: recycleWriteNotifyIO ( epicsGuard < epicsMutex > & guard,
syncGroupWriteNotify & io )
{
guard.assertIdenticalMutex ( this->client.mutexRef() );
diff --git a/modules/ca/src/client/access.cpp b/modules/ca/src/client/access.cpp
index a36899c..528cd6c 100644
--- a/modules/ca/src/client/access.cpp
+++ b/modules/ca/src/client/access.cpp
@@ -183,19 +183,19 @@ int epicsShareAPI ca_context_create (
}
pcac = ( ca_client_context * ) epicsThreadPrivateGet ( caClientContextId );
- if ( pcac ) {
+ if ( pcac ) {
if ( premptiveCallbackSelect == ca_enable_preemptive_callback &&
! pcac->preemptiveCallbakIsEnabled() ) {
return ECA_NOTTHREADED;
}
- return ECA_NORMAL;
- }
+ return ECA_NORMAL;
+ }
pcac = new ca_client_context (
premptiveCallbackSelect == ca_enable_preemptive_callback );
- if ( ! pcac ) {
- return ECA_ALLOCMEM;
- }
+ if ( ! pcac ) {
+ return ECA_ALLOCMEM;
+ }
epicsThreadPrivateSet ( caClientContextId, (void *) pcac );
}
@@ -467,7 +467,7 @@ int epicsShareAPI ca_pend_event ( ca_real timeout )
try {
// preserve past odd ball behavior of waiting forever when
// the delay is zero
- if ( timeout == 0.0 ) {
+ if ( timeout == 0.0 ) {
while ( true ) {
pcac->pendEvent ( 60.0 );
}
@@ -696,7 +696,7 @@ int epicsShareAPI ca_channel_status ( epicsThreadId /* tid */ )
{
::printf ("The R3.14 EPICS OS abstraction API does not allow peeking at thread private storage of another thread.\n");
::printf ("Please call \"ca_client_status ( unsigned level )\" from the subsystem specific diagnostic code.\n");
- return ECA_ANACHRONISM;
+ return ECA_ANACHRONISM;
}
// extern "C"
@@ -802,253 +802,253 @@ epicsShareDef const int epicsTypeToDBR_XXXX [lastEpicsType+1] = {
// extern "C"
epicsShareDef const epicsType DBR_XXXXToEpicsType [LAST_BUFFER_TYPE+1] = {
- epicsOldStringT,
- epicsInt16T,
- epicsFloat32T,
- epicsEnum16T,
- epicsUInt8T,
- epicsInt32T,
- epicsFloat64T,
-
- epicsOldStringT,
- epicsInt16T,
- epicsFloat32T,
- epicsEnum16T,
- epicsUInt8T,
- epicsInt32T,
- epicsFloat64T,
-
- epicsOldStringT,
- epicsInt16T,
- epicsFloat32T,
- epicsEnum16T,
- epicsUInt8T,
- epicsInt32T,
- epicsFloat64T,
-
- epicsOldStringT,
- epicsInt16T,
- epicsFloat32T,
- epicsEnum16T,
- epicsUInt8T,
- epicsInt32T,
- epicsFloat64T,
-
- epicsOldStringT,
- epicsInt16T,
- epicsFloat32T,
- epicsEnum16T,
- epicsUInt8T,
- epicsInt32T,
- epicsFloat64T,
-
- epicsUInt16T,
- epicsUInt16T,
- epicsOldStringT,
- epicsOldStringT
+ epicsOldStringT,
+ epicsInt16T,
+ epicsFloat32T,
+ epicsEnum16T,
+ epicsUInt8T,
+ epicsInt32T,
+ epicsFloat64T,
+
+ epicsOldStringT,
+ epicsInt16T,
+ epicsFloat32T,
+ epicsEnum16T,
+ epicsUInt8T,
+ epicsInt32T,
+ epicsFloat64T,
+
+ epicsOldStringT,
+ epicsInt16T,
+ epicsFloat32T,
+ epicsEnum16T,
+ epicsUInt8T,
+ epicsInt32T,
+ epicsFloat64T,
+
+ epicsOldStringT,
+ epicsInt16T,
+ epicsFloat32T,
+ epicsEnum16T,
+ epicsUInt8T,
+ epicsInt32T,
+ epicsFloat64T,
+
+ epicsOldStringT,
+ epicsInt16T,
+ epicsFloat32T,
+ epicsEnum16T,
+ epicsUInt8T,
+ epicsInt32T,
+ epicsFloat64T,
+
+ epicsUInt16T,
+ epicsUInt16T,
+ epicsOldStringT,
+ epicsOldStringT
};
// extern "C"
epicsShareDef const unsigned short dbr_size[LAST_BUFFER_TYPE+1] = {
- sizeof(dbr_string_t), /* string max size */
- sizeof(dbr_short_t), /* short */
- sizeof(dbr_float_t), /* IEEE Float */
- sizeof(dbr_enum_t), /* item number */
- sizeof(dbr_char_t), /* character */
-
- sizeof(dbr_long_t), /* long */
- sizeof(dbr_double_t), /* double */
- sizeof(struct dbr_sts_string), /* string field with status */
- sizeof(struct dbr_sts_short), /* short field with status */
- sizeof(struct dbr_sts_float), /* float field with status */
-
- sizeof(struct dbr_sts_enum), /* item number with status */
- sizeof(struct dbr_sts_char), /* char field with status */
- sizeof(struct dbr_sts_long), /* long field with status */
- sizeof(struct dbr_sts_double), /* double field with time */
- sizeof(struct dbr_time_string), /* string field with time */
-
- sizeof(struct dbr_time_short), /* short field with time */
- sizeof(struct dbr_time_float), /* float field with time */
- sizeof(struct dbr_time_enum), /* item number with time */
- sizeof(struct dbr_time_char), /* char field with time */
- sizeof(struct dbr_time_long), /* long field with time */
-
- sizeof(struct dbr_time_double), /* double field with time */
- sizeof(struct dbr_sts_string), /* graphic string info */
- sizeof(struct dbr_gr_short), /* graphic short info */
- sizeof(struct dbr_gr_float), /* graphic float info */
- sizeof(struct dbr_gr_enum), /* graphic item info */
-
- sizeof(struct dbr_gr_char), /* graphic char info */
- sizeof(struct dbr_gr_long), /* graphic long info */
- sizeof(struct dbr_gr_double), /* graphic double info */
- sizeof(struct dbr_sts_string), /* control string info */
- sizeof(struct dbr_ctrl_short), /* control short info */
-
- sizeof(struct dbr_ctrl_float), /* control float info */
- sizeof(struct dbr_ctrl_enum), /* control item info */
- sizeof(struct dbr_ctrl_char), /* control char info */
- sizeof(struct dbr_ctrl_long), /* control long info */
- sizeof(struct dbr_ctrl_double), /* control double info */
-
- sizeof(dbr_put_ackt_t), /* put ackt */
- sizeof(dbr_put_acks_t), /* put acks */
- sizeof(struct dbr_stsack_string),/* string field with status/ack*/
- sizeof(dbr_string_t), /* string max size */
+ sizeof(dbr_string_t), /* string max size */
+ sizeof(dbr_short_t), /* short */
+ sizeof(dbr_float_t), /* IEEE Float */
+ sizeof(dbr_enum_t), /* item number */
+ sizeof(dbr_char_t), /* character */
+
+ sizeof(dbr_long_t), /* long */
+ sizeof(dbr_double_t), /* double */
+ sizeof(struct dbr_sts_string), /* string field with status */
+ sizeof(struct dbr_sts_short), /* short field with status */
+ sizeof(struct dbr_sts_float), /* float field with status */
+
+ sizeof(struct dbr_sts_enum), /* item number with status */
+ sizeof(struct dbr_sts_char), /* char field with status */
+ sizeof(struct dbr_sts_long), /* long field with status */
+ sizeof(struct dbr_sts_double), /* double field with time */
+ sizeof(struct dbr_time_string), /* string field with time */
+
+ sizeof(struct dbr_time_short), /* short field with time */
+ sizeof(struct dbr_time_float), /* float field with time */
+ sizeof(struct dbr_time_enum), /* item number with time */
+ sizeof(struct dbr_time_char), /* char field with time */
+ sizeof(struct dbr_time_long), /* long field with time */
+
+ sizeof(struct dbr_time_double), /* double field with time */
+ sizeof(struct dbr_sts_string), /* graphic string info */
+ sizeof(struct dbr_gr_short), /* graphic short info */
+ sizeof(struct dbr_gr_float), /* graphic float info */
+ sizeof(struct dbr_gr_enum), /* graphic item info */
+
+ sizeof(struct dbr_gr_char), /* graphic char info */
+ sizeof(struct dbr_gr_long), /* graphic long info */
+ sizeof(struct dbr_gr_double), /* graphic double info */
+ sizeof(struct dbr_sts_string), /* control string info */
+ sizeof(struct dbr_ctrl_short), /* control short info */
+
+ sizeof(struct dbr_ctrl_float), /* control float info */
+ sizeof(struct dbr_ctrl_enum), /* control item info */
+ sizeof(struct dbr_ctrl_char), /* control char info */
+ sizeof(struct dbr_ctrl_long), /* control long info */
+ sizeof(struct dbr_ctrl_double), /* control double info */
+
+ sizeof(dbr_put_ackt_t), /* put ackt */
+ sizeof(dbr_put_acks_t), /* put acks */
+ sizeof(struct dbr_stsack_string),/* string field with status/ack*/
+ sizeof(dbr_string_t), /* string max size */
};
// extern "C"
epicsShareDef const unsigned short dbr_value_size[LAST_BUFFER_TYPE+1] = {
- sizeof(dbr_string_t), /* string max size */
- sizeof(dbr_short_t), /* short */
- sizeof(dbr_float_t), /* IEEE Float */
- sizeof(dbr_enum_t), /* item number */
- sizeof(dbr_char_t), /* character */
-
- sizeof(dbr_long_t), /* long */
- sizeof(dbr_double_t), /* double */
- sizeof(dbr_string_t), /* string max size */
- sizeof(dbr_short_t), /* short */
- sizeof(dbr_float_t), /* IEEE Float */
-
- sizeof(dbr_enum_t), /* item number */
- sizeof(dbr_char_t), /* character */
- sizeof(dbr_long_t), /* long */
- sizeof(dbr_double_t), /* double */
- sizeof(dbr_string_t), /* string max size */
-
- sizeof(dbr_short_t), /* short */
- sizeof(dbr_float_t), /* IEEE Float */
- sizeof(dbr_enum_t), /* item number */
- sizeof(dbr_char_t), /* character */
- sizeof(dbr_long_t), /* long */
-
- sizeof(dbr_double_t), /* double */
- sizeof(dbr_string_t), /* string max size */
- sizeof(dbr_short_t), /* short */
- sizeof(dbr_float_t), /* IEEE Float */
- sizeof(dbr_enum_t), /* item number */
-
- sizeof(dbr_char_t), /* character */
- sizeof(dbr_long_t), /* long */
- sizeof(dbr_double_t), /* double */
- sizeof(dbr_string_t), /* string max size */
- sizeof(dbr_short_t), /* short */
-
- sizeof(dbr_float_t), /* IEEE Float */
- sizeof(dbr_enum_t), /* item number */
- sizeof(dbr_char_t), /* character */
- sizeof(dbr_long_t), /* long */
- sizeof(dbr_double_t), /* double */
-
- sizeof(dbr_ushort_t), /* put_ackt */
- sizeof(dbr_ushort_t), /* put_acks */
- sizeof(dbr_string_t), /* string max size */
- sizeof(dbr_string_t), /* string max size */
+ sizeof(dbr_string_t), /* string max size */
+ sizeof(dbr_short_t), /* short */
+ sizeof(dbr_float_t), /* IEEE Float */
+ sizeof(dbr_enum_t), /* item number */
+ sizeof(dbr_char_t), /* character */
+
+ sizeof(dbr_long_t), /* long */
+ sizeof(dbr_double_t), /* double */
+ sizeof(dbr_string_t), /* string max size */
+ sizeof(dbr_short_t), /* short */
+ sizeof(dbr_float_t), /* IEEE Float */
+
+ sizeof(dbr_enum_t), /* item number */
+ sizeof(dbr_char_t), /* character */
+ sizeof(dbr_long_t), /* long */
+ sizeof(dbr_double_t), /* double */
+ sizeof(dbr_string_t), /* string max size */
+
+ sizeof(dbr_short_t), /* short */
+ sizeof(dbr_float_t), /* IEEE Float */
+ sizeof(dbr_enum_t), /* item number */
+ sizeof(dbr_char_t), /* character */
+ sizeof(dbr_long_t), /* long */
+
+ sizeof(dbr_double_t), /* double */
+ sizeof(dbr_string_t), /* string max size */
+ sizeof(dbr_short_t), /* short */
+ sizeof(dbr_float_t), /* IEEE Float */
+ sizeof(dbr_enum_t), /* item number */
+
+ sizeof(dbr_char_t), /* character */
+ sizeof(dbr_long_t), /* long */
+ sizeof(dbr_double_t), /* double */
+ sizeof(dbr_string_t), /* string max size */
+ sizeof(dbr_short_t), /* short */
+
+ sizeof(dbr_float_t), /* IEEE Float */
+ sizeof(dbr_enum_t), /* item number */
+ sizeof(dbr_char_t), /* character */
+ sizeof(dbr_long_t), /* long */
+ sizeof(dbr_double_t), /* double */
+
+ sizeof(dbr_ushort_t), /* put_ackt */
+ sizeof(dbr_ushort_t), /* put_acks */
+ sizeof(dbr_string_t), /* string max size */
+ sizeof(dbr_string_t), /* string max size */
};
//extern "C"
epicsShareDef const enum dbr_value_class dbr_value_class[LAST_BUFFER_TYPE+1] = {
- dbr_class_string, /* string max size */
- dbr_class_int, /* short */
- dbr_class_float, /* IEEE Float */
- dbr_class_int, /* item number */
- dbr_class_int, /* character */
- dbr_class_int, /* long */
- dbr_class_float, /* double */
-
- dbr_class_string, /* string max size */
- dbr_class_int, /* short */
- dbr_class_float, /* IEEE Float */
- dbr_class_int, /* item number */
- dbr_class_int, /* character */
- dbr_class_int, /* long */
- dbr_class_float, /* double */
-
- dbr_class_string, /* string max size */
- dbr_class_int, /* short */
- dbr_class_float, /* IEEE Float */
- dbr_class_int, /* item number */
- dbr_class_int, /* character */
- dbr_class_int, /* long */
- dbr_class_float, /* double */
-
- dbr_class_string, /* string max size */
- dbr_class_int, /* short */
- dbr_class_float, /* IEEE Float */
- dbr_class_int, /* item number */
- dbr_class_int, /* character */
- dbr_class_int, /* long */
- dbr_class_float, /* double */
-
- dbr_class_string, /* string max size */
- dbr_class_int, /* short */
- dbr_class_float, /* IEEE Float */
- dbr_class_int, /* item number */
- dbr_class_int, /* character */
- dbr_class_int, /* long */
- dbr_class_float, /* double */
- dbr_class_int,
- dbr_class_int,
- dbr_class_string,
- dbr_class_string, /* string max size */
+ dbr_class_string, /* string max size */
+ dbr_class_int, /* short */
+ dbr_class_float, /* IEEE Float */
+ dbr_class_int, /* item number */
+ dbr_class_int, /* character */
+ dbr_class_int, /* long */
+ dbr_class_float, /* double */
+
+ dbr_class_string, /* string max size */
+ dbr_class_int, /* short */
+ dbr_class_float, /* IEEE Float */
+ dbr_class_int, /* item number */
+ dbr_class_int, /* character */
+ dbr_class_int, /* long */
+ dbr_class_float, /* double */
+
+ dbr_class_string, /* string max size */
+ dbr_class_int, /* short */
+ dbr_class_float, /* IEEE Float */
+ dbr_class_int, /* item number */
+ dbr_class_int, /* character */
+ dbr_class_int, /* long */
+ dbr_class_float, /* double */
+
+ dbr_class_string, /* string max size */
+ dbr_class_int, /* short */
+ dbr_class_float, /* IEEE Float */
+ dbr_class_int, /* item number */
+ dbr_class_int, /* character */
+ dbr_class_int, /* long */
+ dbr_class_float, /* double */
+
+ dbr_class_string, /* string max size */
+ dbr_class_int, /* short */
+ dbr_class_float, /* IEEE Float */
+ dbr_class_int, /* item number */
+ dbr_class_int, /* character */
+ dbr_class_int, /* long */
+ dbr_class_float, /* double */
+ dbr_class_int,
+ dbr_class_int,
+ dbr_class_string,
+ dbr_class_string, /* string max size */
};
// extern "C"
epicsShareDef const unsigned short dbr_value_offset[LAST_BUFFER_TYPE+1] = {
- 0, /* string */
- 0, /* short */
- 0, /* IEEE Float */
- 0, /* item number */
- 0, /* character */
- 0, /* long */
- 0, /* IEEE double */
- (unsigned short) offsetof(dbr_sts_string,value[0]),/* string field with status */
- (unsigned short) offsetof(dbr_sts_short,value), /* short field with status */
- (unsigned short) offsetof(dbr_sts_float,value), /* float field with status */
- (unsigned short) offsetof(dbr_sts_enum,value), /* item number with status */
- (unsigned short) offsetof(dbr_sts_char,value), /* char field with status */
- (unsigned short) offsetof(dbr_sts_long,value), /* long field with status */
- (unsigned short) offsetof(dbr_sts_double,value), /* double field with time */
- (unsigned short) offsetof(dbr_time_string,value[0] ),/* string field with time */
- (unsigned short) offsetof(dbr_time_short,value), /* short field with time */
- (unsigned short) offsetof(dbr_time_float,value), /* float field with time */
- (unsigned short) offsetof(dbr_time_enum,value), /* item number with time */
- (unsigned short) offsetof(dbr_time_char,value), /* char field with time */
- (unsigned short) offsetof(dbr_time_long,value), /* long field with time */
- (unsigned short) offsetof(dbr_time_double,value), /* double field with time */
- (unsigned short) offsetof(dbr_sts_string,value[0]),/* graphic string info */
- (unsigned short) offsetof(dbr_gr_short,value), /* graphic short info */
- (unsigned short) offsetof(dbr_gr_float,value), /* graphic float info */
- (unsigned short) offsetof(dbr_gr_enum,value), /* graphic item info */
- (unsigned short) offsetof(dbr_gr_char,value), /* graphic char info */
- (unsigned short) offsetof(dbr_gr_long,value), /* graphic long info */
- (unsigned short) offsetof(dbr_gr_double,value), /* graphic double info */
- (unsigned short) offsetof(dbr_sts_string,value[0]),/* control string info */
- (unsigned short) offsetof(dbr_ctrl_short,value), /* control short info */
- (unsigned short) offsetof(dbr_ctrl_float,value), /* control float info */
- (unsigned short) offsetof(dbr_ctrl_enum,value), /* control item info */
- (unsigned short) offsetof(dbr_ctrl_char,value), /* control char info */
- (unsigned short) offsetof(dbr_ctrl_long,value), /* control long info */
- (unsigned short) offsetof(dbr_ctrl_double,value), /* control double info */
- 0, /* put ackt */
- 0, /* put acks */
- (unsigned short) offsetof(dbr_stsack_string,value[0]),/* string field with status */
- 0, /* string */
+ 0, /* string */
+ 0, /* short */
+ 0, /* IEEE Float */
+ 0, /* item number */
+ 0, /* character */
+ 0, /* long */
+ 0, /* IEEE double */
+ (unsigned short) offsetof(dbr_sts_string,value[0]), /* string field with status */
+ (unsigned short) offsetof(dbr_sts_short,value), /* short field with status */
+ (unsigned short) offsetof(dbr_sts_float,value), /* float field with status */
+ (unsigned short) offsetof(dbr_sts_enum,value), /* item number with status */
+ (unsigned short) offsetof(dbr_sts_char,value), /* char field with status */
+ (unsigned short) offsetof(dbr_sts_long,value), /* long field with status */
+ (unsigned short) offsetof(dbr_sts_double,value), /* double field with time */
+ (unsigned short) offsetof(dbr_time_string,value[0] ), /* string field with time */
+ (unsigned short) offsetof(dbr_time_short,value), /* short field with time */
+ (unsigned short) offsetof(dbr_time_float,value), /* float field with time */
+ (unsigned short) offsetof(dbr_time_enum,value), /* item number with time */
+ (unsigned short) offsetof(dbr_time_char,value), /* char field with time */
+ (unsigned short) offsetof(dbr_time_long,value), /* long field with time */
+ (unsigned short) offsetof(dbr_time_double,value), /* double field with time */
+ (unsigned short) offsetof(dbr_sts_string,value[0]), /* graphic string info */
+ (unsigned short) offsetof(dbr_gr_short,value), /* graphic short info */
+ (unsigned short) offsetof(dbr_gr_float,value), /* graphic float info */
+ (unsigned short) offsetof(dbr_gr_enum,value), /* graphic item info */
+ (unsigned short) offsetof(dbr_gr_char,value), /* graphic char info */
+ (unsigned short) offsetof(dbr_gr_long,value), /* graphic long info */
+ (unsigned short) offsetof(dbr_gr_double,value), /* graphic double info */
+ (unsigned short) offsetof(dbr_sts_string,value[0]), /* control string info */
+ (unsigned short) offsetof(dbr_ctrl_short,value), /* control short info */
+ (unsigned short) offsetof(dbr_ctrl_float,value), /* control float info */
+ (unsigned short) offsetof(dbr_ctrl_enum,value), /* control item info */
+ (unsigned short) offsetof(dbr_ctrl_char,value), /* control char info */
+ (unsigned short) offsetof(dbr_ctrl_long,value), /* control long info */
+ (unsigned short) offsetof(dbr_ctrl_double,value), /* control double info */
+ 0, /* put ackt */
+ 0, /* put acks */
+ (unsigned short) offsetof(dbr_stsack_string,value[0]), /* string field with status */
+ 0, /* string */
};
// extern "C"
epicsShareDef const char *dbf_text[LAST_TYPE+3] = {
- "TYPENOTCONN",
- "DBF_STRING",
- "DBF_SHORT",
- "DBF_FLOAT",
- "DBF_ENUM",
- "DBF_CHAR",
- "DBF_LONG",
- "DBF_DOUBLE",
- "DBF_NO_ACCESS"
+ "TYPENOTCONN",
+ "DBF_STRING",
+ "DBF_SHORT",
+ "DBF_FLOAT",
+ "DBF_ENUM",
+ "DBF_CHAR",
+ "DBF_LONG",
+ "DBF_DOUBLE",
+ "DBF_NO_ACCESS"
};
// extern "C"
diff --git a/modules/ca/src/client/acctstRegister.cpp b/modules/ca/src/client/acctstRegister.cpp
index e75ed7f..de5298f 100644
--- a/modules/ca/src/client/acctstRegister.cpp
+++ b/modules/ca/src/client/acctstRegister.cpp
@@ -60,10 +60,9 @@ struct AutoInit {
AutoInit ();
};
-AutoInit :: AutoInit ()
+AutoInit :: AutoInit ()
{
iocshRegister ( &acctstFuncDef, acctstCallFunc );
}
AutoInit autoInit;
-
diff --git a/modules/ca/src/client/autoPtrFreeList.h b/modules/ca/src/client/autoPtrFreeList.h
index 7dc7360..12d84ff 100644
--- a/modules/ca/src/client/autoPtrFreeList.h
+++ b/modules/ca/src/client/autoPtrFreeList.h
@@ -18,9 +18,9 @@
* Copyright, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef autoPtrFreeListh
diff --git a/modules/ca/src/client/autoPtrRecycle.h b/modules/ca/src/client/autoPtrRecycle.h
index 173e148..18b8e26 100644
--- a/modules/ca/src/client/autoPtrRecycle.h
+++ b/modules/ca/src/client/autoPtrRecycle.h
@@ -18,9 +18,9 @@
* Copyright, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef autoPtrRecycleh
@@ -43,8 +43,8 @@ private:
chronIntIdResTable < baseNMIU > & ioTable;
epicsGuard < epicsMutex > & guard;
// not implemented
- autoPtrRecycle ( const autoPtrRecycle & );
- autoPtrRecycle & operator = ( const autoPtrRecycle & );
+ autoPtrRecycle ( const autoPtrRecycle & );
+ autoPtrRecycle & operator = ( const autoPtrRecycle & );
};
template < class T >
diff --git a/modules/ca/src/client/baseNMIU.cpp b/modules/ca/src/client/baseNMIU.cpp
index 20f153b..d5ca537 100644
--- a/modules/ca/src/client/baseNMIU.cpp
+++ b/modules/ca/src/client/baseNMIU.cpp
@@ -5,10 +5,10 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
*
* L O S A L A M O S
* Los Alamos National Laboratory
@@ -33,7 +33,3 @@ void baseNMIU::forceSubscriptionUpdate (
epicsGuard < epicsMutex > &, nciu & )
{
}
-
-
-
-
diff --git a/modules/ca/src/client/bhe.cpp b/modules/ca/src/client/bhe.cpp
index d6f1796..5af19d4 100644
--- a/modules/ca/src/client/bhe.cpp
+++ b/modules/ca/src/client/bhe.cpp
@@ -5,10 +5,10 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-
-/*
+
+/*
*
* L O S A L A M O S
* Los Alamos National Laboratory
@@ -42,12 +42,12 @@
* start up
*
* if creating this in response to a search reply
- * and not in response to a beacon then
+ * and not in response to a beacon then
* we set the beacon time stamp to
* zero (so we can correctly compute the period
* between the 1st and 2nd beacons)
*/
-bhe::bhe ( epicsMutex & mutexIn, const epicsTime & initialTimeStamp,
+bhe::bhe ( epicsMutex & mutexIn, const epicsTime & initialTimeStamp,
unsigned initialBeaconNumber, const inetAddrID & addr ) :
inetAddrID ( addr ), timeStamp ( initialTimeStamp ), averagePeriod ( - DBL_MAX ),
mutex ( mutexIn ), pIIU ( 0 ), lastBeaconNumber ( initialBeaconNumber )
@@ -74,7 +74,7 @@ void bhe::beaconAnomalyNotify ( epicsGuard < epicsMutex > & guard )
}
#ifdef DEBUG
-void bhe::logBeacon ( const char * pDiagnostic,
+void bhe::logBeacon ( const char * pDiagnostic,
const double & currentPeriod,
const epicsTime & currentTime )
{
@@ -82,10 +82,10 @@ void bhe::logBeacon ( const char * pDiagnostic,
char name[64];
this->name ( name, sizeof ( name ) );
char date[64];
- currentTime.strftime ( date, sizeof ( date ),
+ currentTime.strftime ( date, sizeof ( date ),
"%a %b %d %Y %H:%M:%S.%f");
::printf ( "%s cp=%g ap=%g %s %s\n",
- pDiagnostic, currentPeriod,
+ pDiagnostic, currentPeriod,
this->averagePeriod, name, date );
}
}
@@ -105,7 +105,7 @@ void bhe::logBeaconDiscard ( unsigned beaconAdvance,
char name[64];
this->name ( name, sizeof ( name ) );
char date[64];
- currentTime.strftime ( date, sizeof ( date ),
+ currentTime.strftime ( date, sizeof ( date ),
"%a %b %d %Y %H:%M:%S.%f");
::printf ( "bb %u %s %s\n",
beaconAdvance, name, date );
@@ -123,16 +123,16 @@ void bhe::logBeaconDiscard ( unsigned /* beaconAdvance */,
*
* updates beacon period, and looks for beacon anomalies
*/
-bool bhe::updatePeriod (
- epicsGuard < epicsMutex > & guard, const epicsTime & programBeginTime,
- const epicsTime & currentTime, ca_uint32_t beaconNumber,
+bool bhe::updatePeriod (
+ epicsGuard < epicsMutex > & guard, const epicsTime & programBeginTime,
+ const epicsTime & currentTime, ca_uint32_t beaconNumber,
unsigned protocolRevision )
{
guard.assertIdenticalMutex ( this->mutex );
//
// this block is enetered if the beacon was created as a side effect of
- // creating a connection and so we dont yet know the first beacon time
+ // creating a connection and so we dont yet know the first beacon time
// and sequence number
//
if ( this->timeStamp == epicsTime () ) {
@@ -142,7 +142,7 @@ bool bhe::updatePeriod (
this->beaconAnomalyNotify ( guard );
- /*
+ /*
* this is the 1st beacon seen - the beacon time stamp
* was not initialized during BHE create because
* a TCP/IP connection created the beacon.
@@ -167,15 +167,15 @@ bool bhe::updatePeriod (
}
this->lastBeaconNumber = beaconNumber;
- // throw out sequence numbers just prior to, or the same as, the last one received
+ // throw out sequence numbers just prior to, or the same as, the last one received
// (this situation is probably caused by a temporary duplicate route )
if ( beaconSeqAdvance == 0 || beaconSeqAdvance > ca_uint32_max - 256 ) {
logBeaconDiscard ( beaconSeqAdvance, currentTime );
return false;
}
- // throw out sequence numbers that jump forward by only a few numbers
- // (this situation is probably caused by a duplicate route
+ // throw out sequence numbers that jump forward by only a few numbers
+ // (this situation is probably caused by a duplicate route
// or a beacon due to input queue overun)
if ( beaconSeqAdvance > 1 && beaconSeqAdvance < 4 ) {
logBeaconDiscard ( beaconSeqAdvance, currentTime );
@@ -205,7 +205,7 @@ bool bhe::updatePeriod (
/*
* ignore beacons seen for the first time shortly after
* init, but do not ignore beacons arriving with a short
- * period because the IOC was rebooted soon after the
+ * period because the IOC was rebooted soon after the
* client starts up.
*/
totalRunningTime = this->timeStamp - programBeginTime;
@@ -217,24 +217,24 @@ bool bhe::updatePeriod (
/*
* Is this an IOC seen because of a restored
- * network segment?
+ * network segment?
*
- * It may be possible to get false triggers here
+ * It may be possible to get false triggers here
* if the client is busy, but this does not cause
- * problems because the echo response will tell us
+ * problems because the echo response will tell us
* that the server is available
*/
if ( currentPeriod >= this->averagePeriod * 1.25 ) {
- /*
- * trigger on any missing beacon
+ /*
+ * trigger on any missing beacon
* if connected to this server
- */
+ */
this->beaconAnomalyNotify ( guard );
if ( currentPeriod >= this->averagePeriod * 3.25 ) {
- /*
- * trigger on any 3 contiguous missing beacons
+ /*
+ * trigger on any 3 contiguous missing beacons
* if not connected to this server
*/
netChange = true;
@@ -248,9 +248,9 @@ bool bhe::updatePeriod (
* IOC reboots). Lower tolarance here because we
* dont have to worry about lost beacons.
*
- * It may be possible to get false triggers here
+ * It may be possible to get false triggers here
* if the client is busy, but this does not cause
- * problems because the echo response will tell us
+ * problems because the echo response will tell us
* that the server is available
*/
else if ( currentPeriod <= this->averagePeriod * 0.80 ) {
@@ -259,14 +259,14 @@ bool bhe::updatePeriod (
logBeacon ( "bal", currentPeriod, currentTime );
}
else if ( this->pIIU ) {
- // update state of health for active virtual circuits
+ // update state of health for active virtual circuits
// if the beacon looks ok
this->pIIU->beaconArrivalNotify ( guard );
logBeacon ( "vb", currentPeriod, currentTime );
}
// update a running average period
- this->averagePeriod = currentPeriod * 0.125 +
+ this->averagePeriod = currentPeriod * 0.125 +
this->averagePeriod * 0.875;
}
@@ -286,22 +286,22 @@ void bhe::show ( epicsGuard < epicsMutex > &, unsigned level ) const
char host [64];
this->name ( host, sizeof ( host ) );
if ( this->averagePeriod == -DBL_MAX ) {
- ::printf ( "CA beacon hash entry for %s <no period estimate>\n",
+ ::printf ( "CA beacon hash entry for %s <no period estimate>\n",
host );
}
else {
- ::printf ( "CA beacon hash entry for %s with period estimate %f\n",
+ ::printf ( "CA beacon hash entry for %s with period estimate %f\n",
host, this->averagePeriod );
}
if ( level > 0u ) {
char date[64];
this->timeStamp.strftime ( date, sizeof ( date ), "%a %b %d %Y %H:%M:%S");
- ::printf ( "\tbeacon number %u, on %s\n",
+ ::printf ( "\tbeacon number %u, on %s\n",
this->lastBeaconNumber, date );
}
}
-double bhe::period ( epicsGuard < epicsMutex > & guard ) const
+double bhe::period ( epicsGuard < epicsMutex > & guard ) const
{
guard.assertIdenticalMutex ( this->mutex );
return this->averagePeriod;
@@ -313,14 +313,14 @@ epicsTime bhe::updateTime ( epicsGuard < epicsMutex > & guard ) const
return this->timeStamp;
}
-void bhe::registerIIU (
+void bhe::registerIIU (
epicsGuard < epicsMutex > & guard, tcpiiu & iiu )
{
guard.assertIdenticalMutex ( this->mutex );
this->pIIU = & iiu;
}
-void bhe::unregisterIIU (
+void bhe::unregisterIIU (
epicsGuard < epicsMutex > & guard, tcpiiu & iiu )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -354,5 +354,3 @@ void bheFreeStore::release ( void * pCadaver )
}
bheMemoryManager::~bheMemoryManager () {}
-
-
diff --git a/modules/ca/src/client/bhe.h b/modules/ca/src/client/bhe.h
index 4da9520..d782df3 100644
--- a/modules/ca/src/client/bhe.h
+++ b/modules/ca/src/client/bhe.h
@@ -85,8 +85,8 @@ private:
const epicsTime & currentTime );
void logBeaconDiscard ( unsigned beaconAdvance,
const epicsTime & currentTime );
- bhe ( const bhe & );
- bhe & operator = ( const bhe & );
+ bhe ( const bhe & );
+ bhe & operator = ( const bhe & );
epicsShareFunc void operator delete ( void * );
};
@@ -99,8 +99,8 @@ public:
void release ( void * );
private:
tsFreeList < bhe, 0x100 > freeList;
- bheFreeStore ( const bheFreeStore & );
- bheFreeStore & operator = ( const bheFreeStore & );
+ bheFreeStore ( const bheFreeStore & );
+ bheFreeStore & operator = ( const bheFreeStore & );
};
inline void * bhe::operator new ( size_t size,
diff --git a/modules/ca/src/client/caConnTest.cpp b/modules/ca/src/client/caConnTest.cpp
index 2107739..bd479e6 100644
--- a/modules/ca/src/client/caConnTest.cpp
+++ b/modules/ca/src/client/caConnTest.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
#include <stdio.h>
@@ -60,50 +60,50 @@ void caConnTest ( const char *pNameIn, unsigned channelCountIn, double delayIn )
{
unsigned iteration = 0u;
int status;
- unsigned i;
- chid *pChans;
+ unsigned i;
+ chid *pChans;
channelCount = channelCountIn;
pChans = new chid [channelCount];
-
- while ( 1 ) {
+
+ while ( 1 ) {
connCount = 0u;
subsequentConnect = false;
begin = epicsTime::getCurrent ();
printf ( "initializing CA client library\n" );
- status = ca_task_initialize();
- SEVCHK ( status, "CA init failed" );
+ status = ca_task_initialize();
+ SEVCHK ( status, "CA init failed" );
printf ( "creating channels\n" );
- for ( i = 0u; i < channelCount; i++ ) {
- status = ca_search_and_connect ( pNameIn,
+ for ( i = 0u; i < channelCount; i++ ) {
+ status = ca_search_and_connect ( pNameIn,
&pChans[i], caConnTestConnHandler, 0 );
- SEVCHK ( status, "CA search problems" );
- }
+ SEVCHK ( status, "CA search problems" );
+ }
printf ( "all channels were created\n" );
- ca_pend_event ( delayIn );
+ ca_pend_event ( delayIn );
if ( iteration & 1 ) {
- for ( i = 0u; i < channelCount; i++ ) {
- status = ca_clear_channel ( pChans[i] );
- SEVCHK ( status, "ca_clear_channel() problems" );
- }
+ for ( i = 0u; i < channelCount; i++ ) {
+ status = ca_clear_channel ( pChans[i] );
+ SEVCHK ( status, "ca_clear_channel() problems" );
+ }
printf ( "all channels were destroyed\n" );
}
printf ( "shutting down CA client library\n" );
- status = ca_task_exit ();
- SEVCHK ( status, "task exit problems" );
+ status = ca_task_exit ();
+ SEVCHK ( status, "task exit problems" );
iteration++;
- }
+ }
//delete [] pChans;
}
diff --git a/modules/ca/src/client/caConnTestMain.cpp b/modules/ca/src/client/caConnTestMain.cpp
index f398580..b5e921c 100644
--- a/modules/ca/src/client/caConnTestMain.cpp
+++ b/modules/ca/src/client/caConnTestMain.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
#include <stdio.h>
diff --git a/modules/ca/src/client/caEventRate.cpp b/modules/ca/src/client/caEventRate.cpp
index 8beb163..7445a4d 100644
--- a/modules/ca/src/client/caEventRate.cpp
+++ b/modules/ca/src/client/caEventRate.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
#include <stdio.h>
@@ -38,50 +38,50 @@ void caEventRate ( const char *pName, unsigned count )
chid * pChidTable = new chid [ count ];
{
- printf ( "Connecting to CA Channel \"%s\" %u times.",
+ printf ( "Connecting to CA Channel \"%s\" %u times.",
pName, count );
fflush ( stdout );
-
+
epicsTime begin = epicsTime::getCurrent ();
for ( unsigned i = 0u; i < count; i++ ) {
int status = ca_search ( pName, & pChidTable[i] );
SEVCHK ( status, NULL );
}
-
+
int status = ca_pend_io ( 10000.0 );
if ( status != ECA_NORMAL ) {
fprintf ( stderr, " not found.\n" );
return;
}
epicsTime end = epicsTime::getCurrent ();
-
+
printf ( " done(%f sec).\n", end - begin );
}
{
printf ( "Subscribing %u times.", count );
fflush ( stdout );
-
+
epicsTime begin = epicsTime::getCurrent ();
for ( unsigned i = 0u; i < count; i++ ) {
- int addEventStatus = ca_add_event ( DBR_FLOAT,
+ int addEventStatus = ca_add_event ( DBR_FLOAT,
pChidTable[i], eventCallBack, &eventCount, NULL);
SEVCHK ( addEventStatus, __FILE__ );
}
-
+
int status = ca_flush_io ();
SEVCHK ( status, __FILE__ );
-
+
epicsTime end = epicsTime::getCurrent ();
-
+
printf ( " done(%f sec).\n", end - begin );
}
-
+
{
printf ( "Waiting for initial value events." );
fflush ( stdout );
-
- // let the first one go by
+
+ // let the first one go by
epicsTime begin = epicsTime::getCurrent ();
while ( eventCount < count ) {
int status = ca_pend_event ( 0.01 );
@@ -90,7 +90,7 @@ void caEventRate ( const char *pName, unsigned count )
}
}
epicsTime end = epicsTime::getCurrent ();
-
+
printf ( " done(%f sec).\n", end - begin );
}
@@ -128,7 +128,7 @@ void caEventRate ( const char *pName, unsigned count )
double mean = X / N;
double stdDev = sqrt ( XX / N - mean * mean );
- printf ( "CA Event Rate (Hz): current %g mean %g std dev %g\n",
+ printf ( "CA Event Rate (Hz): current %g mean %g std dev %g\n",
Hz, mean, stdDev );
if ( samplePeriod < maxSamplePeriod ) {
@@ -136,4 +136,3 @@ void caEventRate ( const char *pName, unsigned count )
}
}
}
-
diff --git a/modules/ca/src/client/caEventRateMain.cpp b/modules/ca/src/client/caEventRateMain.cpp
index 725e661..7ace11d 100644
--- a/modules/ca/src/client/caEventRateMain.cpp
+++ b/modules/ca/src/client/caEventRateMain.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
#include <stdio.h>
diff --git a/modules/ca/src/client/caRepeater.cpp b/modules/ca/src/client/caRepeater.cpp
index 2561223..9755f45 100644
--- a/modules/ca/src/client/caRepeater.cpp
+++ b/modules/ca/src/client/caRepeater.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
*
@@ -94,4 +94,3 @@ int main(int argc, char* argv[])
ca_repeater ();
return ( 0 );
}
-
diff --git a/modules/ca/src/client/ca_client_context.cpp b/modules/ca/src/client/ca_client_context.cpp
index 3fd0512..44d6427 100644
--- a/modules/ca/src/client/ca_client_context.cpp
+++ b/modules/ca/src/client/ca_client_context.cpp
@@ -17,9 +17,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifdef _MSC_VER
diff --git a/modules/ca/src/client/cac.cpp b/modules/ca/src/client/cac.cpp
index 476d1c3..e335e6e 100644
--- a/modules/ca/src/client/cac.cpp
+++ b/modules/ca/src/client/cac.cpp
@@ -155,7 +155,7 @@ cac::cac (
}
try {
- long status;
+ long status;
/*
* Certain os, such as HPUX, do not unblock a socket system call
diff --git a/modules/ca/src/client/cac.h b/modules/ca/src/client/cac.h
index 7db5c6d..c98f05d 100644
--- a/modules/ca/src/client/cac.h
+++ b/modules/ca/src/client/cac.h
@@ -81,8 +81,8 @@ public:
void release ( void * );
private:
tsFreeList < comBuf, 0x20 > freeList;
- cacComBufMemoryManager ( const cacComBufMemoryManager & );
- cacComBufMemoryManager & operator = ( const cacComBufMemoryManager & );
+ cacComBufMemoryManager ( const cacComBufMemoryManager & );
+ cacComBufMemoryManager & operator = ( const cacComBufMemoryManager & );
};
class notifyGuard {
@@ -348,8 +348,8 @@ private:
const char *pCtx, unsigned status );
static const pExcepProtoStubTCP tcpExcepJumpTableCAC [];
- cac ( const cac & );
- cac & operator = ( const cac & );
+ cac ( const cac & );
+ cac & operator = ( const cac & );
friend class tcpiiu;
};
diff --git a/modules/ca/src/client/cacChannel.cpp b/modules/ca/src/client/cacChannel.cpp
index c1a52a0..31af307 100644
--- a/modules/ca/src/client/cacChannel.cpp
+++ b/modules/ca/src/client/cacChannel.cpp
@@ -5,11 +5,11 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
*
* L O S A L A M O S
* Los Alamos National Laboratory
@@ -41,7 +41,7 @@ private:
epicsSingleton < localHostName > :: reference
_refLocalHostName;
};
-
+
static epicsThreadOnceId cacChannelIdOnce = EPICS_THREAD_ONCE_INIT;
const cacChannel::priLev cacChannel::priorityMax = 99u;
@@ -55,63 +55,63 @@ cacChannel::~cacChannel ()
{
}
-caAccessRights cacChannel::accessRights (
- epicsGuard < epicsMutex > & ) const
+caAccessRights cacChannel::accessRights (
+ epicsGuard < epicsMutex > & ) const
{
static caAccessRights ar ( true, true );
return ar;
}
-unsigned cacChannel::searchAttempts (
- epicsGuard < epicsMutex > & ) const
+unsigned cacChannel::searchAttempts (
+ epicsGuard < epicsMutex > & ) const
{
return 0u;
}
-double cacChannel::beaconPeriod (
- epicsGuard < epicsMutex > & ) const
+double cacChannel::beaconPeriod (
+ epicsGuard < epicsMutex > & ) const
{
return - DBL_MAX;
}
-double cacChannel::receiveWatchdogDelay (
+double cacChannel::receiveWatchdogDelay (
epicsGuard < epicsMutex > & ) const
{
return - DBL_MAX;
}
bool cacChannel::ca_v42_ok (
- epicsGuard < epicsMutex > & ) const
+ epicsGuard < epicsMutex > & ) const
{
return true;
}
bool cacChannel::connected (
- epicsGuard < epicsMutex > & ) const
+ epicsGuard < epicsMutex > & ) const
{
return true;
}
-CACChannelPrivate ::
+CACChannelPrivate ::
CACChannelPrivate() :
_refLocalHostName ( localHostNameCache.getReference () )
{
}
-inline unsigned CACChannelPrivate ::
+inline unsigned CACChannelPrivate ::
getHostName ( char * pBuf, unsigned bufLength )
{
return _refLocalHostName->getName ( pBuf, bufLength );
}
-
-inline const char * CACChannelPrivate ::
+
+inline const char * CACChannelPrivate ::
pHostName ()
{
return _refLocalHostName->pointer ();
}
static CACChannelPrivate * pCACChannelPrivate = 0;
-
+
// runs once only for each process
extern "C" void cacChannelSetup ( void * )
{
@@ -119,7 +119,7 @@ extern "C" void cacChannelSetup ( void * )
}
// the default is to assume that it is a locally hosted channel
-unsigned cacChannel::getHostName (
+unsigned cacChannel::getHostName (
epicsGuard < epicsMutex > &,
char * pBuf, unsigned bufLength ) const throw ()
{
@@ -141,5 +141,3 @@ const char * cacChannel::pHostName (
cacContext::~cacContext () {}
cacService::~cacService () {}
-
-
diff --git a/modules/ca/src/client/cacChannelNotify.cpp b/modules/ca/src/client/cacChannelNotify.cpp
index 08d2cab..c8ea0c9 100644
--- a/modules/ca/src/client/cacChannelNotify.cpp
+++ b/modules/ca/src/client/cacChannelNotify.cpp
@@ -5,21 +5,21 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
+ *
*
- *
* L O S A L A M O S
* Los Alamos National Laboratory
* Los Alamos, New Mexico 87545
- *
+ *
* Copyright, 1986, The Regents of the University of California.
- *
- *
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ *
+ *
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#include "iocinf.h"
@@ -28,7 +28,6 @@
#include "cacIO.h"
#undef epicsExportSharedSymbols
-cacChannelNotify::~cacChannelNotify ()
+cacChannelNotify::~cacChannelNotify ()
{
}
-
diff --git a/modules/ca/src/client/cacContextNotify.cpp b/modules/ca/src/client/cacContextNotify.cpp
index a4498ac..044f1e4 100644
--- a/modules/ca/src/client/cacContextNotify.cpp
+++ b/modules/ca/src/client/cacContextNotify.cpp
@@ -5,10 +5,10 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
*
* L O S A L A M O S
* Los Alamos National Laboratory
@@ -31,13 +31,10 @@ cacContextNotify::~cacContextNotify ()
{
}
-void cacContextNotify::callbackProcessingInitiateNotify ()
+void cacContextNotify::callbackProcessingInitiateNotify ()
{
}
-void cacContextNotify::callbackProcessingCompleteNotify ()
+void cacContextNotify::callbackProcessingCompleteNotify ()
{
}
-
-
-
diff --git a/modules/ca/src/client/cacIO.h b/modules/ca/src/client/cacIO.h
index 4e8af4a..426ba02 100644
--- a/modules/ca/src/client/cacIO.h
+++ b/modules/ca/src/client/cacIO.h
@@ -17,9 +17,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef cacIOh
@@ -273,8 +273,8 @@ protected:
private:
cacChannelNotify & callback;
- cacChannel ( const cacChannel & );
- cacChannel & operator = ( const cacChannel & );
+ cacChannel ( const cacChannel & );
+ cacChannel & operator = ( const cacChannel & );
};
class epicsShareClass cacContext {
diff --git a/modules/ca/src/client/cacReadNotify.cpp b/modules/ca/src/client/cacReadNotify.cpp
index 23284c8..3d3d5a7 100644
--- a/modules/ca/src/client/cacReadNotify.cpp
+++ b/modules/ca/src/client/cacReadNotify.cpp
@@ -5,10 +5,10 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
*
* L O S A L A M O S
* Los Alamos National Laboratory
diff --git a/modules/ca/src/client/cacStateNotify.cpp b/modules/ca/src/client/cacStateNotify.cpp
index 0885248..ba5575f 100644
--- a/modules/ca/src/client/cacStateNotify.cpp
+++ b/modules/ca/src/client/cacStateNotify.cpp
@@ -5,10 +5,10 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
*
* L O S A L A M O S
* Los Alamos National Laboratory
diff --git a/modules/ca/src/client/cacWriteNotify.cpp b/modules/ca/src/client/cacWriteNotify.cpp
index 13d47cd..2bd2221 100644
--- a/modules/ca/src/client/cacWriteNotify.cpp
+++ b/modules/ca/src/client/cacWriteNotify.cpp
@@ -5,10 +5,10 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
*
* L O S A L A M O S
* Los Alamos National Laboratory
diff --git a/modules/ca/src/client/cadef.h b/modules/ca/src/client/cadef.h
index e62dd72..2a23ee9 100644
--- a/modules/ca/src/client/cadef.h
+++ b/modules/ca/src/client/cadef.h
@@ -535,24 +535,24 @@ epicsShareFunc chid epicsShareAPI ca_evid_to_chid ( evid id );
/* FLOW OF TYPICAL APPLICATION */
/* */
/* search() ! Obtain Channel ids */
-/* . ! " */
+/* . ! " */
/* . ! " */
/* pend_io ! wait for channels to connect */
/* */
/* get() ! several requests for remote info */
-/* get() ! " */
-/* add_event() ! " */
-/* get() ! " */
+/* get() ! " */
+/* add_event() ! " */
+/* get() ! " */
/* . */
/* . */
/* . */
/* flush_io() ! send get requests */
/* ! optional parallel processing */
-/* . ! " */
-/* . ! " */
+/* . ! " */
+/* . ! " */
/* pend_io() ! wait for replies from get requests */
/* . ! access to requested data */
-/* . ! " */
+/* . ! " */
/* pend_event() ! wait for requested events */
/* */
/************************************************************************/
diff --git a/modules/ca/src/client/casw.cpp b/modules/ca/src/client/casw.cpp
index ed17660..e527a3c 100644
--- a/modules/ca/src/client/casw.cpp
+++ b/modules/ca/src/client/casw.cpp
@@ -5,10 +5,10 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
*
* L O S A L A M O S
* Los Alamos National Laboratory
@@ -23,7 +23,7 @@
#define epicsAssertAuthor "Jeff Hill johill at lanl.gov"
-#include "envDefs.h"
+#include "envDefs.h"
#include "errlog.h"
#include "osiWireFormat.h"
@@ -40,8 +40,8 @@ public:
void release ( void * );
private:
tsFreeList < class bhe, 0x100 > freeList;
- bheFreeStoreMgr ( const bheFreeStoreMgr & );
- bheFreeStoreMgr & operator = ( const bheFreeStoreMgr & );
+ bheFreeStoreMgr ( const bheFreeStoreMgr & );
+ bheFreeStoreMgr & operator = ( const bheFreeStoreMgr & );
};
void * bheFreeStoreMgr::allocate ( size_t size )
@@ -108,7 +108,7 @@ int main ( int argc, char ** argv )
sock = epicsSocketCreate ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
if ( sock == INVALID_SOCKET ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
errlogPrintf ("casw: unable to create datagram socket because = \"%s\"\n",
sockErrBuf );
@@ -122,7 +122,7 @@ int main ( int argc, char ** argv )
status = bind ( sock, &addr.sa, sizeof (addr) );
if ( status < 0 ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
epicsSocketDestroy ( sock );
errlogPrintf ( "casw: unable to bind to an unconstrained address because = \"%s\"\n",
@@ -134,7 +134,7 @@ int main ( int argc, char ** argv )
status = socket_ioctl ( sock, FIONBIO, &yes );
if ( status < 0 ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
epicsSocketDestroy ( sock );
errlogPrintf ( "casw: unable to set socket to nonblocking state because \"%s\"\n",
@@ -169,7 +169,7 @@ int main ( int argc, char ** argv )
status = socket_ioctl ( sock, FIONBIO, &no );
if ( status < 0 ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
epicsSocketDestroy ( sock );
errlogPrintf ( "casw: unable to set socket to blocking state because \"%s\"\n",
@@ -185,7 +185,7 @@ int main ( int argc, char ** argv )
&addr.sa, &addrSize );
if ( status <= 0 ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
epicsSocketDestroy ( sock );
errlogPrintf ("casw: error from recv was = \"%s\"\n",
@@ -196,7 +196,7 @@ int main ( int argc, char ** argv )
if ( addr.sa.sa_family != AF_INET ) {
continue;
}
-
+
unsigned byteCount = static_cast <unsigned> ( status );
pCurMsg = reinterpret_cast < const caHdr * > ( ( pCurBuf = buf ) );
while ( byteCount ) {
@@ -213,9 +213,9 @@ int main ( int argc, char ** argv )
epicsTime previousTime;
struct sockaddr_in ina;
- /*
+ /*
* this allows a fan-out server to potentially
- * insert the true address of the CA server
+ * insert the true address of the CA server
*
* old servers:
* 1) set this field to one of the ip addresses of the host _or_
@@ -252,8 +252,8 @@ int main ( int argc, char ** argv )
bhe *pBHE = beaconTable.lookup ( ina );
if ( pBHE ) {
previousTime = pBHE->updateTime ( guard );
- anomaly = pBHE->updatePeriod (
- guard, programBeginTime,
+ anomaly = pBHE->updatePeriod (
+ guard, programBeginTime,
currentTime, beaconNumber, protocolRevision );
}
else {
@@ -264,7 +264,7 @@ int main ( int argc, char ** argv )
* time that we have seen a server's beacon
* shortly after the program started up)
*/
- pBHE = new ( bheFreeList )
+ pBHE = new ( bheFreeList )
bhe ( mutex, currentTime, beaconNumber, ina );
if ( pBHE ) {
if ( beaconTable.add ( *pBHE ) < 0 ) {
@@ -275,7 +275,7 @@ int main ( int argc, char ** argv )
}
if ( anomaly || interest > 1 ) {
char date[64];
- currentTime.strftime ( date, sizeof ( date ),
+ currentTime.strftime ( date, sizeof ( date ),
"%Y-%m-%d %H:%M:%S.%09f");
char host[64];
ipAddrToA ( &ina, host, sizeof ( host ) );
@@ -288,11 +288,11 @@ int main ( int argc, char ** argv )
pPrefix = " ";
}
}
- printf ( "%s%-40s %s\n",
+ printf ( "%s%-40s %s\n",
pPrefix, host, date );
if ( anomaly && interest > 0 ) {
- printf ( "\testimate=%f current=%f\n",
- pBHE->period ( guard ),
+ printf ( "\testimate=%f current=%f\n",
+ pBHE->period ( guard ),
currentTime - previousTime );
}
fflush(stdout);
diff --git a/modules/ca/src/client/comBuf.cpp b/modules/ca/src/client/comBuf.cpp
index 94245d3..ec99ad0 100644
--- a/modules/ca/src/client/comBuf.cpp
+++ b/modules/ca/src/client/comBuf.cpp
@@ -5,20 +5,20 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
+ *
*
- *
* L O S A L A M O S
* Los Alamos National Laboratory
* Los Alamos, New Mexico 87545
- *
+ *
* Copyright, 1986, The Regents of the University of California.
- *
- *
- * Author Jeffrey O. Hill
- * johill at lanl.gov
+ *
+ *
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
*/
#include <stdexcept>
@@ -33,7 +33,7 @@ bool comBuf::flushToWire ( wireSendAdapter & wire, const epicsTime & currentTime
unsigned index = this->nextReadIndex;
unsigned finalIndex = this->commitIndex;
while ( index < finalIndex ) {
- unsigned nBytes = wire.sendBytes (
+ unsigned nBytes = wire.sendBytes (
&this->buf[index], finalIndex - index, currentTime );
if ( nBytes == 0u ) {
this->nextReadIndex = index;
@@ -45,9 +45,9 @@ bool comBuf::flushToWire ( wireSendAdapter & wire, const epicsTime & currentTime
return true;
}
-// throwing the exception from a function that isnt inline
+// throwing the exception from a function that isnt inline
// shrinks the GNU compiled object code
-void comBuf::throwInsufficentBytesException ()
+void comBuf::throwInsufficentBytesException ()
{
throw comBuf::insufficentBytesAvailable ();
}
diff --git a/modules/ca/src/client/comBuf.h b/modules/ca/src/client/comBuf.h
index 59e3878..c8ece9d 100644
--- a/modules/ca/src/client/comBuf.h
+++ b/modules/ca/src/client/comBuf.h
@@ -17,8 +17,8 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
*/
#ifndef comBufh
diff --git a/modules/ca/src/client/comQueRecv.cpp b/modules/ca/src/client/comQueRecv.cpp
index 8826354..efa7ff4 100644
--- a/modules/ca/src/client/comQueRecv.cpp
+++ b/modules/ca/src/client/comQueRecv.cpp
@@ -5,9 +5,9 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
*
*
* L O S A L A M O S
@@ -26,8 +26,8 @@
#include "iocinf.h"
#include "virtualCircuit.h"
-comQueRecv::comQueRecv ( comBufMemoryManager & comBufMemoryManagerIn ):
- comBufMemMgr ( comBufMemoryManagerIn ), nBytesPending ( 0u )
+comQueRecv::comQueRecv ( comBufMemoryManager & comBufMemoryManagerIn ):
+ comBufMemMgr ( comBufMemoryManagerIn ), nBytesPending ( 0u )
{
}
@@ -101,7 +101,7 @@ void comQueRecv::popString ( epicsOldString *pStr )
}
void comQueRecv::pushLastComBufReceived ( comBuf & bufIn )
-
+
{
bufIn.commitIncomming ();
comBuf * pComBuf = this->bufs.last ();
@@ -172,7 +172,7 @@ void comQueRecv::removeAndDestroyBuf ( comBuf & buf )
this->comBufMemMgr.release ( & buf );
}
-epicsUInt8 comQueRecv::popUInt8 ()
+epicsUInt8 comQueRecv::popUInt8 ()
{
comBuf * pComBuf = this->bufs.first ();
if ( ! pComBuf ) {
@@ -266,4 +266,3 @@ bool comQueRecv::popOldMsgHeader ( caHdrLargeArray & msg )
return false;
}
}
-
diff --git a/modules/ca/src/client/comQueRecv.h b/modules/ca/src/client/comQueRecv.h
index 7f3153d..1764cfa 100644
--- a/modules/ca/src/client/comQueRecv.h
+++ b/modules/ca/src/client/comQueRecv.h
@@ -18,9 +18,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef comQueRecvh
@@ -54,8 +54,8 @@ private:
epicsUInt16 multiBufferPopUInt16 ();
epicsUInt32 multiBufferPopUInt32 ();
void removeAndDestroyBuf ( comBuf & );
- comQueRecv ( const comQueRecv & );
- comQueRecv & operator = ( const comQueRecv & );
+ comQueRecv ( const comQueRecv & );
+ comQueRecv & operator = ( const comQueRecv & );
};
inline unsigned comQueRecv::occupiedBytes () const
diff --git a/modules/ca/src/client/comQueSend.cpp b/modules/ca/src/client/comQueSend.cpp
index 6ed516b..1e63ece 100644
--- a/modules/ca/src/client/comQueSend.cpp
+++ b/modules/ca/src/client/comQueSend.cpp
@@ -5,21 +5,21 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
+ *
*
- *
* L O S A L A M O S
* Los Alamos National Laboratory
* Los Alamos, New Mexico 87545
- *
+ *
* Copyright, 1986, The Regents of the University of California.
- *
- *
- * Author Jeffrey O. Hill
- * johill at lanl.gov
+ *
+ *
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
*/
//
@@ -35,7 +35,7 @@
// a connection dropped.
// 4) Do not allocate too much memory in exception situatons (such as
// after a circuit disconnect).
-// 5) Avoid allocating more memory than is absolutely necessary to meet
+// 5) Avoid allocating more memory than is absolutely necessary to meet
// the above requirements.
// 6) Message fragments must never be sent to the IOC when there isnt
// enough memory to queue part of a message (we also must not force
@@ -44,7 +44,7 @@
// protocol stream.
//
// Implementation:
-// 1) When queuing a complete message, first test to see if a flush is
+// 1) When queuing a complete message, first test to see if a flush is
// required. If it is a receive thread scheduals the flush with the
// send thread, and otherwise directly execute the system call. The
// send thread must run at a higher priority than the receive thread
@@ -52,14 +52,14 @@
// 2) Preallocate space for the entire message prior to copying in the
// message so that message fragments are not flushed out just prior
// to detecting that memory is unavailable.
-// 3) Return a special error constant when the following situations
+// 3) Return a special error constant when the following situations
// are detected when the user is attempting to queue a request
// from within a user callback executed by a receive thread:
-// a) A user is queuing more requests that demand a response from a
+// a) A user is queuing more requests that demand a response from a
// callback than are removed by the response that initiated the
// callback, and this situation persists for many callbacks until
// all buffering in the system is exausted.
-// b) A user is queuing many requests that demand a response from one
+// b) A user is queuing many requests that demand a response from one
// callback until all buffering in the system is exausted.
// c) Some combination of both (a) nad (b).
//
@@ -73,15 +73,15 @@
#include "db_access.h" // for dbr_short_t etc
// nill message alignment pad bytes
-const char cacNillBytes [] =
-{
+const char cacNillBytes [] =
+{
0, 0, 0, 0,
0, 0, 0, 0
};
-comQueSend::comQueSend ( wireSendAdapter & wireIn,
+comQueSend::comQueSend ( wireSendAdapter & wireIn,
comBufMemoryManager & comBufMemMgrIn ):
- comBufMemMgr ( comBufMemMgrIn ), wire ( wireIn ),
+ comBufMemMgr ( comBufMemMgrIn ), wire ( wireIn ),
nBytesPending ( 0u )
{
}
@@ -91,7 +91,7 @@ comQueSend::~comQueSend ()
this->clear ();
}
-void comQueSend::clear ()
+void comQueSend::clear ()
{
comBuf *pBuf;
@@ -181,32 +181,32 @@ const comQueSend::copyScalarFunc_t comQueSend::dbrCopyScalar [39] = {
&comQueSend::copy_dbr_invalid // DBR_CLASS_NAME
};
-void comQueSend::copy_dbr_string ( const void *pValue, unsigned nElem )
+void comQueSend::copy_dbr_string ( const void *pValue, unsigned nElem )
{
this->push ( static_cast < const char * > ( pValue ), nElem * MAX_STRING_SIZE );
}
-void comQueSend::copy_dbr_short ( const void *pValue, unsigned nElem )
+void comQueSend::copy_dbr_short ( const void *pValue, unsigned nElem )
{
this->push ( static_cast <const dbr_short_t *> ( pValue ), nElem );
}
-void comQueSend::copy_dbr_float ( const void *pValue, unsigned nElem )
+void comQueSend::copy_dbr_float ( const void *pValue, unsigned nElem )
{
this->push ( static_cast <const dbr_float_t *> ( pValue ), nElem );
}
-void comQueSend::copy_dbr_char ( const void *pValue, unsigned nElem )
+void comQueSend::copy_dbr_char ( const void *pValue, unsigned nElem )
{
this->push ( static_cast <const dbr_char_t *> ( pValue ), nElem );
}
-void comQueSend::copy_dbr_long ( const void *pValue, unsigned nElem )
+void comQueSend::copy_dbr_long ( const void *pValue, unsigned nElem )
{
this->push ( static_cast <const dbr_long_t *> ( pValue ), nElem );
}
-void comQueSend::copy_dbr_double ( const void *pValue, unsigned nElem )
+void comQueSend::copy_dbr_double ( const void *pValue, unsigned nElem )
{
this->push ( static_cast <const dbr_double_t *> ( pValue ), nElem );
}
@@ -258,7 +258,7 @@ const comQueSend::copyVectorFunc_t comQueSend::dbrCopyVector [39] = {
&comQueSend::copy_dbr_invalid // DBR_CLASS_NAME
};
-comBuf * comQueSend::popNextComBufToSend ()
+comBuf * comQueSend::popNextComBufToSend ()
{
comBuf *pBuf = this->bufs.get ();
if ( pBuf ) {
@@ -279,9 +279,9 @@ comBuf * comQueSend::popNextComBufToSend ()
}
void comQueSend::insertRequestHeader (
- ca_uint16_t request, ca_uint32_t payloadSize,
- ca_uint16_t dataType, ca_uint32_t nElem, ca_uint32_t cid,
- ca_uint32_t requestDependent, bool v49Ok )
+ ca_uint16_t request, ca_uint32_t payloadSize,
+ ca_uint16_t dataType, ca_uint32_t nElem, ca_uint32_t cid,
+ ca_uint32_t requestDependent, bool v49Ok )
{
if ( payloadSize < 0xffff && nElem < 0xffff ) {
comBuf * pComBuf = this->bufs.last ();
@@ -289,12 +289,12 @@ void comQueSend::insertRequestHeader (
pComBuf = newComBuf ();
this->pushComBuf ( *pComBuf );
}
- pComBuf->push ( request );
- pComBuf->push ( static_cast < ca_uint16_t > ( payloadSize ) );
- pComBuf->push ( dataType );
- pComBuf->push ( static_cast < ca_uint16_t > ( nElem ) );
- pComBuf->push ( cid );
- pComBuf->push ( requestDependent );
+ pComBuf->push ( request );
+ pComBuf->push ( static_cast < ca_uint16_t > ( payloadSize ) );
+ pComBuf->push ( dataType );
+ pComBuf->push ( static_cast < ca_uint16_t > ( nElem ) );
+ pComBuf->push ( cid );
+ pComBuf->push ( requestDependent );
}
else if ( v49Ok ) {
comBuf * pComBuf = this->bufs.last ();
@@ -302,14 +302,14 @@ void comQueSend::insertRequestHeader (
pComBuf = newComBuf ();
this->pushComBuf ( *pComBuf );
}
- pComBuf->push ( request );
- pComBuf->push ( static_cast < ca_uint16_t > ( 0xffff ) );
- pComBuf->push ( dataType );
- pComBuf->push ( static_cast < ca_uint16_t > ( 0u ) );
- pComBuf->push ( cid );
- pComBuf->push ( requestDependent );
- pComBuf->push ( payloadSize );
- pComBuf->push ( nElem );
+ pComBuf->push ( request );
+ pComBuf->push ( static_cast < ca_uint16_t > ( 0xffff ) );
+ pComBuf->push ( dataType );
+ pComBuf->push ( static_cast < ca_uint16_t > ( 0u ) );
+ pComBuf->push ( cid );
+ pComBuf->push ( requestDependent );
+ pComBuf->push ( payloadSize );
+ pComBuf->push ( nElem );
}
else {
throw cacChannel::outOfBounds ();
@@ -317,9 +317,9 @@ void comQueSend::insertRequestHeader (
}
void comQueSend::insertRequestWithPayLoad (
- ca_uint16_t request, unsigned dataType, arrayElementCount nElem,
- ca_uint32_t cid, ca_uint32_t requestDependent,
- const void * pPayload, bool v49Ok )
+ ca_uint16_t request, unsigned dataType, arrayElementCount nElem,
+ ca_uint32_t cid, ca_uint32_t requestDependent,
+ const void * pPayload, bool v49Ok )
{
if ( INVALID_DB_REQ ( dataType ) ) {
throw cacChannel::badType ();
@@ -337,16 +337,16 @@ void comQueSend::insertRequestWithPayLoad (
throw cacChannel::outOfBounds();
}
payloadSize = CA_MESSAGE_ALIGN ( size );
- this->insertRequestHeader ( request, payloadSize,
- static_cast <ca_uint16_t> ( dataType ),
+ this->insertRequestHeader ( request, payloadSize,
+ static_cast <ca_uint16_t> ( dataType ),
nElem, cid, requestDependent, v49Ok );
- this->pushString ( pStr, size );
+ this->pushString ( pStr, size );
}
else {
size = dbr_size[dataType];
payloadSize = CA_MESSAGE_ALIGN ( size );
- this->insertRequestHeader ( request, payloadSize,
- static_cast <ca_uint16_t> ( dataType ),
+ this->insertRequestHeader ( request, payloadSize,
+ static_cast <ca_uint16_t> ( dataType ),
nElem, cid, requestDependent, v49Ok );
( this->*dbrCopyScalar [dataType] ) ( pPayload );
}
@@ -357,22 +357,22 @@ void comQueSend::insertRequestWithPayLoad (
maxBytes = 0xffffffff;
}
else {
- maxBytes = MAX_TCP - sizeof ( caHdr );
+ maxBytes = MAX_TCP - sizeof ( caHdr );
}
- arrayElementCount maxElem =
- ( maxBytes - sizeof (dbr_double_t) - dbr_size[dataType] ) /
+ arrayElementCount maxElem =
+ ( maxBytes - sizeof (dbr_double_t) - dbr_size[dataType] ) /
dbr_value_size[dataType];
if ( nElem >= maxElem ) {
throw cacChannel::outOfBounds();
}
// the above checks verify that the total size
// is lest that 0xffffffff
- size = static_cast < ca_uint32_t >
+ size = static_cast < ca_uint32_t >
( dbr_size_n ( dataType, nElem ) );
payloadSize = CA_MESSAGE_ALIGN ( size );
- this->insertRequestHeader ( request, payloadSize,
- static_cast <ca_uint16_t> ( dataType ),
- static_cast < ca_uint32_t > ( nElem ),
+ this->insertRequestHeader ( request, payloadSize,
+ static_cast <ca_uint16_t> ( dataType ),
+ static_cast < ca_uint32_t > ( nElem ),
cid, requestDependent, v49Ok );
( this->*dbrCopyVector [dataType] ) ( pPayload, nElem );
}
@@ -383,7 +383,7 @@ void comQueSend::insertRequestWithPayLoad (
}
}
-void comQueSend::commitMsg ()
+void comQueSend::commitMsg ()
{
while ( this->pFirstUncommited.valid() ) {
this->nBytesPending += this->pFirstUncommited->uncommittedBytes ();
@@ -408,4 +408,3 @@ void comQueSend::clearUncommitedMsg ()
this->pFirstUncommited = next;
}
}
-
diff --git a/modules/ca/src/client/comQueSend.h b/modules/ca/src/client/comQueSend.h
index 808285e..bfd4f04 100644
--- a/modules/ca/src/client/comQueSend.h
+++ b/modules/ca/src/client/comQueSend.h
@@ -19,9 +19,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef comQueSendh
diff --git a/modules/ca/src/client/convert.cpp b/modules/ca/src/client/convert.cpp
index 8517117..f104c70 100644
--- a/modules/ca/src/client/convert.cpp
+++ b/modules/ca/src/client/convert.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
* C O N V E R T . C
@@ -13,11 +13,11 @@
* Author: D. Kersteins
*
*
- * NOTES:
+ * NOTES:
*
* 1) All routines in this file have an encode argument which
* determines if we are converting from the standard format to
- * the local format or vise versa. To date only float and double data
+ * the local format or vise versa. To date only float and double data
* types must be converted differently depending on the encode
* argument - joh
*
@@ -46,38 +46,38 @@
*
* net format: big endian and IEEE float
*/
-typedef void ( * CACVRTFUNCPTR ) (
+typedef void ( * CACVRTFUNCPTR ) (
const void *pSrc, void *pDest, int hton, arrayElementCount count );
-inline void dbr_htond (
+inline void dbr_htond (
const dbr_double_t * pHost, dbr_double_t * pNet )
{
AlignedWireRef < epicsFloat64 > tmp ( *pNet );
tmp = *pHost;
}
-inline void dbr_ntohd (
+inline void dbr_ntohd (
const dbr_double_t * pNet, dbr_double_t * pHost )
{
*pHost = AlignedWireRef < const epicsFloat64 > ( *pNet );
}
-inline void dbr_htonf (
+inline void dbr_htonf (
const dbr_float_t * pHost, dbr_float_t * pNet )
{
AlignedWireRef < epicsFloat32 > tmp ( *pNet );
tmp = *pHost;
}
-inline void dbr_ntohf (
+inline void dbr_ntohf (
const dbr_float_t * pNet, dbr_float_t * pHost )
{
*pHost = AlignedWireRef < const epicsFloat32 > ( *pNet );
}
-inline epicsUInt16 dbr_ntohs( const epicsUInt16 & net )
+inline epicsUInt16 dbr_ntohs( const epicsUInt16 & net )
{
return AlignedWireRef < const epicsUInt16 > ( net );
}
-inline epicsUInt16 dbr_htons ( const epicsUInt16 & host )
+inline epicsUInt16 dbr_htons ( const epicsUInt16 & host )
{
epicsUInt16 tmp;
AlignedWireRef < epicsUInt16 > awr ( tmp );
@@ -103,7 +103,7 @@ inline epicsUInt32 dbr_htonl ( const epicsUInt32 & host )
* otherwise vise-versa
*
* net format: big endian and IEEE float
- *
+ *
*/
/*
@@ -122,7 +122,7 @@ arrayElementCount num /* number of values */
/* convert "in place" -> nothing to do */
if (s == d)
return;
- memcpy ( pDest, pSrc, num*MAX_STRING_SIZE );
+ memcpy ( pDest, pSrc, num*MAX_STRING_SIZE );
}
/*
@@ -234,7 +234,7 @@ arrayElementCount num /* number of values */
*
*
* NOTES:
- * placing encode outside the loop results in more
+ * placing encode outside the loop results in more
* code but better performance.
*
*/
@@ -291,10 +291,10 @@ arrayElementCount num /* number of values */
** struct dbr_sts_string *d pointer to destination struct
** int encode; boolean, if true vax to ieee
** else ieee to vax
-**
+**
** converts fields of struct in HOST format to NET format
-** or
-** converts fields of struct in NET format to fields with HOST
+** or
+** converts fields of struct in NET format to fields with HOST
** format;
****************************************************************************/
@@ -307,7 +307,7 @@ arrayElementCount num /* number of values */
{
struct dbr_sts_string *pSrc = (struct dbr_sts_string *) s;
struct dbr_sts_string *pDest = (struct dbr_sts_string *) d;
-
+
/* convert ieee to vax format or vax to ieee */
pDest->status = dbr_ntohs(pSrc->status);
pDest->severity = dbr_ntohs(pSrc->severity);
@@ -328,8 +328,8 @@ arrayElementCount num /* number of values */
** else ieee to vax
**
** converts fields ofstruct in HOST format to ieee format
-** or
-** converts fields of struct in NET format to fields with HOST
+** or
+** converts fields of struct in NET format to fields with HOST
** format
****************************************************************************/
@@ -361,10 +361,10 @@ arrayElementCount num /* number of values */
** int encode; boolean, if true vax to ieee
** else ieee to vax
**
-** if encode
+** if encode
** converts struct in HOST format to ieee format
-** else
-** converts fields of struct in NET format to fields with HOST
+** else
+** converts fields of struct in NET format to fields with HOST
** format;
****************************************************************************/
@@ -387,10 +387,10 @@ arrayElementCount num /* number of values */
/****************************************************************************
** cvrt_sts_double(s,d)
**
-** if encode
+** if encode
** converts struct in HOST format to ieee format
-** else
-** converts fields of struct in NET format to fields with HOST
+** else
+** converts fields of struct in NET format to fields with HOST
** format;
****************************************************************************/
@@ -418,9 +418,9 @@ arrayElementCount num /* number of values */
** else ieee to vax
**
** converts fields of struct in NET format to fields with HOST format
-** or
+** or
** converts fields of struct in HOST format to fields with NET format
-**
+**
****************************************************************************/
static void cvrt_sts_enum(
@@ -446,9 +446,9 @@ arrayElementCount num /* number of values */
** cvrt_gr_short()
**
** converts fields of struct in NET format to fields with HOST format
-** or
+** or
** converts fields of struct in HOST format to fields with NET format
-**
+**
****************************************************************************/
static void cvrt_gr_short(
@@ -485,9 +485,9 @@ arrayElementCount num /* number of values */
** cvrt_gr_char()
**
** converts fields of struct in NET format to fields with HOST format
-** or
+** or
** converts fields of struct in HOST format to fields with NET format
-**
+**
****************************************************************************/
static void cvrt_gr_char(
@@ -526,9 +526,9 @@ arrayElementCount num /* number of values */
** cvrt_gr_long()
**
** converts fields of struct in NET format to fields with HOST format
-** or
+** or
** converts fields of struct in HOST format to fields with NET format
-**
+**
****************************************************************************/
static void cvrt_gr_long(
@@ -564,10 +564,10 @@ arrayElementCount num /* number of values */
/****************************************************************************
** cvrt_gr_enum(s,d)
**
-** if encode
+** if encode
** converts struct in HOST format to ieee format
-** else
-** converts fields of struct in NET format to fields with HOST
+** else
+** converts fields of struct in NET format to fields with HOST
** format;
****************************************************************************/
@@ -599,10 +599,10 @@ arrayElementCount num /* number of values */
/****************************************************************************
** cvrt_gr_double(s,d)
**
-** if encode
+** if encode
** converts struct in HOST format to ieee format
-** else
-** converts fields of struct in NET format to fields with HOST
+** else
+** converts fields of struct in NET format to fields with HOST
** format;
****************************************************************************/
@@ -663,10 +663,10 @@ arrayElementCount num /* number of values */
** int encode; boolean, if true vax to ieee
** else ieee to vax
**
-** if encode
+** if encode
** converts struct in HOST format to ieee format
-** else
-** converts fields of struct in NET format to fields with HOST
+** else
+** converts fields of struct in NET format to fields with HOST
** format;
****************************************************************************/
@@ -730,9 +730,9 @@ arrayElementCount num /* number of values */
** else ieee to vax
**
** converts fields of struct in NET format to fields with HOST format
-** or
+** or
** converts fields of struct in HOST format to fields with NET format
-**
+**
****************************************************************************/
static void cvrt_ctrl_short(
@@ -772,9 +772,9 @@ arrayElementCount num /* number of values */
** cvrt_ctrl_long(s,d)
**
** converts fields of struct in NET format to fields with HOST format
-** or
+** or
** converts fields of struct in HOST format to fields with NET format
-**
+**
****************************************************************************/
static void cvrt_ctrl_long(
@@ -814,9 +814,9 @@ arrayElementCount num /* number of values */
** cvrt_ctrl_short(s,d)
**
** converts fields of struct in NET format to fields with HOST format
-** or
+** or
** converts fields of struct in HOST format to fields with NET format
-**
+**
****************************************************************************/
static void cvrt_ctrl_char(
@@ -833,7 +833,7 @@ arrayElementCount num /* number of values */
pDest->status = dbr_ntohs(pSrc->status);
pDest->severity = dbr_ntohs(pSrc->severity);
- if ( s == d )
+ if ( s == d )
return;
pDest->upper_disp_limit = pSrc->upper_disp_limit;
@@ -853,10 +853,10 @@ arrayElementCount num /* number of values */
/****************************************************************************
** cvrt_ctrl_double(s,d)
**
-** if encode
+** if encode
** converts struct in HOST format to ieee format
-** else
-** converts fields of struct in NET format to fields with HOST
+** else
+** converts fields of struct in NET format to fields with HOST
** format;
****************************************************************************/
@@ -919,10 +919,10 @@ arrayElementCount num /* number of values */
/****************************************************************************
** cvrt_ctrl_float(s,d)
**
-** if encode
+** if encode
** converts struct in HOST format to ieee format
-** else
-** converts fields of struct in NET format to fields with HOST
+** else
+** converts fields of struct in NET format to fields with HOST
** format;
****************************************************************************/
@@ -984,10 +984,10 @@ arrayElementCount num /* number of values */
/****************************************************************************
** cvrt_ctrl_enum(s,d)
**
-** if encode
+** if encode
** converts struct in HOST format to ieee format
-** else
-** converts fields of struct in NET format to fields with HOST
+** else
+** converts fields of struct in NET format to fields with HOST
** format;
****************************************************************************/
@@ -1003,7 +1003,7 @@ arrayElementCount num /* number of values */
pDest->status = dbr_ntohs(pSrc->status);
pDest->severity = dbr_ntohs(pSrc->severity);
- pDest->no_str = dbr_ntohs(pSrc->no_str);
+ pDest->no_str = dbr_ntohs(pSrc->no_str);
if ( s != d ) {
memcpy((void *)pDest->strs,(void *)pSrc->strs,sizeof(pSrc->strs));
}
@@ -1024,8 +1024,8 @@ arrayElementCount num /* number of values */
** else ieee to vax
**
** converts fields ofstruct in HOST format to ieee format
-** or
-** converts fields of struct in NET format to fields with HOST
+** or
+** converts fields of struct in NET format to fields with HOST
** format
****************************************************************************/
@@ -1043,7 +1043,7 @@ arrayElementCount num /* number of values */
pDest->status = dbr_ntohs(pSrc->status);
pDest->severity = dbr_ntohs(pSrc->severity);
- if ( s == d )
+ if ( s == d )
return;
if (num == 1) /* single value */
@@ -1058,8 +1058,8 @@ arrayElementCount num /* number of values */
** cvrt_sts_long(s,d)
**
** converts fields ofstruct in HOST format to ieee format
-** or
-** converts fields of struct in NET format to fields with HOST
+** or
+** converts fields of struct in NET format to fields with HOST
** format
****************************************************************************/
@@ -1088,10 +1088,10 @@ arrayElementCount num /* number of values */
/****************************************************************************
** cvrt_time_string(s,d)
-**
+**
** converts fields of struct in HOST format to NET format
-** or
-** converts fields of struct in NET format to fields with HOST
+** or
+** converts fields of struct in NET format to fields with HOST
** format;
****************************************************************************/
@@ -1104,7 +1104,7 @@ arrayElementCount num /* number of values */
{
struct dbr_time_string *pSrc = (struct dbr_time_string *) s;
struct dbr_time_string *pDest = (struct dbr_time_string *) d;
-
+
/* convert ieee to vax format or vax to ieee */
pDest->status = dbr_ntohs(pSrc->status);
pDest->severity = dbr_ntohs(pSrc->severity);
@@ -1120,8 +1120,8 @@ arrayElementCount num /* number of values */
** cvrt_time_short(s,d)
**
** converts fields ofstruct in HOST format to ieee format
-** or
-** converts fields of struct in NET format to fields with HOST
+** or
+** converts fields of struct in NET format to fields with HOST
** format
****************************************************************************/
@@ -1152,10 +1152,10 @@ arrayElementCount num /* number of values */
/****************************************************************************
** cvrt_time_float(s,d)
**
-** if encode
+** if encode
** converts struct in HOST format to ieee format
-** else
-** converts fields of struct in NET format to fields with HOST
+** else
+** converts fields of struct in NET format to fields with HOST
** format;
****************************************************************************/
@@ -1180,10 +1180,10 @@ arrayElementCount num /* number of values */
/****************************************************************************
** cvrt_time_double(s,d)
**
-** if encode
+** if encode
** converts struct in HOST format to ieee format
-** else
-** converts fields of struct in NET format to fields with HOST
+** else
+** converts fields of struct in NET format to fields with HOST
** format;
****************************************************************************/
@@ -1211,9 +1211,9 @@ arrayElementCount num /* number of values */
** cvrt_time_enum(s,d)
**
** converts fields of struct in NET format to fields with HOST format
-** or
+** or
** converts fields of struct in HOST format to fields with NET format
-**
+**
****************************************************************************/
static void cvrt_time_enum(
@@ -1241,8 +1241,8 @@ arrayElementCount num /* number of values */
** cvrt_sts_char(s,d)
**
** converts fields ofstruct in HOST format to ieee format
-** or
-** converts fields of struct in NET format to fields with HOST
+** or
+** converts fields of struct in NET format to fields with HOST
** format
****************************************************************************/
@@ -1262,7 +1262,7 @@ arrayElementCount num /* number of values */
pDest->stamp.secPastEpoch = dbr_ntohl(pSrc->stamp.secPastEpoch);
pDest->stamp.nsec = dbr_ntohl(pSrc->stamp.nsec);
- if ( s == d )
+ if ( s == d )
return;
if (num == 1) /* single value */
@@ -1276,8 +1276,8 @@ arrayElementCount num /* number of values */
** cvrt_time_long(s,d)
**
** converts fields ofstruct in HOST format to ieee format
-** or
-** converts fields of struct in NET format to fields with HOST
+** or
+** converts fields of struct in NET format to fields with HOST
** format
****************************************************************************/
@@ -1326,7 +1326,7 @@ arrayElementCount num /* number of values */
for(i=0; i<num; i++){
*pDest = dbr_ntohs( *pSrc );
/*
- * dont increment these inside the MACRO
+ * dont increment these inside the MACRO
*/
pDest++;
pSrc++;
@@ -1339,10 +1339,10 @@ arrayElementCount num /* number of values */
** struct dbr_stsack_string *d pointer to destination struct
** int encode; boolean, if true vax to ieee
** else ieee to vax
-**
+**
** converts fields of struct in HOST format to NET format
-** or
-** converts fields of struct in NET format to fields with HOST
+** or
+** converts fields of struct in NET format to fields with HOST
** format;
****************************************************************************/
@@ -1355,7 +1355,7 @@ arrayElementCount num /* number of values */
{
struct dbr_stsack_string *pSrc = (struct dbr_stsack_string *) s;
struct dbr_stsack_string *pDest = (struct dbr_stsack_string *) d;
-
+
/* convert ieee to vax format or vax to ieee */
pDest->status = dbr_ntohs(pSrc->status);
pDest->severity = dbr_ntohs(pSrc->severity);
@@ -1411,7 +1411,7 @@ static CACVRTFUNCPTR cac_dbr_cvrt[] = {
cvrt_ctrl_long,
cvrt_ctrl_double,
- cvrt_put_ackt,
+ cvrt_put_ackt,
cvrt_put_ackt, /* DBR_PUT_ACKS identical to DBR_PUT_ACKT */
cvrt_stsack_string,
cvrt_string
@@ -1419,22 +1419,21 @@ static CACVRTFUNCPTR cac_dbr_cvrt[] = {
#endif /* EPICS_CONVERSION_REQUIRED */
-int caNetConvert ( unsigned type, const void *pSrc, void *pDest,
+int caNetConvert ( unsigned type, const void *pSrc, void *pDest,
int hton, arrayElementCount count )
{
# ifdef EPICS_CONVERSION_REQUIRED
if ( type >= NELEMENTS ( cac_dbr_cvrt ) ) {
return ECA_BADTYPE;
- }
+ }
( * cac_dbr_cvrt [ type ] ) ( pSrc, pDest, hton, count );
# else
if ( INVALID_DB_REQ ( type ) ) {
return ECA_BADTYPE;
- }
+ }
if ( pSrc != pDest ) {
memcpy ( pDest, pSrc, dbr_size_n ( type, count ) );
}
# endif
return ECA_NORMAL;
}
-
diff --git a/modules/ca/src/client/db_access.h b/modules/ca/src/client/db_access.h
index 92aa5d0..9745563 100644
--- a/modules/ca/src/client/db_access.h
+++ b/modules/ca/src/client/db_access.h
@@ -35,9 +35,9 @@
extern "C" {
#endif
-#define MAX_UNITS_SIZE 8
-#define MAX_ENUM_STRING_SIZE 26
-#define MAX_ENUM_STATES 16
+#define MAX_UNITS_SIZE 8
+#define MAX_ENUM_STRING_SIZE 26
+#define MAX_ENUM_STATES 16
/*
* architecture independent types
@@ -47,81 +47,81 @@ extern "C" {
typedef epicsOldString dbr_string_t;
typedef epicsUInt8 dbr_char_t;
typedef epicsInt16 dbr_short_t;
-typedef epicsUInt16 dbr_ushort_t;
+typedef epicsUInt16 dbr_ushort_t;
typedef epicsInt16 dbr_int_t;
typedef epicsUInt16 dbr_enum_t;
typedef epicsInt32 dbr_long_t;
typedef epicsUInt32 dbr_ulong_t;
typedef epicsFloat32 dbr_float_t;
typedef epicsFloat64 dbr_double_t;
-typedef epicsUInt16 dbr_put_ackt_t;
-typedef epicsUInt16 dbr_put_acks_t;
+typedef epicsUInt16 dbr_put_ackt_t;
+typedef epicsUInt16 dbr_put_acks_t;
typedef epicsOldString dbr_stsack_string_t;
typedef epicsOldString dbr_class_name_t;
#ifndef db_accessHFORdb_accessC
/* database field types */
-#define DBF_STRING 0
-#define DBF_INT 1
-#define DBF_SHORT 1
-#define DBF_FLOAT 2
-#define DBF_ENUM 3
-#define DBF_CHAR 4
-#define DBF_LONG 5
-#define DBF_DOUBLE 6
-#define DBF_NO_ACCESS 7
-#define LAST_TYPE DBF_DOUBLE
-#define VALID_DB_FIELD(x) ((x >= 0) && (x <= LAST_TYPE))
-#define INVALID_DB_FIELD(x) ((x < 0) || (x > LAST_TYPE))
+#define DBF_STRING 0
+#define DBF_INT 1
+#define DBF_SHORT 1
+#define DBF_FLOAT 2
+#define DBF_ENUM 3
+#define DBF_CHAR 4
+#define DBF_LONG 5
+#define DBF_DOUBLE 6
+#define DBF_NO_ACCESS 7
+#define LAST_TYPE DBF_DOUBLE
+#define VALID_DB_FIELD(x) ((x >= 0) && (x <= LAST_TYPE))
+#define INVALID_DB_FIELD(x) ((x < 0) || (x > LAST_TYPE))
/* data request buffer types */
-#define DBR_STRING DBF_STRING
-#define DBR_INT DBF_INT
-#define DBR_SHORT DBF_INT
-#define DBR_FLOAT DBF_FLOAT
-#define DBR_ENUM DBF_ENUM
-#define DBR_CHAR DBF_CHAR
-#define DBR_LONG DBF_LONG
-#define DBR_DOUBLE DBF_DOUBLE
-#define DBR_STS_STRING 7
-#define DBR_STS_SHORT 8
-#define DBR_STS_INT DBR_STS_SHORT
-#define DBR_STS_FLOAT 9
-#define DBR_STS_ENUM 10
-#define DBR_STS_CHAR 11
-#define DBR_STS_LONG 12
-#define DBR_STS_DOUBLE 13
-#define DBR_TIME_STRING 14
-#define DBR_TIME_INT 15
-#define DBR_TIME_SHORT 15
-#define DBR_TIME_FLOAT 16
-#define DBR_TIME_ENUM 17
-#define DBR_TIME_CHAR 18
-#define DBR_TIME_LONG 19
-#define DBR_TIME_DOUBLE 20
-#define DBR_GR_STRING 21
-#define DBR_GR_SHORT 22
-#define DBR_GR_INT DBR_GR_SHORT
-#define DBR_GR_FLOAT 23
-#define DBR_GR_ENUM 24
-#define DBR_GR_CHAR 25
-#define DBR_GR_LONG 26
-#define DBR_GR_DOUBLE 27
-#define DBR_CTRL_STRING 28
-#define DBR_CTRL_SHORT 29
-#define DBR_CTRL_INT DBR_CTRL_SHORT
-#define DBR_CTRL_FLOAT 30
-#define DBR_CTRL_ENUM 31
-#define DBR_CTRL_CHAR 32
-#define DBR_CTRL_LONG 33
-#define DBR_CTRL_DOUBLE 34
-#define DBR_PUT_ACKT DBR_CTRL_DOUBLE + 1
+#define DBR_STRING DBF_STRING
+#define DBR_INT DBF_INT
+#define DBR_SHORT DBF_INT
+#define DBR_FLOAT DBF_FLOAT
+#define DBR_ENUM DBF_ENUM
+#define DBR_CHAR DBF_CHAR
+#define DBR_LONG DBF_LONG
+#define DBR_DOUBLE DBF_DOUBLE
+#define DBR_STS_STRING 7
+#define DBR_STS_SHORT 8
+#define DBR_STS_INT DBR_STS_SHORT
+#define DBR_STS_FLOAT 9
+#define DBR_STS_ENUM 10
+#define DBR_STS_CHAR 11
+#define DBR_STS_LONG 12
+#define DBR_STS_DOUBLE 13
+#define DBR_TIME_STRING 14
+#define DBR_TIME_INT 15
+#define DBR_TIME_SHORT 15
+#define DBR_TIME_FLOAT 16
+#define DBR_TIME_ENUM 17
+#define DBR_TIME_CHAR 18
+#define DBR_TIME_LONG 19
+#define DBR_TIME_DOUBLE 20
+#define DBR_GR_STRING 21
+#define DBR_GR_SHORT 22
+#define DBR_GR_INT DBR_GR_SHORT
+#define DBR_GR_FLOAT 23
+#define DBR_GR_ENUM 24
+#define DBR_GR_CHAR 25
+#define DBR_GR_LONG 26
+#define DBR_GR_DOUBLE 27
+#define DBR_CTRL_STRING 28
+#define DBR_CTRL_SHORT 29
+#define DBR_CTRL_INT DBR_CTRL_SHORT
+#define DBR_CTRL_FLOAT 30
+#define DBR_CTRL_ENUM 31
+#define DBR_CTRL_CHAR 32
+#define DBR_CTRL_LONG 33
+#define DBR_CTRL_DOUBLE 34
+#define DBR_PUT_ACKT DBR_CTRL_DOUBLE + 1
#define DBR_PUT_ACKS DBR_PUT_ACKT + 1
#define DBR_STSACK_STRING DBR_PUT_ACKS + 1
#define DBR_CLASS_NAME DBR_STSACK_STRING + 1
-#define LAST_BUFFER_TYPE DBR_CLASS_NAME
-#define VALID_DB_REQ(x) ((x >= 0) && (x <= LAST_BUFFER_TYPE))
-#define INVALID_DB_REQ(x) ((x < 0) || (x > LAST_BUFFER_TYPE))
+#define LAST_BUFFER_TYPE DBR_CLASS_NAME
+#define VALID_DB_REQ(x) ((x >= 0) && (x <= LAST_BUFFER_TYPE))
+#define INVALID_DB_REQ(x) ((x < 0) || (x > LAST_BUFFER_TYPE))
/*
* The enumeration "epicsType" is an index to this array
@@ -136,46 +136,46 @@ epicsShareExtern const int epicsTypeToDBR_XXXX [lastEpicsType+1];
epicsShareExtern const epicsType DBR_XXXXToEpicsType [LAST_BUFFER_TYPE+1];
/* values returned for each field type
- * DBR_STRING returns a NULL terminated string
- * DBR_SHORT returns an unsigned short
- * DBR_INT returns an unsigned short
- * DBR_FLOAT returns an IEEE floating point value
- * DBR_ENUM returns an unsigned short which is the enum item
- * DBR_CHAR returns an unsigned char
- * DBR_LONG returns an unsigned long
- * DBR_DOUBLE returns a double precision floating point number
- * DBR_STS_STRING returns a string status structure (dbr_sts_string)
- * DBR_STS_SHORT returns a short status structure (dbr_sts_short)
- * DBR_STS_INT returns a short status structure (dbr_sts_int)
- * DBR_STS_FLOAT returns a float status structure (dbr_sts_float)
- * DBR_STS_ENUM returns an enum status structure (dbr_sts_enum)
- * DBR_STS_CHAR returns a char status structure (dbr_sts_char)
- * DBR_STS_LONG returns a long status structure (dbr_sts_long)
- * DBR_STS_DOUBLE returns a double status structure (dbr_sts_double)
- * DBR_TIME_STRING returns a string time structure (dbr_time_string)
- * DBR_TIME_SHORT returns a short time structure (dbr_time_short)
- * DBR_TIME_INT returns a short time structure (dbr_time_short)
- * DBR_TIME_FLOAT returns a float time structure (dbr_time_float)
- * DBR_TIME_ENUM returns an enum time structure (dbr_time_enum)
- * DBR_TIME_CHAR returns a char time structure (dbr_time_char)
- * DBR_TIME_LONG returns a long time structure (dbr_time_long)
- * DBR_TIME_DOUBLE returns a double time structure (dbr_time_double)
- * DBR_GR_STRING returns a graphic string structure (dbr_gr_string)
- * DBR_GR_SHORT returns a graphic short structure (dbr_gr_short)
- * DBR_GR_INT returns a graphic short structure (dbr_gr_int)
- * DBR_GR_FLOAT returns a graphic float structure (dbr_gr_float)
- * DBR_GR_ENUM returns a graphic enum structure (dbr_gr_enum)
- * DBR_GR_CHAR returns a graphic char structure (dbr_gr_char)
- * DBR_GR_LONG returns a graphic long structure (dbr_gr_long)
- * DBR_GR_DOUBLE returns a graphic double structure (dbr_gr_double)
- * DBR_CTRL_STRING returns a control string structure (dbr_ctrl_int)
- * DBR_CTRL_SHORT returns a control short structure (dbr_ctrl_short)
- * DBR_CTRL_INT returns a control short structure (dbr_ctrl_int)
- * DBR_CTRL_FLOAT returns a control float structure (dbr_ctrl_float)
- * DBR_CTRL_ENUM returns a control enum structure (dbr_ctrl_enum)
- * DBR_CTRL_CHAR returns a control char structure (dbr_ctrl_char)
- * DBR_CTRL_LONG returns a control long structure (dbr_ctrl_long)
- * DBR_CTRL_DOUBLE returns a control double structure (dbr_ctrl_double)
+ * DBR_STRING returns a NULL terminated string
+ * DBR_SHORT returns an unsigned short
+ * DBR_INT returns an unsigned short
+ * DBR_FLOAT returns an IEEE floating point value
+ * DBR_ENUM returns an unsigned short which is the enum item
+ * DBR_CHAR returns an unsigned char
+ * DBR_LONG returns an unsigned long
+ * DBR_DOUBLE returns a double precision floating point number
+ * DBR_STS_STRING returns a string status structure (dbr_sts_string)
+ * DBR_STS_SHORT returns a short status structure (dbr_sts_short)
+ * DBR_STS_INT returns a short status structure (dbr_sts_int)
+ * DBR_STS_FLOAT returns a float status structure (dbr_sts_float)
+ * DBR_STS_ENUM returns an enum status structure (dbr_sts_enum)
+ * DBR_STS_CHAR returns a char status structure (dbr_sts_char)
+ * DBR_STS_LONG returns a long status structure (dbr_sts_long)
+ * DBR_STS_DOUBLE returns a double status structure (dbr_sts_double)
+ * DBR_TIME_STRING returns a string time structure (dbr_time_string)
+ * DBR_TIME_SHORT returns a short time structure (dbr_time_short)
+ * DBR_TIME_INT returns a short time structure (dbr_time_short)
+ * DBR_TIME_FLOAT returns a float time structure (dbr_time_float)
+ * DBR_TIME_ENUM returns an enum time structure (dbr_time_enum)
+ * DBR_TIME_CHAR returns a char time structure (dbr_time_char)
+ * DBR_TIME_LONG returns a long time structure (dbr_time_long)
+ * DBR_TIME_DOUBLE returns a double time structure (dbr_time_double)
+ * DBR_GR_STRING returns a graphic string structure (dbr_gr_string)
+ * DBR_GR_SHORT returns a graphic short structure (dbr_gr_short)
+ * DBR_GR_INT returns a graphic short structure (dbr_gr_int)
+ * DBR_GR_FLOAT returns a graphic float structure (dbr_gr_float)
+ * DBR_GR_ENUM returns a graphic enum structure (dbr_gr_enum)
+ * DBR_GR_CHAR returns a graphic char structure (dbr_gr_char)
+ * DBR_GR_LONG returns a graphic long structure (dbr_gr_long)
+ * DBR_GR_DOUBLE returns a graphic double structure (dbr_gr_double)
+ * DBR_CTRL_STRING returns a control string structure (dbr_ctrl_int)
+ * DBR_CTRL_SHORT returns a control short structure (dbr_ctrl_short)
+ * DBR_CTRL_INT returns a control short structure (dbr_ctrl_int)
+ * DBR_CTRL_FLOAT returns a control float structure (dbr_ctrl_float)
+ * DBR_CTRL_ENUM returns a control enum structure (dbr_ctrl_enum)
+ * DBR_CTRL_CHAR returns a control char structure (dbr_ctrl_char)
+ * DBR_CTRL_LONG returns a control long structure (dbr_ctrl_long)
+ * DBR_CTRL_DOUBLE returns a control double structure (dbr_ctrl_double)
*/
#endif /*db_accessHFORdb_accessC*/
@@ -183,345 +183,345 @@ epicsShareExtern const epicsType DBR_XXXXToEpicsType [LAST_BUFFER_TYPE+1];
/* structure for a string status field */
struct dbr_sts_string {
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- dbr_string_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ dbr_string_t value; /* current value */
};
/* structure for a string status and ack field */
struct dbr_stsack_string{
- dbr_ushort_t status; /* status of value */
- dbr_ushort_t severity; /* severity of alarm */
- dbr_ushort_t ackt; /* ack transient? */
- dbr_ushort_t acks; /* ack severity */
- dbr_string_t value; /* current value */
+ dbr_ushort_t status; /* status of value */
+ dbr_ushort_t severity; /* severity of alarm */
+ dbr_ushort_t ackt; /* ack transient? */
+ dbr_ushort_t acks; /* ack severity */
+ dbr_string_t value; /* current value */
};
/* structure for an short status field */
struct dbr_sts_int{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- dbr_short_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ dbr_short_t value; /* current value */
};
struct dbr_sts_short{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- dbr_short_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ dbr_short_t value; /* current value */
};
/* structure for a float status field */
struct dbr_sts_float{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- dbr_float_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ dbr_float_t value; /* current value */
};
/* structure for a enum status field */
struct dbr_sts_enum{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- dbr_enum_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ dbr_enum_t value; /* current value */
};
/* structure for a char status field */
struct dbr_sts_char{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- dbr_char_t RISC_pad; /* RISC alignment */
- dbr_char_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ dbr_char_t RISC_pad; /* RISC alignment */
+ dbr_char_t value; /* current value */
};
/* structure for a long status field */
struct dbr_sts_long{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- dbr_long_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ dbr_long_t value; /* current value */
};
/* structure for a double status field */
struct dbr_sts_double{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- dbr_long_t RISC_pad; /* RISC alignment */
- dbr_double_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ dbr_long_t RISC_pad; /* RISC alignment */
+ dbr_double_t value; /* current value */
};
/* VALUES WITH STATUS AND TIME STRUCTURES */
/* structure for a string time field */
struct dbr_time_string{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- epicsTimeStamp stamp; /* time stamp */
- dbr_string_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ epicsTimeStamp stamp; /* time stamp */
+ dbr_string_t value; /* current value */
};
/* structure for an short time field */
struct dbr_time_short{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- epicsTimeStamp stamp; /* time stamp */
- dbr_short_t RISC_pad; /* RISC alignment */
- dbr_short_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ epicsTimeStamp stamp; /* time stamp */
+ dbr_short_t RISC_pad; /* RISC alignment */
+ dbr_short_t value; /* current value */
};
/* structure for a float time field */
struct dbr_time_float{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- epicsTimeStamp stamp; /* time stamp */
- dbr_float_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ epicsTimeStamp stamp; /* time stamp */
+ dbr_float_t value; /* current value */
};
/* structure for a enum time field */
struct dbr_time_enum{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- epicsTimeStamp stamp; /* time stamp */
- dbr_short_t RISC_pad; /* RISC alignment */
- dbr_enum_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ epicsTimeStamp stamp; /* time stamp */
+ dbr_short_t RISC_pad; /* RISC alignment */
+ dbr_enum_t value; /* current value */
};
/* structure for a char time field */
struct dbr_time_char{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- epicsTimeStamp stamp; /* time stamp */
- dbr_short_t RISC_pad0; /* RISC alignment */
- dbr_char_t RISC_pad1; /* RISC alignment */
- dbr_char_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ epicsTimeStamp stamp; /* time stamp */
+ dbr_short_t RISC_pad0; /* RISC alignment */
+ dbr_char_t RISC_pad1; /* RISC alignment */
+ dbr_char_t value; /* current value */
};
/* structure for a long time field */
struct dbr_time_long{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- epicsTimeStamp stamp; /* time stamp */
- dbr_long_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ epicsTimeStamp stamp; /* time stamp */
+ dbr_long_t value; /* current value */
};
/* structure for a double time field */
struct dbr_time_double{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- epicsTimeStamp stamp; /* time stamp */
- dbr_long_t RISC_pad; /* RISC alignment */
- dbr_double_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ epicsTimeStamp stamp; /* time stamp */
+ dbr_long_t RISC_pad; /* RISC alignment */
+ dbr_double_t value; /* current value */
};
/* VALUES WITH STATUS AND GRAPHIC STRUCTURES */
/* structure for a graphic string */
- /* not implemented; use struct_dbr_sts_string */
+ /* not implemented; use struct_dbr_sts_string */
/* structure for a graphic short field */
struct dbr_gr_int{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- char units[MAX_UNITS_SIZE]; /* units of value */
- dbr_short_t upper_disp_limit; /* upper limit of graph */
- dbr_short_t lower_disp_limit; /* lower limit of graph */
- dbr_short_t upper_alarm_limit;
- dbr_short_t upper_warning_limit;
- dbr_short_t lower_warning_limit;
- dbr_short_t lower_alarm_limit;
- dbr_short_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ char units[MAX_UNITS_SIZE]; /* units of value */
+ dbr_short_t upper_disp_limit; /* upper limit of graph */
+ dbr_short_t lower_disp_limit; /* lower limit of graph */
+ dbr_short_t upper_alarm_limit;
+ dbr_short_t upper_warning_limit;
+ dbr_short_t lower_warning_limit;
+ dbr_short_t lower_alarm_limit;
+ dbr_short_t value; /* current value */
};
struct dbr_gr_short{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- char units[MAX_UNITS_SIZE]; /* units of value */
- dbr_short_t upper_disp_limit; /* upper limit of graph */
- dbr_short_t lower_disp_limit; /* lower limit of graph */
- dbr_short_t upper_alarm_limit;
- dbr_short_t upper_warning_limit;
- dbr_short_t lower_warning_limit;
- dbr_short_t lower_alarm_limit;
- dbr_short_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ char units[MAX_UNITS_SIZE]; /* units of value */
+ dbr_short_t upper_disp_limit; /* upper limit of graph */
+ dbr_short_t lower_disp_limit; /* lower limit of graph */
+ dbr_short_t upper_alarm_limit;
+ dbr_short_t upper_warning_limit;
+ dbr_short_t lower_warning_limit;
+ dbr_short_t lower_alarm_limit;
+ dbr_short_t value; /* current value */
};
/* structure for a graphic floating point field */
struct dbr_gr_float{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- dbr_short_t precision; /* number of decimal places */
- dbr_short_t RISC_pad0; /* RISC alignment */
- char units[MAX_UNITS_SIZE]; /* units of value */
- dbr_float_t upper_disp_limit; /* upper limit of graph */
- dbr_float_t lower_disp_limit; /* lower limit of graph */
- dbr_float_t upper_alarm_limit;
- dbr_float_t upper_warning_limit;
- dbr_float_t lower_warning_limit;
- dbr_float_t lower_alarm_limit;
- dbr_float_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ dbr_short_t precision; /* number of decimal places */
+ dbr_short_t RISC_pad0; /* RISC alignment */
+ char units[MAX_UNITS_SIZE]; /* units of value */
+ dbr_float_t upper_disp_limit; /* upper limit of graph */
+ dbr_float_t lower_disp_limit; /* lower limit of graph */
+ dbr_float_t upper_alarm_limit;
+ dbr_float_t upper_warning_limit;
+ dbr_float_t lower_warning_limit;
+ dbr_float_t lower_alarm_limit;
+ dbr_float_t value; /* current value */
};
/* structure for a graphic enumeration field */
struct dbr_gr_enum{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- dbr_short_t no_str; /* number of strings */
- char strs[MAX_ENUM_STATES][MAX_ENUM_STRING_SIZE];
- /* state strings */
- dbr_enum_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ dbr_short_t no_str; /* number of strings */
+ char strs[MAX_ENUM_STATES][MAX_ENUM_STRING_SIZE];
+ /* state strings */
+ dbr_enum_t value; /* current value */
};
/* structure for a graphic char field */
struct dbr_gr_char{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- char units[MAX_UNITS_SIZE]; /* units of value */
- dbr_char_t upper_disp_limit; /* upper limit of graph */
- dbr_char_t lower_disp_limit; /* lower limit of graph */
- dbr_char_t upper_alarm_limit;
- dbr_char_t upper_warning_limit;
- dbr_char_t lower_warning_limit;
- dbr_char_t lower_alarm_limit;
- dbr_char_t RISC_pad; /* RISC alignment */
- dbr_char_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ char units[MAX_UNITS_SIZE]; /* units of value */
+ dbr_char_t upper_disp_limit; /* upper limit of graph */
+ dbr_char_t lower_disp_limit; /* lower limit of graph */
+ dbr_char_t upper_alarm_limit;
+ dbr_char_t upper_warning_limit;
+ dbr_char_t lower_warning_limit;
+ dbr_char_t lower_alarm_limit;
+ dbr_char_t RISC_pad; /* RISC alignment */
+ dbr_char_t value; /* current value */
};
/* structure for a graphic long field */
struct dbr_gr_long{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- char units[MAX_UNITS_SIZE]; /* units of value */
- dbr_long_t upper_disp_limit; /* upper limit of graph */
- dbr_long_t lower_disp_limit; /* lower limit of graph */
- dbr_long_t upper_alarm_limit;
- dbr_long_t upper_warning_limit;
- dbr_long_t lower_warning_limit;
- dbr_long_t lower_alarm_limit;
- dbr_long_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ char units[MAX_UNITS_SIZE]; /* units of value */
+ dbr_long_t upper_disp_limit; /* upper limit of graph */
+ dbr_long_t lower_disp_limit; /* lower limit of graph */
+ dbr_long_t upper_alarm_limit;
+ dbr_long_t upper_warning_limit;
+ dbr_long_t lower_warning_limit;
+ dbr_long_t lower_alarm_limit;
+ dbr_long_t value; /* current value */
};
/* structure for a graphic double field */
struct dbr_gr_double{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- dbr_short_t precision; /* number of decimal places */
- dbr_short_t RISC_pad0; /* RISC alignment */
- char units[MAX_UNITS_SIZE]; /* units of value */
- dbr_double_t upper_disp_limit; /* upper limit of graph */
- dbr_double_t lower_disp_limit; /* lower limit of graph */
- dbr_double_t upper_alarm_limit;
- dbr_double_t upper_warning_limit;
- dbr_double_t lower_warning_limit;
- dbr_double_t lower_alarm_limit;
- dbr_double_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ dbr_short_t precision; /* number of decimal places */
+ dbr_short_t RISC_pad0; /* RISC alignment */
+ char units[MAX_UNITS_SIZE]; /* units of value */
+ dbr_double_t upper_disp_limit; /* upper limit of graph */
+ dbr_double_t lower_disp_limit; /* lower limit of graph */
+ dbr_double_t upper_alarm_limit;
+ dbr_double_t upper_warning_limit;
+ dbr_double_t lower_warning_limit;
+ dbr_double_t lower_alarm_limit;
+ dbr_double_t value; /* current value */
};
/* VALUES WITH STATUS, GRAPHIC and CONTROL STRUCTURES */
/* structure for a control string */
- /* not implemented; use struct_dbr_sts_string */
+ /* not implemented; use struct_dbr_sts_string */
/* structure for a control integer */
struct dbr_ctrl_int{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- char units[MAX_UNITS_SIZE]; /* units of value */
- dbr_short_t upper_disp_limit; /* upper limit of graph */
- dbr_short_t lower_disp_limit; /* lower limit of graph */
- dbr_short_t upper_alarm_limit;
- dbr_short_t upper_warning_limit;
- dbr_short_t lower_warning_limit;
- dbr_short_t lower_alarm_limit;
- dbr_short_t upper_ctrl_limit; /* upper control limit */
- dbr_short_t lower_ctrl_limit; /* lower control limit */
- dbr_short_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ char units[MAX_UNITS_SIZE]; /* units of value */
+ dbr_short_t upper_disp_limit; /* upper limit of graph */
+ dbr_short_t lower_disp_limit; /* lower limit of graph */
+ dbr_short_t upper_alarm_limit;
+ dbr_short_t upper_warning_limit;
+ dbr_short_t lower_warning_limit;
+ dbr_short_t lower_alarm_limit;
+ dbr_short_t upper_ctrl_limit; /* upper control limit */
+ dbr_short_t lower_ctrl_limit; /* lower control limit */
+ dbr_short_t value; /* current value */
};
struct dbr_ctrl_short{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- char units[MAX_UNITS_SIZE]; /* units of value */
- dbr_short_t upper_disp_limit; /* upper limit of graph */
- dbr_short_t lower_disp_limit; /* lower limit of graph */
- dbr_short_t upper_alarm_limit;
- dbr_short_t upper_warning_limit;
- dbr_short_t lower_warning_limit;
- dbr_short_t lower_alarm_limit;
- dbr_short_t upper_ctrl_limit; /* upper control limit */
- dbr_short_t lower_ctrl_limit; /* lower control limit */
- dbr_short_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ char units[MAX_UNITS_SIZE]; /* units of value */
+ dbr_short_t upper_disp_limit; /* upper limit of graph */
+ dbr_short_t lower_disp_limit; /* lower limit of graph */
+ dbr_short_t upper_alarm_limit;
+ dbr_short_t upper_warning_limit;
+ dbr_short_t lower_warning_limit;
+ dbr_short_t lower_alarm_limit;
+ dbr_short_t upper_ctrl_limit; /* upper control limit */
+ dbr_short_t lower_ctrl_limit; /* lower control limit */
+ dbr_short_t value; /* current value */
};
/* structure for a control floating point field */
struct dbr_ctrl_float{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- dbr_short_t precision; /* number of decimal places */
- dbr_short_t RISC_pad; /* RISC alignment */
- char units[MAX_UNITS_SIZE]; /* units of value */
- dbr_float_t upper_disp_limit; /* upper limit of graph */
- dbr_float_t lower_disp_limit; /* lower limit of graph */
- dbr_float_t upper_alarm_limit;
- dbr_float_t upper_warning_limit;
- dbr_float_t lower_warning_limit;
- dbr_float_t lower_alarm_limit;
- dbr_float_t upper_ctrl_limit; /* upper control limit */
- dbr_float_t lower_ctrl_limit; /* lower control limit */
- dbr_float_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ dbr_short_t precision; /* number of decimal places */
+ dbr_short_t RISC_pad; /* RISC alignment */
+ char units[MAX_UNITS_SIZE]; /* units of value */
+ dbr_float_t upper_disp_limit; /* upper limit of graph */
+ dbr_float_t lower_disp_limit; /* lower limit of graph */
+ dbr_float_t upper_alarm_limit;
+ dbr_float_t upper_warning_limit;
+ dbr_float_t lower_warning_limit;
+ dbr_float_t lower_alarm_limit;
+ dbr_float_t upper_ctrl_limit; /* upper control limit */
+ dbr_float_t lower_ctrl_limit; /* lower control limit */
+ dbr_float_t value; /* current value */
};
/* structure for a control enumeration field */
struct dbr_ctrl_enum{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- dbr_short_t no_str; /* number of strings */
- char strs[MAX_ENUM_STATES][MAX_ENUM_STRING_SIZE];
- /* state strings */
- dbr_enum_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ dbr_short_t no_str; /* number of strings */
+ char strs[MAX_ENUM_STATES][MAX_ENUM_STRING_SIZE];
+ /* state strings */
+ dbr_enum_t value; /* current value */
};
/* structure for a control char field */
struct dbr_ctrl_char{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- char units[MAX_UNITS_SIZE]; /* units of value */
- dbr_char_t upper_disp_limit; /* upper limit of graph */
- dbr_char_t lower_disp_limit; /* lower limit of graph */
- dbr_char_t upper_alarm_limit;
- dbr_char_t upper_warning_limit;
- dbr_char_t lower_warning_limit;
- dbr_char_t lower_alarm_limit;
- dbr_char_t upper_ctrl_limit; /* upper control limit */
- dbr_char_t lower_ctrl_limit; /* lower control limit */
- dbr_char_t RISC_pad; /* RISC alignment */
- dbr_char_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ char units[MAX_UNITS_SIZE]; /* units of value */
+ dbr_char_t upper_disp_limit; /* upper limit of graph */
+ dbr_char_t lower_disp_limit; /* lower limit of graph */
+ dbr_char_t upper_alarm_limit;
+ dbr_char_t upper_warning_limit;
+ dbr_char_t lower_warning_limit;
+ dbr_char_t lower_alarm_limit;
+ dbr_char_t upper_ctrl_limit; /* upper control limit */
+ dbr_char_t lower_ctrl_limit; /* lower control limit */
+ dbr_char_t RISC_pad; /* RISC alignment */
+ dbr_char_t value; /* current value */
};
/* structure for a control long field */
struct dbr_ctrl_long{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- char units[MAX_UNITS_SIZE]; /* units of value */
- dbr_long_t upper_disp_limit; /* upper limit of graph */
- dbr_long_t lower_disp_limit; /* lower limit of graph */
- dbr_long_t upper_alarm_limit;
- dbr_long_t upper_warning_limit;
- dbr_long_t lower_warning_limit;
- dbr_long_t lower_alarm_limit;
- dbr_long_t upper_ctrl_limit; /* upper control limit */
- dbr_long_t lower_ctrl_limit; /* lower control limit */
- dbr_long_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ char units[MAX_UNITS_SIZE]; /* units of value */
+ dbr_long_t upper_disp_limit; /* upper limit of graph */
+ dbr_long_t lower_disp_limit; /* lower limit of graph */
+ dbr_long_t upper_alarm_limit;
+ dbr_long_t upper_warning_limit;
+ dbr_long_t lower_warning_limit;
+ dbr_long_t lower_alarm_limit;
+ dbr_long_t upper_ctrl_limit; /* upper control limit */
+ dbr_long_t lower_ctrl_limit; /* lower control limit */
+ dbr_long_t value; /* current value */
};
/* structure for a control double field */
struct dbr_ctrl_double{
- dbr_short_t status; /* status of value */
- dbr_short_t severity; /* severity of alarm */
- dbr_short_t precision; /* number of decimal places */
- dbr_short_t RISC_pad0; /* RISC alignment */
- char units[MAX_UNITS_SIZE]; /* units of value */
- dbr_double_t upper_disp_limit; /* upper limit of graph */
- dbr_double_t lower_disp_limit; /* lower limit of graph */
- dbr_double_t upper_alarm_limit;
- dbr_double_t upper_warning_limit;
- dbr_double_t lower_warning_limit;
- dbr_double_t lower_alarm_limit;
- dbr_double_t upper_ctrl_limit; /* upper control limit */
- dbr_double_t lower_ctrl_limit; /* lower control limit */
- dbr_double_t value; /* current value */
+ dbr_short_t status; /* status of value */
+ dbr_short_t severity; /* severity of alarm */
+ dbr_short_t precision; /* number of decimal places */
+ dbr_short_t RISC_pad0; /* RISC alignment */
+ char units[MAX_UNITS_SIZE]; /* units of value */
+ dbr_double_t upper_disp_limit; /* upper limit of graph */
+ dbr_double_t lower_disp_limit; /* lower limit of graph */
+ dbr_double_t upper_alarm_limit;
+ dbr_double_t upper_warning_limit;
+ dbr_double_t lower_warning_limit;
+ dbr_double_t lower_alarm_limit;
+ dbr_double_t upper_ctrl_limit; /* upper control limit */
+ dbr_double_t lower_ctrl_limit; /* lower control limit */
+ dbr_double_t value; /* current value */
};
#define dbr_size_n(TYPE,COUNT)\
@@ -536,10 +536,10 @@ epicsShareExtern const unsigned short dbr_value_size[];
#ifndef db_accessHFORdb_accessC
/* class for each type's value */
enum dbr_value_class {
- dbr_class_int,
- dbr_class_float,
- dbr_class_string,
- dbr_class_max};
+ dbr_class_int,
+ dbr_class_float,
+ dbr_class_string,
+ dbr_class_max};
epicsShareExtern const enum dbr_value_class dbr_value_class[LAST_BUFFER_TYPE+1];
@@ -560,128 +560,128 @@ epicsShareExtern const unsigned short dbr_value_offset[LAST_BUFFER_TYPE+1];
/* union for each fetch buffers */
union db_access_val{
- dbr_string_t strval; /* string max size */
- dbr_short_t shrtval; /* short */
- dbr_short_t intval; /* short */
- dbr_float_t fltval; /* IEEE Float */
- dbr_enum_t enmval; /* item number */
- dbr_char_t charval; /* character */
- dbr_long_t longval; /* long */
- dbr_double_t doubleval; /* double */
- struct dbr_sts_string sstrval; /* string field with status */
- struct dbr_sts_short sshrtval; /* short field with status */
- struct dbr_sts_float sfltval; /* float field with status */
- struct dbr_sts_enum senmval; /* item number with status */
- struct dbr_sts_char schrval; /* char field with status */
- struct dbr_sts_long slngval; /* long field with status */
- struct dbr_sts_double sdblval; /* double field with time */
- struct dbr_time_string tstrval; /* string field with time */
- struct dbr_time_short tshrtval; /* short field with time */
- struct dbr_time_float tfltval; /* float field with time */
- struct dbr_time_enum tenmval; /* item number with time */
- struct dbr_time_char tchrval; /* char field with time */
- struct dbr_time_long tlngval; /* long field with time */
- struct dbr_time_double tdblval; /* double field with time */
- struct dbr_sts_string gstrval; /* graphic string info */
- struct dbr_gr_short gshrtval; /* graphic short info */
- struct dbr_gr_float gfltval; /* graphic float info */
- struct dbr_gr_enum genmval; /* graphic item info */
- struct dbr_gr_char gchrval; /* graphic char info */
- struct dbr_gr_long glngval; /* graphic long info */
- struct dbr_gr_double gdblval; /* graphic double info */
- struct dbr_sts_string cstrval; /* control string info */
- struct dbr_ctrl_short cshrtval; /* control short info */
- struct dbr_ctrl_float cfltval; /* control float info */
- struct dbr_ctrl_enum cenmval; /* control item info */
- struct dbr_ctrl_char cchrval; /* control char info */
- struct dbr_ctrl_long clngval; /* control long info */
- struct dbr_ctrl_double cdblval; /* control double info */
- dbr_put_ackt_t putackt; /* item number */
- dbr_put_acks_t putacks; /* item number */
- struct dbr_sts_string sastrval; /* string field with status */
- dbr_string_t classname; /* string max size */
+ dbr_string_t strval; /* string max size */
+ dbr_short_t shrtval; /* short */
+ dbr_short_t intval; /* short */
+ dbr_float_t fltval; /* IEEE Float */
+ dbr_enum_t enmval; /* item number */
+ dbr_char_t charval; /* character */
+ dbr_long_t longval; /* long */
+ dbr_double_t doubleval; /* double */
+ struct dbr_sts_string sstrval; /* string field with status */
+ struct dbr_sts_short sshrtval; /* short field with status */
+ struct dbr_sts_float sfltval; /* float field with status */
+ struct dbr_sts_enum senmval; /* item number with status */
+ struct dbr_sts_char schrval; /* char field with status */
+ struct dbr_sts_long slngval; /* long field with status */
+ struct dbr_sts_double sdblval; /* double field with time */
+ struct dbr_time_string tstrval; /* string field with time */
+ struct dbr_time_short tshrtval; /* short field with time */
+ struct dbr_time_float tfltval; /* float field with time */
+ struct dbr_time_enum tenmval; /* item number with time */
+ struct dbr_time_char tchrval; /* char field with time */
+ struct dbr_time_long tlngval; /* long field with time */
+ struct dbr_time_double tdblval; /* double field with time */
+ struct dbr_sts_string gstrval; /* graphic string info */
+ struct dbr_gr_short gshrtval; /* graphic short info */
+ struct dbr_gr_float gfltval; /* graphic float info */
+ struct dbr_gr_enum genmval; /* graphic item info */
+ struct dbr_gr_char gchrval; /* graphic char info */
+ struct dbr_gr_long glngval; /* graphic long info */
+ struct dbr_gr_double gdblval; /* graphic double info */
+ struct dbr_sts_string cstrval; /* control string info */
+ struct dbr_ctrl_short cshrtval; /* control short info */
+ struct dbr_ctrl_float cfltval; /* control float info */
+ struct dbr_ctrl_enum cenmval; /* control item info */
+ struct dbr_ctrl_char cchrval; /* control char info */
+ struct dbr_ctrl_long clngval; /* control long info */
+ struct dbr_ctrl_double cdblval; /* control double info */
+ dbr_put_ackt_t putackt; /* item number */
+ dbr_put_acks_t putacks; /* item number */
+ struct dbr_sts_string sastrval; /* string field with status */
+ dbr_string_t classname; /* string max size */
};
/*----------------------------------------------------------------------------
* repository for some useful PV database constants and utilities
*
* item dimensions
-* db_strval_dim dimension for string values
-* db_units_dim dimension for record units text
-* db_desc_dim dimension for record description text
-* db_name_dim dimension for channel names (record.field\0)
-* db_state_dim number of states possible in a state table
-* db_state_text_dim dimension for a state text string
-* usage: char state_table[db_state_dim][db_state_text_dim]
+* db_strval_dim dimension for string values
+* db_units_dim dimension for record units text
+* db_desc_dim dimension for record description text
+* db_name_dim dimension for channel names (record.field\0)
+* db_state_dim number of states possible in a state table
+* db_state_text_dim dimension for a state text string
+* usage: char state_table[db_state_dim][db_state_text_dim]
*
* type checking macros -- return non-zero if condition is true, zero otherwise
*
-* int dbf_type_is_valid(type) type is a valid DBF_xxx
-* int dbr_type_is_valid(type) type is a valid DBR_xxx
-* int dbr_type_is_plain(type) type is a valid plain DBR_xxx
-* int dbr_type_is_STS(type) type is a valid DBR_STS_xxx
-* int dbr_type_is_TIME(type) type is a valid DBR_TIME_xxx
-* int dbr_type_is_GR(type) type is a valid DBR_GR_xxx
-* int dbr_type_is_CTRL(type) type is a valid DBR_CTRL_xxx
-* int dbr_type_is_STRING(type) type is a valid DBR_STRING_xxx
-* int dbr_type_is_SHORT(type) type is a valid DBR_SHORT_xxx
-* int dbr_type_is_FLOAT(type) type is a valid DBR_FLOAT_xxx
-* int dbr_type_is_ENUM(type) type is a valid DBR_ENUM_xxx
-* int dbr_type_is_CHAR(type) type is a valid DBR_CHAR_xxx
-* int dbr_type_is_LONG(type) type is a valid DBR_LONG_xxx
-* int dbr_type_is_DOUBLE(type) type is a valid DBR_DOUBLE_xxx
+* int dbf_type_is_valid(type) type is a valid DBF_xxx
+* int dbr_type_is_valid(type) type is a valid DBR_xxx
+* int dbr_type_is_plain(type) type is a valid plain DBR_xxx
+* int dbr_type_is_STS(type) type is a valid DBR_STS_xxx
+* int dbr_type_is_TIME(type) type is a valid DBR_TIME_xxx
+* int dbr_type_is_GR(type) type is a valid DBR_GR_xxx
+* int dbr_type_is_CTRL(type) type is a valid DBR_CTRL_xxx
+* int dbr_type_is_STRING(type) type is a valid DBR_STRING_xxx
+* int dbr_type_is_SHORT(type) type is a valid DBR_SHORT_xxx
+* int dbr_type_is_FLOAT(type) type is a valid DBR_FLOAT_xxx
+* int dbr_type_is_ENUM(type) type is a valid DBR_ENUM_xxx
+* int dbr_type_is_CHAR(type) type is a valid DBR_CHAR_xxx
+* int dbr_type_is_LONG(type) type is a valid DBR_LONG_xxx
+* int dbr_type_is_DOUBLE(type) type is a valid DBR_DOUBLE_xxx
*
* type conversion macros
*
-* char *dbf_type_to_text(type) returns text matching DBF_xxx
+* char *dbf_type_to_text(type) returns text matching DBF_xxx
* void dbf_text_to_type(text, type) finds DBF_xxx matching text
-* int dbf_type_to_DBR(type) returns DBR_xxx matching DBF_xxx
-* int dbf_type_to_DBR_TIME(type) returns DBR_TIME_xxx matching DBF_xxx
-* int dbf_type_to_DBR_GR(type) returns DBR_GR_xxx matching DBF_xxx
-* int dbf_type_to_DBR_CTRL(type) returns DBR_CTRL_xxx matching DBF_xxx
-* char *dbr_type_to_text(type) returns text matching DBR_xxx
+* int dbf_type_to_DBR(type) returns DBR_xxx matching DBF_xxx
+* int dbf_type_to_DBR_TIME(type) returns DBR_TIME_xxx matching DBF_xxx
+* int dbf_type_to_DBR_GR(type) returns DBR_GR_xxx matching DBF_xxx
+* int dbf_type_to_DBR_CTRL(type) returns DBR_CTRL_xxx matching DBF_xxx
+* char *dbr_type_to_text(type) returns text matching DBR_xxx
* void dbr_text_to_type(text, type) finds DBR_xxx matching text
*---------------------------------------------------------------------------*/
-#define db_strval_dim MAX_STRING_SIZE
-#define db_units_dim MAX_UNITS_SIZE
-#define db_desc_dim 24
-#define db_name_dim 36
-#define db_state_dim MAX_ENUM_STATES
-#define db_state_text_dim MAX_ENUM_STRING_SIZE
+#define db_strval_dim MAX_STRING_SIZE
+#define db_units_dim MAX_UNITS_SIZE
+#define db_desc_dim 24
+#define db_name_dim 36
+#define db_state_dim MAX_ENUM_STATES
+#define db_state_text_dim MAX_ENUM_STRING_SIZE
#define dbf_type_is_valid(type) ((type) >= 0 && (type) <= LAST_TYPE)
#define dbr_type_is_valid(type) ((type) >= 0 && (type) <= LAST_BUFFER_TYPE)
#define dbr_type_is_plain(type) \
- ((type) >= DBR_STRING && (type) <= DBR_DOUBLE)
+ ((type) >= DBR_STRING && (type) <= DBR_DOUBLE)
#define dbr_type_is_STS(type) \
- ((type) >= DBR_STS_STRING && (type) <= DBR_STS_DOUBLE)
+ ((type) >= DBR_STS_STRING && (type) <= DBR_STS_DOUBLE)
#define dbr_type_is_TIME(type) \
- ((type) >= DBR_TIME_STRING && (type) <= DBR_TIME_DOUBLE)
+ ((type) >= DBR_TIME_STRING && (type) <= DBR_TIME_DOUBLE)
#define dbr_type_is_GR(type) \
- ((type) >= DBR_GR_STRING && (type) <= DBR_GR_DOUBLE)
+ ((type) >= DBR_GR_STRING && (type) <= DBR_GR_DOUBLE)
#define dbr_type_is_CTRL(type) \
- ((type) >= DBR_CTRL_STRING && (type) <= DBR_CTRL_DOUBLE)
+ ((type) >= DBR_CTRL_STRING && (type) <= DBR_CTRL_DOUBLE)
#define dbr_type_is_STRING(type) \
- ((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
- (type)%(LAST_TYPE+1) == DBR_STRING)
+ ((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
+ (type)%(LAST_TYPE+1) == DBR_STRING)
#define dbr_type_is_SHORT(type) \
- ((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
- (type)%(LAST_TYPE+1) == DBR_SHORT)
+ ((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
+ (type)%(LAST_TYPE+1) == DBR_SHORT)
#define dbr_type_is_FLOAT(type) \
- ((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
- (type)%(LAST_TYPE+1) == DBR_FLOAT)
+ ((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
+ (type)%(LAST_TYPE+1) == DBR_FLOAT)
#define dbr_type_is_ENUM(type) \
- ((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
- (type)%(LAST_TYPE+1) == DBR_ENUM)
+ ((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
+ (type)%(LAST_TYPE+1) == DBR_ENUM)
#define dbr_type_is_CHAR(type) \
- ((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
- (type)%(LAST_TYPE+1) == DBR_CHAR)
+ ((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
+ (type)%(LAST_TYPE+1) == DBR_CHAR)
#define dbr_type_is_LONG(type) \
- ((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
- (type)%(LAST_TYPE+1) == DBR_LONG)
+ ((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
+ (type)%(LAST_TYPE+1) == DBR_LONG)
#define dbr_type_is_DOUBLE(type) \
- ((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
- (type)%(LAST_TYPE+1) == DBR_DOUBLE)
+ ((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
+ (type)%(LAST_TYPE+1) == DBR_DOUBLE)
#define dbf_type_to_text(type) \
( ((type) >= -1 && (type) < dbf_text_dim-2) ? \
@@ -724,12 +724,12 @@ union db_access_val{
(type) + 4*(dbf_text_dim-2) : -1 )
-epicsShareExtern const char *dbf_text[LAST_TYPE+3];
-epicsShareExtern const short dbf_text_dim;
+epicsShareExtern const char *dbf_text[LAST_TYPE+3];
+epicsShareExtern const short dbf_text_dim;
epicsShareExtern const char *dbf_text_invalid;
-epicsShareExtern const char *dbr_text[LAST_BUFFER_TYPE+1];
-epicsShareExtern const short dbr_text_dim;
+epicsShareExtern const char *dbr_text[LAST_BUFFER_TYPE+1];
+epicsShareExtern const short dbr_text_dim;
epicsShareExtern const char *dbr_text_invalid;
#endif /*db_accessHFORdb_accessC*/
diff --git a/modules/ca/src/client/disconnectGovernorTimer.cpp b/modules/ca/src/client/disconnectGovernorTimer.cpp
index f1d517f..bc3f450 100644
--- a/modules/ca/src/client/disconnectGovernorTimer.cpp
+++ b/modules/ca/src/client/disconnectGovernorTimer.cpp
@@ -5,9 +5,9 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-//
+//
//
// L O S A L A M O S
// Los Alamos National Laboratory
@@ -27,9 +27,9 @@
static const double disconnectGovernorPeriod = 10.0; // sec
-disconnectGovernorTimer::disconnectGovernorTimer (
- disconnectGovernorNotify & iiuIn,
- epicsTimerQueue & queueIn,
+disconnectGovernorTimer::disconnectGovernorTimer (
+ disconnectGovernorNotify & iiuIn,
+ epicsTimerQueue & queueIn,
epicsMutex & mutexIn ) :
mutex ( mutexIn ), timer ( queueIn.createTimer () ),
iiu ( iiuIn )
@@ -58,18 +58,18 @@ void disconnectGovernorTimer::shutdown (
}
}
while ( nciu * pChan = this->chanList.get () ) {
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_none;
pChan->serviceShutdownNotify ( cbGuard, guard );
}
}
-epicsTimerNotify::expireStatus disconnectGovernorTimer::expire (
+epicsTimerNotify::expireStatus disconnectGovernorTimer::expire (
const epicsTime & /* currentTime */ )
{
epicsGuard < epicsMutex > guard ( this->mutex );
while ( nciu * pChan = chanList.get () ) {
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_none;
this->iiu.govExpireNotify ( guard, *pChan );
}
@@ -83,14 +83,14 @@ void disconnectGovernorTimer::show ( unsigned level ) const
this->chanList.count () );
if ( level > 0u ) {
tsDLIterConst < nciu > pChan = this->chanList.firstIter ();
- while ( pChan.valid () ) {
+ while ( pChan.valid () ) {
pChan->show ( level - 1u );
pChan++;
}
}
}
-void disconnectGovernorTimer::installChan (
+void disconnectGovernorTimer::installChan (
epicsGuard < epicsMutex > & guard, nciu & chan )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -107,4 +107,3 @@ void disconnectGovernorTimer::uninstallChan (
}
disconnectGovernorNotify::~disconnectGovernorNotify () {}
-
diff --git a/modules/ca/src/client/disconnectGovernorTimer.h b/modules/ca/src/client/disconnectGovernorTimer.h
index f636d62..d1c3210 100644
--- a/modules/ca/src/client/disconnectGovernorTimer.h
+++ b/modules/ca/src/client/disconnectGovernorTimer.h
@@ -18,9 +18,9 @@
// Copyright, 1986, The Regents of the University of California.
//
//
-// Author Jeffrey O. Hill
-// johill at lanl.gov
-// 505 665 1831
+// Author Jeffrey O. Hill
+// johill at lanl.gov
+// 505 665 1831
//
#ifndef disconnectGovernorTimerh
@@ -70,8 +70,8 @@ private:
epicsTimer & timer;
class disconnectGovernorNotify & iiu;
epicsTimerNotify::expireStatus expire ( const epicsTime & currentTime );
- disconnectGovernorTimer ( const disconnectGovernorTimer & );
- disconnectGovernorTimer & operator = ( const disconnectGovernorTimer & );
+ disconnectGovernorTimer ( const disconnectGovernorTimer & );
+ disconnectGovernorTimer & operator = ( const disconnectGovernorTimer & );
};
#endif // ifdef disconnectGovernorTimerh
diff --git a/modules/ca/src/client/getCallback.cpp b/modules/ca/src/client/getCallback.cpp
index 0fc0500..69ebd64 100644
--- a/modules/ca/src/client/getCallback.cpp
+++ b/modules/ca/src/client/getCallback.cpp
@@ -5,22 +5,22 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
+ *
*
- *
* L O S A L A M O S
* Los Alamos National Laboratory
* Los Alamos, New Mexico 87545
- *
+ *
* Copyright, The Regents of the University of California.
- *
- *
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ *
+ *
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#include <string>
@@ -32,7 +32,7 @@
#include "iocinf.h"
#include "oldAccess.h"
-getCallback::getCallback ( oldChannelNotify & chanIn,
+getCallback::getCallback ( oldChannelNotify & chanIn,
caEventCallBackFunc *pFuncIn, void *pPrivateIn ) :
chan ( chanIn ), pFunc ( pFuncIn ), pPrivate ( pPrivateIn )
{
@@ -65,7 +65,7 @@ void getCallback::completion (
void getCallback::exception (
epicsGuard < epicsMutex > & guard,
- int status, const char * /* pContext */,
+ int status, const char * /* pContext */,
unsigned type, arrayElementCount count )
{
if ( status != ECA_CHANDESTROY ) {
@@ -100,5 +100,3 @@ void getCallback::operator delete ( void * )
errlogPrintf ( "%s:%d this compiler is confused about placement delete - memory was probably leaked",
__FILE__, __LINE__ );
}
-
-
diff --git a/modules/ca/src/client/getCopy.cpp b/modules/ca/src/client/getCopy.cpp
index 23a508d..47db7c4 100644
--- a/modules/ca/src/client/getCopy.cpp
+++ b/modules/ca/src/client/getCopy.cpp
@@ -5,22 +5,22 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
+ *
*
- *
* L O S A L A M O S
* Los Alamos National Laboratory
* Los Alamos, New Mexico 87545
- *
+ *
* Copyright, 1986, The Regents of the University of California.
- *
- *
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ *
+ *
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#include <string>
@@ -35,18 +35,18 @@
#include "oldAccess.h"
#include "cac.h"
-getCopy::getCopy (
- epicsGuard < epicsMutex > & guard, ca_client_context & cacCtxIn,
- oldChannelNotify & chanIn, unsigned typeIn,
+getCopy::getCopy (
+ epicsGuard < epicsMutex > & guard, ca_client_context & cacCtxIn,
+ oldChannelNotify & chanIn, unsigned typeIn,
arrayElementCount countIn, void * pValueIn ) :
- count ( countIn ), cacCtx ( cacCtxIn ), chan ( chanIn ), pValue ( pValueIn ),
+ count ( countIn ), cacCtx ( cacCtxIn ), chan ( chanIn ), pValue ( pValueIn ),
ioSeqNo ( 0 ), type ( typeIn )
{
this->ioSeqNo = cacCtxIn.sequenceNumberOfOutstandingIO ( guard );
cacCtxIn.incrementOutstandingIO ( guard, this->ioSeqNo );
}
-getCopy::~getCopy ()
+getCopy::~getCopy ()
{
}
@@ -56,8 +56,8 @@ void getCopy::cancel ()
this->cacCtx.decrementOutstandingIO ( guard, this->ioSeqNo );
}
-void getCopy::completion (
- epicsGuard < epicsMutex > & guard, unsigned typeIn,
+void getCopy::completion (
+ epicsGuard < epicsMutex > & guard, unsigned typeIn,
arrayElementCount countIn, const void *pDataIn )
{
if ( this->type == typeIn ) {
@@ -68,7 +68,7 @@ void getCopy::completion (
// this object destroyed by preceding function call
}
else {
- this->exception ( guard, ECA_INTERNAL,
+ this->exception ( guard, ECA_INTERNAL,
"bad data type match in get copy back response",
typeIn, countIn);
// this object destroyed by preceding function call
@@ -77,7 +77,7 @@ void getCopy::completion (
void getCopy::exception (
epicsGuard < epicsMutex > & guard,
- int status, const char *pContext,
+ int status, const char *pContext,
unsigned /* typeIn */, arrayElementCount /* countIn */ )
{
oldChannelNotify & chanTmp ( this->chan );
@@ -88,8 +88,8 @@ void getCopy::exception (
// the lock and calling cb in case they destroy channel there
this->cacCtx.destroyGetCopy ( guard, *this );
if ( status != ECA_CHANDESTROY ) {
- caClientCtx.exception ( guard, status, pContext,
- __FILE__, __LINE__, chanTmp, typeTmp,
+ caClientCtx.exception ( guard, status, pContext,
+ __FILE__, __LINE__, chanTmp, typeTmp,
countTmp, CA_OP_GET );
}
}
@@ -97,7 +97,7 @@ void getCopy::exception (
void getCopy::show ( unsigned level ) const
{
int tmpType = static_cast <int> ( this->type );
- ::printf ( "read copy IO at %p, type %s, element count %lu\n",
+ ::printf ( "read copy IO at %p, type %s, element count %lu\n",
static_cast <const void *> ( this ), dbf_type_to_text ( tmpType ), this->count );
if ( level > 0u ) {
::printf ( "\tIO sequence number %u, user's storage %p\n",
@@ -115,4 +115,3 @@ void getCopy::operator delete ( void * )
errlogPrintf ( "%s:%d this compiler is confused about placement delete - memory was probably leaked",
__FILE__, __LINE__ );
}
-
diff --git a/modules/ca/src/client/hostNameCache.cpp b/modules/ca/src/client/hostNameCache.cpp
index c3d105c..3a76508 100644
--- a/modules/ca/src/client/hostNameCache.cpp
+++ b/modules/ca/src/client/hostNameCache.cpp
@@ -5,21 +5,21 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
+ *
*
- *
* L O S A L A M O S
* Los Alamos National Laboratory
* Los Alamos, New Mexico 87545
- *
+ *
* Copyright, 1986, The Regents of the University of California.
- *
- *
- * Author Jeffrey O. Hill
- * johill at lanl.gov
+ *
+ *
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
*/
#include <algorithm>
@@ -29,7 +29,7 @@
#include "hostNameCache.h"
#include "epicsGuard.h"
-hostNameCache::hostNameCache (
+hostNameCache::hostNameCache (
const osiSockAddr & addr, ipAddrToAsciiEngine & engine ) :
dnsTransaction ( engine.createTransaction() ), nameLength ( 0 )
{
@@ -65,7 +65,7 @@ void hostNameCache::transactionComplete ( const char * pHostNameIn )
this->nameLength = newNameLen;
}
-unsigned hostNameCache::getName (
+unsigned hostNameCache::getName (
char * pBuf, unsigned bufSize ) const
{
if ( bufSize == 0u ) {
@@ -89,4 +89,3 @@ unsigned hostNameCache::getName (
return sockAddrToDottedIP ( &tmpAddr.sa, pBuf, bufSize );
}
}
-
diff --git a/modules/ca/src/client/hostNameCache.h b/modules/ca/src/client/hostNameCache.h
index a4eacfb..0891bf6 100644
--- a/modules/ca/src/client/hostNameCache.h
+++ b/modules/ca/src/client/hostNameCache.h
@@ -18,9 +18,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef hostNameCacheh
diff --git a/modules/ca/src/client/iocinf.cpp b/modules/ca/src/client/iocinf.cpp
index 09eea29..9ad33c6 100644
--- a/modules/ca/src/client/iocinf.cpp
+++ b/modules/ca/src/client/iocinf.cpp
@@ -4,10 +4,10 @@
* Copyright (c) 2002 The Regents of the University of California, as
* Operator of Los Alamos National Laboratory.
* EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
*
* L O S A L A M O S
* Los Alamos National Laboratory
@@ -65,8 +65,8 @@ static char *getToken ( const char **ppString, char *pBuf, unsigned bufSIze )
if ( tokenFound ) {
pBuf[bufSIze-1] = '\0';
- return pBuf;
- }
+ return pBuf;
+ }
return NULL;
}
@@ -74,7 +74,7 @@ static char *getToken ( const char **ppString, char *pBuf, unsigned bufSIze )
* addAddrToChannelAccessAddressList ()
*/
extern "C" int epicsShareAPI addAddrToChannelAccessAddressList
- ( ELLLIST *pList, const ENV_PARAM *pEnv,
+ ( ELLLIST *pList, const ENV_PARAM *pEnv,
unsigned short port, int ignoreNonDefaultPort )
{
osiSockAddrNode *pNewNode;
@@ -109,9 +109,9 @@ extern "C" int epicsShareAPI addAddrToChannelAccessAddressList
pNewNode->addr.ia = addr;
- /*
- * LOCK applied externally
- */
+ /*
+ * LOCK applied externally
+ */
ellAdd (pList, &pNewNode->node);
ret = 0; /* success if anything is added to the list */
}
@@ -122,14 +122,14 @@ extern "C" int epicsShareAPI addAddrToChannelAccessAddressList
/*
* removeDuplicateAddresses ()
*/
-extern "C" void epicsShareAPI removeDuplicateAddresses
+extern "C" void epicsShareAPI removeDuplicateAddresses
( ELLLIST *pDestList, ELLLIST *pSrcList, int silent )
{
ELLNODE *pRawNode;
while ( (pRawNode = ellGet ( pSrcList ) ) ) {
- STATIC_ASSERT ( offsetof (osiSockAddrNode, node) == 0 );
- osiSockAddrNode *pNode = reinterpret_cast <osiSockAddrNode *> ( pRawNode );
+ STATIC_ASSERT ( offsetof (osiSockAddrNode, node) == 0 );
+ osiSockAddrNode *pNode = reinterpret_cast <osiSockAddrNode *> ( pRawNode );
osiSockAddrNode *pTmpNode;
if ( pNode->addr.sa.sa_family == AF_INET ) {
@@ -137,14 +137,14 @@ extern "C" void epicsShareAPI removeDuplicateAddresses
pTmpNode = (osiSockAddrNode *) ellFirst (pDestList);
while ( pTmpNode ) {
if (pTmpNode->addr.sa.sa_family == AF_INET) {
- if ( pNode->addr.ia.sin_addr.s_addr == pTmpNode->addr.ia.sin_addr.s_addr &&
+ if ( pNode->addr.ia.sin_addr.s_addr == pTmpNode->addr.ia.sin_addr.s_addr &&
pNode->addr.ia.sin_port == pTmpNode->addr.ia.sin_port ) {
- if ( ! silent ) {
+ if ( ! silent ) {
char buf[64];
ipAddrToDottedIP ( &pNode->addr.ia, buf, sizeof (buf) );
- fprintf ( stderr,
- "Warning: Duplicate EPICS CA Address list entry \"%s\" discarded\n", buf );
- }
+ fprintf ( stderr,
+ "Warning: Duplicate EPICS CA Address list entry \"%s\" discarded\n", buf );
+ }
free (pNode);
pNode = NULL;
break;
@@ -182,7 +182,7 @@ static void forcePort ( ELLLIST *pList, unsigned short port )
/*
* configureChannelAccessAddressList ()
*/
-extern "C" void epicsShareAPI configureChannelAccessAddressList
+extern "C" void epicsShareAPI configureChannelAccessAddressList
( ELLLIST *pList, SOCKET sock, unsigned short port )
{
ELLLIST tmpList;
@@ -203,7 +203,7 @@ extern "C" void epicsShareAPI configureChannelAccessAddressList
* from the interfaces found.
*/
yes = true;
- pstr = envGetConfigParam ( &EPICS_CA_AUTO_ADDR_LIST,
+ pstr = envGetConfigParam ( &EPICS_CA_AUTO_ADDR_LIST,
sizeof (yesno), yesno );
if ( pstr ) {
if ( strstr ( pstr, "no" ) || strstr ( pstr, "NO" ) ) {
@@ -216,19 +216,19 @@ extern "C" void epicsShareAPI configureChannelAccessAddressList
* (lock outside because this is used by the server also)
*/
if (yes) {
- ELLLIST bcastList;
+ ELLLIST bcastList;
osiSockAddr addr;
- ellInit ( &bcastList );
+ ellInit ( &bcastList );
addr.ia.sin_family = AF_UNSPEC;
osiSockDiscoverBroadcastAddresses ( &bcastList, sock, &addr );
forcePort ( &bcastList, port );
- removeDuplicateAddresses ( &tmpList, &bcastList, 1 );
+ removeDuplicateAddresses ( &tmpList, &bcastList, 1 );
if ( ellCount ( &tmpList ) == 0 ) {
osiSockAddrNode *pNewNode;
pNewNode = (osiSockAddrNode *) calloc ( 1, sizeof (*pNewNode) );
if ( pNewNode ) {
- /*
- * if no interfaces found then look for local channels
+ /*
+ * if no interfaces found then look for local channels
* with the loop back interface
*/
pNewNode->addr.ia.sin_family = AF_INET;
diff --git a/modules/ca/src/client/iocinf.h b/modules/ca/src/client/iocinf.h
index 0d3b57d..e7acd35 100644
--- a/modules/ca/src/client/iocinf.h
+++ b/modules/ca/src/client/iocinf.h
@@ -17,9 +17,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef INCiocinfh
diff --git a/modules/ca/src/client/localHostName.cpp b/modules/ca/src/client/localHostName.cpp
index b0b96bb..b281964 100644
--- a/modules/ca/src/client/localHostName.cpp
+++ b/modules/ca/src/client/localHostName.cpp
@@ -5,10 +5,10 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
*
* L O S A L A M O S
* Los Alamos National Laboratory
@@ -31,7 +31,7 @@ localHostName::localHostName () :
const char * pErrStr = "<unknown host>";
int status = -1;
if ( this->attachedToSockLib ) {
- status = gethostname (
+ status = gethostname (
this->cache, sizeof ( this->cache ) );
}
if ( status ) {
@@ -48,7 +48,7 @@ localHostName::~localHostName ()
}
}
-unsigned localHostName::getName (
+unsigned localHostName::getName (
char * pBuf, unsigned bufLength ) const
{
if ( bufLength ) {
diff --git a/modules/ca/src/client/msgForMultiplyDefinedPV.cpp b/modules/ca/src/client/msgForMultiplyDefinedPV.cpp
index 7002dd4..b04782b 100644
--- a/modules/ca/src/client/msgForMultiplyDefinedPV.cpp
+++ b/modules/ca/src/client/msgForMultiplyDefinedPV.cpp
@@ -5,22 +5,22 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
+ *
*
- *
* L O S A L A M O S
* Los Alamos National Laboratory
* Los Alamos, New Mexico 87545
- *
+ *
* Copyright, 1986, The Regents of the University of California.
- *
- *
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ *
+ *
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#include <string>
@@ -36,9 +36,9 @@
#include "cac.h"
#include "caerr.h" // for ECA_DBLCHNL
-msgForMultiplyDefinedPV::msgForMultiplyDefinedPV (
+msgForMultiplyDefinedPV::msgForMultiplyDefinedPV (
ipAddrToAsciiEngine & engine,
- callbackForMultiplyDefinedPV & cbIn,
+ callbackForMultiplyDefinedPV & cbIn,
const char * pChannelName, const char * pAcc ) :
dnsTransaction ( engine.createTransaction () ), cb ( cbIn )
{
@@ -61,15 +61,15 @@ void msgForMultiplyDefinedPV::transactionComplete ( const char * pHostNameRej )
// !! dont touch 'this' pointer after this point because object has been deleted !!
}
-void * msgForMultiplyDefinedPV::operator new ( size_t size,
+void * msgForMultiplyDefinedPV::operator new ( size_t size,
tsFreeList < class msgForMultiplyDefinedPV, 16 > & freeList )
{
return freeList.allocate ( size );
}
#ifdef CXX_PLACEMENT_DELETE
-void msgForMultiplyDefinedPV::operator delete ( void *pCadaver,
- tsFreeList < class msgForMultiplyDefinedPV, 16 > & freeList )
+void msgForMultiplyDefinedPV::operator delete ( void *pCadaver,
+ tsFreeList < class msgForMultiplyDefinedPV, 16 > & freeList )
{
freeList.release ( pCadaver, sizeof ( msgForMultiplyDefinedPV ) );
}
@@ -89,5 +89,3 @@ void msgForMultiplyDefinedPV::operator delete ( void * )
callbackForMultiplyDefinedPV::~callbackForMultiplyDefinedPV ()
{
}
-
-
diff --git a/modules/ca/src/client/msgForMultiplyDefinedPV.h b/modules/ca/src/client/msgForMultiplyDefinedPV.h
index 3f1e771..270e01d 100644
--- a/modules/ca/src/client/msgForMultiplyDefinedPV.h
+++ b/modules/ca/src/client/msgForMultiplyDefinedPV.h
@@ -18,9 +18,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef msgForMultiplyDefinedPVh
diff --git a/modules/ca/src/client/nciu.cpp b/modules/ca/src/client/nciu.cpp
index 8eb89c5..e2a5706 100644
--- a/modules/ca/src/client/nciu.cpp
+++ b/modules/ca/src/client/nciu.cpp
@@ -51,7 +51,7 @@ nciu::nciu ( cac & cacIn, netiiu & iiuIn, cacChannelNotify & chanIn,
typeCode ( USHRT_MAX ),
priority ( static_cast <ca_uint8_t> ( pri ) )
{
- size_t nameLengthTmp = strlen ( pNameIn ) + 1;
+ size_t nameLengthTmp = strlen ( pNameIn ) + 1;
// second constraint is imposed by size field in protocol header
if ( nameLengthTmp > MAX_UDP_SEND - sizeof ( caHdr ) || nameLengthTmp > USHRT_MAX ) {
@@ -62,7 +62,7 @@ nciu::nciu ( cac & cacIn, netiiu & iiuIn, cacChannelNotify & chanIn,
throw cacChannel::badPriority ();
}
- this->nameLength = static_cast <unsigned short> ( nameLengthTmp );
+ this->nameLength = static_cast <unsigned short> ( nameLengthTmp );
this->pNameStr = new char [ this->nameLength ];
strcpy ( this->pNameStr, pNameIn );
@@ -114,7 +114,7 @@ void nciu::initiateConnect (
}
void nciu::connect ( unsigned nativeType,
- unsigned nativeCount, unsigned sidIn,
+ unsigned nativeCount, unsigned sidIn,
epicsGuard < epicsMutex > & /* cbGuard */,
epicsGuard < epicsMutex > & guard )
{
@@ -623,4 +623,3 @@ unsigned channelNode::getSearchTimerIndex (
}
return index;
}
-
diff --git a/modules/ca/src/client/nciu.h b/modules/ca/src/client/nciu.h
index 7cba6e8..5bba4a6 100644
--- a/modules/ca/src/client/nciu.h
+++ b/modules/ca/src/client/nciu.h
@@ -17,9 +17,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef nciuh
@@ -278,8 +278,8 @@ private:
epicsGuard < epicsMutex > &, class baseNMIU & );
const char * pHostName (
epicsGuard < epicsMutex > & guard ) const throw ();
- nciu ( const nciu & );
- nciu & operator = ( const nciu & );
+ nciu ( const nciu & );
+ nciu & operator = ( const nciu & );
void operator delete ( void * );
};
diff --git a/modules/ca/src/client/netIO.h b/modules/ca/src/client/netIO.h
index e728d2a..0b2bcca 100644
--- a/modules/ca/src/client/netIO.h
+++ b/modules/ca/src/client/netIO.h
@@ -17,9 +17,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef netIOh
diff --git a/modules/ca/src/client/netReadNotifyIO.cpp b/modules/ca/src/client/netReadNotifyIO.cpp
index 2e4b8ea..e105378 100644
--- a/modules/ca/src/client/netReadNotifyIO.cpp
+++ b/modules/ca/src/client/netReadNotifyIO.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
*
@@ -29,8 +29,8 @@
#include "nciu.h"
#include "cac.h"
-netReadNotifyIO::netReadNotifyIO (
- privateInterfaceForIO & ioComplIntfIn,
+netReadNotifyIO::netReadNotifyIO (
+ privateInterfaceForIO & ioComplIntfIn,
cacReadNotify & notify ) :
notify ( notify ), privateChanForIO ( ioComplIntfIn )
{
@@ -42,26 +42,26 @@ netReadNotifyIO::~netReadNotifyIO ()
void netReadNotifyIO::show ( unsigned /* level */ ) const
{
- ::printf ( "netReadNotifyIO at %p\n",
+ ::printf ( "netReadNotifyIO at %p\n",
static_cast < const void * > ( this ) );
}
-void netReadNotifyIO::show (
+void netReadNotifyIO::show (
epicsGuard < epicsMutex > &, unsigned level ) const
{
this->show ( level );
}
-void netReadNotifyIO::destroy (
+void netReadNotifyIO::destroy (
epicsGuard < epicsMutex > & guard, cacRecycle & recycle )
{
this->~netReadNotifyIO ();
recycle.recycleReadNotifyIO ( guard, *this );
}
-void netReadNotifyIO::completion (
- epicsGuard < epicsMutex > & guard,
- cacRecycle & recycle, unsigned type,
+void netReadNotifyIO::completion (
+ epicsGuard < epicsMutex > & guard,
+ cacRecycle & recycle, unsigned type,
arrayElementCount count, const void * pData )
{
//guard.assertIdenticalMutex ( this->mutex );
@@ -82,28 +82,28 @@ void netReadNotifyIO::completion (
recycle.recycleReadNotifyIO ( guard, *this );
}
-void netReadNotifyIO::exception (
- epicsGuard < epicsMutex > & guard,
+void netReadNotifyIO::exception (
+ epicsGuard < epicsMutex > & guard,
cacRecycle & recycle,
int status, const char *pContext )
{
//guard.assertIdenticalMutex ( this->mutex );
this->privateChanForIO.ioCompletionNotify ( guard, *this );
- this->notify.exception (
+ this->notify.exception (
guard, status, pContext, UINT_MAX, 0u );
this->~netReadNotifyIO ();
recycle.recycleReadNotifyIO ( guard, *this );
}
-void netReadNotifyIO::exception (
- epicsGuard < epicsMutex > & guard,
+void netReadNotifyIO::exception (
+ epicsGuard < epicsMutex > & guard,
cacRecycle & recycle,
- int status, const char *pContext,
+ int status, const char *pContext,
unsigned type, arrayElementCount count )
{
//guard.assertIdenticalMutex ( this->mutex )
this->privateChanForIO.ioCompletionNotify ( guard, *this );
- this->notify.exception (
+ this->notify.exception (
guard, status, pContext, type, count );
this->~netReadNotifyIO ();
recycle.recycleReadNotifyIO ( guard, *this );
@@ -129,6 +129,3 @@ void netReadNotifyIO::operator delete ( void * )
errlogPrintf ( "%s:%d this compiler is confused about placement delete - memory was probably leaked",
__FILE__, __LINE__ );
}
-
-
-
diff --git a/modules/ca/src/client/netSubscription.cpp b/modules/ca/src/client/netSubscription.cpp
index fe2426a..bd3fa43 100644
--- a/modules/ca/src/client/netSubscription.cpp
+++ b/modules/ca/src/client/netSubscription.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
*
@@ -32,9 +32,9 @@
#include "db_access.h" // for dbf_type_to_text
#include "caerr.h"
-netSubscription::netSubscription (
- privateInterfaceForIO & chanIn,
- unsigned typeIn, arrayElementCount countIn,
+netSubscription::netSubscription (
+ privateInterfaceForIO & chanIn,
+ unsigned typeIn, arrayElementCount countIn,
unsigned maskIn, cacStateNotify & notifyIn ) :
count ( countIn ), privateChanForIO ( chanIn ),
notify ( notifyIn ), type ( typeIn ), mask ( maskIn ),
@@ -48,11 +48,11 @@ netSubscription::netSubscription (
}
}
-netSubscription::~netSubscription ()
+netSubscription::~netSubscription ()
{
}
-void netSubscription::destroy (
+void netSubscription::destroy (
epicsGuard < epicsMutex > & guard, cacRecycle & recycle )
{
this->~netSubscription ();
@@ -66,26 +66,26 @@ class netSubscription * netSubscription::isSubscription ()
void netSubscription::show ( unsigned /* level */ ) const
{
- ::printf ( "event subscription IO at %p, type %s, element count %lu, mask %u\n",
- static_cast < const void * > ( this ),
- dbf_type_to_text ( static_cast < int > ( this->type ) ),
+ ::printf ( "event subscription IO at %p, type %s, element count %lu, mask %u\n",
+ static_cast < const void * > ( this ),
+ dbf_type_to_text ( static_cast < int > ( this->type ) ),
this->count, this->mask );
}
-void netSubscription::show (
+void netSubscription::show (
epicsGuard < epicsMutex > &, unsigned level ) const
{
this->show ( level );
}
-void netSubscription::completion (
+void netSubscription::completion (
epicsGuard < epicsMutex > &, cacRecycle & )
{
errlogPrintf ( "subscription update w/o data ?\n" );
}
-void netSubscription::exception (
- epicsGuard < epicsMutex > & guard, cacRecycle & recycle,
+void netSubscription::exception (
+ epicsGuard < epicsMutex > & guard, cacRecycle & recycle,
int status, const char * pContext )
{
if ( status == ECA_DISCONN ) {
@@ -93,7 +93,7 @@ void netSubscription::exception (
}
if ( status == ECA_CHANDESTROY ) {
this->privateChanForIO.ioCompletionNotify ( guard, *this );
- this->notify.exception (
+ this->notify.exception (
guard, status, pContext, UINT_MAX, 0 );
this->~netSubscription ();
recycle.recycleSubscription ( guard, *this );
@@ -101,15 +101,15 @@ void netSubscription::exception (
else {
// guard.assertIdenticalMutex ( this->mutex );
if ( this->privateChanForIO.connected ( guard ) ) {
- this->notify.exception (
+ this->notify.exception (
guard, status, pContext, UINT_MAX, 0 );
}
}
}
-void netSubscription::exception (
- epicsGuard < epicsMutex > & guard,
- cacRecycle & recycle, int status, const char * pContext,
+void netSubscription::exception (
+ epicsGuard < epicsMutex > & guard,
+ cacRecycle & recycle, int status, const char * pContext,
unsigned typeIn, arrayElementCount countIn )
{
if ( status == ECA_DISCONN ) {
@@ -117,7 +117,7 @@ void netSubscription::exception (
}
if ( status == ECA_CHANDESTROY ) {
this->privateChanForIO.ioCompletionNotify ( guard, *this );
- this->notify.exception (
+ this->notify.exception (
guard, status, pContext, UINT_MAX, 0 );
this->~netSubscription ();
recycle.recycleSubscription ( guard, *this );
@@ -125,20 +125,20 @@ void netSubscription::exception (
else {
//guard.assertIdenticalMutex ( this->mutex );
if ( this->privateChanForIO.connected ( guard ) ) {
- this->notify.exception (
+ this->notify.exception (
guard, status, pContext, typeIn, countIn );
}
}
}
-void netSubscription::completion (
+void netSubscription::completion (
epicsGuard < epicsMutex > & guard, cacRecycle &,
- unsigned typeIn, arrayElementCount countIn,
+ unsigned typeIn, arrayElementCount countIn,
const void * pDataIn )
{
// guard.assertIdenticalMutex ( this->mutex );
if ( this->privateChanForIO.connected ( guard ) ) {
- this->notify.current (
+ this->notify.current (
guard, typeIn, countIn, pDataIn );
}
}
@@ -147,17 +147,17 @@ void netSubscription::subscribeIfRequired (
epicsGuard < epicsMutex > & guard, nciu & chan )
{
if ( ! this->subscribed ) {
- chan.getPIIU(guard)->subscriptionRequest (
+ chan.getPIIU(guard)->subscriptionRequest (
guard, chan, *this );
this->subscribed = true;
}
}
-void netSubscription::unsubscribeIfRequired (
+void netSubscription::unsubscribeIfRequired (
epicsGuard < epicsMutex > & guard, nciu & chan )
{
if ( this->subscribed ) {
- chan.getPIIU(guard)->subscriptionCancelRequest (
+ chan.getPIIU(guard)->subscriptionCancelRequest (
guard, chan, *this );
this->subscribed = false;
}
@@ -166,7 +166,7 @@ void netSubscription::unsubscribeIfRequired (
void netSubscription::forceSubscriptionUpdate (
epicsGuard < epicsMutex > & guard, nciu & chan )
{
- chan.getPIIU(guard)->subscriptionUpdateRequest (
+ chan.getPIIU(guard)->subscriptionUpdateRequest (
guard, chan, *this );
}
@@ -180,10 +180,3 @@ void netSubscription::operator delete ( void * )
errlogPrintf ( "%s:%d this compiler is confused about placement delete - memory was probably leaked",
__FILE__, __LINE__ );
}
-
-
-
-
-
-
-
diff --git a/modules/ca/src/client/netWriteNotifyIO.cpp b/modules/ca/src/client/netWriteNotifyIO.cpp
index afa9996..041e538 100644
--- a/modules/ca/src/client/netWriteNotifyIO.cpp
+++ b/modules/ca/src/client/netWriteNotifyIO.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
*
@@ -29,7 +29,7 @@
#include "nciu.h"
#include "cac.h"
-netWriteNotifyIO::netWriteNotifyIO (
+netWriteNotifyIO::netWriteNotifyIO (
privateInterfaceForIO & ioComplIntf, cacWriteNotify & notifyIn ) :
notify ( notifyIn ), privateChanForIO ( ioComplIntf )
{
@@ -41,19 +41,19 @@ netWriteNotifyIO::~netWriteNotifyIO ()
void netWriteNotifyIO::show ( unsigned /* level */ ) const
{
- ::printf ( "read write notify IO at %p\n",
+ ::printf ( "read write notify IO at %p\n",
static_cast < const void * > ( this ) );
}
-void netWriteNotifyIO::show (
- epicsGuard < epicsMutex > &,
+void netWriteNotifyIO::show (
+ epicsGuard < epicsMutex > &,
unsigned level ) const
{
this->show ( level );
}
-void netWriteNotifyIO::destroy (
- epicsGuard < epicsMutex > & guard,
+void netWriteNotifyIO::destroy (
+ epicsGuard < epicsMutex > & guard,
cacRecycle & recycle )
{
this->~netWriteNotifyIO ();
@@ -70,10 +70,10 @@ void netWriteNotifyIO::completion (
recycle.recycleWriteNotifyIO ( guard, *this );
}
-void netWriteNotifyIO::completion (
- epicsGuard < epicsMutex > & guard,
+void netWriteNotifyIO::completion (
+ epicsGuard < epicsMutex > & guard,
cacRecycle & recycle,
- unsigned /* type */, arrayElementCount /* count */,
+ unsigned /* type */, arrayElementCount /* count */,
const void * /* pData */ )
{
//this->chan.getClient().printf ( "Write response with data ?\n" );
@@ -82,26 +82,26 @@ void netWriteNotifyIO::completion (
recycle.recycleWriteNotifyIO ( guard, *this );
}
-void netWriteNotifyIO::exception (
+void netWriteNotifyIO::exception (
epicsGuard < epicsMutex > & guard,
cacRecycle & recycle,
int status, const char * pContext )
{
this->privateChanForIO.ioCompletionNotify ( guard, *this );
- this->notify.exception (
+ this->notify.exception (
guard, status, pContext, UINT_MAX, 0u );
this->~netWriteNotifyIO ();
recycle.recycleWriteNotifyIO ( guard, *this );
}
-void netWriteNotifyIO::exception (
- epicsGuard < epicsMutex > & guard,
+void netWriteNotifyIO::exception (
+ epicsGuard < epicsMutex > & guard,
cacRecycle & recycle,
- int status, const char *pContext,
+ int status, const char *pContext,
unsigned type, arrayElementCount count )
{
this->privateChanForIO.ioCompletionNotify ( guard, *this );
- this->notify.exception (
+ this->notify.exception (
guard, status, pContext, type, count );
this->~netWriteNotifyIO ();
recycle.recycleWriteNotifyIO ( guard, *this );
@@ -127,4 +127,3 @@ void netWriteNotifyIO::operator delete ( void * )
errlogPrintf ( "%s:%d this compiler is confused about placement delete - memory was probably leaked",
__FILE__, __LINE__ );
}
-
diff --git a/modules/ca/src/client/net_convert.h b/modules/ca/src/client/net_convert.h
index bee51c0..992e547 100644
--- a/modules/ca/src/client/net_convert.h
+++ b/modules/ca/src/client/net_convert.h
@@ -9,7 +9,7 @@
\*************************************************************************/
/*
*
- * Author: J. Hill
+ * Author: J. Hill
*
*/
@@ -33,4 +33,4 @@ epicsShareFunc int caNetConvert (
}
#endif
-#endif /* define _NET_CONVERT_H */
+#endif /* define _NET_CONVERT_H */
diff --git a/modules/ca/src/client/netiiu.cpp b/modules/ca/src/client/netiiu.cpp
index a81b155..cd6063a 100644
--- a/modules/ca/src/client/netiiu.cpp
+++ b/modules/ca/src/client/netiiu.cpp
@@ -5,10 +5,10 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
*
* L O S A L A M O S
* Los Alamos National Laboratory
@@ -20,7 +20,7 @@
*/
#include <stdexcept>
-#include <string> // vxWorks 6.0 requires this include
+#include <string> // vxWorks 6.0 requires this include
#include <limits.h>
#include <float.h>
@@ -47,51 +47,51 @@ bool netiiu::ca_v41_ok (
return false;
}
-void netiiu::writeRequest (
- epicsGuard < epicsMutex > &, nciu &,
+void netiiu::writeRequest (
+ epicsGuard < epicsMutex > &, nciu &,
unsigned, arrayElementCount, const void * )
{
throw cacChannel::notConnected();
}
-void netiiu::writeNotifyRequest (
- epicsGuard < epicsMutex > &,
- nciu &, netWriteNotifyIO &, unsigned,
+void netiiu::writeNotifyRequest (
+ epicsGuard < epicsMutex > &,
+ nciu &, netWriteNotifyIO &, unsigned,
arrayElementCount, const void * )
{
throw cacChannel::notConnected();
}
-void netiiu::readNotifyRequest (
- epicsGuard < epicsMutex > &,
+void netiiu::readNotifyRequest (
+ epicsGuard < epicsMutex > &,
nciu &, netReadNotifyIO &, unsigned, arrayElementCount )
{
throw cacChannel::notConnected();
}
-void netiiu::clearChannelRequest (
+void netiiu::clearChannelRequest (
epicsGuard < epicsMutex > &, ca_uint32_t, ca_uint32_t )
{
}
-void netiiu::subscriptionRequest (
+void netiiu::subscriptionRequest (
epicsGuard < epicsMutex > &, nciu &, netSubscription & )
{
}
-void netiiu::subscriptionCancelRequest (
+void netiiu::subscriptionCancelRequest (
epicsGuard < epicsMutex > &, nciu &, netSubscription & )
{
}
-void netiiu::subscriptionUpdateRequest (
+void netiiu::subscriptionUpdateRequest (
epicsGuard < epicsMutex > &, nciu &, netSubscription & )
{
}
static const char * const pHostNameNetIIU = "<disconnected>";
-unsigned netiiu::getHostName (
+unsigned netiiu::getHostName (
epicsGuard < epicsMutex > &,
char * pBuf, unsigned bufLen ) const throw ()
{
@@ -124,18 +124,18 @@ osiSockAddr netiiu::getNetworkAddress (
return addr;
}
-void netiiu::flushRequest (
+void netiiu::flushRequest (
epicsGuard < epicsMutex > & )
{
}
-unsigned netiiu::requestMessageBytesPending (
+unsigned netiiu::requestMessageBytesPending (
epicsGuard < epicsMutex > & )
{
return 0u;
}
-void netiiu::flush (
+void netiiu::flush (
epicsGuard < epicsMutex > & )
{
}
@@ -145,7 +145,7 @@ void netiiu::requestRecvProcessPostponedFlush (
{
}
-void netiiu::uninstallChan (
+void netiiu::uninstallChan (
epicsGuard < epicsMutex > &, nciu & )
{
throw cacChannel::notConnected();
@@ -157,18 +157,16 @@ double netiiu::receiveWatchdogDelay (
return - DBL_MAX;
}
-void netiiu::uninstallChanDueToSuccessfulSearchResponse (
+void netiiu::uninstallChanDueToSuccessfulSearchResponse (
epicsGuard < epicsMutex > &, nciu &, const epicsTime & )
{
- throw std::runtime_error (
+ throw std::runtime_error (
"search response occured when not attached to udpiiu?" );
}
bool netiiu::searchMsg (
- epicsGuard < epicsMutex > &, ca_uint32_t /* id */,
+ epicsGuard < epicsMutex > &, ca_uint32_t /* id */,
const char * /* pName */, unsigned /* nameLength */ )
{
return false;
}
-
-
diff --git a/modules/ca/src/client/netiiu.h b/modules/ca/src/client/netiiu.h
index 2caa3d0..0ead821 100644
--- a/modules/ca/src/client/netiiu.h
+++ b/modules/ca/src/client/netiiu.h
@@ -17,9 +17,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef netiiuh
diff --git a/modules/ca/src/client/noopiiu.cpp b/modules/ca/src/client/noopiiu.cpp
index a3d20b5..39a7b2a 100644
--- a/modules/ca/src/client/noopiiu.cpp
+++ b/modules/ca/src/client/noopiiu.cpp
@@ -5,21 +5,21 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
+ *
*
- *
* L O S A L A M O S
* Los Alamos National Laboratory
* Los Alamos, New Mexico 87545
- *
+ *
* Copyright, 1986, The Regents of the University of California.
- *
- *
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ *
+ *
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#include "osiSock.h"
@@ -29,11 +29,11 @@
noopiiu noopIIU;
-noopiiu::~noopiiu ()
+noopiiu::~noopiiu ()
{
}
-unsigned noopiiu::getHostName (
+unsigned noopiiu::getHostName (
epicsGuard < epicsMutex > & cacGuard,
char * pBuf, unsigned bufLength ) const throw ()
{
@@ -58,71 +58,71 @@ bool noopiiu::ca_v41_ok (
return netiiu::ca_v41_ok ( cacGuard );
}
-void noopiiu::writeRequest (
- epicsGuard < epicsMutex > & guard,
- nciu & chan, unsigned type,
+void noopiiu::writeRequest (
+ epicsGuard < epicsMutex > & guard,
+ nciu & chan, unsigned type,
arrayElementCount nElem, const void * pValue )
{
netiiu::writeRequest ( guard, chan, type, nElem, pValue );
}
-void noopiiu::writeNotifyRequest (
- epicsGuard < epicsMutex > & guard, nciu & chan,
- netWriteNotifyIO & io, unsigned type,
+void noopiiu::writeNotifyRequest (
+ epicsGuard < epicsMutex > & guard, nciu & chan,
+ netWriteNotifyIO & io, unsigned type,
arrayElementCount nElem, const void *pValue )
{
netiiu::writeNotifyRequest ( guard, chan, io, type, nElem, pValue );
}
-void noopiiu::readNotifyRequest (
- epicsGuard < epicsMutex > & guard, nciu & chan,
+void noopiiu::readNotifyRequest (
+ epicsGuard < epicsMutex > & guard, nciu & chan,
netReadNotifyIO & io, unsigned type, arrayElementCount nElem )
{
netiiu::readNotifyRequest ( guard, chan, io, type, nElem );
}
-void noopiiu::clearChannelRequest (
- epicsGuard < epicsMutex > & guard,
+void noopiiu::clearChannelRequest (
+ epicsGuard < epicsMutex > & guard,
ca_uint32_t sid, ca_uint32_t cid )
{
netiiu::clearChannelRequest ( guard, sid, cid );
}
-void noopiiu::subscriptionRequest (
- epicsGuard < epicsMutex > & guard, nciu & chan,
+void noopiiu::subscriptionRequest (
+ epicsGuard < epicsMutex > & guard, nciu & chan,
netSubscription & subscr )
{
netiiu::subscriptionRequest ( guard, chan, subscr );
}
-void noopiiu::subscriptionUpdateRequest (
- epicsGuard < epicsMutex > & guard, nciu & chan,
+void noopiiu::subscriptionUpdateRequest (
+ epicsGuard < epicsMutex > & guard, nciu & chan,
netSubscription & subscr )
{
netiiu::subscriptionUpdateRequest (
guard, chan, subscr );
}
-void noopiiu::subscriptionCancelRequest (
- epicsGuard < epicsMutex > & guard,
+void noopiiu::subscriptionCancelRequest (
+ epicsGuard < epicsMutex > & guard,
nciu & chan, netSubscription & subscr )
{
netiiu::subscriptionCancelRequest ( guard, chan, subscr );
}
-void noopiiu::flushRequest (
+void noopiiu::flushRequest (
epicsGuard < epicsMutex > & guard )
{
netiiu::flushRequest ( guard );
}
-unsigned noopiiu::requestMessageBytesPending (
+unsigned noopiiu::requestMessageBytesPending (
epicsGuard < epicsMutex > & guard )
{
return netiiu::requestMessageBytesPending ( guard );
}
-void noopiiu::flush (
+void noopiiu::flush (
epicsGuard < epicsMutex > & guard )
{
netiiu::flush ( guard );
@@ -146,14 +146,14 @@ double noopiiu::receiveWatchdogDelay (
return netiiu::receiveWatchdogDelay ( guard );
}
-void noopiiu::uninstallChan (
+void noopiiu::uninstallChan (
epicsGuard < epicsMutex > &, nciu & )
{
// intentionally does not call default in netiiu
}
-void noopiiu::uninstallChanDueToSuccessfulSearchResponse (
- epicsGuard < epicsMutex > & guard, nciu & chan,
+void noopiiu::uninstallChanDueToSuccessfulSearchResponse (
+ epicsGuard < epicsMutex > & guard, nciu & chan,
const class epicsTime & currentTime )
{
netiiu::uninstallChanDueToSuccessfulSearchResponse (
@@ -161,10 +161,9 @@ void noopiiu::uninstallChanDueToSuccessfulSearchResponse (
}
bool noopiiu::searchMsg (
- epicsGuard < epicsMutex > & guard, ca_uint32_t id,
+ epicsGuard < epicsMutex > & guard, ca_uint32_t id,
const char * pName, unsigned nameLength )
{
return netiiu::searchMsg (
guard, id, pName, nameLength );
}
-
diff --git a/modules/ca/src/client/noopiiu.h b/modules/ca/src/client/noopiiu.h
index f373ede..f63d9ba 100644
--- a/modules/ca/src/client/noopiiu.h
+++ b/modules/ca/src/client/noopiiu.h
@@ -17,9 +17,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef noopiiuh
diff --git a/modules/ca/src/client/oldAccess.h b/modules/ca/src/client/oldAccess.h
index 1337cb3..2910750 100644
--- a/modules/ca/src/client/oldAccess.h
+++ b/modules/ca/src/client/oldAccess.h
@@ -18,9 +18,9 @@
* Copyright, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef oldAccessh
@@ -195,8 +195,8 @@ private:
void exception (
epicsGuard < epicsMutex > &, int status,
const char *pContext, unsigned type, arrayElementCount count );
- getCopy ( const getCopy & );
- getCopy & operator = ( const getCopy & );
+ getCopy ( const getCopy & );
+ getCopy & operator = ( const getCopy & );
void operator delete ( void * );
};
@@ -220,8 +220,8 @@ private:
void exception (
epicsGuard < epicsMutex > &, int status,
const char * pContext, unsigned type, arrayElementCount count );
- getCallback ( const getCallback & );
- getCallback & operator = ( const getCallback & );
+ getCallback ( const getCallback & );
+ getCallback & operator = ( const getCallback & );
void operator delete ( void * );
};
@@ -243,8 +243,8 @@ private:
void exception (
epicsGuard < epicsMutex > &, int status, const char *pContext,
unsigned type, arrayElementCount count );
- putCallback ( const putCallback & );
- putCallback & operator = ( const putCallback & );
+ putCallback ( const putCallback & );
+ putCallback & operator = ( const putCallback & );
void operator delete ( void * );
};
@@ -283,8 +283,8 @@ private:
void exception (
epicsGuard < epicsMutex > &, int status,
const char *pContext, unsigned type, arrayElementCount count );
- oldSubscription ( const oldSubscription & );
- oldSubscription & operator = ( const oldSubscription & );
+ oldSubscription ( const oldSubscription & );
+ oldSubscription & operator = ( const oldSubscription & );
void operator delete ( void * );
};
diff --git a/modules/ca/src/client/oldChannelNotify.cpp b/modules/ca/src/client/oldChannelNotify.cpp
index 701f51f..2528270 100644
--- a/modules/ca/src/client/oldChannelNotify.cpp
+++ b/modules/ca/src/client/oldChannelNotify.cpp
@@ -17,9 +17,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#include <string>
@@ -705,5 +705,3 @@ int epicsShareAPI ca_v42_ok ( chid pChan )
epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
return pChan->io.ca_v42_ok ( guard );
}
-
-
diff --git a/modules/ca/src/client/oldSubscription.cpp b/modules/ca/src/client/oldSubscription.cpp
index 34b58a4..52226cc 100644
--- a/modules/ca/src/client/oldSubscription.cpp
+++ b/modules/ca/src/client/oldSubscription.cpp
@@ -5,10 +5,10 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
*
* L O S A L A M O S
* Los Alamos National Laboratory
@@ -28,12 +28,12 @@
#include "oldAccess.h"
oldSubscription::oldSubscription (
- epicsGuard < epicsMutex > & guard,
- oldChannelNotify & chanIn, cacChannel & io,
+ epicsGuard < epicsMutex > & guard,
+ oldChannelNotify & chanIn, cacChannel & io,
unsigned type, arrayElementCount nElem, unsigned mask,
caEventCallBackFunc * pFuncIn, void * pPrivateIn,
evid * pEventId ) :
- chan ( chanIn ), id ( UINT_MAX ), pFunc ( pFuncIn ),
+ chan ( chanIn ), id ( UINT_MAX ), pFunc ( pFuncIn ),
pPrivate ( pPrivateIn )
{
// The users event id *must* be set prior to potentially
@@ -51,7 +51,7 @@ oldSubscription::~oldSubscription ()
{
}
-void oldSubscription::current (
+void oldSubscription::current (
epicsGuard < epicsMutex > & guard,
unsigned type, arrayElementCount count, const void * pData )
{
@@ -68,10 +68,10 @@ void oldSubscription::current (
( *pFuncTmp ) ( args );
}
}
-
+
void oldSubscription::exception (
epicsGuard < epicsMutex > & guard,
- int status, const char * /* pContext */,
+ int status, const char * /* pContext */,
unsigned type, arrayElementCount count )
{
if ( status == ECA_CHANDESTROY ) {
@@ -104,4 +104,3 @@ void oldSubscription::operator delete ( void * )
errlogPrintf ( "%s:%d this compiler is confused about placement delete - memory was probably leaked",
__FILE__, __LINE__ );
}
-
diff --git a/modules/ca/src/client/putCallback.cpp b/modules/ca/src/client/putCallback.cpp
index 85fcaeb..e1baefa 100644
--- a/modules/ca/src/client/putCallback.cpp
+++ b/modules/ca/src/client/putCallback.cpp
@@ -5,22 +5,22 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
+ *
*
- *
* L O S A L A M O S
* Los Alamos National Laboratory
* Los Alamos, New Mexico 87545
- *
+ *
* Copyright, The Regents of the University of California.
- *
- *
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ *
+ *
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#include <string>
@@ -32,8 +32,8 @@
#include "iocinf.h"
#include "oldAccess.h"
-putCallback::putCallback (
- oldChannelNotify & chanIn, caEventCallBackFunc * pFuncIn,
+putCallback::putCallback (
+ oldChannelNotify & chanIn, caEventCallBackFunc * pFuncIn,
void * pPrivateIn ) :
chan ( chanIn ), pFunc ( pFuncIn ), pPrivate ( pPrivateIn )
{
@@ -63,9 +63,9 @@ void putCallback::completion ( epicsGuard < epicsMutex > & guard )
}
}
-void putCallback::exception (
+void putCallback::exception (
epicsGuard < epicsMutex > & guard,
- int status, const char * /* pContext */,
+ int status, const char * /* pContext */,
unsigned type, arrayElementCount count )
{
if ( status != ECA_CHANDESTROY ) {
@@ -100,4 +100,3 @@ void putCallback::operator delete ( void * )
errlogPrintf ( "%s:%d this compiler is confused about placement delete - memory was probably leaked",
__FILE__, __LINE__ );
}
-
diff --git a/modules/ca/src/client/repeater.cpp b/modules/ca/src/client/repeater.cpp
index 67429e6..e4be7da 100644
--- a/modules/ca/src/client/repeater.cpp
+++ b/modules/ca/src/client/repeater.cpp
@@ -4,7 +4,7 @@
* Copyright (c) 2002 The Regents of the University of California, as
* Operator of Los Alamos National Laboratory.
* EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
*
@@ -33,7 +33,7 @@
* received it goes to all sockets on the same port, but if a unicast is
* received it goes to only one of the sockets on the same port (we can only
* guess at which one it will be).
- *
+ *
* I have observed this behavior under winsock II:
* o only one of the sockets on the same port receives the message if we
* send to the loopback address
@@ -77,7 +77,7 @@
#include "addrList.h"
-/*
+/*
* these can be external since there is only one instance
* per machine so we dont care about reentrancy
*/
@@ -90,7 +90,7 @@ static const unsigned short PORT_ANY = 0u;
*/
static int makeSocket ( unsigned short port, bool reuseAddr, SOCKET * pSock )
{
- SOCKET sock = epicsSocketCreate ( AF_INET, SOCK_DGRAM, 0 );
+ SOCKET sock = epicsSocketCreate ( AF_INET, SOCK_DGRAM, 0 );
if ( sock == INVALID_SOCKET ) {
*pSock = sock;
@@ -109,8 +109,8 @@ static int makeSocket ( unsigned short port, bool reuseAddr, SOCKET * pSock )
memset ( (char *) &bd, 0, sizeof (bd) );
bd.ia.sin_family = AF_INET;
- bd.ia.sin_addr.s_addr = htonl ( INADDR_ANY );
- bd.ia.sin_port = htons ( port );
+ bd.ia.sin_addr.s_addr = htonl ( INADDR_ANY );
+ bd.ia.sin_port = htons ( port );
status = bind ( sock, &bd.sa, (int) sizeof(bd) );
if ( status < 0 ) {
status = SOCKERRNO;
@@ -140,7 +140,7 @@ bool repeaterClient::connect ()
if ( int sockerrno = makeSocket ( PORT_ANY, false, & this->sock ) ) {
char sockErrBuf[64];
- epicsSocketConvertErrorToString (
+ epicsSocketConvertErrorToString (
sockErrBuf, sizeof ( sockErrBuf ), sockerrno );
fprintf ( stderr, "%s: no client sock because \"%s\"\n",
__FILE__, sockErrBuf );
@@ -150,7 +150,7 @@ bool repeaterClient::connect ()
status = ::connect ( this->sock, &this->from.sa, sizeof ( this->from.sa ) );
if ( status < 0 ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
fprintf ( stderr, "%s: unable to connect client sock because \"%s\"\n",
__FILE__, sockErrBuf );
@@ -179,7 +179,7 @@ bool repeaterClient::sendConfirm ()
}
else {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
debugPrintf ( ( "CA Repeater: confirm req err was \"%s\"\n", sockErrBuf) );
return false;
@@ -228,7 +228,7 @@ repeaterClient::~repeaterClient ()
}
void repeaterClient::operator delete ( void * )
-{
+{
// Visual C++ .net appears to require operator delete if
// placement operator delete is defined? I smell a ms rat
// because if I declare placement new and delete, but
@@ -238,16 +238,16 @@ void repeaterClient::operator delete ( void * )
__FILE__, __LINE__ );
}
-void * repeaterClient::operator new ( size_t size,
+void * repeaterClient::operator new ( size_t size,
tsFreeList < repeaterClient, 0x20 > & freeList )
-{
+{
return freeList.allocate ( size );
}
#ifdef CXX_PLACEMENT_DELETE
-void repeaterClient::operator delete ( void *pCadaver,
- tsFreeList < repeaterClient, 0x20 > & freeList )
-{
+void repeaterClient::operator delete ( void *pCadaver,
+ tsFreeList < repeaterClient, 0x20 > & freeList )
+{
freeList.release ( pCadaver );
}
#endif
@@ -327,7 +327,7 @@ static void verifyClients ( tsFreeList < repeaterClient, 0x20 > & freeList )
/*
* fanOut()
*/
-static void fanOut ( const osiSockAddr & from, const void * pMsg,
+static void fanOut ( const osiSockAddr & from, const void * pMsg,
unsigned msgSize, tsFreeList < repeaterClient, 0x20 > & freeList )
{
static tsDLList < repeaterClient > theClients;
@@ -355,7 +355,7 @@ static void fanOut ( const osiSockAddr & from, const void * pMsg,
/*
* register_new_client()
*/
-static void register_new_client ( osiSockAddr & from,
+static void register_new_client ( osiSockAddr & from,
tsFreeList < repeaterClient, 0x20 > & freeList )
{
bool newClient = false;
@@ -376,7 +376,7 @@ static void register_new_client ( osiSockAddr & from,
SOCKET sock;
if ( int sockerrno = makeSocket ( PORT_ANY, true, & sock ) ) {
char sockErrBuf[64];
- epicsSocketConvertErrorToString (
+ epicsSocketConvertErrorToString (
sockErrBuf, sizeof ( sockErrBuf ), sockerrno );
fprintf ( stderr, "%s: Unable to create repeater bind test socket because \"%s\"\n",
__FILE__, sockErrBuf );
@@ -392,7 +392,7 @@ static void register_new_client ( osiSockAddr & from,
* repeater would not always allow the loopback address
* as a local client address so current clients alternate
* between the address of the first non-loopback interface
- * found and the loopback addresss when subscribing with
+ * found and the loopback addresss when subscribing with
* the CA repeater until all CA repeaters have been updated
* to current code.
*/
@@ -419,8 +419,8 @@ static void register_new_client ( osiSockAddr & from,
break;
}
pclient++;
- }
-
+ }
+
repeaterClient *pNewClient;
if ( pclient.valid () ) {
pNewClient = pclient.pointer ();
@@ -436,7 +436,7 @@ static void register_new_client ( osiSockAddr & from,
freeList.release ( pNewClient );
return;
}
- client_list.add ( *pNewClient );
+ client_list.add ( *pNewClient );
newClient = true;
}
@@ -452,7 +452,7 @@ static void register_new_client ( osiSockAddr & from,
}
/*
- * send a noop message to all other clients so that we dont
+ * send a noop message to all other clients so that we dont
* accumulate sockets when there are no beacons
*/
caHdr noop;
@@ -480,14 +480,14 @@ static void register_new_client ( osiSockAddr & from,
/*
* ca_repeater ()
*/
-void ca_repeater ()
+void ca_repeater ()
{
tsFreeList < repeaterClient, 0x20 > freeList;
int size;
SOCKET sock;
osiSockAddr from;
unsigned short port;
- char * pBuf;
+ char * pBuf;
pBuf = new char [MAX_UDP_RECV];
@@ -509,7 +509,7 @@ void ca_repeater ()
return;
}
char sockErrBuf[64];
- epicsSocketConvertErrorToString (
+ epicsSocketConvertErrorToString (
sockErrBuf, sizeof ( sockErrBuf ), sockerrno );
fprintf ( stderr, "%s: Unable to create repeater socket because \"%s\" - fatal\n",
__FILE__, sockErrBuf );
@@ -585,7 +585,7 @@ void ca_repeater ()
continue;
}
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
fprintf ( stderr, "CA Repeater: unexpected UDP recv err: %s\n",
sockErrBuf );
@@ -622,7 +622,7 @@ void ca_repeater ()
continue;
}
- fanOut ( from, pMsg, size, freeList );
+ fanOut ( from, pMsg, size, freeList );
}
}
@@ -634,5 +634,3 @@ extern "C" void caRepeaterThread ( void * /* pDummy */ )
taskwdInsert ( epicsThreadGetIdSelf(), NULL, NULL );
ca_repeater ();
}
-
-
diff --git a/modules/ca/src/client/repeaterClient.h b/modules/ca/src/client/repeaterClient.h
index faaf080..54b12f7 100644
--- a/modules/ca/src/client/repeaterClient.h
+++ b/modules/ca/src/client/repeaterClient.h
@@ -18,9 +18,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef repeaterClienth
diff --git a/modules/ca/src/client/repeaterSubscribeTimer.cpp b/modules/ca/src/client/repeaterSubscribeTimer.cpp
index 71ba5ad..ee12935 100644
--- a/modules/ca/src/client/repeaterSubscribeTimer.cpp
+++ b/modules/ca/src/client/repeaterSubscribeTimer.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
*
@@ -32,10 +32,10 @@
static const double repeaterSubscribeTimerInitialPeriod = 10.0; // sec
static const double repeaterSubscribeTimerPeriod = 1.0; // sec
-repeaterSubscribeTimer::repeaterSubscribeTimer (
+repeaterSubscribeTimer::repeaterSubscribeTimer (
repeaterTimerNotify & iiuIn, epicsTimerQueue & queueIn,
epicsMutex & cbMutexIn, cacContextNotify & ctxNotifyIn ) :
- timer ( queueIn.createTimer () ), iiu ( iiuIn ),
+ timer ( queueIn.createTimer () ), iiu ( iiuIn ),
cbMutex ( cbMutexIn ),ctxNotify ( ctxNotifyIn ),
stateMutex(__FILE__, __LINE__),
attempts ( 0 ), registered ( false ), once ( false )
@@ -49,7 +49,7 @@ repeaterSubscribeTimer::~repeaterSubscribeTimer ()
void repeaterSubscribeTimer::start ()
{
- this->timer.start (
+ this->timer.start (
*this, repeaterSubscribeTimerInitialPeriod );
}
@@ -68,12 +68,12 @@ epicsTimerNotify::expireStatus repeaterSubscribeTimer::
expire ( const epicsTime & /* currentTime */ )
{
epicsGuard < epicsMutex > guard ( this->stateMutex );
-
+
static const unsigned nTriesToMsg = 50;
if ( this->attempts > nTriesToMsg && ! this->once ) {
callbackManager mgr ( this->ctxNotify, this->cbMutex );
this->iiu.printFormated ( mgr.cbGuard,
- "CA client library is unable to contact CA repeater after %u tries.\n",
+ "CA client library is unable to contact CA repeater after %u tries.\n",
nTriesToMsg );
this->iiu.printFormated ( mgr.cbGuard,
"Silence this message by starting a CA repeater daemon\n") ;
@@ -96,7 +96,7 @@ epicsTimerNotify::expireStatus repeaterSubscribeTimer::
void repeaterSubscribeTimer::show ( unsigned /* level */ ) const
{
epicsGuard < epicsMutex > guard ( this->stateMutex );
-
+
::printf ( "repeater subscribe timer: attempts=%u registered=%u once=%u\n",
this->attempts, this->registered, this->once );
}
diff --git a/modules/ca/src/client/repeaterSubscribeTimer.h b/modules/ca/src/client/repeaterSubscribeTimer.h
index fa47684..8970de4 100644
--- a/modules/ca/src/client/repeaterSubscribeTimer.h
+++ b/modules/ca/src/client/repeaterSubscribeTimer.h
@@ -18,9 +18,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef repeaterSubscribeTimerh
@@ -64,7 +64,7 @@ public:
epicsGuard < epicsMutex > & cbGuard,
epicsGuard < epicsMutex > & guard );
void confirmNotify ();
- void show ( unsigned level ) const;
+ void show ( unsigned level ) const;
private:
epicsTimer & timer;
repeaterTimerNotify & iiu;
@@ -74,9 +74,9 @@ private:
unsigned attempts;
bool registered;
bool once;
- expireStatus expire ( const epicsTime & currentTime );
- repeaterSubscribeTimer ( const repeaterSubscribeTimer & );
- repeaterSubscribeTimer & operator = ( const repeaterSubscribeTimer & );
+ expireStatus expire ( const epicsTime & currentTime );
+ repeaterSubscribeTimer ( const repeaterSubscribeTimer & );
+ repeaterSubscribeTimer & operator = ( const repeaterSubscribeTimer & );
};
#endif // ifdef repeaterSubscribeTimerh
diff --git a/modules/ca/src/client/searchTimer.cpp b/modules/ca/src/client/searchTimer.cpp
index bb9b9a9..1fac5b0 100644
--- a/modules/ca/src/client/searchTimer.cpp
+++ b/modules/ca/src/client/searchTimer.cpp
@@ -5,9 +5,9 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-//
+//
//
// L O S A L A M O S
// Los Alamos National Laboratory
@@ -19,7 +19,7 @@
//
#include <stdexcept>
-#include <string> // vxWorks 6.0 requires this include
+#include <string> // vxWorks 6.0 requires this include
#include <limits.h>
#define epicsAssertAuthor "Jeff Hill johill at lanl.gov"
@@ -32,15 +32,15 @@
#include "nciu.h"
static const unsigned initialTriesPerFrame = 1u; // initial UDP frames per search try
-static const unsigned maxTriesPerFrame = 64u; // max UDP frames per search try
+static const unsigned maxTriesPerFrame = 64u; // max UDP frames per search try
//
// searchTimer::searchTimer ()
//
-searchTimer::searchTimer (
- searchTimerNotify & iiuIn,
- epicsTimerQueue & queueIn,
- const unsigned indexIn,
+searchTimer::searchTimer (
+ searchTimerNotify & iiuIn,
+ epicsTimerQueue & queueIn,
+ const unsigned indexIn,
epicsMutex & mutexIn,
bool boostPossibleIn ) :
timeAtLastSend ( epicsTime::getMonotonic () ),
@@ -73,7 +73,7 @@ searchTimer::~searchTimer ()
this->timer.destroy ();
}
-void searchTimer::shutdown (
+void searchTimer::shutdown (
epicsGuard < epicsMutex > & cbGuard,
epicsGuard < epicsMutex > & guard )
{
@@ -87,25 +87,25 @@ void searchTimer::shutdown (
}
while ( nciu * pChan = this->chanListReqPending.get () ) {
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_none;
pChan->serviceShutdownNotify ( cbGuard, guard );
}
while ( nciu * pChan = this->chanListRespPending.get () ) {
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_none;
pChan->serviceShutdownNotify ( cbGuard, guard );
}
}
-void searchTimer::installChannel (
+void searchTimer::installChannel (
epicsGuard < epicsMutex > & guard, nciu & chan )
{
this->chanListReqPending.add ( chan );
chan.channelNode::setReqPendingState ( guard, this->index );
}
-void searchTimer::moveChannels (
+void searchTimer::moveChannels (
epicsGuard < epicsMutex > & guard, searchTimer & dest )
{
while ( nciu * pChan = this->chanListRespPending.get () ) {
@@ -122,25 +122,25 @@ void searchTimer::moveChannels (
//
// searchTimer::expire ()
//
-epicsTimerNotify::expireStatus searchTimer::expire (
+epicsTimerNotify::expireStatus searchTimer::expire (
const epicsTime & currentTime )
{
epicsGuard < epicsMutex > guard ( this->mutex );
while ( nciu * pChan = this->chanListRespPending.get () ) {
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_none;
- this->iiu.noSearchRespNotify (
+ this->iiu.noSearchRespNotify (
guard, *pChan, this->index );
}
-
+
this->timeAtLastSend = currentTime;
// boost search period for channels not recently
// searched for if there was some success
if ( this->searchResponses && this->boostPossible ) {
while ( nciu * pChan = this->chanListReqPending.get () ) {
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_none;
this->iiu.boostChannel ( guard, *pChan );
}
@@ -149,8 +149,8 @@ epicsTimerNotify::expireStatus searchTimer::expire (
if ( this->searchAttempts ) {
#if 0
//
- // dynamically adjust the number of UDP frames per
- // try depending how many search requests are not
+ // dynamically adjust the number of UDP frames per
+ // try depending how many search requests are not
// replied to
//
// The variable this->framesPerTry
@@ -160,13 +160,13 @@ epicsTimerNotify::expireStatus searchTimer::expire (
// network bandwidth. If it is too low we will
// use very little of the incoming UDP message
// buffer associated with the server's port and
- // will therefore take longer to connect. We
- // initialize this->framesPerTry to a prime number
+ // will therefore take longer to connect. We
+ // initialize this->framesPerTry to a prime number
// so that it is less likely that the
// same channel is in the last UDP frame
// sent every time that this is called (and
// potentially discarded by a CA server with
- // a small UDP input queue).
+ // a small UDP input queue).
//
// increase frames per try only if we see better than
// a 93.75% success rate for one pass through the list
@@ -182,19 +182,19 @@ epicsTimerNotify::expireStatus searchTimer::expire (
else {
this->framesPerTry += (this->framesPerTry/8) + 1;
}
- debugPrintf ( ("Increasing frame count to %u t=%u r=%u\n",
+ debugPrintf ( ("Increasing frame count to %u t=%u r=%u\n",
this->framesPerTry, this->searchAttempts, this->searchResponses) );
}
}
- // if we detect congestion because we have less than a 87.5% success
+ // if we detect congestion because we have less than a 87.5% success
// rate then gradually reduce the frames per try
- else if ( this->searchResponses <
+ else if ( this->searchResponses <
( this->searchAttempts - (this->searchAttempts/8u) ) ) {
if ( this->framesPerTry > 1 ) {
this->framesPerTry--;
}
this->framesPerTryCongestThresh = this->framesPerTry/2 + 1;
- debugPrintf ( ("Congestion detected - set frames per try to %f t=%u r=%u\n",
+ debugPrintf ( ("Congestion detected - set frames per try to %f t=%u r=%u\n",
this->framesPerTry, this->searchAttempts, this->searchResponses) );
}
#else
@@ -214,20 +214,20 @@ epicsTimerNotify::expireStatus searchTimer::expire (
else {
this->framesPerTry += 1.0 / this->framesPerTry;
}
- debugPrintf ( ("Increasing frame count to %g t=%u r=%u\n",
+ debugPrintf ( ("Increasing frame count to %g t=%u r=%u\n",
this->framesPerTry, this->searchAttempts, this->searchResponses) );
}
}
else {
this->framesPerTryCongestThresh = this->framesPerTry / 2.0;
this->framesPerTry = 1u;
- debugPrintf ( ("Congestion detected - set frames per try to %g t=%u r=%u\n",
+ debugPrintf ( ("Congestion detected - set frames per try to %g t=%u r=%u\n",
this->framesPerTry, this->searchAttempts, this->searchResponses) );
}
#endif
}
- this->dgSeqNoAtTimerExpireBegin =
+ this->dgSeqNoAtTimerExpireBegin =
this->iiu.datagramSeqNumber ( guard );
this->searchAttempts = 0;
@@ -240,9 +240,9 @@ epicsTimerNotify::expireStatus searchTimer::expire (
break;
}
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_none;
-
+
bool success = pChan->searchMsg ( guard );
if ( ! success ) {
if ( this->iiu.datagramFlush ( guard, currentTime ) ) {
@@ -253,14 +253,14 @@ epicsTimerNotify::expireStatus searchTimer::expire (
}
if ( ! success ) {
this->chanListReqPending.push ( *pChan );
- pChan->channelNode::setReqPendingState (
+ pChan->channelNode::setReqPendingState (
guard, this->index );
break;
}
}
this->chanListRespPending.add ( *pChan );
- pChan->channelNode::setRespPendingState (
+ pChan->channelNode::setRespPendingState (
guard, this->index );
if ( this->searchAttempts < UINT_MAX ) {
@@ -273,14 +273,14 @@ epicsTimerNotify::expireStatus searchTimer::expire (
nFrameSent++;
}
- this->dgSeqNoAtTimerExpireEnd =
+ this->dgSeqNoAtTimerExpireEnd =
this->iiu.datagramSeqNumber ( guard ) - 1u;
# ifdef DEBUG
if ( this->searchAttempts ) {
char buf[64];
currentTime.strftime ( buf, sizeof(buf), "%M:%S.%09f");
- debugPrintf ( ("sent %u delay sec=%f Rts=%s\n",
+ debugPrintf ( ("sent %u delay sec=%f Rts=%s\n",
nFrameSent, this->period(), buf ) );
}
# endif
@@ -293,22 +293,22 @@ void searchTimer :: show ( unsigned level ) const
epicsGuard < epicsMutex > guard ( this->mutex );
::printf ( "searchTimer with period %f\n", this->period ( guard ) );
if ( level > 0 ) {
- ::printf ( "channels with search request pending = %u\n",
+ ::printf ( "channels with search request pending = %u\n",
this->chanListReqPending.count () );
if ( level > 1u ) {
- tsDLIterConst < nciu > pChan =
+ tsDLIterConst < nciu > pChan =
this->chanListReqPending.firstIter ();
- while ( pChan.valid () ) {
+ while ( pChan.valid () ) {
pChan->show ( level - 2u );
pChan++;
}
}
- ::printf ( "channels with search response pending = %u\n",
+ ::printf ( "channels with search response pending = %u\n",
this->chanListRespPending.count () );
if ( level > 1u ) {
- tsDLIterConst < nciu > pChan =
+ tsDLIterConst < nciu > pChan =
this->chanListRespPending.firstIter ();
- while ( pChan.valid () ) {
+ while ( pChan.valid () ) {
pChan->show ( level - 2u );
pChan++;
}
@@ -321,9 +321,9 @@ void searchTimer :: show ( unsigned level ) const
// at least one response. However, dont reset this delay if we
// get a delayed response to an old search request.
//
-void searchTimer::uninstallChanDueToSuccessfulSearchResponse (
- epicsGuard < epicsMutex > & guard, nciu & chan,
- ca_uint32_t respDatagramSeqNo, bool seqNumberIsValid,
+void searchTimer::uninstallChanDueToSuccessfulSearchResponse (
+ epicsGuard < epicsMutex > & guard, nciu & chan,
+ ca_uint32_t respDatagramSeqNo, bool seqNumberIsValid,
const epicsTime & currentTime )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -335,8 +335,8 @@ void searchTimer::uninstallChanDueToSuccessfulSearchResponse (
bool validResponse = true;
if ( seqNumberIsValid ) {
- validResponse =
- this->dgSeqNoAtTimerExpireBegin <= respDatagramSeqNo &&
+ validResponse =
+ this->dgSeqNoAtTimerExpireBegin <= respDatagramSeqNo &&
this->dgSeqNoAtTimerExpireEnd >= respDatagramSeqNo;
}
@@ -351,7 +351,7 @@ void searchTimer::uninstallChanDueToSuccessfulSearchResponse (
if ( this->searchResponses == this->searchAttempts ) {
if ( this->chanListReqPending.count () ) {
//
- // when we get 100% success immediately
+ // when we get 100% success immediately
// send another search request
//
debugPrintf ( ( "All requests succesful, set timer delay to zero\n" ) );
@@ -366,25 +366,25 @@ void searchTimer::uninstallChan (
epicsGuard < epicsMutex > & cacGuard, nciu & chan )
{
cacGuard.assertIdenticalMutex ( this->mutex );
- unsigned ulistmem =
- static_cast <unsigned> ( chan.channelNode::listMember );
- unsigned uReqBase =
- static_cast <unsigned> ( channelNode::cs_searchReqPending0 );
+ unsigned ulistmem =
+ static_cast <unsigned> ( chan.channelNode::listMember );
+ unsigned uReqBase =
+ static_cast <unsigned> ( channelNode::cs_searchReqPending0 );
if ( ulistmem == this->index + uReqBase ) {
this->chanListReqPending.remove ( chan );
}
- else {
- unsigned uRespBase =
- static_cast <unsigned > (
- channelNode::cs_searchRespPending0 );
- if ( ulistmem == this->index + uRespBase ) {
- this->chanListRespPending.remove ( chan );
- }
- else {
- throw std::runtime_error (
- "uninstalling channel search timer, but channel "
- "state is wrong" );
- }
+ else {
+ unsigned uRespBase =
+ static_cast <unsigned > (
+ channelNode::cs_searchRespPending0 );
+ if ( ulistmem == this->index + uRespBase ) {
+ this->chanListRespPending.remove ( chan );
+ }
+ else {
+ throw std::runtime_error (
+ "uninstalling channel search timer, but channel "
+ "state is wrong" );
+ }
}
chan.channelNode::listMember = channelNode::cs_none;
}
diff --git a/modules/ca/src/client/searchTimer.h b/modules/ca/src/client/searchTimer.h
index 7b9fe17..2019191 100644
--- a/modules/ca/src/client/searchTimer.h
+++ b/modules/ca/src/client/searchTimer.h
@@ -18,9 +18,9 @@
// Copyright, 1986, The Regents of the University of California.
//
//
-// Author Jeffrey O. Hill
-// johill at lanl.gov
-// 505 665 1831
+// Author Jeffrey O. Hill
+// johill at lanl.gov
+// 505 665 1831
//
#ifndef searchTimerh
@@ -101,8 +101,8 @@ private:
expireStatus expire ( const epicsTime & currentTime );
double period ( epicsGuard < epicsMutex > & ) const;
- searchTimer ( const searchTimer & ); // not implemented
- searchTimer & operator = ( const searchTimer & ); // not implemented
+ searchTimer ( const searchTimer & ); // not implemented
+ searchTimer & operator = ( const searchTimer & ); // not implemented
};
#endif // ifdef searchTimerh
diff --git a/modules/ca/src/client/sgAutoPtr.h b/modules/ca/src/client/sgAutoPtr.h
index e289946..14bfd35 100644
--- a/modules/ca/src/client/sgAutoPtr.h
+++ b/modules/ca/src/client/sgAutoPtr.h
@@ -18,9 +18,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef sgAutoPtrh
@@ -40,7 +40,7 @@ private:
T * pNotify;
struct CASG & sg;
epicsGuard < epicsMutex > & guard;
- sgAutoPtr & operator = ( const sgAutoPtr & );
+ sgAutoPtr & operator = ( const sgAutoPtr & );
};
template < class T >
diff --git a/modules/ca/src/client/syncGroup.h b/modules/ca/src/client/syncGroup.h
index 3b9c3cd..f1fe330 100644
--- a/modules/ca/src/client/syncGroup.h
+++ b/modules/ca/src/client/syncGroup.h
@@ -17,9 +17,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef syncGrouph
@@ -150,7 +150,7 @@ private:
void completion ( epicsGuard < epicsMutex > & );
void exception (
epicsGuard < epicsMutex > &, int status, const char *pContext,
- unsigned type, arrayElementCount count );
+ unsigned type, arrayElementCount count );
syncGroupWriteNotify ( const syncGroupWriteNotify & );
syncGroupWriteNotify & operator = ( const syncGroupWriteNotify & );
};
diff --git a/modules/ca/src/client/syncGroupNotify.cpp b/modules/ca/src/client/syncGroupNotify.cpp
index 2780fbe..3cdfa4a 100644
--- a/modules/ca/src/client/syncGroupNotify.cpp
+++ b/modules/ca/src/client/syncGroupNotify.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
@@ -21,14 +21,10 @@
#include "syncGroup.h"
#include "oldAccess.h"
-syncGroupNotify::syncGroupNotify ()
+syncGroupNotify::syncGroupNotify ()
{
}
syncGroupNotify::~syncGroupNotify ()
{
}
-
-
-
-
diff --git a/modules/ca/src/client/syncGroupReadNotify.cpp b/modules/ca/src/client/syncGroupReadNotify.cpp
index 711a2fa..fafcc70 100644
--- a/modules/ca/src/client/syncGroupReadNotify.cpp
+++ b/modules/ca/src/client/syncGroupReadNotify.cpp
@@ -29,7 +29,7 @@
syncGroupReadNotify::syncGroupReadNotify (
CASG & sgIn, PRecycleFunc pRecycleFuncIn,
chid pChan, void * pValueIn ) :
- chan ( pChan ), pRecycleFunc ( pRecycleFuncIn ),
+ chan ( pChan ), pRecycleFunc ( pRecycleFuncIn ),
sg ( sgIn ), pValue ( pValueIn ),
magic ( CASG_MAGIC ), id ( 0u ),
idIsValid ( false ), ioComplete ( false )
diff --git a/modules/ca/src/client/syncGroupWriteNotify.cpp b/modules/ca/src/client/syncGroupWriteNotify.cpp
index f0bf427..3cf7c34 100644
--- a/modules/ca/src/client/syncGroupWriteNotify.cpp
+++ b/modules/ca/src/client/syncGroupWriteNotify.cpp
@@ -26,7 +26,7 @@
#include "syncGroup.h"
#include "oldAccess.h"
-syncGroupWriteNotify::syncGroupWriteNotify ( CASG & sgIn,
+syncGroupWriteNotify::syncGroupWriteNotify ( CASG & sgIn,
PRecycleFunc pRecycleFuncIn, chid pChan ) :
chan ( pChan ), pRecycleFunc ( pRecycleFuncIn ),
sg ( sgIn ), magic ( CASG_MAGIC ),
@@ -141,4 +141,3 @@ void syncGroupWriteNotify::operator delete ( void *pCadaver,
freeList.release ( pCadaver );
}
#endif
-
diff --git a/modules/ca/src/client/syncgrp.cpp b/modules/ca/src/client/syncgrp.cpp
index 9727ae8..fef0706 100644
--- a/modules/ca/src/client/syncgrp.cpp
+++ b/modules/ca/src/client/syncgrp.cpp
@@ -102,7 +102,7 @@ void sync_group_reset ( ca_client_context & client, CASG & sg )
epicsGuard < epicsMutex > guard ( client.mutex );
sg.reset ( *client.pCallbackGuard.get(), guard );
}
- else {
+ else {
//
// we will definately stall out here if all of the
// following are true
@@ -262,7 +262,7 @@ extern "C" int epicsShareAPI ca_sg_array_put ( const CA_SYNC_GID gid, chtype typ
}
try {
- pcasg->put ( guard, pChan, type,
+ pcasg->put ( guard, pChan, type,
static_cast < unsigned > ( count ), pValue );
return ECA_NORMAL;
}
@@ -324,7 +324,7 @@ extern "C" int epicsShareAPI ca_sg_array_get ( const CA_SYNC_GID gid, chtype typ
}
try {
- pcasg->get ( guard, pChan, type,
+ pcasg->get ( guard, pChan, type,
static_cast < unsigned > ( count ), pValue );
return ECA_NORMAL;
}
diff --git a/modules/ca/src/client/tcpRecvThread.cpp b/modules/ca/src/client/tcpRecvThread.cpp
index 34bf8ca..2e1770e 100644
--- a/modules/ca/src/client/tcpRecvThread.cpp
+++ b/modules/ca/src/client/tcpRecvThread.cpp
@@ -5,7 +5,5 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-
-
diff --git a/modules/ca/src/client/tcpRecvWatchdog.cpp b/modules/ca/src/client/tcpRecvWatchdog.cpp
index 72c9296..281f222 100644
--- a/modules/ca/src/client/tcpRecvWatchdog.cpp
+++ b/modules/ca/src/client/tcpRecvWatchdog.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
*
@@ -27,14 +27,14 @@
//
// the recv watchdog timer is active when this object is created
//
-tcpRecvWatchdog::tcpRecvWatchdog
+tcpRecvWatchdog::tcpRecvWatchdog
( epicsMutex & cbMutexIn, cacContextNotify & ctxNotifyIn,
- epicsMutex & mutexIn, tcpiiu & iiuIn,
+ epicsMutex & mutexIn, tcpiiu & iiuIn,
double periodIn, epicsTimerQueue & queueIn ) :
period ( periodIn ), timer ( queueIn.createTimer () ),
- cbMutex ( cbMutexIn ), ctxNotify ( ctxNotifyIn ),
- mutex ( mutexIn ), iiu ( iiuIn ),
- probeResponsePending ( false ), beaconAnomaly ( true ),
+ cbMutex ( cbMutexIn ), ctxNotify ( ctxNotifyIn ),
+ mutex ( mutexIn ), iiu ( iiuIn ),
+ probeResponsePending ( false ), beaconAnomaly ( true ),
probeTimeoutDetected ( false ), shuttingDown ( false )
{
}
@@ -61,15 +61,15 @@ tcpRecvWatchdog::expire ( const epicsTime & /* currentTime */ )
char hostName[128];
this->iiu.getHostName ( guard, hostName, sizeof (hostName) );
debugPrintf ( ( "CA server \"%s\" unresponsive after %g inactive sec"
- "- disconnecting.\n",
+ "- disconnecting.\n",
hostName, this->period ) );
# endif
- // to get the callback lock safely we must reorder
+ // to get the callback lock safely we must reorder
// the lock hierarchy
epicsGuardRelease < epicsMutex > unguard ( guard );
{
// callback lock is required because channel disconnect
- // state change is initiated from this thread, and
+ // state change is initiated from this thread, and
// this can cause their disconnect notify callback
// to be invoked.
callbackManager mgr ( this->ctxNotify, this->cbMutex );
@@ -91,7 +91,7 @@ tcpRecvWatchdog::expire ( const epicsTime & /* currentTime */ )
}
}
-void tcpRecvWatchdog::beaconArrivalNotify (
+void tcpRecvWatchdog::beaconArrivalNotify (
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -103,12 +103,12 @@ void tcpRecvWatchdog::beaconArrivalNotify (
//
// be careful about using beacons to reset the connection
-// time out watchdog until we have received a ping response
+// time out watchdog until we have received a ping response
// from the IOC (this makes the software detect reconnects
-// faster when the server is rebooted twice in rapid
+// faster when the server is rebooted twice in rapid
// succession before a 1st or 2nd beacon has been received)
//
-void tcpRecvWatchdog::beaconAnomalyNotify (
+void tcpRecvWatchdog::beaconAnomalyNotify (
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -116,7 +116,7 @@ void tcpRecvWatchdog::beaconAnomalyNotify (
debugPrintf ( ("Saw an abnormal beacon\n") );
}
-void tcpRecvWatchdog::messageArrivalNotify (
+void tcpRecvWatchdog::messageArrivalNotify (
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -128,7 +128,7 @@ void tcpRecvWatchdog::messageArrivalNotify (
}
}
-void tcpRecvWatchdog::probeResponseNotify (
+void tcpRecvWatchdog::probeResponseNotify (
epicsGuard < epicsMutex > & cbGuard )
{
bool restartNeeded = false;
@@ -158,27 +158,27 @@ void tcpRecvWatchdog::probeResponseNotify (
}
//
-// The thread for outgoing requests in the client runs
+// The thread for outgoing requests in the client runs
// at a higher priority than the thread in the client
-// that receives responses. Therefore, there could
-// be considerable large array write send backlog that
-// is delaying departure of an echo request and also
-// interrupting delivery of an echo response.
-// We must be careful not to timeout the echo response as
-// long as we see indication of regular departures of
-// message buffers from the client in a situation where
-// we know that the TCP send queueing has been exceeded.
-// The send watchdog will be responsible for detecting
+// that receives responses. Therefore, there could
+// be considerable large array write send backlog that
+// is delaying departure of an echo request and also
+// interrupting delivery of an echo response.
+// We must be careful not to timeout the echo response as
+// long as we see indication of regular departures of
+// message buffers from the client in a situation where
+// we know that the TCP send queueing has been exceeded.
+// The send watchdog will be responsible for detecting
// dead connections in this case.
//
-void tcpRecvWatchdog::sendBacklogProgressNotify (
+void tcpRecvWatchdog::sendBacklogProgressNotify (
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
// We dont set "beaconAnomaly" to be false here because, after we see a
- // beacon anomaly (which could be transiently detecting a reboot) we will
- // not trust the beacon as an indicator of a healthy server until we
+ // beacon anomaly (which could be transiently detecting a reboot) we will
+ // not trust the beacon as an indicator of a healthy server until we
// receive at least one message from the server.
if ( this->probeResponsePending && ! this->shuttingDown ) {
this->timer.start ( *this, CA_ECHO_TIMEOUT );
@@ -197,7 +197,7 @@ void tcpRecvWatchdog::connectNotify (
debugPrintf ( ("connected to the server - initiating circuit recv watchdog\n") );
}
-void tcpRecvWatchdog::sendTimeoutNotify (
+void tcpRecvWatchdog::sendTimeoutNotify (
epicsGuard < epicsMutex > & /* cbGuard */,
epicsGuard < epicsMutex > & guard )
{
@@ -243,9 +243,8 @@ void tcpRecvWatchdog::show ( unsigned level ) const
static_cast <const void *> ( this ), this->period );
if ( level > 0u ) {
::printf ( "\t%s %s %s\n",
- this->probeResponsePending ? "probe-response-pending" : "",
+ this->probeResponsePending ? "probe-response-pending" : "",
this->beaconAnomaly ? "beacon-anomaly-detected" : "",
this->probeTimeoutDetected ? "probe-response-timeout" : "" );
}
}
-
diff --git a/modules/ca/src/client/tcpRecvWatchdog.h b/modules/ca/src/client/tcpRecvWatchdog.h
index 0b15e22..636b6ff 100644
--- a/modules/ca/src/client/tcpRecvWatchdog.h
+++ b/modules/ca/src/client/tcpRecvWatchdog.h
@@ -18,9 +18,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef tcpRecvWatchdogh
@@ -77,8 +77,8 @@ private:
bool probeTimeoutDetected;
bool shuttingDown;
expireStatus expire ( const epicsTime & currentTime );
- tcpRecvWatchdog ( const tcpRecvWatchdog & );
- tcpRecvWatchdog & operator = ( const tcpRecvWatchdog & );
+ tcpRecvWatchdog ( const tcpRecvWatchdog & );
+ tcpRecvWatchdog & operator = ( const tcpRecvWatchdog & );
};
#endif // #ifndef tcpRecvWatchdogh
diff --git a/modules/ca/src/client/tcpSendWatchdog.cpp b/modules/ca/src/client/tcpSendWatchdog.cpp
index 6834b39..20ee76f 100644
--- a/modules/ca/src/client/tcpSendWatchdog.cpp
+++ b/modules/ca/src/client/tcpSendWatchdog.cpp
@@ -5,10 +5,10 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
*
* L O S A L A M O S
* Los Alamos National Laboratory
@@ -25,8 +25,8 @@
#include "cac.h"
#include "virtualCircuit.h"
-tcpSendWatchdog::tcpSendWatchdog (
- epicsMutex & cbMutexIn, cacContextNotify & ctxNotifyIn,
+tcpSendWatchdog::tcpSendWatchdog (
+ epicsMutex & cbMutexIn, cacContextNotify & ctxNotifyIn,
epicsMutex & mutexIn, tcpiiu & iiuIn,
double periodIn, epicsTimerQueue & queueIn ) :
period ( periodIn ), timer ( queueIn.createTimer () ),
@@ -40,7 +40,7 @@ tcpSendWatchdog::~tcpSendWatchdog ()
this->timer.destroy ();
}
-epicsTimerNotify::expireStatus tcpSendWatchdog::expire (
+epicsTimerNotify::expireStatus tcpSendWatchdog::expire (
const epicsTime & /* currentTime */ )
{
{
@@ -55,7 +55,7 @@ epicsTimerNotify::expireStatus tcpSendWatchdog::expire (
# ifdef DEBUG
char hostName[128];
this->iiu.getHostName ( guard, hostName, sizeof ( hostName ) );
- debugPrintf ( ( "Request not accepted by CA server %s for %g sec. Disconnecting.\n",
+ debugPrintf ( ( "Request not accepted by CA server %s for %g sec. Disconnecting.\n",
hostName, this->period ) );
# endif
this->iiu.sendTimeoutNotify ( mgr, guard );
@@ -72,5 +72,3 @@ void tcpSendWatchdog::cancel ()
{
this->timer.cancel ();
}
-
-
diff --git a/modules/ca/src/client/tcpSendWatchdog.h b/modules/ca/src/client/tcpSendWatchdog.h
index 05a2dfe..7c16de0 100644
--- a/modules/ca/src/client/tcpSendWatchdog.h
+++ b/modules/ca/src/client/tcpSendWatchdog.h
@@ -18,9 +18,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef tcpSendWatchdogh
@@ -56,8 +56,8 @@ private:
epicsMutex & mutex;
tcpiiu & iiu;
expireStatus expire ( const epicsTime & currentTime );
- tcpSendWatchdog ( const tcpSendWatchdog & );
- tcpSendWatchdog & operator = ( const tcpSendWatchdog & );
+ tcpSendWatchdog ( const tcpSendWatchdog & );
+ tcpSendWatchdog & operator = ( const tcpSendWatchdog & );
};
#endif // #ifndef tcpSendWatchdog
diff --git a/modules/ca/src/client/tcpiiu.cpp b/modules/ca/src/client/tcpiiu.cpp
index 9d174ab..1fdd34b 100644
--- a/modules/ca/src/client/tcpiiu.cpp
+++ b/modules/ca/src/client/tcpiiu.cpp
@@ -4,10 +4,10 @@
* Copyright (c) 2002 The Regents of the University of California, as
* Operator of Los Alamos National Laboratory.
* EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
* L O S A L A M O S
* Los Alamos National Laboratory
* Los Alamos, New Mexico 87545
@@ -48,7 +48,7 @@
using namespace std;
tcpSendThread::tcpSendThread (
- class tcpiiu & iiuIn, const char * pName,
+ class tcpiiu & iiuIn, const char * pName,
unsigned stackSize, unsigned priority ) :
thread ( *this, pName, stackSize, priority ), iiu ( iiuIn )
{
@@ -92,7 +92,7 @@ void tcpSendThread::run ()
}
laborPending = false;
- bool flowControlLaborNeeded =
+ bool flowControlLaborNeeded =
this->iiu.busyStateDetected != this->iiu.flowControlActive;
bool echoLaborNeeded = this->iiu.echoRequestPending;
this->iiu.echoRequestPending = false;
@@ -119,7 +119,7 @@ void tcpSendThread::run ()
if ( CA_V42 ( this->iiu.minorProtocolVersion ) ) {
this->iiu.createRespPend.add ( *pChan );
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_createRespPend;
}
else {
@@ -129,12 +129,12 @@ void tcpSendThread::run ()
// that the UDP thread take the callback lock. There are
// almost no V42 servers left at this point.
this->iiu.v42ConnCallbackPend.add ( *pChan );
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_v42ConnCallbackPend;
this->iiu.echoRequestPending = true;
laborPending = true;
}
-
+
if ( this->iiu.sendQue.flushBlockThreshold () ) {
laborPending = true;
break;
@@ -145,7 +145,7 @@ void tcpSendThread::run ()
// this installs any subscriptions as needed
pChan->resubscribe ( guard );
this->iiu.connectedList.add ( *pChan );
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_connected;
if ( this->iiu.sendQue.flushBlockThreshold () ) {
laborPending = true;
@@ -157,7 +157,7 @@ void tcpSendThread::run ()
// this updates any subscriptions as needed
pChan->sendSubscriptionUpdateRequests ( guard );
this->iiu.connectedList.add ( *pChan );
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_connected;
if ( this->iiu.sendQue.flushBlockThreshold () ) {
laborPending = true;
@@ -171,14 +171,14 @@ void tcpSendThread::run ()
}
if ( this->iiu.state == tcpiiu::iiucs_clean_shutdown ) {
this->iiu.sendThreadFlush ( guard );
- // this should cause the server to disconnect from
+ // this should cause the server to disconnect from
// the client
int status = ::shutdown ( this->iiu.sock, SHUT_WR );
if ( status ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
- errlogPrintf ("CAC TCP clean socket shutdown error was %s\n",
+ errlogPrintf ("CAC TCP clean socket shutdown error was %s\n",
sockErrBuf );
}
}
@@ -187,14 +187,14 @@ void tcpSendThread::run ()
errlogPrintf (
"cac: tcp send thread received an unexpected exception "
"- disconnecting\n");
- // this should cause the server to disconnect from
+ // this should cause the server to disconnect from
// the client
int status = ::shutdown ( this->iiu.sock, SHUT_WR );
if ( status ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
- errlogPrintf ("CAC TCP clean socket shutdown error was %s\n",
+ errlogPrintf ("CAC TCP clean socket shutdown error was %s\n",
sockErrBuf );
}
}
@@ -203,11 +203,11 @@ void tcpSendThread::run ()
this->iiu.recvDog.shutdown ();
while ( ! this->iiu.recvThread.exitWait ( 30.0 ) ) {
- // it is possible to get stuck here if the user calls
+ // it is possible to get stuck here if the user calls
// ca_context_destroy() when a circuit isnt known to
// be unresponsive, but is. That situation is probably
// rare, and the IP kernel might have a timeout for
- // such situations, nevertheless we will attempt to deal
+ // such situations, nevertheless we will attempt to deal
// with it here after waiting a reasonable amount of time
// for a clean shutdown to finish.
epicsGuard < epicsMutex > guard ( this->iiu.mutex );
@@ -215,7 +215,7 @@ void tcpSendThread::run ()
}
// user threads blocking for send backlog to be reduced
- // will abort their attempt to get space if
+ // will abort their attempt to get space if
// the state of the tcpiiu changes from connected to a
// disconnecting state. Nevertheless, we need to wait
// for them to finish prior to destroying the IIU.
@@ -229,7 +229,7 @@ void tcpSendThread::run ()
this->iiu.cacRef.destroyIIU ( this->iiu );
}
-unsigned tcpiiu::sendBytes ( const void *pBuf,
+unsigned tcpiiu::sendBytes ( const void *pBuf,
unsigned nBytesInBuf, const epicsTime & currentTime )
{
unsigned nBytes = 0u;
@@ -238,7 +238,7 @@ unsigned tcpiiu::sendBytes ( const void *pBuf,
this->sendDog.start ( currentTime );
while ( true ) {
- int status = ::send ( this->sock,
+ int status = ::send ( this->sock,
static_cast < const char * > (pBuf), (int) nBytesInBuf, 0 );
if ( status > 0 ) {
nBytes = static_cast <unsigned> ( status );
@@ -264,7 +264,7 @@ unsigned tcpiiu::sendBytes ( const void *pBuf,
}
if ( localError == SOCK_ENOBUFS ) {
- errlogPrintf (
+ errlogPrintf (
"CAC: system low on network buffers "
"- send retry in 15 seconds\n" );
{
@@ -274,16 +274,16 @@ unsigned tcpiiu::sendBytes ( const void *pBuf,
continue;
}
- if (
- localError != SOCK_EPIPE &&
+ if (
+ localError != SOCK_EPIPE &&
localError != SOCK_ECONNRESET &&
- localError != SOCK_ETIMEDOUT &&
+ localError != SOCK_ETIMEDOUT &&
localError != SOCK_ECONNABORTED &&
localError != SOCK_SHUTDOWN ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
- errlogPrintf ( "CAC: unexpected TCP send error: %s\n",
+ errlogPrintf ( "CAC: unexpected TCP send error: %s\n",
sockErrBuf );
}
@@ -297,13 +297,13 @@ unsigned tcpiiu::sendBytes ( const void *pBuf,
return nBytes;
}
-void tcpiiu::recvBytes (
+void tcpiiu::recvBytes (
void * pBuf, unsigned nBytesInBuf, statusWireIO & stat )
{
assert ( nBytesInBuf <= INT_MAX );
while ( true ) {
- int status = ::recv ( this->sock, static_cast <char *> ( pBuf ),
+ int status = ::recv ( this->sock, static_cast <char *> ( pBuf ),
static_cast <int> ( nBytesInBuf ), 0 );
if ( status > 0 ) {
@@ -322,14 +322,14 @@ void tcpiiu::recvBytes (
return;
}
- // if the circuit was locally aborted then supress
+ // if the circuit was locally aborted then supress
// warning messages about bad file descriptor etc
- if ( this->state != iiucs_connected &&
+ if ( this->state != iiucs_connected &&
this->state != iiucs_clean_shutdown ) {
stat.bytesCopied = 0u;
stat.circuitState = swioLocalAbort;
return;
- }
+ }
int localErrno = SOCKERRNO;
@@ -344,7 +344,7 @@ void tcpiiu::recvBytes (
}
if ( localErrno == SOCK_ENOBUFS ) {
- errlogPrintf (
+ errlogPrintf (
"CAC: system low on network buffers "
"- receive retry in 15 seconds\n" );
{
@@ -355,20 +355,20 @@ void tcpiiu::recvBytes (
}
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
// the replacable printf handler isnt called here
// because it reqires a callback lock which probably
// isnt appropriate here
char name[64];
- this->hostNameCacheInstance.getName (
+ this->hostNameCacheInstance.getName (
name, sizeof ( name ) );
errlogPrintf (
"Unexpected problem with CA circuit to"
- " server \"%s\" was \"%s\" - disconnecting\n",
+ " server \"%s\" was \"%s\" - disconnecting\n",
name, sockErrBuf );
-
+
stat.bytesCopied = 0u;
stat.circuitState = swioPeerAbort;
return;
@@ -376,12 +376,12 @@ void tcpiiu::recvBytes (
}
}
-tcpRecvThread::tcpRecvThread (
+tcpRecvThread::tcpRecvThread (
class tcpiiu & iiuIn, class epicsMutex & cbMutexIn,
- cacContextNotify & ctxNotifyIn, const char * pName,
+ cacContextNotify & ctxNotifyIn, const char * pName,
unsigned int stackSize, unsigned int priority ) :
thread ( *this, pName, stackSize, priority ),
- iiu ( iiuIn ), cbMutex ( cbMutexIn ),
+ iiu ( iiuIn ), cbMutex ( cbMutexIn ),
ctxNotify ( ctxNotifyIn ) {}
tcpRecvThread::~tcpRecvThread ()
@@ -407,7 +407,7 @@ void tcpRecvThread::exitWait ()
this->thread.exitWait ();
}
-bool tcpRecvThread::validFillStatus (
+bool tcpRecvThread::validFillStatus (
epicsGuard < epicsMutex > & guard, const statusWireIO & stat )
{
if ( this->iiu.state != tcpiiu::iiucs_connected &&
@@ -464,9 +464,9 @@ void tcpRecvThread::run ()
//
// We leave the bytes pending and fetch them after
- // callbacks are enabled when running in the old preemptive
+ // callbacks are enabled when running in the old preemptive
// call back disabled mode so that asynchronous wakeup via
- // file manager call backs works correctly. This does not
+ // file manager call backs works correctly. This does not
// appear to impact performance.
//
if ( ! pComBuf ) {
@@ -480,7 +480,7 @@ void tcpRecvThread::run ()
{
epicsGuard < epicsMutex > guard ( this->iiu.mutex );
-
+
if ( ! this->validFillStatus ( guard, stat ) ) {
break;
}
@@ -502,7 +502,7 @@ void tcpRecvThread::run ()
callbackManager mgr ( this->ctxNotify, this->cbMutex );
epicsGuard < epicsMutex > guard ( this->iiu.mutex );
-
+
// route legacy V42 channel connect through the recv thread -
// the only thread that should be taking the callback lock
while ( nciu * pChan = this->iiu.v42ConnCallbackPend.first () ) {
@@ -525,7 +525,7 @@ void tcpRecvThread::run ()
}
this->iiu._receiveThreadIsBusy = false;
// reschedule connection activity watchdog
- this->iiu.recvDog.messageArrivalNotify ( guard );
+ this->iiu.recvDog.messageArrivalNotify ( guard );
//
// if this thread has connected channels with subscriptions
// that need to be sent then wakeup the send thread
@@ -533,13 +533,13 @@ void tcpRecvThread::run ()
sendWakeupNeeded = true;
}
}
-
+
//
// we dont feel comfortable calling this with a lock applied
// (it might block for longer than we like)
//
- // we would prefer to improve efficency by trying, first, a
- // recv with the new MSG_DONTWAIT flag set, but there isnt
+ // we would prefer to improve efficency by trying, first, a
+ // recv with the new MSG_DONTWAIT flag set, but there isnt
// universal support
//
bool bytesArePending = this->iiu.bytesArePendingInOS ();
@@ -548,7 +548,7 @@ void tcpRecvThread::run ()
if ( bytesArePending ) {
if ( ! this->iiu.busyStateDetected ) {
this->iiu.contigRecvMsgCount++;
- if ( this->iiu.contigRecvMsgCount >=
+ if ( this->iiu.contigRecvMsgCount >=
this->iiu.cacRef.maxContiguousFrames ( guard ) ) {
this->iiu.busyStateDetected = true;
sendWakeupNeeded = true;
@@ -578,7 +578,7 @@ void tcpRecvThread::run ()
}
}
catch ( std::bad_alloc & ) {
- errlogPrintf (
+ errlogPrintf (
"CA client library tcp receive thread "
"terminating due to no space in pool "
"C++ exception\n" );
@@ -586,15 +586,15 @@ void tcpRecvThread::run ()
this->iiu.initiateCleanShutdown ( guard );
}
catch ( std::exception & except ) {
- errlogPrintf (
+ errlogPrintf (
"CA client library tcp receive thread "
- "terminating due to C++ exception \"%s\"\n",
+ "terminating due to C++ exception \"%s\"\n",
except.what () );
epicsGuard < epicsMutex > guard ( this->iiu.mutex );
this->iiu.initiateCleanShutdown ( guard );
}
catch ( ... ) {
- errlogPrintf (
+ errlogPrintf (
"CA client library tcp receive thread "
"terminating due to a non-standard C++ exception\n" );
epicsGuard < epicsMutex > guard ( this->iiu.mutex );
@@ -614,7 +614,7 @@ void tcpRecvThread::connect (
{
epicsGuardRelease < epicsMutex > unguard ( guard );
osiSockAddr tmp = this->iiu.address ();
- status = ::connect ( this->iiu.sock,
+ status = ::connect ( this->iiu.sock,
& tmp.sa, sizeof ( tmp.sa ) );
}
@@ -624,7 +624,7 @@ void tcpRecvThread::connect (
if ( status >= 0 ) {
// put the iiu into the connected state
this->iiu.state = tcpiiu::iiucs_connected;
- this->iiu.recvDog.connectNotify ( guard );
+ this->iiu.recvDog.connectNotify ( guard );
break;
}
else {
@@ -640,7 +640,7 @@ void tcpRecvThread::connect (
}
else {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
errlogPrintf ( "CAC: Unable to connect because \"%s\"\n",
sockErrBuf );
@@ -663,24 +663,24 @@ void tcpRecvThread::connect (
//
// tcpiiu::tcpiiu ()
//
-tcpiiu::tcpiiu (
- cac & cac, epicsMutex & mutexIn, epicsMutex & cbMutexIn,
- cacContextNotify & ctxNotifyIn, double connectionTimeout,
- epicsTimerQueue & timerQueue, const osiSockAddr & addrIn,
+tcpiiu::tcpiiu (
+ cac & cac, epicsMutex & mutexIn, epicsMutex & cbMutexIn,
+ cacContextNotify & ctxNotifyIn, double connectionTimeout,
+ epicsTimerQueue & timerQueue, const osiSockAddr & addrIn,
comBufMemoryManager & comBufMemMgrIn,
- unsigned minorVersion, ipAddrToAsciiEngine & engineIn,
+ unsigned minorVersion, ipAddrToAsciiEngine & engineIn,
const cacChannel::priLev & priorityIn,
SearchDestTCP * pSearchDestIn ) :
caServerID ( addrIn.ia, priorityIn ),
hostNameCacheInstance ( addrIn, engineIn ),
- recvThread ( *this, cbMutexIn, ctxNotifyIn, "CAC-TCP-recv",
+ recvThread ( *this, cbMutexIn, ctxNotifyIn, "CAC-TCP-recv",
epicsThreadGetStackSize ( epicsThreadStackBig ),
cac::highestPriorityLevelBelow ( cac.getInitializingThreadsPriority() ) ),
sendThread ( *this, "CAC-TCP-send",
epicsThreadGetStackSize ( epicsThreadStackMedium ),
cac::lowestPriorityLevelAbove (
cac.getInitializingThreadsPriority() ) ),
- recvDog ( cbMutexIn, ctxNotifyIn, mutexIn,
+ recvDog ( cbMutexIn, ctxNotifyIn, mutexIn,
*this, connectionTimeout, timerQueue ),
sendDog ( cbMutexIn, ctxNotifyIn, mutexIn,
*this, connectionTimeout, timerQueue ),
@@ -721,9 +721,9 @@ tcpiiu::tcpiiu (
if ( this->sock == INVALID_SOCKET ) {
freeListFree(this->cacRef.tcpSmallRecvBufFreeList, this->pCurData);
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
- std :: string reason =
+ std :: string reason =
"CAC: TCP circuit creation failure because \"";
reason += sockErrBuf;
reason += "\"";
@@ -735,7 +735,7 @@ tcpiiu::tcpiiu (
(char *) &flag, sizeof ( flag ) );
if ( status < 0 ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
errlogPrintf ( "CAC: problems setting socket option TCP_NODELAY = \"%s\"\n",
sockErrBuf );
@@ -746,13 +746,13 @@ tcpiiu::tcpiiu (
( char * ) &flag, sizeof ( flag ) );
if ( status < 0 ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
errlogPrintf ( "CAC: problems setting socket option SO_KEEPALIVE = \"%s\"\n",
sockErrBuf );
}
- // load message queue with messages informing server
+ // load message queue with messages informing server
// of version, user, and host name of client
{
epicsGuard < epicsMutex > guard ( this->mutex );
@@ -768,7 +768,7 @@ tcpiiu::tcpiiu (
/*
* some concern that vxWorks will run out of mBuf's
* if this change is made joh 11-10-98
- */
+ */
i = MAX_MSG_SIZE;
status = setsockopt ( this->sock, SOL_SOCKET, SO_SNDBUF,
( char * ) &i, sizeof ( i ) );
@@ -795,10 +795,10 @@ tcpiiu::tcpiiu (
osiSocklen_t sizeOfParameter = static_cast < int > ( sizeof ( nBytes ) );
status = getsockopt ( this->sock, SOL_SOCKET, SO_SNDBUF,
( char * ) &nBytes, &sizeOfParameter );
- if ( status < 0 || nBytes < 0 ||
+ if ( status < 0 || nBytes < 0 ||
sizeOfParameter != static_cast < int > ( sizeof ( nBytes ) ) ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
errlogPrintf ("CAC: problems getting socket option SO_SNDBUF = \"%s\"\n",
sockErrBuf );
@@ -815,16 +815,16 @@ tcpiiu::tcpiiu (
memset ( (void *) &this->curMsg, '\0', sizeof ( this->curMsg ) );
}
-// this must always be called by the udp thread when it holds
+// this must always be called by the udp thread when it holds
// the callback lock.
-void tcpiiu::start (
+void tcpiiu::start (
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
this->recvThread.start ();
}
-void tcpiiu::initiateCleanShutdown (
+void tcpiiu::initiateCleanShutdown (
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -849,7 +849,7 @@ void tcpiiu::initiateCleanShutdown (
}
}
-void tcpiiu::disconnectNotify (
+void tcpiiu::disconnectNotify (
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -858,7 +858,7 @@ void tcpiiu::disconnectNotify (
this->flushBlockEvent.signal ();
}
-void tcpiiu::responsiveCircuitNotify (
+void tcpiiu::responsiveCircuitNotify (
epicsGuard < epicsMutex > & cbGuard,
epicsGuard < epicsMutex > & guard )
{
@@ -868,7 +868,7 @@ void tcpiiu::responsiveCircuitNotify (
this->unresponsiveCircuit = false;
while ( nciu * pChan = this->unrespCircuit.get() ) {
this->subscripUpdateReqPend.add ( *pChan );
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_subscripUpdateReqPend;
pChan->connect ( cbGuard, guard );
}
@@ -876,7 +876,7 @@ void tcpiiu::responsiveCircuitNotify (
}
}
-void tcpiiu::sendTimeoutNotify (
+void tcpiiu::sendTimeoutNotify (
callbackManager & mgr,
epicsGuard < epicsMutex > & guard )
{
@@ -887,7 +887,7 @@ void tcpiiu::sendTimeoutNotify (
this->recvDog.sendTimeoutNotify ( mgr.cbGuard, guard );
}
-void tcpiiu::receiveTimeoutNotify (
+void tcpiiu::receiveTimeoutNotify (
callbackManager & mgr,
epicsGuard < epicsMutex > & guard )
{
@@ -896,8 +896,8 @@ void tcpiiu::receiveTimeoutNotify (
this->unresponsiveCircuitNotify ( mgr.cbGuard, guard );
}
-void tcpiiu::unresponsiveCircuitNotify (
- epicsGuard < epicsMutex > & cbGuard,
+void tcpiiu::unresponsiveCircuitNotify (
+ epicsGuard < epicsMutex > & cbGuard,
epicsGuard < epicsMutex > & guard )
{
cbGuard.assertIdenticalMutex ( this->cbMutex );
@@ -922,7 +922,7 @@ void tcpiiu::unresponsiveCircuitNotify (
if ( this->connectedList.count() ) {
char hostNameTmp[128];
this->getHostName ( guard, hostNameTmp, sizeof ( hostNameTmp ) );
- genLocalExcep ( cbGuard, guard, this->cacRef,
+ genLocalExcep ( cbGuard, guard, this->cacRef,
ECA_UNRESPTMO, hostNameTmp );
while ( nciu * pChan = this->connectedList.get () ) {
// The cac lock is released herein so there is concern that
@@ -932,7 +932,7 @@ void tcpiiu::unresponsiveCircuitNotify (
// channel. The callback lock must be taken in all of
// these situations so this code is protected.
this->unrespCircuit.add ( *pChan );
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_unrespCircuit;
pChan->unresponsiveCircuitNotify ( cbGuard, guard );
}
@@ -940,24 +940,24 @@ void tcpiiu::unresponsiveCircuitNotify (
}
}
-void tcpiiu::initiateAbortShutdown (
+void tcpiiu::initiateAbortShutdown (
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
if ( ! this->discardingPendingData ) {
- // force abortive shutdown sequence
+ // force abortive shutdown sequence
// (discard outstanding sends and receives)
struct linger tmpLinger;
tmpLinger.l_onoff = true;
tmpLinger.l_linger = 0u;
- int status = setsockopt ( this->sock, SOL_SOCKET, SO_LINGER,
+ int status = setsockopt ( this->sock, SOL_SOCKET, SO_LINGER,
reinterpret_cast <char *> ( &tmpLinger ), sizeof (tmpLinger) );
if ( status != 0 ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
- errlogPrintf ( "CAC TCP socket linger set error was %s\n",
+ errlogPrintf ( "CAC TCP socket linger set error was %s\n",
sockErrBuf );
}
this->discardingPendingData = true;
@@ -986,9 +986,9 @@ void tcpiiu::initiateAbortShutdown (
int status = ::shutdown ( this->sock, SHUT_RDWR );
if ( status ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
- errlogPrintf ("CAC TCP socket shutdown error was %s\n",
+ errlogPrintf ("CAC TCP socket shutdown error was %s\n",
sockErrBuf );
}
}
@@ -1001,7 +1001,7 @@ void tcpiiu::initiateAbortShutdown (
break;
};
- //
+ //
// wake up the send thread if it isnt blocking in send()
//
this->sendThreadFlushEvent.signal ();
@@ -1046,15 +1046,15 @@ void tcpiiu::show ( unsigned level ) const
epicsGuard < epicsMutex > locker ( this->mutex );
char buf[256];
this->hostNameCacheInstance.getName ( buf, sizeof ( buf ) );
- ::printf ( "Virtual circuit to \"%s\" at version V%u.%u state %u\n",
+ ::printf ( "Virtual circuit to \"%s\" at version V%u.%u state %u\n",
buf, CA_MAJOR_PROTOCOL_REVISION,
this->minorProtocolVersion, this->state );
if ( level > 1u ) {
::printf ( "\tcurrent data cache pointer = %p current data cache size = %lu\n",
static_cast < void * > ( this->pCurData ), this->curDataMax );
- ::printf ( "\tcontiguous receive message count=%u, busy detect bool=%u, flow control bool=%u\n",
+ ::printf ( "\tcontiguous receive message count=%u, busy detect bool=%u, flow control bool=%u\n",
this->contigRecvMsgCount, this->busyStateDetected, this->flowControlActive );
- ::printf ( "\receive thread is busy=%u\n",
+ ::printf ( "\receive thread is busy=%u\n",
this->_receiveThreadIsBusy );
}
if ( level > 2u ) {
@@ -1071,7 +1071,7 @@ void tcpiiu::show ( unsigned level ) const
if ( this->createReqPend.count () ) {
::printf ( "Create request pending channels\n" );
tsDLIterConst < nciu > pChan = this->createReqPend.firstIter ();
- while ( pChan.valid () ) {
+ while ( pChan.valid () ) {
pChan->show ( level - 2u );
pChan++;
}
@@ -1079,7 +1079,7 @@ void tcpiiu::show ( unsigned level ) const
if ( this->createRespPend.count () ) {
::printf ( "Create response pending channels\n" );
tsDLIterConst < nciu > pChan = this->createRespPend.firstIter ();
- while ( pChan.valid () ) {
+ while ( pChan.valid () ) {
pChan->show ( level - 2u );
pChan++;
}
@@ -1087,7 +1087,7 @@ void tcpiiu::show ( unsigned level ) const
if ( this->v42ConnCallbackPend.count () ) {
::printf ( "V42 Conn Callback pending channels\n" );
tsDLIterConst < nciu > pChan = this->v42ConnCallbackPend.firstIter ();
- while ( pChan.valid () ) {
+ while ( pChan.valid () ) {
pChan->show ( level - 2u );
pChan++;
}
@@ -1095,7 +1095,7 @@ void tcpiiu::show ( unsigned level ) const
if ( this->subscripReqPend.count () ) {
::printf ( "Subscription request pending channels\n" );
tsDLIterConst < nciu > pChan = this->subscripReqPend.firstIter ();
- while ( pChan.valid () ) {
+ while ( pChan.valid () ) {
pChan->show ( level - 2u );
pChan++;
}
@@ -1103,7 +1103,7 @@ void tcpiiu::show ( unsigned level ) const
if ( this->connectedList.count () ) {
::printf ( "Connected channels\n" );
tsDLIterConst < nciu > pChan = this->connectedList.firstIter ();
- while ( pChan.valid () ) {
+ while ( pChan.valid () ) {
pChan->show ( level - 2u );
pChan++;
}
@@ -1111,7 +1111,7 @@ void tcpiiu::show ( unsigned level ) const
if ( this->unrespCircuit.count () ) {
::printf ( "Unresponsive circuit channels\n" );
tsDLIterConst < nciu > pChan = this->unrespCircuit.firstIter ();
- while ( pChan.valid () ) {
+ while ( pChan.valid () ) {
pChan->show ( level - 2u );
pChan++;
}
@@ -1144,8 +1144,8 @@ void tcpiiu::flushIfRecvProcessRequested (
}
}
-bool tcpiiu::processIncoming (
- const epicsTime & currentTime,
+bool tcpiiu::processIncoming (
+ const epicsTime & currentTime,
callbackManager & mgr )
{
mgr.cbGuard.assertIdenticalMutex ( this->cbMutex );
@@ -1157,7 +1157,7 @@ bool tcpiiu::processIncoming (
//
if ( ! this->msgHeaderAvailable ) {
if ( ! this->oldMsgHeaderAvailable ) {
- this->oldMsgHeaderAvailable =
+ this->oldMsgHeaderAvailable =
this->recvQue.popOldMsgHeader ( this->curMsg );
if ( ! this->oldMsgHeaderAvailable ) {
epicsGuard < epicsMutex > guard ( this->mutex );
@@ -1166,8 +1166,8 @@ bool tcpiiu::processIncoming (
}
}
if ( this->curMsg.m_postsize == 0xffff ) {
- static const unsigned annexSize =
- sizeof ( this->curMsg.m_postsize ) +
+ static const unsigned annexSize =
+ sizeof ( this->curMsg.m_postsize ) +
sizeof ( this->curMsg.m_count );
if ( this->recvQue.occupiedBytes () < annexSize ) {
epicsGuard < epicsMutex > guard ( this->mutex );
@@ -1197,7 +1197,7 @@ bool tcpiiu::processIncoming (
// check for 8 byte aligned protocol
if ( this->curMsg.m_postsize & 0x7 ) {
this->printFormated ( mgr.cbGuard,
- "CAC: server sent missaligned payload 0x%x\n",
+ "CAC: server sent missaligned payload 0x%x\n",
this->curMsg.m_postsize );
return false;
}
@@ -1251,8 +1251,8 @@ bool tcpiiu::processIncoming (
if ( this->curMsg.m_postsize <= this->curDataMax ) {
if ( this->curMsg.m_postsize > 0u ) {
- this->curDataBytes += this->recvQue.copyOutBytes (
- &this->pCurData[this->curDataBytes],
+ this->curDataBytes += this->recvQue.copyOutBytes (
+ &this->pCurData[this->curDataBytes],
this->curMsg.m_postsize - this->curDataBytes );
if ( this->curDataBytes < this->curMsg.m_postsize ) {
epicsGuard < epicsMutex > guard ( this->mutex );
@@ -1260,7 +1260,7 @@ bool tcpiiu::processIncoming (
return true;
}
}
- bool msgOK = this->cacRef.executeResponse ( mgr, *this,
+ bool msgOK = this->cacRef.executeResponse ( mgr, *this,
currentTime, this->curMsg, this->pCurData );
if ( ! msgOK ) {
return false;
@@ -1274,7 +1274,7 @@ bool tcpiiu::processIncoming (
this->curMsg.m_postsize );
once = true;
}
- this->curDataBytes += this->recvQue.removeBytes (
+ this->curDataBytes += this->recvQue.removeBytes (
this->curMsg.m_postsize - this->curDataBytes );
if ( this->curDataBytes < this->curMsg.m_postsize ) {
epicsGuard < epicsMutex > guard ( this->mutex );
@@ -1282,7 +1282,7 @@ bool tcpiiu::processIncoming (
return true;
}
}
-
+
this->oldMsgHeaderAvailable = false;
this->msgHeaderAvailable = false;
this->curDataBytes = 0u;
@@ -1296,7 +1296,7 @@ void tcpiiu::hostNameSetRequest ( epicsGuard < epicsMutex > & guard )
if ( ! CA_V41 ( this->minorProtocolVersion ) ) {
return;
}
-
+
const char * pName = this->cacRef.pLocalHostName ();
unsigned size = strlen ( pName ) + 1u;
unsigned postSize = CA_MESSAGE_ALIGN ( size );
@@ -1307,9 +1307,9 @@ void tcpiiu::hostNameSetRequest ( epicsGuard < epicsMutex > & guard )
}
comQueSendMsgMinder minder ( this->sendQue, guard );
- this->sendQue.insertRequestHeader (
- CA_PROTO_HOST_NAME, postSize,
- 0u, 0u, 0u, 0u,
+ this->sendQue.insertRequestHeader (
+ CA_PROTO_HOST_NAME, postSize,
+ 0u, 0u, 0u, 0u,
CA_V49 ( this->minorProtocolVersion ) );
this->sendQue.pushString ( pName, size );
this->sendQue.pushString ( cacNillBytes, postSize - size );
@@ -1337,16 +1337,16 @@ void tcpiiu::userNameSetRequest ( epicsGuard < epicsMutex > & guard )
}
comQueSendMsgMinder minder ( this->sendQue, guard );
- this->sendQue.insertRequestHeader (
- CA_PROTO_CLIENT_NAME, postSize,
- 0u, 0u, 0u, 0u,
+ this->sendQue.insertRequestHeader (
+ CA_PROTO_CLIENT_NAME, postSize,
+ 0u, 0u, 0u, 0u,
CA_V49 ( this->minorProtocolVersion ) );
this->sendQue.pushString ( pName, size );
this->sendQue.pushString ( cacNillBytes, postSize - size );
minder.commit ();
}
-void tcpiiu::disableFlowControlRequest (
+void tcpiiu::disableFlowControlRequest (
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -1355,14 +1355,14 @@ void tcpiiu::disableFlowControlRequest (
this->flushRequest ( guard );
}
comQueSendMsgMinder minder ( this->sendQue, guard );
- this->sendQue.insertRequestHeader (
- CA_PROTO_EVENTS_ON, 0u,
- 0u, 0u, 0u, 0u,
+ this->sendQue.insertRequestHeader (
+ CA_PROTO_EVENTS_ON, 0u,
+ 0u, 0u, 0u, 0u,
CA_V49 ( this->minorProtocolVersion ) );
minder.commit ();
}
-void tcpiiu::enableFlowControlRequest (
+void tcpiiu::enableFlowControlRequest (
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -1371,9 +1371,9 @@ void tcpiiu::enableFlowControlRequest (
this->flushRequest ( guard );
}
comQueSendMsgMinder minder ( this->sendQue, guard );
- this->sendQue.insertRequestHeader (
- CA_PROTO_EVENTS_OFF, 0u,
- 0u, 0u, 0u, 0u,
+ this->sendQue.insertRequestHeader (
+ CA_PROTO_EVENTS_OFF, 0u,
+ 0u, 0u, 0u, 0u,
CA_V49 ( this->minorProtocolVersion ) );
minder.commit ();
}
@@ -1390,10 +1390,10 @@ void tcpiiu::versionMessage ( epicsGuard < epicsMutex > & guard,
}
comQueSendMsgMinder minder ( this->sendQue, guard );
- this->sendQue.insertRequestHeader (
- CA_PROTO_VERSION, 0u,
- static_cast < ca_uint16_t > ( priority ),
- CA_MINOR_PROTOCOL_REVISION, 0u, 0u,
+ this->sendQue.insertRequestHeader (
+ CA_PROTO_VERSION, 0u,
+ static_cast < ca_uint16_t > ( priority ),
+ CA_MINOR_PROTOCOL_REVISION, 0u, 0u,
CA_V49 ( this->minorProtocolVersion ) );
minder.commit ();
}
@@ -1401,7 +1401,7 @@ void tcpiiu::versionMessage ( epicsGuard < epicsMutex > & guard,
void tcpiiu::echoRequest ( epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
-
+
epicsUInt16 command = CA_PROTO_ECHO;
if ( ! CA_V43 ( this->minorProtocolVersion ) ) {
// we fake an echo to early server using a read sync
@@ -1412,9 +1412,9 @@ void tcpiiu::echoRequest ( epicsGuard < epicsMutex > & guard )
this->flushRequest ( guard );
}
comQueSendMsgMinder minder ( this->sendQue, guard );
- this->sendQue.insertRequestHeader (
- command, 0u,
- 0u, 0u, 0u, 0u,
+ this->sendQue.insertRequestHeader (
+ command, 0u,
+ 0u, 0u, 0u, 0u,
CA_V49 ( this->minorProtocolVersion ) );
minder.commit ();
}
@@ -1427,7 +1427,7 @@ void tcpiiu::writeRequest ( epicsGuard < epicsMutex > & guard,
throw cacChannel::badType ();
}
comQueSendMsgMinder minder ( this->sendQue, guard );
- this->sendQue.insertRequestWithPayLoad ( CA_PROTO_WRITE,
+ this->sendQue.insertRequestWithPayLoad ( CA_PROTO_WRITE,
type, nElem, chan.getSID(guard), chan.getCID(guard), pValue,
CA_V49 ( this->minorProtocolVersion ) );
minder.commit ();
@@ -1435,7 +1435,7 @@ void tcpiiu::writeRequest ( epicsGuard < epicsMutex > & guard,
void tcpiiu::writeNotifyRequest ( epicsGuard < epicsMutex > & guard,
- nciu &chan, netWriteNotifyIO &io, unsigned type,
+ nciu &chan, netWriteNotifyIO &io, unsigned type,
arrayElementCount nElem, const void *pValue )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -1447,14 +1447,14 @@ void tcpiiu::writeNotifyRequest ( epicsGuard < epicsMutex > & guard,
throw cacChannel::badType ();
}
comQueSendMsgMinder minder ( this->sendQue, guard );
- this->sendQue.insertRequestWithPayLoad ( CA_PROTO_WRITE_NOTIFY,
+ this->sendQue.insertRequestWithPayLoad ( CA_PROTO_WRITE_NOTIFY,
type, nElem, chan.getSID(guard), io.getId(), pValue,
CA_V49 ( this->minorProtocolVersion ) );
minder.commit ();
}
void tcpiiu::readNotifyRequest ( epicsGuard < epicsMutex > & guard,
- nciu & chan, netReadNotifyIO & io,
+ nciu & chan, netReadNotifyIO & io,
unsigned dataType, arrayElementCount nElem )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -1468,7 +1468,7 @@ void tcpiiu::readNotifyRequest ( epicsGuard < epicsMutex > & guard,
else {
maxBytes = MAX_TCP;
}
- arrayElementCount maxElem =
+ arrayElementCount maxElem =
( maxBytes - dbr_size[dataType] ) / dbr_value_size[dataType];
if ( nElem > maxElem ) {
throw cacChannel::msgBodyCacheTooSmall ();
@@ -1476,21 +1476,21 @@ void tcpiiu::readNotifyRequest ( epicsGuard < epicsMutex > & guard,
if (nElem == 0 && !CA_V413(this->minorProtocolVersion))
nElem = chan.getcount();
comQueSendMsgMinder minder ( this->sendQue, guard );
- this->sendQue.insertRequestHeader (
- CA_PROTO_READ_NOTIFY, 0u,
- static_cast < ca_uint16_t > ( dataType ),
- static_cast < ca_uint32_t > ( nElem ),
- chan.getSID(guard), io.getId(),
+ this->sendQue.insertRequestHeader (
+ CA_PROTO_READ_NOTIFY, 0u,
+ static_cast < ca_uint16_t > ( dataType ),
+ static_cast < ca_uint32_t > ( nElem ),
+ chan.getSID(guard), io.getId(),
CA_V49 ( this->minorProtocolVersion ) );
minder.commit ();
}
-void tcpiiu::createChannelRequest (
+void tcpiiu::createChannelRequest (
nciu & chan, epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
- if ( this->state != iiucs_connected &&
+ if ( this->state != iiucs_connected &&
this->state != iiucs_connecting ) {
return;
}
@@ -1521,9 +1521,9 @@ void tcpiiu::createChannelRequest (
// here to communicate the minor version number
// starting with CA 4.1.
//
- this->sendQue.insertRequestHeader (
- CA_PROTO_CREATE_CHAN, postCnt,
- 0u, 0u, identity, CA_MINOR_PROTOCOL_REVISION,
+ this->sendQue.insertRequestHeader (
+ CA_PROTO_CREATE_CHAN, postCnt,
+ 0u, 0u, identity, CA_MINOR_PROTOCOL_REVISION,
CA_V49 ( this->minorProtocolVersion ) );
if ( nameLength ) {
this->sendQue.pushString ( pName, nameLength );
@@ -1544,9 +1544,9 @@ void tcpiiu::clearChannelRequest ( epicsGuard < epicsMutex > & guard,
return;
}
comQueSendMsgMinder minder ( this->sendQue, guard );
- this->sendQue.insertRequestHeader (
- CA_PROTO_CLEAR_CHANNEL, 0u,
- 0u, 0u, sid, cid,
+ this->sendQue.insertRequestHeader (
+ CA_PROTO_CLEAR_CHANNEL, 0u,
+ 0u, 0u, sid, cid,
CA_V49 ( this->minorProtocolVersion ) );
minder.commit ();
}
@@ -1555,14 +1555,14 @@ void tcpiiu::clearChannelRequest ( epicsGuard < epicsMutex > & guard,
// this routine return void because if this internally fails the best response
// is to try again the next time that we reconnect
//
-void tcpiiu::subscriptionRequest (
+void tcpiiu::subscriptionRequest (
epicsGuard < epicsMutex > & guard,
nciu & chan, netSubscription & subscr )
{
guard.assertIdenticalMutex ( this->mutex );
// there are situations where the circuit is disconnected, but
// the channel does not know this yet
- if ( this->state != iiucs_connected &&
+ if ( this->state != iiucs_connected &&
this->state != iiucs_connecting ) {
return;
}
@@ -1587,11 +1587,11 @@ void tcpiiu::subscriptionRequest (
}
comQueSendMsgMinder minder ( this->sendQue, guard );
// nElement bounds checked above
- this->sendQue.insertRequestHeader (
- CA_PROTO_EVENT_ADD, 16u,
- static_cast < ca_uint16_t > ( dataType ),
- static_cast < ca_uint32_t > ( nElem ),
- chan.getSID(guard), subscr.getId(),
+ this->sendQue.insertRequestHeader (
+ CA_PROTO_EVENT_ADD, 16u,
+ static_cast < ca_uint16_t > ( dataType ),
+ static_cast < ca_uint32_t > ( nElem ),
+ chan.getSID(guard), subscr.getId(),
CA_V49 ( this->minorProtocolVersion ) );
// extension
@@ -1607,7 +1607,7 @@ void tcpiiu::subscriptionRequest (
// this routine return void because if this internally fails the best response
// is to try again the next time that we reconnect
//
-void tcpiiu::subscriptionUpdateRequest (
+void tcpiiu::subscriptionUpdateRequest (
epicsGuard < epicsMutex > & guard,
nciu & chan, netSubscription & subscr )
{
@@ -1634,11 +1634,11 @@ void tcpiiu::subscriptionUpdateRequest (
}
comQueSendMsgMinder minder ( this->sendQue, guard );
// nElem boounds checked above
- this->sendQue.insertRequestHeader (
- CA_PROTO_READ_NOTIFY, 0u,
- static_cast < ca_uint16_t > ( dataType ),
- static_cast < ca_uint32_t > ( nElem ),
- chan.getSID (guard), subscr.getId (),
+ this->sendQue.insertRequestHeader (
+ CA_PROTO_READ_NOTIFY, 0u,
+ static_cast < ca_uint16_t > ( dataType ),
+ static_cast < ca_uint32_t > ( nElem ),
+ chan.getSID (guard), subscr.getId (),
CA_V49 ( this->minorProtocolVersion ) );
minder.commit ();
}
@@ -1653,12 +1653,12 @@ void tcpiiu::subscriptionCancelRequest ( epicsGuard < epicsMutex > & guard,
return;
}
comQueSendMsgMinder minder ( this->sendQue, guard );
- this->sendQue.insertRequestHeader (
- CA_PROTO_EVENT_CANCEL, 0u,
- static_cast < ca_uint16_t > ( subscr.getType ( guard ) ),
+ this->sendQue.insertRequestHeader (
+ CA_PROTO_EVENT_CANCEL, 0u,
+ static_cast < ca_uint16_t > ( subscr.getType ( guard ) ),
static_cast < ca_uint16_t > ( subscr.getCount (
guard, CA_V413(this->minorProtocolVersion) ) ),
- chan.getSID(guard), subscr.getId(),
+ chan.getSID(guard), subscr.getId(),
CA_V49 ( this->minorProtocolVersion ) );
minder.commit ();
}
@@ -1689,10 +1689,10 @@ bool tcpiiu::sendThreadFlush ( epicsGuard < epicsMutex > & guard )
return false;
}
- // set it here with this odd order because we must have
+ // set it here with this odd order because we must have
// the lock and we must have already sent the bytes
this->unacknowledgedSendBytes += bytesToBeSent;
- if ( this->unacknowledgedSendBytes >
+ if ( this->unacknowledgedSendBytes >
this->socketLibrarySendBufferSize ) {
this->recvDog.sendBacklogProgressNotify ( guard );
}
@@ -1712,25 +1712,25 @@ void tcpiiu :: flush ( epicsGuard < epicsMutex > & guard )
this->flushRequest ( guard );
// the process thread is not permitted to flush as this
// can result in a push / pull deadlock on the TCP pipe.
- // Instead, the process thread scheduals the flush with the
- // send thread which runs at a higher priority than the
+ // Instead, the process thread scheduals the flush with the
+ // send thread which runs at a higher priority than the
// receive thread. The same applies to the UDP thread for
// locking hierarchy reasons.
if ( ! epicsThreadPrivateGet ( caClientCallbackThreadId ) ) {
// enable / disable of call back preemption must occur here
// because the tcpiiu might disconnect while waiting and its
- // pointer to this cac might become invalid
+ // pointer to this cac might become invalid
assert ( this->blockingForFlush < UINT_MAX );
this->blockingForFlush++;
while ( this->sendQue.flushBlockThreshold() ) {
bool userRequestsCanBeAccepted =
this->state == iiucs_connected ||
- ( ! this->ca_v42_ok ( guard ) &&
+ ( ! this->ca_v42_ok ( guard ) &&
this->state == iiucs_connecting );
// fail the users request if we have a disconnected
// or unresponsive circuit
- if ( ! userRequestsCanBeAccepted ||
+ if ( ! userRequestsCanBeAccepted ||
this->unresponsiveCircuit ) {
this->decrementBlockingForFlushCount ( guard );
throw cacChannel::notConnected ();
@@ -1743,7 +1743,7 @@ void tcpiiu :: flush ( epicsGuard < epicsMutex > & guard )
}
}
-unsigned tcpiiu::requestMessageBytesPending (
+unsigned tcpiiu::requestMessageBytesPending (
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -1756,7 +1756,7 @@ unsigned tcpiiu::requestMessageBytesPending (
return sendQue.occupiedBytes ();
}
-void tcpiiu::decrementBlockingForFlushCount (
+void tcpiiu::decrementBlockingForFlushCount (
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -1789,10 +1789,10 @@ void tcpiiu::requestRecvProcessPostponedFlush (
this->recvProcessPostponedFlush = true;
}
-unsigned tcpiiu::getHostName (
+unsigned tcpiiu::getHostName (
epicsGuard < epicsMutex > & guard,
char * pBuf, unsigned bufLength ) const throw ()
-{
+{
guard.assertIdenticalMutex ( this->mutex );
return this->hostNameCacheInstance.getName ( pBuf, bufLength );
}
@@ -1804,8 +1804,8 @@ const char * tcpiiu::pHostName (
return this->hostNameCacheInstance.pointer ();
}
-void tcpiiu::disconnectAllChannels (
- epicsGuard < epicsMutex > & cbGuard,
+void tcpiiu::disconnectAllChannels (
+ epicsGuard < epicsMutex > & cbGuard,
epicsGuard < epicsMutex > & guard,
class udpiiu & discIIU )
{
@@ -1818,21 +1818,21 @@ void tcpiiu::disconnectAllChannels (
while ( nciu * pChan = this->createRespPend.get () ) {
// we dont yet know the server's id so we cant
- // send a channel delete request and will instead
+ // send a channel delete request and will instead
// trust that the server can do the proper cleanup
// when the circuit disconnects
discIIU.installDisconnectedChannel ( guard, *pChan );
}
-
+
while ( nciu * pChan = this->v42ConnCallbackPend.get () ) {
- this->clearChannelRequest ( guard,
+ this->clearChannelRequest ( guard,
pChan->getSID(guard), pChan->getCID(guard) );
discIIU.installDisconnectedChannel ( guard, *pChan );
}
while ( nciu * pChan = this->subscripReqPend.get () ) {
pChan->disconnectAllIO ( cbGuard, guard );
- this->clearChannelRequest ( guard,
+ this->clearChannelRequest ( guard,
pChan->getSID(guard), pChan->getCID(guard) );
discIIU.installDisconnectedChannel ( guard, *pChan );
pChan->unresponsiveCircuitNotify ( cbGuard, guard );
@@ -1840,7 +1840,7 @@ void tcpiiu::disconnectAllChannels (
while ( nciu * pChan = this->connectedList.get () ) {
pChan->disconnectAllIO ( cbGuard, guard );
- this->clearChannelRequest ( guard,
+ this->clearChannelRequest ( guard,
pChan->getSID(guard), pChan->getCID(guard) );
discIIU.installDisconnectedChannel ( guard, *pChan );
pChan->unresponsiveCircuitNotify ( cbGuard, guard );
@@ -1848,16 +1848,16 @@ void tcpiiu::disconnectAllChannels (
while ( nciu * pChan = this->unrespCircuit.get () ) {
// if we know that the circuit is unresponsive
- // then we dont send a channel delete request and
- // will instead trust that the server can do the
+ // then we dont send a channel delete request and
+ // will instead trust that the server can do the
// proper cleanup when the circuit disconnects
pChan->disconnectAllIO ( cbGuard, guard );
discIIU.installDisconnectedChannel ( guard, *pChan );
}
-
+
while ( nciu * pChan = this->subscripUpdateReqPend.get () ) {
pChan->disconnectAllIO ( cbGuard, guard );
- this->clearChannelRequest ( guard,
+ this->clearChannelRequest ( guard,
pChan->getSID(guard), pChan->getCID(guard) );
discIIU.installDisconnectedChannel ( guard, *pChan );
pChan->unresponsiveCircuitNotify ( cbGuard, guard );
@@ -1867,71 +1867,71 @@ void tcpiiu::disconnectAllChannels (
this->initiateCleanShutdown ( guard );
}
-void tcpiiu::unlinkAllChannels (
- epicsGuard < epicsMutex > & cbGuard,
+void tcpiiu::unlinkAllChannels (
+ epicsGuard < epicsMutex > & cbGuard,
epicsGuard < epicsMutex > & guard )
{
cbGuard.assertIdenticalMutex ( this->cbMutex );
guard.assertIdenticalMutex ( this->mutex );
while ( nciu * pChan = this->createReqPend.get () ) {
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_none;
pChan->serviceShutdownNotify ( cbGuard, guard );
}
while ( nciu * pChan = this->createRespPend.get () ) {
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_none;
// we dont yet know the server's id so we cant
- // send a channel delete request and will instead
+ // send a channel delete request and will instead
// trust that the server can do the proper cleanup
// when the circuit disconnects
pChan->serviceShutdownNotify ( cbGuard, guard );
}
-
+
while ( nciu * pChan = this->v42ConnCallbackPend.get () ) {
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_none;
- this->clearChannelRequest ( guard,
+ this->clearChannelRequest ( guard,
pChan->getSID(guard), pChan->getCID(guard) );
pChan->serviceShutdownNotify ( cbGuard, guard );
}
while ( nciu * pChan = this->subscripReqPend.get () ) {
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_none;
pChan->disconnectAllIO ( cbGuard, guard );
- this->clearChannelRequest ( guard,
+ this->clearChannelRequest ( guard,
pChan->getSID(guard), pChan->getCID(guard) );
pChan->serviceShutdownNotify ( cbGuard, guard );
}
while ( nciu * pChan = this->connectedList.get () ) {
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_none;
pChan->disconnectAllIO ( cbGuard, guard );
- this->clearChannelRequest ( guard,
+ this->clearChannelRequest ( guard,
pChan->getSID(guard), pChan->getCID(guard) );
pChan->serviceShutdownNotify ( cbGuard, guard );
}
while ( nciu * pChan = this->unrespCircuit.get () ) {
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_none;
pChan->disconnectAllIO ( cbGuard, guard );
// if we know that the circuit is unresponsive
- // then we dont send a channel delete request and
- // will instead trust that the server can do the
+ // then we dont send a channel delete request and
+ // will instead trust that the server can do the
// proper cleanup when the circuit disconnects
pChan->serviceShutdownNotify ( cbGuard, guard );
}
-
+
while ( nciu * pChan = this->subscripUpdateReqPend.get () ) {
- pChan->channelNode::listMember =
+ pChan->channelNode::listMember =
channelNode::cs_none;
pChan->disconnectAllIO ( cbGuard, guard );
- this->clearChannelRequest ( guard,
+ this->clearChannelRequest ( guard,
pChan->getSID(guard), pChan->getCID(guard) );
pChan->serviceShutdownNotify ( cbGuard, guard );
}
@@ -1940,9 +1940,9 @@ void tcpiiu::unlinkAllChannels (
this->initiateCleanShutdown ( guard );
}
-void tcpiiu::installChannel (
- epicsGuard < epicsMutex > & guard,
- nciu & chan, unsigned sidIn,
+void tcpiiu::installChannel (
+ epicsGuard < epicsMutex > & guard,
+ nciu & chan, unsigned sidIn,
ca_uint16_t typeIn, arrayElementCount countIn )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -1951,12 +1951,12 @@ void tcpiiu::installChannel (
this->channelCountTot++;
chan.channelNode::listMember = channelNode::cs_createReqPend;
chan.searchReplySetUp ( *this, sidIn, typeIn, countIn, guard );
- // The tcp send thread runs at apriority below the udp thread
+ // The tcp send thread runs at apriority below the udp thread
// so that this will not send small packets
this->sendThreadFlushEvent.signal ();
}
-bool tcpiiu :: connectNotify (
+bool tcpiiu :: connectNotify (
epicsGuard < epicsMutex > & guard, nciu & chan )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -1980,7 +1980,7 @@ bool tcpiiu :: connectNotify (
return wasExpected;
}
-void tcpiiu::uninstallChan (
+void tcpiiu::uninstallChan (
epicsGuard < epicsMutex > & guard, nciu & chan )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -2008,7 +2008,7 @@ void tcpiiu::uninstallChan (
this->subscripUpdateReqPend.remove ( chan );
break;
default:
- errlogPrintf (
+ errlogPrintf (
"cac: attempt to uninstall channel from tcp iiu, but it inst installed there?" );
}
chan.channelNode::listMember = channelNode::cs_none;
@@ -2018,8 +2018,8 @@ void tcpiiu::uninstallChan (
}
}
-int tcpiiu :: printFormated (
- epicsGuard < epicsMutex > & cbGuard,
+int tcpiiu :: printFormated (
+ epicsGuard < epicsMutex > & cbGuard,
const char *pformat, ... )
{
cbGuard.assertIdenticalMutex ( this->cbMutex );
@@ -2028,11 +2028,11 @@ int tcpiiu :: printFormated (
int status;
va_start ( theArgs, pformat );
-
+
status = this->cacRef.varArgsPrintFormated ( cbGuard, pformat, theArgs );
-
+
va_end ( theArgs );
-
+
return status;
}
@@ -2054,7 +2054,7 @@ bool tcpiiu::bytesArePendingInOS () const
tmo.tv_usec = 0;
int status = select ( this->sock + 1, & readBits, NULL, NULL, & tmo );
if ( status > 0 ) {
- if ( FD_ISSET ( this->sock, & readBits ) ) {
+ if ( FD_ISSET ( this->sock, & readBits ) ) {
return true;
}
}
@@ -2079,8 +2079,8 @@ double tcpiiu::receiveWatchdogDelay (
}
/*
- * Certain OS, such as HPUX, do not unblock a socket system call
- * when another thread asynchronously calls both shutdown() and
+ * Certain OS, such as HPUX, do not unblock a socket system call
+ * when another thread asynchronously calls both shutdown() and
* close(). To solve this problem we need to employ OS specific
* mechanisms.
*/
@@ -2117,8 +2117,8 @@ unsigned tcpiiu::channelCount ( epicsGuard < epicsMutex > & guard )
return this->channelCountTot;
}
-void tcpiiu::uninstallChanDueToSuccessfulSearchResponse (
- epicsGuard < epicsMutex > & guard, nciu & chan,
+void tcpiiu::uninstallChanDueToSuccessfulSearchResponse (
+ epicsGuard < epicsMutex > & guard, nciu & chan,
const class epicsTime & currentTime )
{
netiiu::uninstallChanDueToSuccessfulSearchResponse (
@@ -2126,7 +2126,7 @@ void tcpiiu::uninstallChanDueToSuccessfulSearchResponse (
}
bool tcpiiu::searchMsg (
- epicsGuard < epicsMutex > & guard, ca_uint32_t id,
+ epicsGuard < epicsMutex > & guard, ca_uint32_t id,
const char * pName, unsigned nameLength )
{
return netiiu::searchMsg (
@@ -2193,7 +2193,7 @@ void tcpiiu :: versionRespNotify ( const caHdrLargeArray & msg )
void tcpiiu :: searchRespNotify (
const epicsTime & currentTime, const caHdrLargeArray & msg )
-{
+{
/*
* the type field is abused to carry the port number
* so that we can have multiple servers on one host
@@ -2207,7 +2207,7 @@ void tcpiiu :: searchRespNotify (
else {
serverAddr = this->address ();
}
- cacRef.transferChanToVirtCircuit
- ( msg.m_available, msg.m_cid, 0xffff,
+ cacRef.transferChanToVirtCircuit
+ ( msg.m_available, msg.m_cid, 0xffff,
0, minorProtocolVersion, serverAddr, currentTime );
}
diff --git a/modules/ca/src/client/test/ca_test.h b/modules/ca/src/client/test/ca_test.h
index 076f893..b912376 100644
--- a/modules/ca/src/client/test/ca_test.h
+++ b/modules/ca/src/client/test/ca_test.h
@@ -8,8 +8,8 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
- * Author: Jeff Hill
- * Date: 21JAN2000
+ * Author: Jeff Hill
+ * Date: 21JAN2000
*/
#ifdef __cplusplus
diff --git a/modules/ca/src/client/test_event.cpp b/modules/ca/src/client/test_event.cpp
index 8b5a8bb..058a27b 100644
--- a/modules/ca/src/client/test_event.cpp
+++ b/modules/ca/src/client/test_event.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
*
@@ -32,7 +32,7 @@ extern "C" void epicsShareAPI ca_test_event ( struct event_handler_args args )
}
}
- printf ( "ca_test_event() for channel \"%s\" with native type %s\n",
+ printf ( "ca_test_event() for channel \"%s\" with native type %s\n",
ca_name(args.chid), pNativeTypeName );
if ( ! ( CA_M_SUCCESS & args.status ) ) {
@@ -49,7 +49,7 @@ extern "C" void epicsShareAPI ca_test_event ( struct event_handler_args args )
* ca_dump_dbr()
* dump the specified dbr type to stdout
*/
-extern "C" void epicsShareAPI ca_dump_dbr (
+extern "C" void epicsShareAPI ca_dump_dbr (
chtype type, unsigned count, const void * pbuffer )
{
unsigned i;
@@ -132,7 +132,7 @@ extern "C" void epicsShareAPI ca_dump_dbr (
case DBR_GR_STRING:
case DBR_CTRL_STRING:
{
- struct dbr_sts_string *pvalue
+ struct dbr_sts_string *pvalue
= (struct dbr_sts_string *) pbuffer;
printf("%2d %2d",pvalue->status,pvalue->severity);
printf("\tValue: %s",pvalue->value);
@@ -219,7 +219,7 @@ extern "C" void epicsShareAPI ca_dump_dbr (
}
case DBR_TIME_STRING:
{
- struct dbr_time_string *pvalue
+ struct dbr_time_string *pvalue
= (struct dbr_time_string *) pbuffer;
epicsTimeToStrftime(tsString,sizeof(tsString),
@@ -564,12 +564,12 @@ extern "C" void epicsShareAPI ca_dump_dbr (
}
case DBR_STSACK_STRING:
{
- struct dbr_stsack_string *pvalue
- = (struct dbr_stsack_string *)pbuffer;
- printf("%2d %2d",pvalue->status,pvalue->severity);
- printf(" %2d %2d",pvalue->ackt,pvalue->acks);
- printf(" %s",pvalue->value);
- break;
+ struct dbr_stsack_string *pvalue
+ = (struct dbr_stsack_string *)pbuffer;
+ printf("%2d %2d",pvalue->status,pvalue->severity);
+ printf(" %2d %2d",pvalue->ackt,pvalue->acks);
+ printf(" %s",pvalue->value);
+ break;
}
case DBR_CLASS_NAME:
{
@@ -579,10 +579,9 @@ extern "C" void epicsShareAPI ca_dump_dbr (
break;
}
default:
- printf (
+ printf (
"unsupported by ca_dbrDump()" );
break;
}
printf("\n");
}
-
diff --git a/modules/ca/src/client/ucx.h b/modules/ca/src/client/ucx.h
index c164161..0e1ef4c 100644
--- a/modules/ca/src/client/ucx.h
+++ b/modules/ca/src/client/ucx.h
@@ -9,17 +9,17 @@
\*************************************************************************/
/*
*
- * U C X . H
- * UNIX ioctl structures and defines used for VAX/UCX
+ * U C X . H
+ * UNIX ioctl structures and defines used for VAX/UCX
*
*/
#ifndef _UCX_H_
# define _UCX_H_
#ifdef UCX
-#define IFF_UP 0x1 /* interface is up */
-#define IFF_BROADCAST 0x2 /* broadcast address valid */
-#define IFF_LOOPBACK 0x8 /* is a loopback net */
+#define IFF_UP 0x1 /* interface is up */
+#define IFF_BROADCAST 0x2 /* broadcast address valid */
+#define IFF_LOOPBACK 0x8 /* is a loopback net */
#define IFF_POINTOPOINT 0x10 /* interface is point to point */
/*
* Interface request structure used for socket
@@ -27,23 +27,23 @@
* definitions which begin with ifr_name. The
* remainder may be interface specific.
*/
-struct ifreq {
-#define IFNAMSIZ 16
- char ifr_name[IFNAMSIZ]; /* if name, e.g. "en0" */
- union {
- struct sockaddr ifru_addr;
- struct sockaddr ifru_dstaddr;
- struct sockaddr ifru_broadaddr;
- short ifru_flags;
- int ifru_metric;
- caddr_t ifru_data;
- } ifr_ifru;
-#define ifr_addr ifr_ifru.ifru_addr /* address */
-#define ifr_dstaddr ifr_ifru.ifru_dstaddr /* other end of p-to-p link */
-#define ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */
-#define ifr_flags ifr_ifru.ifru_flags /* flags */
-#define ifr_metric ifr_ifru.ifru_metric /* metric */
-#define ifr_data ifr_ifru.ifru_data /* for use by interface */
+struct ifreq {
+#define IFNAMSIZ 16
+ char ifr_name[IFNAMSIZ]; /* if name, e.g. "en0" */
+ union {
+ struct sockaddr ifru_addr;
+ struct sockaddr ifru_dstaddr;
+ struct sockaddr ifru_broadaddr;
+ short ifru_flags;
+ int ifru_metric;
+ caddr_t ifru_data;
+ } ifr_ifru;
+#define ifr_addr ifr_ifru.ifru_addr /* address */
+#define ifr_dstaddr ifr_ifru.ifru_dstaddr /* other end of p-to-p link */
+#define ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */
+#define ifr_flags ifr_ifru.ifru_flags /* flags */
+#define ifr_metric ifr_ifru.ifru_metric /* metric */
+#define ifr_data ifr_ifru.ifru_data /* for use by interface */
};
/* Structure used in SIOCGIFCONF request.
@@ -51,14 +51,14 @@ struct ifreq {
* for machine (useful for programs which
* must know all networks accessible).
*/
-struct ifconf {
- int ifc_len; /* size of associated buffer */
- union {
- caddr_t ifcu_buf;
- struct ifreq *ifcu_req;
- } ifc_ifcu;
-#define ifc_buf ifc_ifcu.ifcu_buf /* buffer address */
-#define ifc_req ifc_ifcu.ifcu_req /* array of structures returned */
+struct ifconf {
+ int ifc_len; /* size of associated buffer */
+ union {
+ caddr_t ifcu_buf;
+ struct ifreq *ifcu_req;
+ } ifc_ifcu;
+#define ifc_buf ifc_ifcu.ifcu_buf /* buffer address */
+#define ifc_req ifc_ifcu.ifcu_req /* array of structures returned */
};
#ifndef NBBY
@@ -87,7 +87,7 @@ typedef int fd_set ;
#define FD_ZERO(p) memset((char *)(p), 0, sizeof (*(p)))
#include <iodef.h>
-#define IO$_RECEIVE (IO$_WRITEVBLK)
+#define IO$_RECEIVE (IO$_WRITEVBLK)
struct timezone {
int tz_minuteswest ; /* minutes west of Greenwich */
diff --git a/modules/ca/src/client/udpiiu.cpp b/modules/ca/src/client/udpiiu.cpp
index 4efa8ba..28bef35 100644
--- a/modules/ca/src/client/udpiiu.cpp
+++ b/modules/ca/src/client/udpiiu.cpp
@@ -4,7 +4,7 @@
* Copyright (c) 2002 The Regents of the University of California, as
* Operator of Los Alamos National Laboratory.
* EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
@@ -42,7 +42,7 @@
#include "disconnectGovernorTimer.h"
// UDP protocol dispatch table
-const udpiiu::pProtoStubUDP udpiiu::udpJumpTableCAC [] =
+const udpiiu::pProtoStubUDP udpiiu::udpJumpTableCAC [] =
{
&udpiiu::versionAction,
&udpiiu::badUDPRespAction,
@@ -113,16 +113,16 @@ unsigned getNTimers(double maxPeriod)
//
// udpiiu::udpiiu ()
//
-udpiiu::udpiiu (
+udpiiu::udpiiu (
epicsGuard < epicsMutex > & cacGuard,
- epicsTimerQueueActive & timerQueue,
- epicsMutex & cbMutexIn,
+ epicsTimerQueueActive & timerQueue,
+ epicsMutex & cbMutexIn,
epicsMutex & cacMutexIn,
cacContextNotify & ctxNotifyIn,
cac & cac,
unsigned port,
tsDLList < SearchDest > & searchDestListIn ) :
- recvThread ( *this, ctxNotifyIn, cbMutexIn, "CAC-UDP",
+ recvThread ( *this, ctxNotifyIn, cbMutexIn, "CAC-UDP",
epicsThreadGetStackSize ( epicsThreadStackMedium ),
cac::lowestPriorityLevelAbove (
cac::lowestPriorityLevelAbove (
@@ -159,19 +159,19 @@ udpiiu::udpiiu (
}
for ( unsigned i = 0; i < this->nTimers; i++ ) {
- this->ppSearchTmr[i].reset (
- new searchTimer ( *this, timerQueue, i, cacMutexIn,
- i > this->beaconAnomalyTimerIndex ) );
+ this->ppSearchTmr[i].reset (
+ new searchTimer ( *this, timerQueue, i, cacMutexIn,
+ i > this->beaconAnomalyTimerIndex ) );
}
- this->repeaterPort =
+ this->repeaterPort =
envGetInetPortConfigParam ( &EPICS_CA_REPEATER_PORT,
static_cast <unsigned short> (CA_REPEATER_PORT) );
this->sock = epicsSocketCreate ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
if ( this->sock == INVALID_SOCKET ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
errlogPrintf ("CAC: unable to create datagram socket because = \"%s\"\n",
sockErrBuf );
@@ -208,11 +208,11 @@ udpiiu::udpiiu (
#endif
int boolValue = true;
- int status = setsockopt ( this->sock, SOL_SOCKET, SO_BROADCAST,
+ int status = setsockopt ( this->sock, SOL_SOCKET, SO_BROADCAST,
(char *) &boolValue, sizeof ( boolValue ) );
if ( status < 0 ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
errlogPrintf ("CAC: IP broadcasting enable failed because = \"%s\"\n",
sockErrBuf );
@@ -244,26 +244,26 @@ udpiiu::udpiiu (
osiSockAddr addr;
memset ( (char *)&addr, 0 , sizeof (addr) );
addr.ia.sin_family = AF_INET;
- addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY );
+ addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY );
addr.ia.sin_port = htons ( PORT_ANY );
status = bind (this->sock, &addr.sa, sizeof (addr) );
if ( status < 0 ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
epicsSocketDestroy (this->sock);
errlogPrintf ( "CAC: unable to bind to an unconstrained address because = \"%s\"\n",
sockErrBuf );
throwWithLocation ( noSocket () );
}
-
+
{
osiSockAddr tmpAddr;
osiSocklen_t saddr_length = sizeof ( tmpAddr );
status = getsockname ( this->sock, &tmpAddr.sa, &saddr_length );
if ( status < 0 ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
epicsSocketDestroy ( this->sock );
errlogPrintf ( "CAC: getsockname () error was \"%s\"\n", sockErrBuf );
@@ -284,9 +284,9 @@ udpiiu::udpiiu (
ELLLIST dest;
ellInit ( & dest );
configureChannelAccessAddressList ( & dest, this->sock, this->serverPort );
- while ( osiSockAddrNode *
+ while ( osiSockAddrNode *
pNode = reinterpret_cast < osiSockAddrNode * > ( ellGet ( & dest ) ) ) {
- SearchDestUDP & searchDest = *
+ SearchDestUDP & searchDest = *
new SearchDestUDP ( pNode->addr, *this );
_searchDestList.add ( searchDest );
free ( pNode );
@@ -294,14 +294,14 @@ udpiiu::udpiiu (
/* add list of tcp name service addresses */
_searchDestList.add ( searchDestListIn );
-
+
caStartRepeaterIfNotInstalled ( this->repeaterPort );
this->pushVersionMsg ();
// start timers and receive thread
for ( unsigned j =0; j < this->nTimers; j++ ) {
- this->ppSearchTmr[j]->start ( cacGuard );
+ this->ppSearchTmr[j]->start ( cacGuard );
}
this->govTmr.start ();
this->repeaterSubscribeTmr.start ();
@@ -326,19 +326,19 @@ udpiiu::~udpiiu ()
iter++;
delete & curr;
}
-
+
epicsSocketDestroy ( this->sock );
}
-void udpiiu::shutdown (
- epicsGuard < epicsMutex > & cbGuard,
+void udpiiu::shutdown (
+ epicsGuard < epicsMutex > & cbGuard,
epicsGuard < epicsMutex > & guard )
{
// stop all of the timers
this->repeaterSubscribeTmr.shutdown ( cbGuard, guard );
this->govTmr.shutdown ( cbGuard, guard );
for ( unsigned i =0; i < this->nTimers; i++ ) {
- this->ppSearchTmr[i]->shutdown ( cbGuard, guard );
+ this->ppSearchTmr[i]->shutdown ( cbGuard, guard );
}
{
@@ -368,13 +368,13 @@ void udpiiu::shutdown (
}
}
-udpRecvThread::udpRecvThread (
+udpRecvThread::udpRecvThread (
udpiiu & iiuIn, cacContextNotify & ctxNotifyIn, epicsMutex & cbMutexIn,
const char * pName, unsigned stackSize, unsigned priority ) :
- iiu ( iiuIn ), cbMutex ( cbMutexIn ), ctxNotify ( ctxNotifyIn ),
+ iiu ( iiuIn ), cbMutex ( cbMutexIn ), ctxNotify ( ctxNotifyIn ),
thread ( *this, pName, stackSize, priority ) {}
-udpRecvThread::~udpRecvThread ()
+udpRecvThread::~udpRecvThread ()
{
}
@@ -395,18 +395,18 @@ void udpRecvThread::show ( unsigned /* level */ ) const
void udpRecvThread::run ()
{
epicsThreadPrivateSet ( caClientCallbackThreadId, &this->iiu );
-
- if ( this->iiu._searchDestList.count () == 0 ) {
+
+ if ( this->iiu._searchDestList.count () == 0 ) {
callbackManager mgr ( this->ctxNotify, this->cbMutex );
epicsGuard < epicsMutex > guard ( this->iiu.cacMutex );
- genLocalExcep ( mgr.cbGuard, guard,
+ genLocalExcep ( mgr.cbGuard, guard,
this->iiu.cacRef, ECA_NOSEARCHADDR, NULL );
}
do {
osiSockAddr src;
osiSocklen_t src_size = sizeof ( src );
- int status = recvfrom ( this->iiu.sock,
+ int status = recvfrom ( this->iiu.sock,
this->iiu.recvBuf, sizeof ( this->iiu.recvBuf ), 0,
& src.sa, & src_size );
@@ -414,7 +414,7 @@ void udpRecvThread::run ()
if ( status < 0 ) {
int errnoCpy = SOCKERRNO;
- if (
+ if (
errnoCpy != SOCK_EINTR &&
errnoCpy != SOCK_SHUTDOWN &&
errnoCpy != SOCK_ENOTSOCK &&
@@ -426,15 +426,15 @@ void udpRecvThread::run ()
errnoCpy != SOCK_ECONNRESET ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
- errlogPrintf ( "CAC: UDP recv error was \"%s\"\n",
+ errlogPrintf ( "CAC: UDP recv error was \"%s\"\n",
sockErrBuf );
}
}
}
else if ( status > 0 ) {
- this->iiu.postMsg ( src, this->iiu.recvBuf,
+ this->iiu.postMsg ( src, this->iiu.recvBuf,
(arrayElementCount) status, epicsTime::getMonotonic() );
}
@@ -442,14 +442,14 @@ void udpRecvThread::run ()
}
/* for sunpro compiler */
-udpiiu::M_repeaterTimerNotify::~M_repeaterTimerNotify ()
+udpiiu::M_repeaterTimerNotify::~M_repeaterTimerNotify ()
{
}
/*
* udpiiu::M_repeaterTimerNotify::repeaterRegistrationMessage ()
*
- * register with the repeater
+ * register with the repeater
*/
void udpiiu :: M_repeaterTimerNotify :: repeaterRegistrationMessage ( unsigned attemptNumber )
{
@@ -460,9 +460,9 @@ void udpiiu :: M_repeaterTimerNotify :: repeaterRegistrationMessage ( unsigned a
/*
* caRepeaterRegistrationMessage ()
*
- * register with the repeater
+ * register with the repeater
*/
-void epicsShareAPI caRepeaterRegistrationMessage (
+void epicsShareAPI caRepeaterRegistrationMessage (
SOCKET sock, unsigned repeaterPort, unsigned attemptNumber )
{
osiSockAddr saddr;
@@ -470,19 +470,19 @@ void epicsShareAPI caRepeaterRegistrationMessage (
int status;
int len;
- assert ( repeaterPort <= USHRT_MAX );
- unsigned short port = static_cast <unsigned short> ( repeaterPort );
+ assert ( repeaterPort <= USHRT_MAX );
+ unsigned short port = static_cast <unsigned short> ( repeaterPort );
/*
- * In 3.13 beta 11 and before the CA repeater calls local_addr()
- * to determine a local address and does not allow registration
- * messages originating from other addresses. In these
+ * In 3.13 beta 11 and before the CA repeater calls local_addr()
+ * to determine a local address and does not allow registration
+ * messages originating from other addresses. In these
* releases local_addr() returned the address of the first enabled
* interface found, and this address may or may not have been the loop
* back address. Starting with 3.13 beta 12 local_addr() was
- * changed to always return the address of the first enabled
+ * changed to always return the address of the first enabled
* non-loopback interface because a valid non-loopback local
- * address is required in the beacon messages. Therefore, to
+ * address is required in the beacon messages. Therefore, to
* guarantee compatibility with past versions of the repeater
* we alternate between the address returned by local_addr()
* and the loopback address here.
@@ -527,9 +527,9 @@ void epicsShareAPI caRepeaterRegistrationMessage (
*/
# if defined ( DOES_NOT_ACCEPT_ZERO_LENGTH_UDP )
len = sizeof (msg);
-# else
+# else
len = 0;
-# endif
+# endif
status = sendto ( sock, (char *) &msg, len, 0,
&saddr.sa, sizeof ( saddr ) );
@@ -543,13 +543,13 @@ void epicsShareAPI caRepeaterRegistrationMessage (
* Linux returns SOCK_ECONNREFUSED
* Windows 2000 returns SOCK_ECONNRESET
*/
- if ( errnoCpy != SOCK_EINTR &&
- errnoCpy != SOCK_ECONNREFUSED &&
+ if ( errnoCpy != SOCK_EINTR &&
+ errnoCpy != SOCK_ECONNREFUSED &&
errnoCpy != SOCK_ECONNRESET ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
- fprintf ( stderr, "error sending registration message to CA repeater daemon was \"%s\"\n",
+ fprintf ( stderr, "error sending registration message to CA repeater daemon was \"%s\"\n",
sockErrBuf );
}
}
@@ -565,7 +565,7 @@ void epicsShareAPI caRepeaterRegistrationMessage (
* however the repeater detects this, prints a message,
* and lets the other task start the repeater.
*
- * QUESTION: is there a better way to test for a port in use?
+ * QUESTION: is there a better way to test for a port in use?
* ANSWER: none that I can find.
*
* Problems with checking for the repeater installed
@@ -585,7 +585,7 @@ void epicsShareAPI caStartRepeaterIfNotInstalled ( unsigned repeaterPort )
int status;
SOCKET tmpSock;
union {
- struct sockaddr_in ia;
+ struct sockaddr_in ia;
struct sockaddr sa;
} bd;
@@ -599,8 +599,8 @@ void epicsShareAPI caStartRepeaterIfNotInstalled ( unsigned repeaterPort )
ca_uint16_t port = static_cast < ca_uint16_t > ( repeaterPort );
memset ( (char *) &bd, 0, sizeof ( bd ) );
bd.ia.sin_family = AF_INET;
- bd.ia.sin_addr.s_addr = htonl ( INADDR_ANY );
- bd.ia.sin_port = htons ( port );
+ bd.ia.sin_addr.s_addr = htonl ( INADDR_ANY );
+ bd.ia.sin_port = htons ( port );
status = bind ( tmpSock, &bd.sa, sizeof ( bd ) );
if ( status < 0 ) {
if ( SOCKERRNO == SOCK_EADDRINUSE ) {
@@ -621,14 +621,14 @@ void epicsShareAPI caStartRepeaterIfNotInstalled ( unsigned repeaterPort )
epicsSocketDestroy ( tmpSock );
if ( ! installed ) {
-
- /*
- * This is not called if the repeater is known to be
- * already running. (in the event of a race condition
- * the 2nd repeater exits when unable to attach to the
- * repeater's port)
- */
- osiSpawnDetachedProcessReturn osptr =
+
+ /*
+ * This is not called if the repeater is known to be
+ * already running. (in the event of a race condition
+ * the 2nd repeater exits when unable to attach to the
+ * repeater's port)
+ */
+ osiSpawnDetachedProcessReturn osptr =
osiSpawnDetachedProcess ( "CA Repeater", "caRepeater" );
if ( osptr == osiSpawnDetachedProcessNoSupport ) {
epicsThreadId tid;
@@ -645,19 +645,19 @@ void epicsShareAPI caStartRepeaterIfNotInstalled ( unsigned repeaterPort )
}
}
-bool udpiiu::badUDPRespAction (
+bool udpiiu::badUDPRespAction (
const caHdr &msg, const osiSockAddr &netAddr, const epicsTime ¤tTime )
{
char buf[64];
sockAddrToDottedIP ( &netAddr.sa, buf, sizeof ( buf ) );
char date[64];
currentTime.strftime ( date, sizeof ( date ), "%a %b %d %Y %H:%M:%S");
- errlogPrintf ( "CAC: Undecipherable ( bad msg code %u ) UDP message from %s at %s\n",
+ errlogPrintf ( "CAC: Undecipherable ( bad msg code %u ) UDP message from %s at %s\n",
msg.m_cmmd, buf, date );
return false;
}
-bool udpiiu::versionAction (
+bool udpiiu::versionAction (
const caHdr & hdr, const osiSockAddr &, const epicsTime & /* currentTime */ )
{
epicsGuard < epicsMutex > guard ( this->cacMutex );
@@ -671,12 +671,12 @@ bool udpiiu::versionAction (
return true;
}
-bool udpiiu :: searchRespAction (
- const caHdr & msg, const osiSockAddr & addr,
+bool udpiiu :: searchRespAction (
+ const caHdr & msg, const osiSockAddr & addr,
const epicsTime & currentTime )
{
/*
- * we dont currently know what to do with channel's
+ * we dont currently know what to do with channel's
* found to be at non-IP type addresses
*/
if ( addr.sa.sa_family != AF_INET ) {
@@ -694,7 +694,7 @@ bool udpiiu :: searchRespAction (
* care is taken here not to break gcc 3.2 aggressive alias
* analysis rules
*/
- const ca_uint8_t * pPayLoad =
+ const ca_uint8_t * pPayLoad =
reinterpret_cast < const ca_uint8_t *> ( & msg + 1 );
unsigned byte0 = pPayLoad[0];
unsigned byte1 = pPayLoad[1];
@@ -729,21 +729,21 @@ bool udpiiu :: searchRespAction (
}
if ( CA_V42 ( minorVersion ) ) {
- cacRef.transferChanToVirtCircuit
- ( msg.m_available, msg.m_cid, 0xffff,
+ cacRef.transferChanToVirtCircuit
+ ( msg.m_available, msg.m_cid, 0xffff,
0, minorVersion, serverAddr, currentTime );
}
else {
- cacRef.transferChanToVirtCircuit
- ( msg.m_available, msg.m_cid, msg.m_dataType,
+ cacRef.transferChanToVirtCircuit
+ ( msg.m_available, msg.m_cid, msg.m_dataType,
msg.m_count, minorVersion, serverAddr, currentTime );
}
return true;
}
-bool udpiiu::beaconAction (
- const caHdr & msg,
+bool udpiiu::beaconAction (
+ const caHdr & msg,
const osiSockAddr & net_addr, const epicsTime & currentTime )
{
struct sockaddr_in ina;
@@ -754,9 +754,9 @@ bool udpiiu::beaconAction (
return false;
}
- /*
+ /*
* this allows a fan-out server to potentially
- * insert the true address of the CA server
+ * insert the true address of the CA server
*
* old servers:
* 1) set this field to one of the ip addresses of the host _or_
@@ -783,29 +783,29 @@ bool udpiiu::beaconAction (
unsigned protocolRevision = msg.m_dataType;
ca_uint32_t beaconNumber = msg.m_cid;
- this->cacRef.beaconNotify ( ina, currentTime,
+ this->cacRef.beaconNotify ( ina, currentTime,
beaconNumber, protocolRevision );
return true;
}
-bool udpiiu::repeaterAckAction (
- const caHdr &,
+bool udpiiu::repeaterAckAction (
+ const caHdr &,
const osiSockAddr &, const epicsTime &)
{
this->repeaterSubscribeTmr.confirmNotify ();
return true;
}
-bool udpiiu::notHereRespAction (
- const caHdr &,
+bool udpiiu::notHereRespAction (
+ const caHdr &,
const osiSockAddr &, const epicsTime & )
{
return true;
}
-bool udpiiu::exceptionRespAction (
- const caHdr &msg,
+bool udpiiu::exceptionRespAction (
+ const caHdr &msg,
const osiSockAddr & net_addr, const epicsTime & currentTime )
{
const caHdr &reqMsg = * ( &msg + 1 );
@@ -815,22 +815,22 @@ bool udpiiu::exceptionRespAction (
currentTime.strftime ( date, sizeof ( date ), "%a %b %d %Y %H:%M:%S");
if ( msg.m_postsize > sizeof ( caHdr ) ){
- errlogPrintf (
- "error condition \"%s\" detected by %s with context \"%s\" at %s\n",
- ca_message ( msg.m_available ),
+ errlogPrintf (
+ "error condition \"%s\" detected by %s with context \"%s\" at %s\n",
+ ca_message ( msg.m_available ),
name, reinterpret_cast <const char *> ( &reqMsg + 1 ), date );
}
else{
- errlogPrintf (
- "error condition \"%s\" detected by %s at %s\n",
+ errlogPrintf (
+ "error condition \"%s\" detected by %s at %s\n",
ca_message ( msg.m_available ), name, date );
}
return true;
}
-void udpiiu::postMsg (
- const osiSockAddr & net_addr,
+void udpiiu::postMsg (
+ const osiSockAddr & net_addr,
char * pInBuf, arrayElementCount blockSize,
const epicsTime & currentTime )
{
@@ -845,16 +845,16 @@ void udpiiu::postMsg (
if ( blockSize < sizeof ( *pCurMsg ) ) {
char buf[64];
sockAddrToDottedIP ( &net_addr.sa, buf, sizeof ( buf ) );
- errlogPrintf (
- "%s: Undecipherable (too small) UDP msg from %s ignored\n",
+ errlogPrintf (
+ "%s: Undecipherable (too small) UDP msg from %s ignored\n",
__FILE__, buf );
return;
}
pCurMsg = reinterpret_cast < caHdr * > ( pInBuf );
- /*
- * fix endian of bytes
+ /*
+ * fix endian of bytes
*/
pCurMsg->m_postsize = AlignedWireRef < epicsUInt16 > ( pCurMsg->m_postsize );
pCurMsg->m_cmmd = AlignedWireRef < epicsUInt16 > ( pCurMsg->m_cmmd );
@@ -882,8 +882,8 @@ void udpiiu::postMsg (
if ( size > blockSize ) {
char buf[64];
sockAddrToDottedIP ( &net_addr.sa, buf, sizeof ( buf ) );
- errlogPrintf (
- "%s: Undecipherable (payload too small) UDP msg from %s ignored\n",
+ errlogPrintf (
+ "%s: Undecipherable (payload too small) UDP msg from %s ignored\n",
__FILE__, buf );
return;
}
@@ -920,14 +920,14 @@ bool udpiiu::pushVersionMsg ()
caHdr msg;
AlignedWireRef < epicsUInt16 > ( msg.m_cmmd ) = CA_PROTO_VERSION;
AlignedWireRef < epicsUInt32 > ( msg.m_available ) = 0;
- AlignedWireRef < epicsUInt16 > ( msg.m_dataType ) = sequenceNoIsValid;
+ AlignedWireRef < epicsUInt16 > ( msg.m_dataType ) = sequenceNoIsValid;
AlignedWireRef < epicsUInt16 > ( msg.m_count ) = CA_MINOR_PROTOCOL_REVISION;
AlignedWireRef < epicsUInt32 > ( msg.m_cid ) = this->sequenceNumber; // sequence number
return this->pushDatagramMsg ( guard, msg, 0, 0 );
}
-bool udpiiu::pushDatagramMsg ( epicsGuard < epicsMutex > & guard,
+bool udpiiu::pushDatagramMsg ( epicsGuard < epicsMutex > & guard,
const caHdr & msg, const void * pExt, ca_uint16_t extsize )
{
guard.assertIdenticalMutex ( this->cacMutex );
@@ -959,13 +959,13 @@ bool udpiiu::pushDatagramMsg ( epicsGuard < epicsMutex > & guard,
return true;
}
-udpiiu :: SearchDestUDP :: SearchDestUDP (
+udpiiu :: SearchDestUDP :: SearchDestUDP (
const osiSockAddr & destAddr, udpiiu & udpiiuIn ) :
_lastError (0u), _destAddr ( destAddr ), _udpiiu ( udpiiuIn )
{
}
-void udpiiu :: SearchDestUDP :: searchRequest (
+void udpiiu :: SearchDestUDP :: searchRequest (
epicsGuard < epicsMutex > & guard, const char * pBuf, size_t bufSize )
{
guard.assertIdenticalMutex ( _udpiiu.cacMutex );
@@ -973,7 +973,7 @@ void udpiiu :: SearchDestUDP :: searchRequest (
int bufSizeAsInt = static_cast < int > ( bufSize );
while ( true ) {
// This const_cast is needed for vxWorks:
- int status = sendto ( _udpiiu.sock, const_cast<char *>(pBuf), bufSizeAsInt, 0,
+ int status = sendto ( _udpiiu.sock, const_cast<char *>(pBuf), bufSizeAsInt, 0,
& _destAddr.sa, sizeof ( _destAddr.sa ) );
if ( status == bufSizeAsInt ) {
if ( _lastError ) {
@@ -1013,7 +1013,7 @@ void udpiiu :: SearchDestUDP :: searchRequest (
break;
} else {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
char buf[64];
sockAddrToDottedIP ( &_destAddr.sa, buf, sizeof ( buf ) );
@@ -1027,8 +1027,8 @@ void udpiiu :: SearchDestUDP :: searchRequest (
}
}
}
-
-void udpiiu :: SearchDestUDP :: show (
+
+void udpiiu :: SearchDestUDP :: show (
epicsGuard < epicsMutex > & guard, unsigned level ) const
{
guard.assertIdenticalMutex ( _udpiiu.cacMutex );
@@ -1037,17 +1037,17 @@ void udpiiu :: SearchDestUDP :: show (
:: printf ( "UDP Search destination \"%s\"\n", buf );
}
-udpiiu :: SearchRespCallback :: SearchRespCallback ( udpiiu & udpiiuIn ) :
+udpiiu :: SearchRespCallback :: SearchRespCallback ( udpiiu & udpiiuIn ) :
_udpiiu ( udpiiuIn )
{
}
-
+
void udpiiu :: SearchRespCallback :: notify (
const caHdr & msg, const void * pPayloadUntyped,
const osiSockAddr & addr, const epicsTime & currentTime )
-{
+{
/*
- * we dont currently know what to do with channel's
+ * we dont currently know what to do with channel's
* found to be at non-IP type addresses
*/
if ( addr.sa.sa_family != AF_INET ) {
@@ -1099,25 +1099,25 @@ void udpiiu :: SearchRespCallback :: notify (
}
if ( CA_V42 ( minorVersion ) ) {
- _udpiiu.cacRef.transferChanToVirtCircuit
- ( msg.m_available, msg.m_cid, 0xffff,
+ _udpiiu.cacRef.transferChanToVirtCircuit
+ ( msg.m_available, msg.m_cid, 0xffff,
0, minorVersion, serverAddr, currentTime );
}
else {
- _udpiiu.cacRef.transferChanToVirtCircuit
- ( msg.m_available, msg.m_cid, msg.m_dataType,
+ _udpiiu.cacRef.transferChanToVirtCircuit
+ ( msg.m_available, msg.m_cid, msg.m_dataType,
msg.m_count, minorVersion, serverAddr, currentTime );
}
}
-void udpiiu :: SearchRespCallback :: show (
+void udpiiu :: SearchRespCallback :: show (
epicsGuard < epicsMutex > & guard, unsigned level ) const
{
guard.assertIdenticalMutex ( _udpiiu.cacMutex );
::printf ( "udpiiu :: SearchRespCallback\n" );
}
-bool udpiiu :: datagramFlush (
+bool udpiiu :: datagramFlush (
epicsGuard < epicsMutex > & guard, const epicsTime & currentTime )
{
guard.assertIdenticalMutex ( cacMutex );
@@ -1149,10 +1149,10 @@ void udpiiu :: show ( unsigned level ) const
if ( level > 1u ) {
::printf ("\trepeater port %u\n", this->repeaterPort );
::printf ("\tdefault server port %u\n", this->serverPort );
- ::printf ( "Search Destination List with %u items\n",
+ ::printf ( "Search Destination List with %u items\n",
_searchDestList.count () );
if ( level > 2u ) {
- tsDLIterConst < SearchDest > iter (
+ tsDLIterConst < SearchDest > iter (
_searchDestList.firstIter () );
while ( iter.valid () )
{
@@ -1193,54 +1193,54 @@ bool udpiiu::wakeupMsg ()
addr.ia.sin_port = htons ( this->localPort );
// send a wakeup msg so the UDP recv thread will exit
- int status = sendto ( this->sock, reinterpret_cast < char * > ( &msg ),
+ int status = sendto ( this->sock, reinterpret_cast < char * > ( &msg ),
sizeof (msg), 0, &addr.sa, sizeof ( addr.sa ) );
return status == sizeof (msg);
}
-void udpiiu::beaconAnomalyNotify (
- epicsGuard < epicsMutex > & cacGuard )
+void udpiiu::beaconAnomalyNotify (
+ epicsGuard < epicsMutex > & cacGuard )
{
- for ( unsigned i = this->beaconAnomalyTimerIndex+1u;
+ for ( unsigned i = this->beaconAnomalyTimerIndex+1u;
i < this->nTimers; i++ ) {
- this->ppSearchTmr[i]->moveChannels ( cacGuard,
+ this->ppSearchTmr[i]->moveChannels ( cacGuard,
*this->ppSearchTmr[this->beaconAnomalyTimerIndex] );
}
}
-void udpiiu::uninstallChanDueToSuccessfulSearchResponse (
- epicsGuard < epicsMutex > & guard, nciu & chan,
+void udpiiu::uninstallChanDueToSuccessfulSearchResponse (
+ epicsGuard < epicsMutex > & guard, nciu & chan,
const epicsTime & currentTime )
{
- channelNode::channelState chanState =
+ channelNode::channelState chanState =
chan.channelNode::listMember;
if ( chanState == channelNode::cs_disconnGov ) {
this->govTmr.uninstallChan ( guard, chan );
}
else {
- this->ppSearchTmr[ chan.getSearchTimerIndex ( guard ) ]->
- uninstallChanDueToSuccessfulSearchResponse (
- guard, chan, this->lastReceivedSeqNo,
+ this->ppSearchTmr[ chan.getSearchTimerIndex ( guard ) ]->
+ uninstallChanDueToSuccessfulSearchResponse (
+ guard, chan, this->lastReceivedSeqNo,
this->lastReceivedSeqNoIsValid, currentTime );
}
}
-void udpiiu::uninstallChan (
+void udpiiu::uninstallChan (
epicsGuard < epicsMutex > & guard, nciu & chan )
{
- channelNode::channelState chanState =
+ channelNode::channelState chanState =
chan.channelNode::listMember;
if ( chanState == channelNode::cs_disconnGov ) {
this->govTmr.uninstallChan ( guard, chan );
}
else {
- this->ppSearchTmr[ chan.getSearchTimerIndex ( guard ) ]->
+ this->ppSearchTmr[ chan.getSearchTimerIndex ( guard ) ]->
uninstallChan ( guard, chan );
}
}
bool udpiiu::searchMsg (
- epicsGuard < epicsMutex > & guard, ca_uint32_t id,
+ epicsGuard < epicsMutex > & guard, ca_uint32_t id,
const char * pName, unsigned nameLength )
{
caHdr msg;
@@ -1249,25 +1249,25 @@ bool udpiiu::searchMsg (
AlignedWireRef < epicsUInt16 > ( msg.m_dataType ) = DONTREPLY;
AlignedWireRef < epicsUInt16 > ( msg.m_count ) = CA_MINOR_PROTOCOL_REVISION;
AlignedWireRef < epicsUInt32 > ( msg.m_cid ) = id;
- return this->pushDatagramMsg (
+ return this->pushDatagramMsg (
guard, msg, pName, (ca_uint16_t) nameLength );
}
-void udpiiu::installNewChannel (
+void udpiiu::installNewChannel (
epicsGuard < epicsMutex > & guard, nciu & chan, netiiu * & piiu )
{
piiu = this;
this->ppSearchTmr[0]->installChannel ( guard, chan );
}
-void udpiiu::installDisconnectedChannel (
+void udpiiu::installDisconnectedChannel (
epicsGuard < epicsMutex > & guard, nciu & chan )
{
chan.setServerAddressUnknown ( *this, guard );
this->govTmr.installChan ( guard, chan );
}
-void udpiiu::noSearchRespNotify (
+void udpiiu::noSearchRespNotify (
epicsGuard < epicsMutex > & guard, nciu & chan, unsigned index )
{
const unsigned nTimersMinusOne = this->nTimers - 1;
@@ -1280,32 +1280,32 @@ void udpiiu::noSearchRespNotify (
this->ppSearchTmr[index]->installChannel ( guard, chan );
}
-void udpiiu::boostChannel (
+void udpiiu::boostChannel (
epicsGuard < epicsMutex > & guard, nciu & chan )
{
this->ppSearchTmr[this->beaconAnomalyTimerIndex]->
installChannel ( guard, chan );
}
-void udpiiu::govExpireNotify (
+void udpiiu::govExpireNotify (
epicsGuard < epicsMutex > & guard, nciu & chan )
{
this->ppSearchTmr[0]->installChannel ( guard, chan );
}
-int udpiiu :: M_repeaterTimerNotify :: printFormated (
- epicsGuard < epicsMutex > & cbGuard,
+int udpiiu :: M_repeaterTimerNotify :: printFormated (
+ epicsGuard < epicsMutex > & cbGuard,
const char * pformat, ... )
{
va_list theArgs;
int status;
va_start ( theArgs, pformat );
-
+
status = m_udpiiu.cacRef.varArgsPrintFormated ( cbGuard, pformat, theArgs );
-
+
va_end ( theArgs );
-
+
return status;
}
@@ -1332,7 +1332,7 @@ double udpiiu::getRTTE ( epicsGuard < epicsMutex > & guard ) const
return this->rtteMean + 4 * this->rtteMeanDev;
}
-unsigned udpiiu::getHostName (
+unsigned udpiiu::getHostName (
epicsGuard < epicsMutex > & cacGuard,
char *pBuf, unsigned bufLength ) const throw ()
{
@@ -1357,71 +1357,71 @@ bool udpiiu::ca_v41_ok (
return netiiu::ca_v41_ok ( cacGuard );
}
-void udpiiu::writeRequest (
- epicsGuard < epicsMutex > & guard,
- nciu & chan, unsigned type,
+void udpiiu::writeRequest (
+ epicsGuard < epicsMutex > & guard,
+ nciu & chan, unsigned type,
arrayElementCount nElem, const void * pValue )
{
netiiu::writeRequest ( guard, chan, type, nElem, pValue );
}
-void udpiiu::writeNotifyRequest (
- epicsGuard < epicsMutex > & guard, nciu & chan,
- netWriteNotifyIO & io, unsigned type,
+void udpiiu::writeNotifyRequest (
+ epicsGuard < epicsMutex > & guard, nciu & chan,
+ netWriteNotifyIO & io, unsigned type,
arrayElementCount nElem, const void *pValue )
{
netiiu::writeNotifyRequest ( guard, chan, io, type, nElem, pValue );
}
-void udpiiu::readNotifyRequest (
- epicsGuard < epicsMutex > & guard, nciu & chan,
+void udpiiu::readNotifyRequest (
+ epicsGuard < epicsMutex > & guard, nciu & chan,
netReadNotifyIO & io, unsigned type, arrayElementCount nElem )
{
netiiu::readNotifyRequest ( guard, chan, io, type, nElem );
}
-void udpiiu::clearChannelRequest (
- epicsGuard < epicsMutex > & guard,
+void udpiiu::clearChannelRequest (
+ epicsGuard < epicsMutex > & guard,
ca_uint32_t sid, ca_uint32_t cid )
{
netiiu::clearChannelRequest ( guard, sid, cid );
}
-void udpiiu::subscriptionRequest (
- epicsGuard < epicsMutex > & guard, nciu & chan,
+void udpiiu::subscriptionRequest (
+ epicsGuard < epicsMutex > & guard, nciu & chan,
netSubscription & subscr )
{
netiiu::subscriptionRequest ( guard, chan, subscr );
}
-void udpiiu::subscriptionUpdateRequest (
- epicsGuard < epicsMutex > & guard, nciu & chan,
+void udpiiu::subscriptionUpdateRequest (
+ epicsGuard < epicsMutex > & guard, nciu & chan,
netSubscription & subscr )
{
netiiu::subscriptionUpdateRequest (
guard, chan, subscr );
}
-void udpiiu::subscriptionCancelRequest (
- epicsGuard < epicsMutex > & guard,
+void udpiiu::subscriptionCancelRequest (
+ epicsGuard < epicsMutex > & guard,
nciu & chan, netSubscription & subscr )
{
netiiu::subscriptionCancelRequest ( guard, chan, subscr );
}
-void udpiiu::flushRequest (
+void udpiiu::flushRequest (
epicsGuard < epicsMutex > & guard )
{
netiiu::flushRequest ( guard );
}
-unsigned udpiiu::requestMessageBytesPending (
+unsigned udpiiu::requestMessageBytesPending (
epicsGuard < epicsMutex > & guard )
{
return netiiu::requestMessageBytesPending ( guard );
}
-void udpiiu::flush (
+void udpiiu::flush (
epicsGuard < epicsMutex > & guard )
{
netiiu::flush ( guard );
@@ -1450,4 +1450,3 @@ ca_uint32_t udpiiu::datagramSeqNumber (
{
return this->sequenceNumber;
}
-
diff --git a/modules/ca/src/client/udpiiu.h b/modules/ca/src/client/udpiiu.h
index fdf3482..c09ee69 100644
--- a/modules/ca/src/client/udpiiu.h
+++ b/modules/ca/src/client/udpiiu.h
@@ -17,9 +17,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef udpiiuh
@@ -303,8 +303,8 @@ private:
void govExpireNotify (
epicsGuard < epicsMutex > &, nciu & );
- udpiiu ( const udpiiu & );
- udpiiu & operator = ( const udpiiu & );
+ udpiiu ( const udpiiu & );
+ udpiiu & operator = ( const udpiiu & );
friend class udpRecvThread;
diff --git a/modules/ca/src/client/virtualCircuit.h b/modules/ca/src/client/virtualCircuit.h
index d06d87c..b6ab6ed 100644
--- a/modules/ca/src/client/virtualCircuit.h
+++ b/modules/ca/src/client/virtualCircuit.h
@@ -17,9 +17,9 @@
* Copyright, 1986, The Regents of the University of California.
*
*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef virtualCircuith
@@ -331,8 +331,8 @@ private:
friend class tcpRecvThread;
friend class tcpSendThread;
- tcpiiu ( const tcpiiu & );
- tcpiiu & operator = ( const tcpiiu & );
+ tcpiiu ( const tcpiiu & );
+ tcpiiu & operator = ( const tcpiiu & );
void operator delete ( void * );
};
diff --git a/modules/database/src/ioc/as/asDbLib.h b/modules/database/src/ioc/as/asDbLib.h
index 235bbbd..289210d 100644
--- a/modules/database/src/ioc/as/asDbLib.h
+++ b/modules/database/src/ioc/as/asDbLib.h
@@ -18,8 +18,8 @@
#include "shareLib.h"
typedef struct {
- epicsCallback callback;
- long status;
+ epicsCallback callback;
+ long status;
} ASDBCALLBACK;
struct dbChannel;
diff --git a/modules/database/src/ioc/bpt/cvtTable.h b/modules/database/src/ioc/bpt/cvtTable.h
index 3746664..88da5bf 100644
--- a/modules/database/src/ioc/bpt/cvtTable.h
+++ b/modules/database/src/ioc/bpt/cvtTable.h
@@ -15,7 +15,7 @@
*/
#ifndef INCcvtTableh
-#define INCcvtTableh 1
+#define INCcvtTableh 1
#include "shareLib.h"
diff --git a/modules/database/src/ioc/db/callback.h b/modules/database/src/ioc/db/callback.h
index a77a888..0802730 100644
--- a/modules/database/src/ioc/db/callback.h
+++ b/modules/database/src/ioc/db/callback.h
@@ -8,10 +8,10 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/* includes for general purpose callback tasks */
+/* includes for general purpose callback tasks */
/*
* Original Author: Marty Kraimer
- * Date: 07-18-91
+ * Date: 07-18-91
*/
#ifndef INCcallbackh
@@ -27,9 +27,9 @@ extern "C" {
* WINDOWS also has a "CALLBACK" type def
*/
#if defined(_WIN32) && !defined(EPICS_NO_CALLBACK)
-# ifdef CALLBACK
-# undef CALLBACK
-# endif /*CALLBACK*/
+# ifdef CALLBACK
+# undef CALLBACK
+# endif /*CALLBACK*/
#endif /*_WIN32*/
#define NUM_CALLBACK_PRIORITIES 3
@@ -38,9 +38,9 @@ extern "C" {
#define priorityHigh 2
typedef struct callbackPvt {
- void (*callback)(struct callbackPvt*);
- int priority;
- void *user; /*for use by callback user*/
+ void (*callback)(struct callbackPvt*);
+ int priority;
+ void *user; /*for use by callback user*/
void *timer; /*for use by callback itself*/
}epicsCallback;
diff --git a/modules/database/src/ioc/db/dbAccess.h b/modules/database/src/ioc/db/dbAccess.h
index 96246b3..b60c38c 100644
--- a/modules/database/src/ioc/db/dbAccess.h
+++ b/modules/database/src/ioc/db/dbAccess.h
@@ -6,7 +6,7 @@
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/* dbAccess.h */
+/* dbAccess.h */
#ifndef INCdbAccessh
#define INCdbAccessh
diff --git a/modules/database/src/ioc/db/dbAccessDefs.h b/modules/database/src/ioc/db/dbAccessDefs.h
index 805dfd4..5ccfa63 100644
--- a/modules/database/src/ioc/db/dbAccessDefs.h
+++ b/modules/database/src/ioc/db/dbAccessDefs.h
@@ -6,7 +6,7 @@
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/* dbAccessDefs.h */
+/* dbAccessDefs.h */
#ifndef INCdbAccessDefsh
#define INCdbAccessDefsh
@@ -38,7 +38,7 @@ epicsShareExtern volatile int interruptAccept;
epicsShareExtern int dbAccessDebugPUTF;
/* The database field and request types are defined in dbFldTypes.h*/
-/* Data Base Request Options */
+/* Data Base Request Options */
#define DBR_STATUS 0x00000001
#define DBR_UNITS 0x00000002
#define DBR_PRECISION 0x00000004
@@ -57,9 +57,9 @@ epicsShareExtern int dbAccessDebugPUTF;
* of 10 float values + DBR_STATUS and DBR_TIME options
*
* struct {
- * DBRstatus
- * DBRtime
- * epicsFloat32 value[10]
+ * DBRstatus
+ * DBRtime
+ * epicsFloat32 value[10]
* } buffer;
*
* IMPORTANT!! The DBRoptions must be given in the order that they
@@ -74,9 +74,9 @@ epicsShareExtern int dbAccessDebugPUTF;
* rtnval=dbGetField(paddr,DBR_FLOAT,&buffer,&options,&number_elements);
*
* When dbGetField returns:
- * rtnval is error status (0 means success)
- * options has a bit set for each option that was accepted
- * number_elements is actual number of elements obtained
+ * rtnval is error status (0 means success)
+ * options has a bit set for each option that was accepted
+ * number_elements is actual number of elements obtained
*
* The individual items can be refered to by the expressions::
*
@@ -90,9 +90,9 @@ epicsShareExtern int dbAccessDebugPUTF;
* The following is also a valid declaration:
*
* typedef struct {
- * DBRstatus
- * DBRtime
- * epicsFloat32 value[10]
+ * DBRstatus
+ * DBRtime
+ * epicsFloat32 value[10]
* } MYBUFFER;
*
* With this definition you can give definitions such as the following:
@@ -103,13 +103,13 @@ epicsShareExtern int dbAccessDebugPUTF;
/* Macros for defining each option */
#define DBRstatus \
- epicsUInt16 status; /* alarm status */\
- epicsUInt16 severity; /* alarm severity*/\
- epicsUInt16 acks; /* alarm ack severity*/\
- epicsUInt16 ackt; /* Acknowledge transient alarms?*/
+ epicsUInt16 status; /* alarm status */\
+ epicsUInt16 severity; /* alarm severity*/\
+ epicsUInt16 acks; /* alarm ack severity*/\
+ epicsUInt16 ackt; /* Acknowledge transient alarms?*/
#define DB_UNITS_SIZE 16
#define DBRunits \
- char units[DB_UNITS_SIZE]; /* units */
+ char units[DB_UNITS_SIZE]; /* units */
#define DBRprecision union { \
long dp; /* number of decimal places*/\
double unused; /* for alignment */\
@@ -119,11 +119,11 @@ epicsShareExtern int dbAccessDebugPUTF;
* too late to change now. DBRprecision must be padded to
* maintain 8-byte alignment. */
#define DBRtime \
- epicsTimeStamp time; /* time stamp*/
+ epicsTimeStamp time; /* time stamp*/
#define DBRenumStrs \
- epicsUInt32 no_str; /* number of strings*/\
- epicsInt32 padenumStrs; /*padding to force 8 byte align*/\
- char strs[DB_MAX_CHOICES][MAX_STRING_SIZE]; /* string values */
+ epicsUInt32 no_str; /* number of strings*/\
+ epicsInt32 padenumStrs; /*padding to force 8 byte align*/\
+ char strs[DB_MAX_CHOICES][MAX_STRING_SIZE]; /* string values */
#define DBRgrLong \
epicsInt32 upper_disp_limit; /*upper limit of graph*/\
epicsInt32 lower_disp_limit; /*lower limit of graph*/
@@ -175,23 +175,23 @@ struct dbr_alDouble {DBRalDouble};
#ifndef INCerrMdefh
#include "errMdef.h"
#endif
-#define S_db_notFound (M_dbAccess| 1) /*Process Variable Not Found*/
-#define S_db_badDbrtype (M_dbAccess| 3) /*Illegal Database Request Type*/
-#define S_db_noMod (M_dbAccess| 5) /*Attempt to modify noMod field*/
-#define S_db_badLset (M_dbAccess| 7) /*Illegal Lock Set*/
-#define S_db_precision (M_dbAccess| 9) /*get precision failed */
-#define S_db_onlyOne (M_dbAccess|11) /*Only one element allowed*/
-#define S_db_badChoice (M_dbAccess|13) /*Illegal choice*/
-#define S_db_badField (M_dbAccess|15) /*Illegal field value*/
-#define S_db_lsetLogic (M_dbAccess|17) /*Logic error generating lock sets*/
+#define S_db_notFound (M_dbAccess| 1) /*Process Variable Not Found*/
+#define S_db_badDbrtype (M_dbAccess| 3) /*Illegal Database Request Type*/
+#define S_db_noMod (M_dbAccess| 5) /*Attempt to modify noMod field*/
+#define S_db_badLset (M_dbAccess| 7) /*Illegal Lock Set*/
+#define S_db_precision (M_dbAccess| 9) /*get precision failed */
+#define S_db_onlyOne (M_dbAccess|11) /*Only one element allowed*/
+#define S_db_badChoice (M_dbAccess|13) /*Illegal choice*/
+#define S_db_badField (M_dbAccess|15) /*Illegal field value*/
+#define S_db_lsetLogic (M_dbAccess|17) /*Logic error generating lock sets*/
#define S_db_noLSET (M_dbAccess|21) /*No link support table or entry*/
-#define S_db_noRSET (M_dbAccess|31) /*missing record support entry table*/
-#define S_db_noSupport (M_dbAccess|33) /*RSET or DSXT routine not defined*/
-#define S_db_BadSub (M_dbAccess|35) /*Subroutine not found*/
+#define S_db_noRSET (M_dbAccess|31) /*missing record support entry table*/
+#define S_db_noSupport (M_dbAccess|33) /*RSET or DSXT routine not defined*/
+#define S_db_BadSub (M_dbAccess|35) /*Subroutine not found*/
/*!!!! Do not change next line without changing src/rsrv/server.h!!!!!!!!*/
-#define S_db_Pending (M_dbAccess|37) /*Request is pending*/
+#define S_db_Pending (M_dbAccess|37) /*Request is pending*/
-#define S_db_Blocked (M_dbAccess|39) /*Request is Blocked*/
+#define S_db_Blocked (M_dbAccess|39) /*Request is Blocked*/
#define S_db_putDisabled (M_dbAccess|41) /*putFields are disabled*/
#define S_db_badHWaddr (M_dbAccess|43) /*Hardware link type not on INP/OUT*/
#define S_db_bkptSet (M_dbAccess|53) /*Breakpoint already set*/
diff --git a/modules/database/src/ioc/db/dbBkpt.h b/modules/database/src/ioc/db/dbBkpt.h
index 7240b70..705b1c3 100644
--- a/modules/database/src/ioc/db/dbBkpt.h
+++ b/modules/database/src/ioc/db/dbBkpt.h
@@ -7,7 +7,7 @@
* and higher are distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/* dbBkpt.h */
+/* dbBkpt.h */
/*
* Author: Matthew Needes
* Date: 8-30-93
diff --git a/modules/database/src/ioc/db/dbCAC.h b/modules/database/src/ioc/db/dbCAC.h
index 2d97fac..0dab81b 100644
--- a/modules/database/src/ioc/db/dbCAC.h
+++ b/modules/database/src/ioc/db/dbCAC.h
@@ -8,9 +8,9 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*
* NOTES:
* 1) This interface is preliminary and will change in the future
diff --git a/modules/database/src/ioc/db/dbCaPvt.h b/modules/database/src/ioc/db/dbCaPvt.h
index c6bdf35..f8ea758 100644
--- a/modules/database/src/ioc/db/dbCaPvt.h
+++ b/modules/database/src/ioc/db/dbCaPvt.h
@@ -22,41 +22,41 @@
#include "link.h"
/* link_action mask */
-#define CA_CLEAR_CHANNEL 0x1
-#define CA_CONNECT 0x2
-#define CA_WRITE_NATIVE 0x4
-#define CA_WRITE_STRING 0x8
-#define CA_MONITOR_NATIVE 0x10
-#define CA_MONITOR_STRING 0x20
-#define CA_GET_ATTRIBUTES 0x40
-#define CA_SYNC 0x1000
+#define CA_CLEAR_CHANNEL 0x1
+#define CA_CONNECT 0x2
+#define CA_WRITE_NATIVE 0x4
+#define CA_WRITE_STRING 0x8
+#define CA_MONITOR_NATIVE 0x10
+#define CA_MONITOR_STRING 0x20
+#define CA_GET_ATTRIBUTES 0x40
+#define CA_SYNC 0x1000
/* write type */
#define CA_PUT 0x1
#define CA_PUT_CALLBACK 0x2
typedef struct caLink
{
- ELLNODE node;
- int refcount;
- epicsMutexId lock;
- struct link *plink;
- char *pvname;
- chid chid;
- short link_action;
+ ELLNODE node;
+ int refcount;
+ epicsMutexId lock;
+ struct link *plink;
+ char *pvname;
+ chid chid;
+ short link_action;
/* The following have new values after each data event*/
- epicsEnum16 sevr;
- epicsEnum16 stat;
- epicsTimeStamp timeStamp;
+ epicsEnum16 sevr;
+ epicsEnum16 stat;
+ epicsTimeStamp timeStamp;
/* The following have values after connection*/
- short dbrType;
+ short dbrType;
size_t elementSize; /* size of one element in pgetNative */
unsigned long nelements; /* PVs max array size */
unsigned long usedelements; /* currently used in pgetNative */
unsigned long putnelements; /* currently used in pputNative */
- char hasReadAccess;
- char hasWriteAccess;
+ char hasReadAccess;
+ char hasWriteAccess;
char isConnected;
- char gotFirstConnection;
+ char gotFirstConnection;
/* The following are for dbCaAddLinkCallback */
dbCaCallback connect;
dbCaCallback monitor;
@@ -67,7 +67,7 @@ typedef struct caLink
void *putUserPvt;
/* The following are for access to additional attributes*/
char gotAttributes;
- dbCaCallback getAttributes;
+ dbCaCallback getAttributes;
void *getAttributesPvt;
/* The following have values after getAttribEventCallback*/
double controlLimits[2];
@@ -76,22 +76,22 @@ typedef struct caLink
short precision;
char units[MAX_UNITS_SIZE]; /* units of value */
/* The following are for handling data*/
- void *pgetNative;
- char *pgetString;
- void *pputNative;
- char *pputString;
- evid evidNative;
- evid evidString;
- char gotInNative;
- char gotInString;
- char gotOutNative;
- char gotOutString;
- char newOutNative;
- char newOutString;
+ void *pgetNative;
+ char *pgetString;
+ void *pputNative;
+ char *pputString;
+ evid evidNative;
+ evid evidString;
+ char gotInNative;
+ char gotInString;
+ char gotOutNative;
+ char gotOutString;
+ char newOutNative;
+ char newOutString;
unsigned char scanningOnce;
/* The following are for dbcar*/
- unsigned long nDisconnect;
- unsigned long nNoWrite; /*only modified by dbCaPutLink*/
+ unsigned long nDisconnect;
+ unsigned long nNoWrite; /*only modified by dbCaPutLink*/
unsigned long nUpdate;
}caLink;
diff --git a/modules/database/src/ioc/db/dbChannelIO.cpp b/modules/database/src/ioc/db/dbChannelIO.cpp
index a086d3e..7ae1576 100644
--- a/modules/database/src/ioc/db/dbChannelIO.cpp
+++ b/modules/database/src/ioc/db/dbChannelIO.cpp
@@ -7,10 +7,10 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+/*
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#include <string>
@@ -48,7 +48,7 @@ dbChannelIO::~dbChannelIO ()
{
}
-void dbChannelIO::destructor ( CallbackGuard & cbGuard,
+void dbChannelIO::destructor ( CallbackGuard & cbGuard,
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -234,4 +234,3 @@ unsigned dbChannelIO::requestMessageBytesPending (
{
return 0u;
}
-
diff --git a/modules/database/src/ioc/db/dbChannelIO.h b/modules/database/src/ioc/db/dbChannelIO.h
index 5eb7c4e..a31bdcd 100644
--- a/modules/database/src/ioc/db/dbChannelIO.h
+++ b/modules/database/src/ioc/db/dbChannelIO.h
@@ -9,9 +9,9 @@
\*************************************************************************/
/*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*
* NOTES:
* 1) This interface is preliminary and will change in the future
diff --git a/modules/database/src/ioc/db/dbContext.cpp b/modules/database/src/ioc/db/dbContext.cpp
index 36cc665..099440d 100644
--- a/modules/database/src/ioc/db/dbContext.cpp
+++ b/modules/database/src/ioc/db/dbContext.cpp
@@ -6,10 +6,10 @@
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+/*
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#include <limits.h>
@@ -123,7 +123,7 @@ cacChannel & dbContext::createChannel (
void dbContext::destroyChannel (
CallbackGuard & cbGuard,
- epicsGuard < epicsMutex > & guard,
+ epicsGuard < epicsMutex > & guard,
dbChannelIO & chan )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -281,7 +281,7 @@ void dbContext::initiatePutNotify (
void dbContext::destroyAllIO (
CallbackGuard & cbGuard,
- epicsGuard < epicsMutex > & guard,
+ epicsGuard < epicsMutex > & guard,
dbChannelIO & chan )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -315,7 +315,7 @@ void dbContext::destroyAllIO (
}
void dbContext::ioCancel (
- CallbackGuard & cbGuard, epicsGuard < epicsMutex > & guard,
+ CallbackGuard & cbGuard, epicsGuard < epicsMutex > & guard,
dbChannelIO & chan, const cacChannel::ioid &id )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -431,5 +431,3 @@ unsigned dbContext::beaconAnomaliesSinceProgramStart (
return 0u;
}
}
-
-
diff --git a/modules/database/src/ioc/db/dbContextReadNotifyCache.cpp b/modules/database/src/ioc/db/dbContextReadNotifyCache.cpp
index e3196b2..62a7ad6 100644
--- a/modules/database/src/ioc/db/dbContextReadNotifyCache.cpp
+++ b/modules/database/src/ioc/db/dbContextReadNotifyCache.cpp
@@ -38,18 +38,18 @@ public:
dbContextReadNotifyCacheAllocator & allocator, unsigned long size ) :
_allocator ( allocator ), _p ( allocator.alloc ( size ) ) {}
~privateAutoDestroyPtr () { _allocator.free ( _p ); }
- char * get () const { return _p; }
+ char * get () const { return _p; }
private:
dbContextReadNotifyCacheAllocator & _allocator;
char * _p;
- privateAutoDestroyPtr ( const privateAutoDestroyPtr & );
- privateAutoDestroyPtr & operator = ( const privateAutoDestroyPtr & );
+ privateAutoDestroyPtr ( const privateAutoDestroyPtr & );
+ privateAutoDestroyPtr & operator = ( const privateAutoDestroyPtr & );
};
// extra effort taken here to not hold the lock when calling the callback
void dbContextReadNotifyCache::callReadNotify (
epicsGuard < epicsMutex > & guard, struct dbChannel * dbch,
- unsigned type, unsigned long count, cacReadNotify & notify )
+ unsigned type, unsigned long count, cacReadNotify & notify )
{
guard.assertIdenticalMutex ( _mutex );
@@ -176,5 +176,3 @@ void dbContextReadNotifyCacheAllocator::show ( unsigned level ) const
_readNotifyCacheSize );
}
}
-
-
diff --git a/modules/database/src/ioc/db/dbEvent.h b/modules/database/src/ioc/db/dbEvent.h
index 374e849..0c90599 100644
--- a/modules/database/src/ioc/db/dbEvent.h
+++ b/modules/database/src/ioc/db/dbEvent.h
@@ -68,7 +68,7 @@ epicsShareFunc void db_cleanup_events(void);
#endif
typedef void EVENTFUNC (void *user_arg, struct dbChannel *chan,
- int eventsRemaining, struct db_field_log *pfl);
+ int eventsRemaining, struct db_field_log *pfl);
typedef void * dbEventSubscription;
epicsShareFunc dbEventSubscription db_add_event (
diff --git a/modules/database/src/ioc/db/dbLock.h b/modules/database/src/ioc/db/dbLock.h
index e15ddd0..50f659e 100644
--- a/modules/database/src/ioc/db/dbLock.h
+++ b/modules/database/src/ioc/db/dbLock.h
@@ -8,7 +8,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* dbLock.h */
-/* Author: Marty Kraimer Date: 12MAR96 */
+/* Author: Marty Kraimer Date: 12MAR96 */
#ifndef INCdbLockh
#define INCdbLockh
diff --git a/modules/database/src/ioc/db/dbLockPvt.h b/modules/database/src/ioc/db/dbLockPvt.h
index 79ccd44..980037e 100644
--- a/modules/database/src/ioc/db/dbLockPvt.h
+++ b/modules/database/src/ioc/db/dbLockPvt.h
@@ -24,10 +24,10 @@
* are guarded by its lock.
*/
typedef struct dbLockSet {
- ELLNODE node;
- ELLLIST lockRecordList; /* holds lockRecord::node */
- epicsMutexId lock;
- unsigned long id;
+ ELLNODE node;
+ ELLLIST lockRecordList; /* holds lockRecord::node */
+ epicsMutexId lock;
+ unsigned long id;
int refcount;
#ifdef LOCKSET_DEBUG
@@ -48,15 +48,15 @@ struct lockRecord;
* plockSet is guarded by spin.
*/
typedef struct lockRecord {
- ELLNODE node; /* in lockSet::lockRecordList */
+ ELLNODE node; /* in lockSet::lockRecordList */
/* The association between lockRecord and lockSet
* can only be changed while the lockSet is held,
* and the lockRecord's spinlock is held.
* It may be read which either lock is held.
*/
- lockSet *plockSet;
+ lockSet *plockSet;
/* the association between lockRecord and dbCommon never changes */
- dbCommon *precord;
+ dbCommon *precord;
epicsSpinId spin;
/* temp used during lockset split.
diff --git a/modules/database/src/ioc/db/dbNotify.h b/modules/database/src/ioc/db/dbNotify.h
index 5641cff..e4cd5ef 100644
--- a/modules/database/src/ioc/db/dbNotify.h
+++ b/modules/database/src/ioc/db/dbNotify.h
@@ -6,7 +6,7 @@
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/* dbNotify.h */
+/* dbNotify.h */
#ifndef INCdbNotifyh
#define INCdbNotifyh
@@ -140,22 +140,22 @@ epicsShareFunc int dbNotifyDump(void);
* The other global routines (dbNotifyAdd and dbNotifyCompletion) are called by:
*
* dbAccess.c
- * dbScanPassive and dbScanLink
- * call dbNotifyAdd just before calling dbProcess
- * dbProcess
- * Calls dbNotifyCompletion if dbProcess does not call process
+ * dbScanPassive and dbScanLink
+ * call dbNotifyAdd just before calling dbProcess
+ * dbProcess
+ * Calls dbNotifyCompletion if dbProcess does not call process
* Unless pact is already true.
- * recGbl
- * recGblFwdLink calls dbNotifyCompletion
+ * recGbl
+ * recGblFwdLink calls dbNotifyCompletion
*
* Two fields in dbCommon are used for put notify.
- * ppn pointer to processNotify
- * If a record is part of a put notify group,
- * This field is the address of the associated processNotify.
- * As soon as a record completes processing the field is set NULL
- * ppnr pointer to processNotifyRecord, which is a private structure
+ * ppn pointer to processNotify
+ * If a record is part of a put notify group,
+ * This field is the address of the associated processNotify.
+ * As soon as a record completes processing the field is set NULL
+ * ppnr pointer to processNotifyRecord, which is a private structure
* owned by dbNotify.
- * dbNotify is reponsible for this structure.
+ * dbNotify is reponsible for this structure.
*
*/
#ifdef __cplusplus
diff --git a/modules/database/src/ioc/db/dbPutNotifyBlocker.cpp b/modules/database/src/ioc/db/dbPutNotifyBlocker.cpp
index 2215f84..3f0e74f 100644
--- a/modules/database/src/ioc/db/dbPutNotifyBlocker.cpp
+++ b/modules/database/src/ioc/db/dbPutNotifyBlocker.cpp
@@ -7,8 +7,8 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
- * Author:
+/*
+ * Author:
* Jeffrey O. Hill
* johill at lanl.gov
* 505 665 1831
@@ -48,7 +48,7 @@ dbPutNotifyBlocker::~dbPutNotifyBlocker ()
{
}
-void dbPutNotifyBlocker::destructor ( CallbackGuard & cbGuard,
+void dbPutNotifyBlocker::destructor ( CallbackGuard & cbGuard,
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -103,7 +103,7 @@ extern "C" int putNotifyPut ( processNotify *ppn, notifyPutType type )
extern "C" void putNotifyCompletion ( processNotify *ppn )
{
- dbPutNotifyBlocker * const pBlocker =
+ dbPutNotifyBlocker * const pBlocker =
static_cast < dbPutNotifyBlocker * > ( ppn->usrPvt );
epicsGuard < epicsMutex > guard ( pBlocker->mutex );
cacWriteNotify * const pNtfy = pBlocker->pNotify;
@@ -111,14 +111,14 @@ extern "C" void putNotifyCompletion ( processNotify *ppn )
pBlocker->pNotify = 0;
// Its necessary to signal the initiators now before we call
// the user callback. This is less efficent, and potentially
- // causes more thread context switching, but its probably
- // unavoidable because its possible that the use callback
+ // causes more thread context switching, but its probably
+ // unavoidable because its possible that the use callback
// might destroy this object.
pBlocker->block.signal ();
if ( pBlocker->pn.status != notifyOK ) {
- pNtfy->exception (
+ pNtfy->exception (
guard, ECA_PUTFAIL, "put notify unsuccessful",
- static_cast < unsigned > (pBlocker->dbrType),
+ static_cast < unsigned > (pBlocker->dbrType),
static_cast < unsigned > (pBlocker->nRequest) );
}
else {
diff --git a/modules/database/src/ioc/db/dbPutNotifyBlocker.h b/modules/database/src/ioc/db/dbPutNotifyBlocker.h
index 6ca11cc..d2284a1 100644
--- a/modules/database/src/ioc/db/dbPutNotifyBlocker.h
+++ b/modules/database/src/ioc/db/dbPutNotifyBlocker.h
@@ -9,9 +9,9 @@
\*************************************************************************/
/*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#ifndef dbPutNotifyBlockerh
@@ -75,8 +75,8 @@ private:
epicsGuard < epicsMutex > &, unsigned long newSize );
friend void putNotifyCompletion ( processNotify * ppn );
friend int putNotifyPut ( processNotify *ppn, notifyPutType type );
- dbPutNotifyBlocker ( const dbPutNotifyBlocker & );
- dbPutNotifyBlocker & operator = ( const dbPutNotifyBlocker & );
+ dbPutNotifyBlocker ( const dbPutNotifyBlocker & );
+ dbPutNotifyBlocker & operator = ( const dbPutNotifyBlocker & );
virtual ~dbPutNotifyBlocker ();
void operator delete ( void * );
};
diff --git a/modules/database/src/ioc/db/dbSubscriptionIO.cpp b/modules/database/src/ioc/db/dbSubscriptionIO.cpp
index 5b9b85e..4539368 100644
--- a/modules/database/src/ioc/db/dbSubscriptionIO.cpp
+++ b/modules/database/src/ioc/db/dbSubscriptionIO.cpp
@@ -7,10 +7,10 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
- * 505 665 1831
+/*
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
+ * 505 665 1831
*/
#include <string>
@@ -56,14 +56,14 @@ dbSubscriptionIO::~dbSubscriptionIO ()
{
}
-void dbSubscriptionIO::destructor ( CallbackGuard & cbGuard,
+void dbSubscriptionIO::destructor ( CallbackGuard & cbGuard,
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
this->~dbSubscriptionIO ();
}
-void dbSubscriptionIO::unsubscribe ( CallbackGuard & cbGuard,
+void dbSubscriptionIO::unsubscribe ( CallbackGuard & cbGuard,
epicsGuard < epicsMutex > & guard )
{
guard.assertIdenticalMutex ( this->mutex );
@@ -112,7 +112,7 @@ void dbSubscriptionIO::operator delete ( void * pCadaver,
#endif
extern "C" void dbSubscriptionEventCallback ( void *pPrivate, struct dbChannel * /* dbch */,
- int /* eventsRemaining */, struct db_field_log *pfl )
+ int /* eventsRemaining */, struct db_field_log *pfl )
{
dbSubscriptionIO * pIO = static_cast < dbSubscriptionIO * > ( pPrivate );
pIO->chan.callStateNotify ( pIO->type, pIO->count, pfl, pIO->notify );
@@ -150,5 +150,3 @@ dbSubscriptionIO * dbSubscriptionIO::isSubscription ()
{
return this;
}
-
-
diff --git a/modules/database/src/ioc/db/db_convert.h b/modules/database/src/ioc/db/db_convert.h
index d06164f..dcbe57f 100644
--- a/modules/database/src/ioc/db/db_convert.h
+++ b/modules/database/src/ioc/db/db_convert.h
@@ -41,27 +41,27 @@ epicsShareExtern unsigned short dbDBRoldToDBFnew[DBR_DOUBLE+1];
epicsShareExtern unsigned short dbDBRnewToDBRold[newDBR_ENUM+1];
#ifdef DB_CONVERT_GBLSOURCE
epicsShareDef unsigned short dbDBRoldToDBFnew[DBR_DOUBLE+1] = {
- 0, /*DBR_STRING to DBF_STRING*/
- 3, /*DBR_INT to DBF_SHORT*/
- 9, /*DBR_FLOAT to DBF_FLOAT*/
- 11, /*DBR_ENUM to DBF_ENUM*/
- 1, /*DBR_CHAR to DBF_CHAR*/
- 5, /*DBR_LONG to DBF_LONG*/
- 10 /*DBR_DOUBLE to DBF_DOUBLE*/
+ 0, /*DBR_STRING to DBF_STRING*/
+ 3, /*DBR_INT to DBF_SHORT*/
+ 9, /*DBR_FLOAT to DBF_FLOAT*/
+ 11, /*DBR_ENUM to DBF_ENUM*/
+ 1, /*DBR_CHAR to DBF_CHAR*/
+ 5, /*DBR_LONG to DBF_LONG*/
+ 10 /*DBR_DOUBLE to DBF_DOUBLE*/
};
epicsShareDef unsigned short dbDBRnewToDBRold[newDBR_ENUM+1] = {
- 0, /*DBR_STRING to DBR_STRING*/
- 4, /*DBR_CHAR to DBR_CHAR*/
- 4, /*DBR_UCHAR to DBR_CHAR*/
- 1, /*DBR_SHORT to DBR_SHORT*/
- 5, /*DBR_USHORT to DBR_LONG*/
- 5, /*DBR_LONG to DBR_LONG*/
- 6, /*DBR_ULONG to DBR_DOUBLE*/
- 6, /*DBR_INT64 to DBR_DOUBLE*/
- 6, /*DBR_UINT64 to DBR_DOUBLE*/
- 2, /*DBR_FLOAT to DBR_FLOAT*/
- 6, /*DBR_DOUBLE to DBR_DOUBLE*/
- 3, /*DBR_ENUM to DBR_ENUM*/
+ 0, /*DBR_STRING to DBR_STRING*/
+ 4, /*DBR_CHAR to DBR_CHAR*/
+ 4, /*DBR_UCHAR to DBR_CHAR*/
+ 1, /*DBR_SHORT to DBR_SHORT*/
+ 5, /*DBR_USHORT to DBR_LONG*/
+ 5, /*DBR_LONG to DBR_LONG*/
+ 6, /*DBR_ULONG to DBR_DOUBLE*/
+ 6, /*DBR_INT64 to DBR_DOUBLE*/
+ 6, /*DBR_UINT64 to DBR_DOUBLE*/
+ 2, /*DBR_FLOAT to DBR_FLOAT*/
+ 6, /*DBR_DOUBLE to DBR_DOUBLE*/
+ 3, /*DBR_ENUM to DBR_ENUM*/
};
#endif /*DB_CONVERT_GBLSOURCE*/
diff --git a/modules/database/src/ioc/db/db_field_log.h b/modules/database/src/ioc/db/db_field_log.h
index 1534517..a6aa8d2 100644
--- a/modules/database/src/ioc/db/db_field_log.h
+++ b/modules/database/src/ioc/db/db_field_log.h
@@ -38,20 +38,20 @@ extern "C" {
* will adjust automatically, it just compares field sizes.
*/
union native_value {
- epicsInt8 dbf_char;
- epicsInt16 dbf_short;
- epicsEnum16 dbf_enum;
- epicsInt32 dbf_long;
- epicsFloat32 dbf_float;
- epicsFloat64 dbf_double;
+ epicsInt8 dbf_char;
+ epicsInt16 dbf_short;
+ epicsEnum16 dbf_enum;
+ epicsInt32 dbf_long;
+ epicsFloat32 dbf_float;
+ epicsFloat64 dbf_double;
#ifdef DB_EVENT_LOG_STRINGS
- char dbf_string[MAX_STRING_SIZE];
+ char dbf_string[MAX_STRING_SIZE];
#endif
};
/*
- * structure to log the state of a data base field at the time
- * an event is triggered.
+ * structure to log the state of a data base field at the time
+ * an event is triggered.
*/
struct db_field_log;
typedef void (dbfl_freeFunc)(struct db_field_log *pfl);
diff --git a/modules/database/src/ioc/db/recGbl.h b/modules/database/src/ioc/db/recGbl.h
index 20de956..57add16 100644
--- a/modules/database/src/ioc/db/recGbl.h
+++ b/modules/database/src/ioc/db/recGbl.h
@@ -7,7 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* recGbl.h */
-/* Record Global
+/* Record Global
* Author: Marty Kraimer
* Date: 13Jun95
*/
diff --git a/modules/database/src/ioc/dbStatic/dbBase.h b/modules/database/src/ioc/dbStatic/dbBase.h
index 9e61211..38292c8 100644
--- a/modules/database/src/ioc/dbStatic/dbBase.h
+++ b/modules/database/src/ioc/dbStatic/dbBase.h
@@ -22,39 +22,39 @@
#include "devSup.h"
typedef struct dbMenu {
- ELLNODE node;
- char *name;
- int nChoice;
- char **papChoiceName;
- char **papChoiceValue;
+ ELLNODE node;
+ char *name;
+ int nChoice;
+ char **papChoiceName;
+ char **papChoiceValue;
}dbMenu;
typedef struct drvSup {
- ELLNODE node;
- char *name;
- struct drvet *pdrvet;
+ ELLNODE node;
+ char *name;
+ struct drvet *pdrvet;
}drvSup;
typedef struct devSup {
- ELLNODE node;
- char *name;
- char *choice;
- int link_type;
- /*Following only available on run time system*/
- dset *pdset;
- struct dsxt *pdsxt; /* Extended device support */
+ ELLNODE node;
+ char *name;
+ char *choice;
+ int link_type;
+ /*Following only available on run time system*/
+ dset *pdset;
+ struct dsxt *pdsxt; /* Extended device support */
}devSup;
typedef struct linkSup {
- ELLNODE node;
- char *name;
- char *jlif_name;
- struct jlif *pjlif;
+ ELLNODE node;
+ char *name;
+ char *jlif_name;
+ struct jlif *pjlif;
} linkSup;
typedef struct dbDeviceMenu {
- int nChoice;
- char **papChoice;
+ int nChoice;
+ char **papChoice;
}dbDeviceMenu;
/* conversion types*/
@@ -64,47 +64,47 @@ typedef enum {ASL0,ASL1} asLevel;
/*Breakpoint Tables */
typedef struct brkInt{ /* breakpoint interval */
- double raw; /*raw value for beginning of interval */
- double slope; /*slope for interval */
- double eng; /*converted value for beginning of interval*/
+ double raw; /*raw value for beginning of interval */
+ double slope; /*slope for interval */
+ double eng; /*converted value for beginning of interval*/
}brkInt;
typedef struct brkTable { /* breakpoint table */
- ELLNODE node;
- char *name; /*breakpoint table name */
- long number; /*number of brkInt in this table*/
- struct brkInt *paBrkInt; /* ptr to array of brkInts */
+ ELLNODE node;
+ char *name; /*breakpoint table name */
+ long number; /*number of brkInt in this table */
+ struct brkInt *paBrkInt; /* ptr to array of brkInts */
}brkTable;
typedef struct dbFldDes{ /* field description */
- char *prompt; /*Prompt string for DCT*/
- char *name; /*Field name*/
- char *extra; /*C def for DBF_NOACCESS*/
+ char *prompt; /*Prompt string for DCT */
+ char *name; /*Field name */
+ char *extra; /*C def for DBF_NOACCESS */
struct dbRecordType *pdbRecordType;
- short indRecordType; /*within dbRecordType.papFldDes */
- short special; /*Special processing requirements */
- dbfType field_type; /*Field type as defined in dbFldTypes.h */
- unsigned int process_passive:1;/*should dbPutField process passive */
- unsigned int prop:1;/*field is a metadata, post DBE_PROPERTY on change*/
- unsigned int isDevLink:1; /* true for INP/OUT fields */
- ctType base; /*base for integer to string conversions*/
- short promptgroup; /*prompt, i.e. gui group */
- short interest; /*interest level */
- asLevel as_level; /*access security level */
- char *initial; /*initial value */
- /*If (DBF_MENU,DBF_DEVICE) ftPvt is (pdbMenu,pdbDeviceMenu) */
- void *ftPvt;
- /*On no runtime following only set for STRING */
- short size; /*length in bytes of a field element */
+ short indRecordType; /*within dbRecordType.papFldDes */
+ short special; /*Special processing requirements */
+ dbfType field_type; /*Field type as defined in dbFldTypes.h */
+ unsigned int process_passive:1;/*should dbPutField process passive */
+ unsigned int prop:1; /*field is a metadata, post DBE_PROPERTY on change*/
+ unsigned int isDevLink:1; /* true for INP/OUT fields */
+ ctType base; /*base for integer to string conversions*/
+ short promptgroup; /*prompt, i.e. gui group */
+ short interest; /*interest level */
+ asLevel as_level; /*access security level */
+ char *initial; /*initial value */
+ /*If (DBF_MENU,DBF_DEVICE) ftPvt is (pdbMenu,pdbDeviceMenu) */
+ void *ftPvt;
+ /*On no runtime following only set for STRING */
+ short size; /*length in bytes of a field element */
/*The following are only available on run time system*/
- unsigned short offset; /*Offset in bytes from beginning of record*/
+ unsigned short offset; /*Offset in bytes from beginning of record*/
}dbFldDes;
-typedef struct dbInfoNode { /*non-field per-record information*/
- ELLNODE node;
- char *name;
- char *string;
- void *pointer;
+typedef struct dbInfoNode { /*non-field per-record information*/
+ ELLNODE node;
+ char *name;
+ char *string;
+ void *pointer;
}dbInfoNode;
#define DBRN_FLAGS_VISIBLE 1
@@ -112,11 +112,11 @@ typedef struct dbInfoNode { /*non-field per-record information*/
#define DBRN_FLAGS_HASALIAS 4
typedef struct dbRecordNode {
- ELLNODE node;
- void *precord;
- char *recordname;
- ELLLIST infoList; /*LIST head of info nodes*/
- int flags;
+ ELLNODE node;
+ void *precord;
+ char *recordname;
+ ELLLIST infoList; /*LIST head of info nodes*/
+ int flags;
struct dbRecordNode *aliasedRecnode; /* NULL unless flags|DBRN_FLAGS_ISALIAS */
}dbRecordNode;
@@ -124,64 +124,64 @@ typedef struct dbRecordNode {
/*pdbFldDes is so that other access routines work correctly*/
/*Until base supports char * value MUST be fixed length string*/
typedef struct dbRecordAttribute {
- ELLNODE node;
- char *name;
- dbFldDes *pdbFldDes;
- char value[MAX_STRING_SIZE];
+ ELLNODE node;
+ char *name;
+ dbFldDes *pdbFldDes;
+ char value[MAX_STRING_SIZE];
}dbRecordAttribute;
typedef struct dbText {
- ELLNODE node;
- char *text;
+ ELLNODE node;
+ char *text;
}dbText;
typedef struct dbVariableDef {
- ELLNODE node;
- char *name;
- char *type;
+ ELLNODE node;
+ char *name;
+ char *type;
}dbVariableDef;
typedef struct dbRecordType {
- ELLNODE node;
- ELLLIST attributeList; /*LIST head of attributes*/
- ELLLIST recList; /*LIST head of sorted dbRecordNodes*/
- ELLLIST devList; /*List of associated device support*/
- ELLLIST cdefList; /*LIST of Cdef text items*/
- char *name;
- short no_fields; /* number of fields defined */
- short no_prompt; /* number of fields to configure*/
- short no_links; /* number of links */
- short no_aliases; /* number of aliases in recList */
- short *link_ind; /* addr of array of ind in papFldDes*/
- char **papsortFldName;/* ptr to array of ptr to fld names*/
- short *sortFldInd; /* addr of array of ind in papFldDes*/
- dbFldDes *pvalFldDes; /*pointer dbFldDes for VAL field*/
- short indvalFlddes; /*ind in papFldDes*/
- dbFldDes **papFldDes; /* ptr to array of ptr to fldDes*/
+ ELLNODE node;
+ ELLLIST attributeList; /*LIST head of attributes*/
+ ELLLIST recList; /*LIST head of sorted dbRecordNodes*/
+ ELLLIST devList; /*List of associated device support*/
+ ELLLIST cdefList; /*LIST of Cdef text items*/
+ char *name;
+ short no_fields; /* number of fields defined */
+ short no_prompt; /* number of fields to configure*/
+ short no_links; /* number of links */
+ short no_aliases; /* number of aliases in recList */
+ short *link_ind; /* addr of array of ind in papFldDes*/
+ char **papsortFldName;/* ptr to array of ptr to fld names*/
+ short *sortFldInd; /* addr of array of ind in papFldDes*/
+ dbFldDes *pvalFldDes; /*pointer dbFldDes for VAL field*/
+ short indvalFlddes; /*ind in papFldDes*/
+ dbFldDes **papFldDes; /* ptr to array of ptr to fldDes*/
/*The following are only available on run time system*/
- rset *prset;
- int rec_size; /*record size in bytes */
+ rset *prset;
+ int rec_size; /*record size in bytes */
}dbRecordType;
struct dbPvd; /* Contents private to dbPvdLib code */
struct gphPvt; /* Contents private to gpHashLib code */
typedef struct dbBase {
- ELLLIST menuList;
- ELLLIST recordTypeList;
- ELLLIST drvList;
- ELLLIST linkList;
- ELLLIST registrarList;
- ELLLIST functionList;
- ELLLIST variableList;
- ELLLIST bptList;
+ ELLLIST menuList;
+ ELLLIST recordTypeList;
+ ELLLIST drvList;
+ ELLLIST linkList;
+ ELLLIST registrarList;
+ ELLLIST functionList;
+ ELLLIST variableList;
+ ELLLIST bptList;
ELLLIST filterList;
ELLLIST guiGroupList;
- void *pathPvt;
- struct dbPvd *ppvd;
- struct gphPvt *pgpHash;
- short ignoreMissingMenus;
- short loadCdefs;
+ void *pathPvt;
+ struct dbPvd *ppvd;
+ struct gphPvt *pgpHash;
+ short ignoreMissingMenus;
+ short loadCdefs;
}dbBase;
#endif
diff --git a/modules/database/src/ioc/dbStatic/dbFldTypes.h b/modules/database/src/ioc/dbStatic/dbFldTypes.h
index ba1a695..c0cb8f1 100644
--- a/modules/database/src/ioc/dbStatic/dbFldTypes.h
+++ b/modules/database/src/ioc/dbStatic/dbFldTypes.h
@@ -22,53 +22,53 @@ extern "C" {
/* field types */
typedef enum {
- DBF_STRING,
- DBF_CHAR,
- DBF_UCHAR,
- DBF_SHORT,
- DBF_USHORT,
- DBF_LONG,
- DBF_ULONG,
- DBF_INT64,
- DBF_UINT64,
- DBF_FLOAT,
- DBF_DOUBLE,
- DBF_ENUM,
- DBF_MENU,
- DBF_DEVICE,
- DBF_INLINK,
- DBF_OUTLINK,
- DBF_FWDLINK,
- DBF_NOACCESS
+ DBF_STRING,
+ DBF_CHAR,
+ DBF_UCHAR,
+ DBF_SHORT,
+ DBF_USHORT,
+ DBF_LONG,
+ DBF_ULONG,
+ DBF_INT64,
+ DBF_UINT64,
+ DBF_FLOAT,
+ DBF_DOUBLE,
+ DBF_ENUM,
+ DBF_MENU,
+ DBF_DEVICE,
+ DBF_INLINK,
+ DBF_OUTLINK,
+ DBF_FWDLINK,
+ DBF_NOACCESS
}dbfType;
#define DBF_NTYPES DBF_NOACCESS+1
typedef struct mapdbfType{
- char *strvalue;
- dbfType value;
+ char *strvalue;
+ dbfType value;
}mapdbfType;
epicsShareExtern mapdbfType pamapdbfType[];
#ifdef DBFLDTYPES_GBLSOURCE
epicsShareDef mapdbfType pamapdbfType[DBF_NTYPES] = {
- {"DBF_STRING",DBF_STRING},
- {"DBF_CHAR",DBF_CHAR},
- {"DBF_UCHAR",DBF_UCHAR},
- {"DBF_SHORT",DBF_SHORT},
- {"DBF_USHORT",DBF_USHORT},
- {"DBF_LONG",DBF_LONG},
- {"DBF_ULONG",DBF_ULONG},
- {"DBF_INT64",DBF_INT64},
- {"DBF_UINT64",DBF_UINT64},
- {"DBF_FLOAT",DBF_FLOAT},
- {"DBF_DOUBLE",DBF_DOUBLE},
- {"DBF_ENUM",DBF_ENUM},
- {"DBF_MENU",DBF_MENU},
- {"DBF_DEVICE",DBF_DEVICE},
- {"DBF_INLINK",DBF_INLINK},
- {"DBF_OUTLINK",DBF_OUTLINK},
- {"DBF_FWDLINK",DBF_FWDLINK},
- {"DBF_NOACCESS",DBF_NOACCESS}
+ {"DBF_STRING",DBF_STRING},
+ {"DBF_CHAR",DBF_CHAR},
+ {"DBF_UCHAR",DBF_UCHAR},
+ {"DBF_SHORT",DBF_SHORT},
+ {"DBF_USHORT",DBF_USHORT},
+ {"DBF_LONG",DBF_LONG},
+ {"DBF_ULONG",DBF_ULONG},
+ {"DBF_INT64",DBF_INT64},
+ {"DBF_UINT64",DBF_UINT64},
+ {"DBF_FLOAT",DBF_FLOAT},
+ {"DBF_DOUBLE",DBF_DOUBLE},
+ {"DBF_ENUM",DBF_ENUM},
+ {"DBF_MENU",DBF_MENU},
+ {"DBF_DEVICE",DBF_DEVICE},
+ {"DBF_INLINK",DBF_INLINK},
+ {"DBF_OUTLINK",DBF_OUTLINK},
+ {"DBF_FWDLINK",DBF_FWDLINK},
+ {"DBF_NOACCESS",DBF_NOACCESS}
};
#endif /*DBFLDTYPES_GBLSOURCE*/
@@ -85,8 +85,8 @@ epicsShareDef mapdbfType pamapdbfType[DBF_NTYPES] = {
#define DBR_FLOAT DBF_FLOAT
#define DBR_DOUBLE DBF_DOUBLE
#define DBR_ENUM DBF_ENUM
-#define DBR_PUT_ACKT DBR_ENUM+1
-#define DBR_PUT_ACKS DBR_PUT_ACKT+1
+#define DBR_PUT_ACKT DBR_ENUM+1
+#define DBR_PUT_ACKS DBR_PUT_ACKT+1
#define DBR_NOACCESS DBF_NOACCESS
#define VALID_DB_REQ(x) ((x >= 0) && (x <= DBR_ENUM))
#define INVALID_DB_REQ(x) ((x < 0) || (x > DBR_ENUM))
diff --git a/modules/database/src/ioc/dbStatic/dbStaticPvt.h b/modules/database/src/ioc/dbStatic/dbStaticPvt.h
index 85fc022..f35c5bc 100644
--- a/modules/database/src/ioc/dbStatic/dbStaticPvt.h
+++ b/modules/database/src/ioc/dbStatic/dbStaticPvt.h
@@ -9,7 +9,7 @@
\*************************************************************************/
/* dbStaticPvt.h */
/*
- * Author: Marty Kraimer
+ * Author: Marty Kraimer
* Date: 06Jun95
*/
@@ -79,8 +79,8 @@ epicsShareFunc void dbFreeLinkInfo(dbLinkInfo *pinfo);
/* The following is for path */
typedef struct dbPathNode {
- ELLNODE node;
- char *directory;
+ ELLNODE node;
+ char *directory;
} dbPathNode;
/* Element of the global gui group list */
@@ -93,13 +93,13 @@ typedef struct dbGuiGroup {
/*The following are in dbPvdLib.c*/
/*directory*/
typedef struct{
- ELLNODE node;
- dbRecordType *precordType;
- dbRecordNode *precnode;
+ ELLNODE node;
+ dbRecordType *precordType;
+ dbRecordNode *precnode;
}PVDENTRY;
epicsShareFunc int dbPvdTableSize(int size);
extern int dbStaticDebug;
-void dbPvdInitPvt(DBBASE *pdbbase);
+void dbPvdInitPvt(DBBASE *pdbbase);
PVDENTRY *dbPvdFind(DBBASE *pdbbase,const char *name,size_t lenname);
PVDENTRY *dbPvdAdd(DBBASE *pdbbase,dbRecordType *precordType,dbRecordNode *precnode);
void dbPvdDelete(DBBASE *pdbbase,dbRecordNode *precnode);
diff --git a/modules/database/src/ioc/dbStatic/devSup.h b/modules/database/src/ioc/dbStatic/devSup.h
index dc55a35..888370f 100644
--- a/modules/database/src/ioc/dbStatic/devSup.h
+++ b/modules/database/src/ioc/dbStatic/devSup.h
@@ -133,19 +133,19 @@ typedef struct dsxt {
#ifdef __cplusplus
extern "C" {
- typedef long (*DEVSUPFUN)(void *); /* ptr to device support function*/
+ typedef long (*DEVSUPFUN)(void *); /* ptr to device support function*/
#else
- typedef long (*DEVSUPFUN)(); /* ptr to device support function*/
+ typedef long (*DEVSUPFUN)(); /* ptr to device support function*/
#endif
#ifndef USE_TYPED_DSET
typedef struct dset { /* device support entry table */
- long number; /*number of support routines*/
- DEVSUPFUN report; /*print report*/
- DEVSUPFUN init; /*init support layer*/
- DEVSUPFUN init_record; /*init device for particular record*/
- DEVSUPFUN get_ioint_info; /* get io interrupt information*/
+ long number; /*number of support routines*/
+ DEVSUPFUN report; /*print report*/
+ DEVSUPFUN init; /*init support layer*/
+ DEVSUPFUN init_record; /*init device for particular record*/
+ DEVSUPFUN get_ioint_info; /* get io interrupt information*/
/*other functions are record dependent*/
} dset;
diff --git a/modules/database/src/ioc/dbStatic/drvSup.h b/modules/database/src/ioc/dbStatic/drvSup.h
index 193d574..d34bab0 100644
--- a/modules/database/src/ioc/dbStatic/drvSup.h
+++ b/modules/database/src/ioc/dbStatic/drvSup.h
@@ -40,7 +40,7 @@ typedef typed_drvet drvet;
/* These interfaces may eventually get deprecated */
-typedef long (*DRVSUPFUN) (); /* ptr to driver support function */
+typedef long (*DRVSUPFUN) (); /* ptr to driver support function */
typedef struct drvet { /* driver entry table */
long number; /* number of support routines */
diff --git a/modules/database/src/ioc/dbStatic/guigroup.h b/modules/database/src/ioc/dbStatic/guigroup.h
index 4e2f2e1..8278348 100644
--- a/modules/database/src/ioc/dbStatic/guigroup.h
+++ b/modules/database/src/ioc/dbStatic/guigroup.h
@@ -9,8 +9,8 @@
\*************************************************************************/
/*
- these are used in the pmt (prompt) field of the record support
- ascii files. They represent field groupings for dct tools
+ these are used in the pmt (prompt) field of the record support
+ ascii files. They represent field groupings for dct tools
*/
#ifndef __gui_group_h__
diff --git a/modules/database/src/ioc/dbStatic/link.h b/modules/database/src/ioc/dbStatic/link.h
index 2e3c778..2d213aa 100644
--- a/modules/database/src/ioc/dbStatic/link.h
+++ b/modules/database/src/ioc/dbStatic/link.h
@@ -24,22 +24,22 @@ extern "C" {
#endif
/* link types */
-#define CONSTANT 0
-#define PV_LINK 1
-#define VME_IO 2
-#define CAMAC_IO 3
-#define AB_IO 4
-#define GPIB_IO 5
-#define BITBUS_IO 6
-#define MACRO_LINK 7
+#define CONSTANT 0
+#define PV_LINK 1
+#define VME_IO 2
+#define CAMAC_IO 3
+#define AB_IO 4
+#define GPIB_IO 5
+#define BITBUS_IO 6
+#define MACRO_LINK 7
#define JSON_LINK 8
-#define PN_LINK 9
-#define DB_LINK 10
-#define CA_LINK 11
-#define INST_IO 12 /* instrument */
-#define BBGPIB_IO 13 /* bitbus -> gpib */
-#define RF_IO 14
-#define VXI_IO 15
+#define PN_LINK 9
+#define DB_LINK 10
+#define CA_LINK 11
+#define INST_IO 12 /* instrument */
+#define BBGPIB_IO 13 /* bitbus -> gpib */
+#define RF_IO 14
+#define VXI_IO 15
#define LINK_NTYPES 16
typedef struct maplinkType {
char *strvalue;
@@ -48,25 +48,25 @@ typedef struct maplinkType {
epicsShareExtern maplinkType pamaplinkType[];
-#define VXIDYNAMIC 0
-#define VXISTATIC 1
-
-/* structure of a PV_LINK DB_LINK and a CA_LINK */
-/*Options defined by pvlMask */
-#define pvlOptMsMode 0x3 /*Maximize Severity mode selection*/
-#define pvlOptNMS 0 /*Don't Maximize Severity*/
-#define pvlOptMS 1 /*Maximize Severity always*/
-#define pvlOptMSI 2 /*Maximize Severity if INVALID*/
-#define pvlOptMSS 3 /*Maximize Severity and copy Status*/
-#define pvlOptPP 0x4 /*Process Passive*/
-#define pvlOptCA 0x8 /*Always make it a CA link*/
-#define pvlOptCP 0x10 /*CA + process on monitor*/
-#define pvlOptCPP 0x20 /*CA + process passive record on monitor*/
-#define pvlOptFWD 0x40 /*Generate ca_put for forward link*/
-#define pvlOptInpNative 0x80 /*Input native*/
-#define pvlOptInpString 0x100 /*Input as string*/
-#define pvlOptOutNative 0x200 /*Output native*/
-#define pvlOptOutString 0x400 /*Output as string*/
+#define VXIDYNAMIC 0
+#define VXISTATIC 1
+
+/* structure of a PV_LINK DB_LINK and a CA_LINK */
+/*Options defined by pvlMask */
+#define pvlOptMsMode 0x3 /*Maximize Severity mode selection*/
+#define pvlOptNMS 0 /*Don't Maximize Severity*/
+#define pvlOptMS 1 /*Maximize Severity always*/
+#define pvlOptMSI 2 /*Maximize Severity if INVALID*/
+#define pvlOptMSS 3 /*Maximize Severity and copy Status*/
+#define pvlOptPP 0x4 /*Process Passive*/
+#define pvlOptCA 0x8 /*Always make it a CA link*/
+#define pvlOptCP 0x10 /*CA + process on monitor*/
+#define pvlOptCPP 0x20 /*CA + process passive record on monitor*/
+#define pvlOptFWD 0x40 /*Generate ca_put for forward link*/
+#define pvlOptInpNative 0x80 /*Input native*/
+#define pvlOptInpString 0x100 /*Input as string*/
+#define pvlOptOutNative 0x200 /*Output native*/
+#define pvlOptOutString 0x400 /*Output as string*/
/* DBLINK Flag bits */
#define DBLINK_FLAG_INITIALIZED 1 /* dbInitLink() called */
@@ -80,12 +80,12 @@ struct dbCommon;
typedef long (*LINKCVT)();
struct pv_link {
- ELLNODE backlinknode;
- char *pvname; /* pvname link points to */
- void *pvt; /* CA or DB private */
- LINKCVT getCvt; /* input conversion function */
- short pvlMask; /* Options mask */
- short lastGetdbrType; /* last dbrType for DB or CA get */
+ ELLNODE backlinknode;
+ char *pvname; /* pvname link points to */
+ void *pvt; /* CA or DB private */
+ LINKCVT getCvt; /* input conversion function */
+ short pvlMask; /* Options mask */
+ short lastGetdbrType; /* last dbrType for DB or CA get */
};
struct jlink;
@@ -96,63 +96,63 @@ struct json_link {
/* structure of a VME io channel */
struct vmeio {
- short card;
- short signal;
- char *parm;
+ short card;
+ short signal;
+ char *parm;
};
/* structure of a CAMAC io channel */
struct camacio {
- short b;
- short c;
- short n;
- short a;
- short f;
- char *parm;
+ short b;
+ short c;
+ short n;
+ short a;
+ short f;
+ char *parm;
};
/* structure of a RF io channel */
struct rfio {
- short branch;
- short cryo;
- short micro;
- short dataset;
- short element;
- long ext;
+ short branch;
+ short cryo;
+ short micro;
+ short dataset;
+ short element;
+ long ext;
};
/* structure of a Allen-Bradley io channel */
struct abio {
- short link;
- short adapter;
- short card;
- short signal;
- char *parm;
+ short link;
+ short adapter;
+ short card;
+ short signal;
+ char *parm;
};
/* structure of a gpib io channel */
struct gpibio {
- short link;
- short addr; /* device address */
- char *parm;
+ short link;
+ short addr; /* device address */
+ char *parm;
};
/* structure of a bitbus io channel */
struct bitbusio {
- unsigned char link;
- unsigned char node;
- unsigned char port;
- unsigned char signal;
- char *parm;
+ unsigned char link;
+ unsigned char node;
+ unsigned char port;
+ unsigned char signal;
+ char *parm;
};
/* structure of a bitbus to gpib io channel */
struct bbgpibio {
- unsigned char link;
- unsigned char bbaddr;
- unsigned char gpibaddr;
- unsigned char pad;
- char *parm;
+ unsigned char link;
+ unsigned char bbaddr;
+ unsigned char gpibaddr;
+ unsigned char pad;
+ char *parm;
};
/* structure of an instrument io link */
@@ -162,35 +162,35 @@ struct instio {
/* structure of a vxi link */
struct vxiio {
- short flag; /* 0 = frame/slot, 1 = SA */
- short frame;
- short slot;
- short la; /* logical address if flag =1 */
- short signal;
- char *parm;
+ short flag; /* 0 = frame/slot, 1 = SA */
+ short frame;
+ short slot;
+ short la; /* logical address if flag =1 */
+ short signal;
+ char *parm;
};
/* union of possible address structures */
union value {
- char *constantStr; /*constant string*/
- struct macro_link macro_link; /* link containing macro substitution*/
+ char *constantStr; /*constant string*/
+ struct macro_link macro_link; /* link containing macro substitution*/
struct json_link json; /* JSON-encoded link */
- struct pv_link pv_link; /* link to process variable*/
- struct vmeio vmeio; /* vme io point */
- struct camacio camacio; /* camac io point */
- struct rfio rfio; /* CEBAF RF buffer interface */
- struct abio abio; /* allen-bradley io point */
- struct gpibio gpibio;
- struct bitbusio bitbusio;
- struct instio instio; /* instrument io link */
- struct bbgpibio bbgpibio; /* bitbus to gpib io link */
- struct vxiio vxiio; /* vxi io */
+ struct pv_link pv_link; /* link to process variable*/
+ struct vmeio vmeio; /* vme io point */
+ struct camacio camacio; /* camac io point */
+ struct rfio rfio; /* CEBAF RF buffer interface */
+ struct abio abio; /* allen-bradley io point */
+ struct gpibio gpibio;
+ struct bitbusio bitbusio;
+ struct instio instio; /* instrument io link */
+ struct bbgpibio bbgpibio; /* bitbus to gpib io link */
+ struct vxiio vxiio; /* vxi io */
};
struct lset;
struct link {
- struct dbCommon *precord; /* Pointer to record owning link */
+ struct dbCommon *precord; /* Pointer to record owning link */
short type;
short flags;
struct lset *lset;
diff --git a/modules/database/src/ioc/dbStatic/recSup.h b/modules/database/src/ioc/dbStatic/recSup.h
index 2850e62..3512992 100644
--- a/modules/database/src/ioc/dbStatic/recSup.h
+++ b/modules/database/src/ioc/dbStatic/recSup.h
@@ -7,7 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* recSup.h
- * Record Support
+ * Record Support
* Author: Marty Kraimer
* Date: 6-1-90
*/
@@ -64,22 +64,22 @@ typedef struct typed_rset rset;
typedef long (*RECSUPFUN) () EPICS_DEPRECATED; /* ptr to record support function*/
-struct rset { /* record support entry table */
- long number; /*number of support routines */
- long (*report)(); /*print report */
- long (*init)(); /*init support */
- long (*init_record)(); /*init record */
- long (*process)(); /*process record */
- long (*special)(); /*special processing */
- long (*get_value)(); /*no longer used */
- long (*cvt_dbaddr)(); /*cvt dbAddr */
+struct rset { /* record support entry table */
+ long number; /*number of support routines*/
+ long (*report)(); /*print report */
+ long (*init)(); /*init support */
+ long (*init_record)(); /*init record */
+ long (*process)(); /*process record */
+ long (*special)(); /*special processing */
+ long (*get_value)(); /*no longer used */
+ long (*cvt_dbaddr)(); /*cvt dbAddr */
long (*get_array_info)();
long (*put_array_info)();
long (*get_units)();
long (*get_precision)();
- long (*get_enum_str)(); /*get string from enum item*/
- long (*get_enum_strs)();/*get all enum strings */
- long (*put_enum_str)(); /*put string from enum item*/
+ long (*get_enum_str)(); /*get string from enum item */
+ long (*get_enum_strs)();/*get all enum strings */
+ long (*put_enum_str)(); /*put string from enum item */
long (*get_graphic_double)();
long (*get_control_double)();
long (*get_alarm_double)();
diff --git a/modules/database/src/ioc/dbStatic/special.h b/modules/database/src/ioc/dbStatic/special.h
index 055287a..a55e677 100644
--- a/modules/database/src/ioc/dbStatic/special.h
+++ b/modules/database/src/ioc/dbStatic/special.h
@@ -23,41 +23,41 @@ extern "C" {
/*NOTE Do NOT add aditional definitions with out modifying dbLexRoutines.c */
/* types 1-99 are global. Record specific must start with 100 */
-#define SPC_NOMOD 1 /*Field must not be modified */
-#define SPC_DBADDR 2 /*db_name_to_addr must call cvt_dbaddr */
-#define SPC_SCAN 3 /*A scan related field is being changed */
-#define SPC_ALARMACK 5 /*Special Alarm Acknowledgement*/
-#define SPC_AS 6 /* Access Security*/
-#define SPC_ATTRIBUTE 7 /* psuedo field, i.e. attribute field*/
+#define SPC_NOMOD 1 /*Field must not be modified*/
+#define SPC_DBADDR 2 /*db_name_to_addr must call cvt_dbaddr*/
+#define SPC_SCAN 3 /*A scan related field is being changed*/
+#define SPC_ALARMACK 5 /*Special Alarm Acknowledgement*/
+#define SPC_AS 6 /* Access Security*/
+#define SPC_ATTRIBUTE 7 /* psuedo field, i.e. attribute field*/
/* useful when record support must be notified of a field changing value*/
-#define SPC_MOD 100
-/* used by all records that support a reset field */
-#define SPC_RESET 101 /*The res field is being modified*/
+#define SPC_MOD 100
+/* used by all records that support a reset field*/
+#define SPC_RESET 101 /*The res field is being modified*/
/* Specific to conversion (Currently only ai */
-#define SPC_LINCONV 102 /*A linear conversion field is being changed*/
+#define SPC_LINCONV 102 /*A linear conversion field is being changed*/
/* Specific to calculation records */
-#define SPC_CALC 103 /*The CALC field is being changed*/
+#define SPC_CALC 103 /*The CALC field is being changed*/
#define SPC_NTYPES 9
typedef struct mapspcType{
- char *strvalue;
- int value;
+ char *strvalue;
+ int value;
}mapspcType;
#ifndef SPECIAL_GBLSOURCE
extern mapspcType pamapspcType[];
#else
mapspcType pamapspcType[SPC_NTYPES] = {
- {"SPC_NOMOD",SPC_NOMOD},
- {"SPC_DBADDR",SPC_DBADDR},
- {"SPC_SCAN",SPC_SCAN},
- {"SPC_ALARMACK",SPC_ALARMACK},
- {"SPC_AS",SPC_AS},
- {"SPC_MOD",SPC_MOD},
- {"SPC_RESET",SPC_RESET},
- {"SPC_LINCONV",SPC_LINCONV},
- {"SPC_CALC",SPC_CALC}
+ {"SPC_NOMOD",SPC_NOMOD},
+ {"SPC_DBADDR",SPC_DBADDR},
+ {"SPC_SCAN",SPC_SCAN},
+ {"SPC_ALARMACK",SPC_ALARMACK},
+ {"SPC_AS",SPC_AS},
+ {"SPC_MOD",SPC_MOD},
+ {"SPC_RESET",SPC_RESET},
+ {"SPC_LINCONV",SPC_LINCONV},
+ {"SPC_CALC",SPC_CALC}
};
#endif /*SPECIAL_GBLSOURCE*/
diff --git a/modules/database/src/ioc/misc/iocInit.h b/modules/database/src/ioc/misc/iocInit.h
index 24ae45e..5e19862 100644
--- a/modules/database/src/ioc/misc/iocInit.h
+++ b/modules/database/src/ioc/misc/iocInit.h
@@ -6,7 +6,7 @@
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/* iocInit.h ioc initialization */
+/* iocInit.h ioc initialization */
#ifndef INCiocInith
#define INCiocInith
diff --git a/modules/database/src/std/softIoc/softMain.cpp b/modules/database/src/std/softIoc/softMain.cpp
index 85a3b73..2a6223e 100644
--- a/modules/database/src/std/softIoc/softMain.cpp
+++ b/modules/database/src/std/softIoc/softMain.cpp
@@ -7,7 +7,7 @@
* found in the file LICENSE that is included with this distribution.
\*************************************************************************/
-/* Author: Andrew Johnson Date: 2003-04-08 */
+/* Author: Andrew Johnson Date: 2003-04-08 */
#include <iostream>
#include <string>
@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
std::cout<<"# End "<<argv[optind]<<"\n";
epicsThreadSleep(0.2);
- loadedDb = true; /* Give it the benefit of the doubt... */
+ loadedDb = true; /* Give it the benefit of the doubt... */
}
if (loadedDb) {
diff --git a/modules/database/src/template/top/exampleApp/src/_APPNAME_Main.cpp b/modules/database/src/template/top/exampleApp/src/_APPNAME_Main.cpp
index ae0ecb6..fe4f105 100644
--- a/modules/database/src/template/top/exampleApp/src/_APPNAME_Main.cpp
+++ b/modules/database/src/template/top/exampleApp/src/_APPNAME_Main.cpp
@@ -13,7 +13,7 @@
int main(int argc,char *argv[])
{
- if(argc>=2) {
+ if(argc>=2) {
iocsh(argv[1]);
epicsThreadSleep(.2);
}
diff --git a/modules/database/src/template/top/iocApp/src/_APPNAME_Main.cpp b/modules/database/src/template/top/iocApp/src/_APPNAME_Main.cpp
index ae0ecb6..fe4f105 100644
--- a/modules/database/src/template/top/iocApp/src/_APPNAME_Main.cpp
+++ b/modules/database/src/template/top/iocApp/src/_APPNAME_Main.cpp
@@ -13,7 +13,7 @@
int main(int argc,char *argv[])
{
- if(argc>=2) {
+ if(argc>=2) {
iocsh(argv[1]);
epicsThreadSleep(.2);
}
diff --git a/modules/libcom/src/as/asLib.h b/modules/libcom/src/as/asLib.h
index 528ce6e..ddcb0c0 100644
--- a/modules/libcom/src/as/asLib.h
+++ b/modules/libcom/src/as/asLib.h
@@ -30,7 +30,7 @@ typedef struct asgMember *ASMEMBERPVT;
typedef struct asgClient *ASCLIENTPVT;
typedef int (*ASINPUTFUNCPTR)(char *buf,int max_size);
typedef enum{
- asClientCOAR /*Change of access rights*/
+ asClientCOAR /*Change of access rights*/
/*For now this is all*/
} asClientStatus;
@@ -125,20 +125,20 @@ epicsShareFunc void * epicsShareAPI asTrapWriteBeforeWithData(
epicsShareFunc void epicsShareAPI asTrapWriteAfterWrite(void *pvt);
-#define S_asLib_clientsExist (M_asLib| 1) /*Client Exists*/
-#define S_asLib_noUag (M_asLib| 2) /*User Access Group does not exist*/
-#define S_asLib_noHag (M_asLib| 3) /*Host Access Group does not exist*/
-#define S_asLib_noAccess (M_asLib| 4) /*access security: no access allowed*/
-#define S_asLib_noModify (M_asLib| 5) /*access security: no modification allowed*/
-#define S_asLib_badConfig (M_asLib| 6) /*access security: bad configuration file*/
-#define S_asLib_badCalc (M_asLib| 7) /*access security: bad calculation espression*/
-#define S_asLib_dupAsg (M_asLib| 8) /*Duplicate Access Security Group */
-#define S_asLib_InitFailed (M_asLib| 9) /*access security: Init failed*/
-#define S_asLib_asNotActive (M_asLib|10) /*access security is not active*/
-#define S_asLib_badMember (M_asLib|11) /*access security: bad ASMEMBERPVT*/
-#define S_asLib_badClient (M_asLib|12) /*access security: bad ASCLIENTPVT*/
-#define S_asLib_badAsg (M_asLib|13) /*access security: bad ASG*/
-#define S_asLib_noMemory (M_asLib|14) /*access security: no Memory */
+#define S_asLib_clientsExist (M_asLib| 1) /*Client Exists*/
+#define S_asLib_noUag (M_asLib| 2) /*User Access Group does not exist*/
+#define S_asLib_noHag (M_asLib| 3) /*Host Access Group does not exist*/
+#define S_asLib_noAccess (M_asLib| 4) /*access security: no access allowed*/
+#define S_asLib_noModify (M_asLib| 5) /*access security: no modification allowed*/
+#define S_asLib_badConfig (M_asLib| 6) /*access security: bad configuration file*/
+#define S_asLib_badCalc (M_asLib| 7) /*access security: bad calculation espression*/
+#define S_asLib_dupAsg (M_asLib| 8) /*Duplicate Access Security Group */
+#define S_asLib_InitFailed (M_asLib| 9) /*access security: Init failed*/
+#define S_asLib_asNotActive (M_asLib|10) /*access security is not active*/
+#define S_asLib_badMember (M_asLib|11) /*access security: bad ASMEMBERPVT*/
+#define S_asLib_badClient (M_asLib|12) /*access security: bad ASCLIENTPVT*/
+#define S_asLib_badAsg (M_asLib|13) /*access security: bad ASG*/
+#define S_asLib_noMemory (M_asLib|14) /*access security: no Memory */
/*Private declarations */
epicsShareExtern int asActive;
@@ -150,92 +150,92 @@ struct gphPvt;
/*Base pointers for access security*/
typedef struct asBase{
- ELLLIST uagList;
- ELLLIST hagList;
- ELLLIST asgList;
- struct gphPvt *phash;
+ ELLLIST uagList;
+ ELLLIST hagList;
+ ELLLIST asgList;
+ struct gphPvt *phash;
} ASBASE;
epicsShareExtern volatile ASBASE *pasbase;
/*Defs for User Access Groups*/
typedef struct{
- ELLNODE node;
- char *user;
+ ELLNODE node;
+ char *user;
} UAGNAME;
typedef struct uag{
- ELLNODE node;
- char *name;
- ELLLIST list; /*list of UAGNAME*/
+ ELLNODE node;
+ char *name;
+ ELLLIST list; /*list of UAGNAME*/
} UAG;
/*Defs for Host Access Groups*/
typedef struct{
- ELLNODE node;
- char host[1];
+ ELLNODE node;
+ char host[1];
} HAGNAME;
typedef struct hag{
- ELLNODE node;
- char *name;
- ELLLIST list; /*list of HAGNAME*/
+ ELLNODE node;
+ char *name;
+ ELLLIST list; /*list of HAGNAME*/
} HAG;
/*Defs for Access SecurityGroups*/
typedef struct {
- ELLNODE node;
- UAG *puag;
+ ELLNODE node;
+ UAG *puag;
}ASGUAG;
typedef struct {
- ELLNODE node;
- HAG *phag;
+ ELLNODE node;
+ HAG *phag;
}ASGHAG;
#define AS_TRAP_WRITE 1
typedef struct{
- ELLNODE node;
- asAccessRights access;
- int level;
- unsigned long inpUsed; /*bitmap of which inputs are used*/
- int result; /*Result of calc converted to TRUE/FALSE*/
- char *calc;
- void *rpcl;
- ELLLIST uagList; /*List of ASGUAG*/
- ELLLIST hagList; /*List of ASGHAG*/
- int trapMask;
+ ELLNODE node;
+ asAccessRights access;
+ int level;
+ unsigned long inpUsed; /*bitmap of which inputs are used*/
+ int result; /*Result of calc converted to TRUE/FALSE*/
+ char *calc;
+ void *rpcl;
+ ELLLIST uagList; /*List of ASGUAG*/
+ ELLLIST hagList; /*List of ASGHAG*/
+ int trapMask;
} ASGRULE;
typedef struct{
- ELLNODE node;
- char *inp;
- void *capvt;
- struct asg *pasg;
- int inpIndex;
+ ELLNODE node;
+ char *inp;
+ void *capvt;
+ struct asg *pasg;
+ int inpIndex;
}ASGINP;
typedef struct asg{
- ELLNODE node;
- char *name;
- ELLLIST inpList;
- ELLLIST ruleList;
- ELLLIST memberList;
- double *pavalue; /*pointer to array of input values*/
- unsigned long inpBad; /*bitmap of which inputs are bad*/
- unsigned long inpChanged; /*bitmap of inputs that changed*/
+ ELLNODE node;
+ char *name;
+ ELLLIST inpList;
+ ELLLIST ruleList;
+ ELLLIST memberList;
+ double *pavalue; /*pointer to array of input values*/
+ unsigned long inpBad; /*bitmap of which inputs are bad*/
+ unsigned long inpChanged; /*bitmap of inputs that changed*/
} ASG;
typedef struct asgMember {
- ELLNODE node;
- ASG *pasg;
- ELLLIST clientList;
- const char *asgName;
- void *userPvt;
+ ELLNODE node;
+ ASG *pasg;
+ ELLLIST clientList;
+ const char *asgName;
+ void *userPvt;
} ASGMEMBER;
typedef struct asgClient {
- ELLNODE node;
- ASGMEMBER *pasgMember;
- const char *user;
- char *host;
- void *userPvt;
- ASCLIENTCALLBACK pcallback;
- int level;
- asAccessRights access;
- int trapMask;
+ ELLNODE node;
+ ASGMEMBER *pasgMember;
+ const char *user;
+ char *host;
+ void *userPvt;
+ ASCLIENTCALLBACK pcallback;
+ int level;
+ asAccessRights access;
+ int trapMask;
} ASGCLIENT;
epicsShareFunc long epicsShareAPI asComputeAsg(ASG *pasg);
diff --git a/modules/libcom/src/bucketLib/bucketLib.h b/modules/libcom/src/bucketLib/bucketLib.h
index 60d73b4..503fb33 100644
--- a/modules/libcom/src/bucketLib/bucketLib.h
+++ b/modules/libcom/src/bucketLib/bucketLib.h
@@ -12,8 +12,8 @@
* (505) 665 1831
* Date: 9-93
*
- * NOTES:
- * .01 Storage for identifier must persist until an item is deleted
+ * NOTES:
+ * .01 Storage for identifier must persist until an item is deleted
*/
#ifndef INCbucketLibh
@@ -27,23 +27,23 @@ extern "C" {
#include "epicsTypes.h"
#include "shareLib.h"
-typedef unsigned BUCKETID;
+typedef unsigned BUCKETID;
typedef enum {bidtUnsigned, bidtPointer, bidtString} buckTypeOfId;
typedef struct item{
- struct item *pItem;
- const void *pId;
- const void *pApp;
- buckTypeOfId type;
+ struct item *pItem;
+ const void *pId;
+ const void *pApp;
+ buckTypeOfId type;
}ITEM;
typedef struct bucket{
- ITEM **pTable;
- void *freeListPVT;
- unsigned hashIdMask;
- unsigned hashIdNBits;
- unsigned nInUse;
+ ITEM **pTable;
+ void *freeListPVT;
+ unsigned hashIdMask;
+ unsigned hashIdNBits;
+ unsigned nInUse;
}BUCKET;
epicsShareFunc BUCKET * epicsShareAPI bucketCreate (unsigned nHashTableEntries);
@@ -55,11 +55,11 @@ epicsShareFunc int epicsShareAPI bucketShow (BUCKET *pb);
* the item is deleted from the bucket !!
*/
epicsShareFunc int epicsShareAPI bucketAddItemUnsignedId (BUCKET *prb,
- const unsigned *pId, const void *pApp);
+ const unsigned *pId, const void *pApp);
epicsShareFunc int epicsShareAPI bucketAddItemPointerId (BUCKET *prb,
- void * const *pId, const void *pApp);
+ void * const *pId, const void *pApp);
epicsShareFunc int epicsShareAPI bucketAddItemStringId (BUCKET *prb,
- const char *pId, const void *pApp);
+ const char *pId, const void *pApp);
epicsShareFunc int epicsShareAPI bucketRemoveItemUnsignedId (BUCKET *prb, const unsigned *pId);
epicsShareFunc int epicsShareAPI bucketRemoveItemPointerId (BUCKET *prb, void * const *pId);
@@ -77,11 +77,11 @@ epicsShareFunc void * epicsShareAPI bucketLookupAndRemoveItemStringId (BUCKET *p
/*
* Status returned by bucketLib functions
*/
-#define BUCKET_SUCCESS S_bucket_success
-#define S_bucket_success 0
-#define S_bucket_noMemory (M_bucket | 1) /*Memory allocation failed*/
-#define S_bucket_idInUse (M_bucket | 2) /*Identifier already in use*/
-#define S_bucket_uknId (M_bucket | 3) /*Unknown identifier*/
+#define BUCKET_SUCCESS S_bucket_success
+#define S_bucket_success 0
+#define S_bucket_noMemory (M_bucket | 1) /*Memory allocation failed*/
+#define S_bucket_idInUse (M_bucket | 2) /*Identifier already in use*/
+#define S_bucket_uknId (M_bucket | 3) /*Unknown identifier*/
#ifdef __cplusplus
}
diff --git a/modules/libcom/src/calc/calcPerform.c b/modules/libcom/src/calc/calcPerform.c
index c0f4aeb..a5bc3a9 100644
--- a/modules/libcom/src/calc/calcPerform.c
+++ b/modules/libcom/src/calc/calcPerform.c
@@ -7,8 +7,8 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
- * Author: Julie Sander and Bob Dalesio
- * Date: 07-27-87
+ * Author: Julie Sander and Bob Dalesio
+ * Date: 07-27-87
*/
#include <stdlib.h>
@@ -44,11 +44,11 @@ static int cond_search(const char **ppinst, int match);
epicsShareFunc long
calcPerform(double *parg, double *presult, const char *pinst)
{
- double stack[CALCPERFORM_STACK+1]; /* zero'th entry not used */
- double *ptop; /* stack pointer */
- double top; /* value from top of stack */
- epicsInt32 itop; /* integer from top of stack */
- epicsUInt32 utop; /* unsigned integer from top of stack */
+ double stack[CALCPERFORM_STACK+1]; /* zero'th entry not used */
+ double *ptop; /* stack pointer */
+ double top; /* value from top of stack */
+ epicsInt32 itop; /* integer from top of stack */
+ epicsUInt32 utop; /* unsigned integer from top of stack */
int op;
int nargs;
@@ -57,235 +57,235 @@ epicsShareFunc long
/* RPN evaluation loop */
while ((op = *pinst++) != END_EXPRESSION){
- switch (op){
-
- case LITERAL_DOUBLE:
- memcpy(++ptop, pinst, sizeof(double));
- pinst += sizeof(double);
- break;
-
- case LITERAL_INT:
- memcpy(&itop, pinst, sizeof(epicsInt32));
- *++ptop = itop;
- pinst += sizeof(epicsInt32);
- break;
-
- case FETCH_VAL:
- *++ptop = *presult;
- break;
-
- case FETCH_A:
- case FETCH_B:
- case FETCH_C:
- case FETCH_D:
- case FETCH_E:
- case FETCH_F:
- case FETCH_G:
- case FETCH_H:
- case FETCH_I:
- case FETCH_J:
- case FETCH_K:
- case FETCH_L:
- *++ptop = parg[op - FETCH_A];
- break;
-
- case STORE_A:
- case STORE_B:
- case STORE_C:
- case STORE_D:
- case STORE_E:
- case STORE_F:
- case STORE_G:
- case STORE_H:
- case STORE_I:
- case STORE_J:
- case STORE_K:
- case STORE_L:
- parg[op - STORE_A] = *ptop--;
- break;
-
- case CONST_PI:
- *++ptop = PI;
- break;
-
- case CONST_D2R:
- *++ptop = PI/180.;
- break;
-
- case CONST_R2D:
- *++ptop = 180./PI;
- break;
-
- case UNARY_NEG:
- *ptop = - *ptop;
- break;
-
- case ADD:
- top = *ptop--;
- *ptop += top;
- break;
-
- case SUB:
- top = *ptop--;
- *ptop -= top;
- break;
-
- case MULT:
- top = *ptop--;
- *ptop *= top;
- break;
-
- case DIV:
- top = *ptop--;
- *ptop /= top;
- break;
-
- case MODULO:
- itop = (epicsInt32) *ptop--;
- if (itop)
- *ptop = (epicsInt32) *ptop % itop;
- else
- *ptop = epicsNAN;
- break;
-
- case POWER:
- top = *ptop--;
- *ptop = pow(*ptop, top);
- break;
-
- case ABS_VAL:
- *ptop = fabs(*ptop);
- break;
-
- case EXP:
- *ptop = exp(*ptop);
- break;
-
- case LOG_10:
- *ptop = log10(*ptop);
- break;
-
- case LOG_E:
- *ptop = log(*ptop);
- break;
-
- case MAX:
- nargs = *pinst++;
- while (--nargs) {
- top = *ptop--;
- if (*ptop < top || isnan(top))
- *ptop = top;
- }
- break;
-
- case MIN:
- nargs = *pinst++;
- while (--nargs) {
- top = *ptop--;
- if (*ptop > top || isnan(top))
- *ptop = top;
- }
- break;
-
- case SQU_RT:
- *ptop = sqrt(*ptop);
- break;
-
- case ACOS:
- *ptop = acos(*ptop);
- break;
-
- case ASIN:
- *ptop = asin(*ptop);
- break;
-
- case ATAN:
- *ptop = atan(*ptop);
- break;
-
- case ATAN2:
- top = *ptop--;
- *ptop = atan2(top, *ptop); /* Ouch!: Args backwards! */
- break;
-
- case COS:
- *ptop = cos(*ptop);
- break;
-
- case SIN:
- *ptop = sin(*ptop);
- break;
-
- case TAN:
- *ptop = tan(*ptop);
- break;
-
- case COSH:
- *ptop = cosh(*ptop);
- break;
-
- case SINH:
- *ptop = sinh(*ptop);
- break;
-
- case TANH:
- *ptop = tanh(*ptop);
- break;
-
- case CEIL:
- *ptop = ceil(*ptop);
- break;
-
- case FLOOR:
- *ptop = floor(*ptop);
- break;
-
- case FINITE:
- nargs = *pinst++;
- top = finite(*ptop);
- while (--nargs) {
- --ptop;
- top = top && finite(*ptop);
- }
- *ptop = top;
- break;
-
- case ISINF:
- *ptop = isinf(*ptop);
- break;
-
- case ISNAN:
- nargs = *pinst++;
- top = isnan(*ptop);
- while (--nargs) {
- --ptop;
- top = top || isnan(*ptop);
- }
- *ptop = top;
- break;
-
- case NINT:
- top = *ptop;
- *ptop = (epicsInt32) (top >= 0 ? top + 0.5 : top - 0.5);
- break;
-
- case RANDOM:
- *++ptop = calcRandom();
- break;
-
- case REL_OR:
- top = *ptop--;
- *ptop = *ptop || top;
- break;
-
- case REL_AND:
- top = *ptop--;
- *ptop = *ptop && top;
- break;
-
- case REL_NOT:
- *ptop = ! *ptop;
- break;
+ switch (op){
+
+ case LITERAL_DOUBLE:
+ memcpy(++ptop, pinst, sizeof(double));
+ pinst += sizeof(double);
+ break;
+
+ case LITERAL_INT:
+ memcpy(&itop, pinst, sizeof(epicsInt32));
+ *++ptop = itop;
+ pinst += sizeof(epicsInt32);
+ break;
+
+ case FETCH_VAL:
+ *++ptop = *presult;
+ break;
+
+ case FETCH_A:
+ case FETCH_B:
+ case FETCH_C:
+ case FETCH_D:
+ case FETCH_E:
+ case FETCH_F:
+ case FETCH_G:
+ case FETCH_H:
+ case FETCH_I:
+ case FETCH_J:
+ case FETCH_K:
+ case FETCH_L:
+ *++ptop = parg[op - FETCH_A];
+ break;
+
+ case STORE_A:
+ case STORE_B:
+ case STORE_C:
+ case STORE_D:
+ case STORE_E:
+ case STORE_F:
+ case STORE_G:
+ case STORE_H:
+ case STORE_I:
+ case STORE_J:
+ case STORE_K:
+ case STORE_L:
+ parg[op - STORE_A] = *ptop--;
+ break;
+
+ case CONST_PI:
+ *++ptop = PI;
+ break;
+
+ case CONST_D2R:
+ *++ptop = PI/180.;
+ break;
+
+ case CONST_R2D:
+ *++ptop = 180./PI;
+ break;
+
+ case UNARY_NEG:
+ *ptop = - *ptop;
+ break;
+
+ case ADD:
+ top = *ptop--;
+ *ptop += top;
+ break;
+
+ case SUB:
+ top = *ptop--;
+ *ptop -= top;
+ break;
+
+ case MULT:
+ top = *ptop--;
+ *ptop *= top;
+ break;
+
+ case DIV:
+ top = *ptop--;
+ *ptop /= top;
+ break;
+
+ case MODULO:
+ itop = (epicsInt32) *ptop--;
+ if (itop)
+ *ptop = (epicsInt32) *ptop % itop;
+ else
+ *ptop = epicsNAN;
+ break;
+
+ case POWER:
+ top = *ptop--;
+ *ptop = pow(*ptop, top);
+ break;
+
+ case ABS_VAL:
+ *ptop = fabs(*ptop);
+ break;
+
+ case EXP:
+ *ptop = exp(*ptop);
+ break;
+
+ case LOG_10:
+ *ptop = log10(*ptop);
+ break;
+
+ case LOG_E:
+ *ptop = log(*ptop);
+ break;
+
+ case MAX:
+ nargs = *pinst++;
+ while (--nargs) {
+ top = *ptop--;
+ if (*ptop < top || isnan(top))
+ *ptop = top;
+ }
+ break;
+
+ case MIN:
+ nargs = *pinst++;
+ while (--nargs) {
+ top = *ptop--;
+ if (*ptop > top || isnan(top))
+ *ptop = top;
+ }
+ break;
+
+ case SQU_RT:
+ *ptop = sqrt(*ptop);
+ break;
+
+ case ACOS:
+ *ptop = acos(*ptop);
+ break;
+
+ case ASIN:
+ *ptop = asin(*ptop);
+ break;
+
+ case ATAN:
+ *ptop = atan(*ptop);
+ break;
+
+ case ATAN2:
+ top = *ptop--;
+ *ptop = atan2(top, *ptop); /* Ouch!: Args backwards! */
+ break;
+
+ case COS:
+ *ptop = cos(*ptop);
+ break;
+
+ case SIN:
+ *ptop = sin(*ptop);
+ break;
+
+ case TAN:
+ *ptop = tan(*ptop);
+ break;
+
+ case COSH:
+ *ptop = cosh(*ptop);
+ break;
+
+ case SINH:
+ *ptop = sinh(*ptop);
+ break;
+
+ case TANH:
+ *ptop = tanh(*ptop);
+ break;
+
+ case CEIL:
+ *ptop = ceil(*ptop);
+ break;
+
+ case FLOOR:
+ *ptop = floor(*ptop);
+ break;
+
+ case FINITE:
+ nargs = *pinst++;
+ top = finite(*ptop);
+ while (--nargs) {
+ --ptop;
+ top = top && finite(*ptop);
+ }
+ *ptop = top;
+ break;
+
+ case ISINF:
+ *ptop = isinf(*ptop);
+ break;
+
+ case ISNAN:
+ nargs = *pinst++;
+ top = isnan(*ptop);
+ while (--nargs) {
+ --ptop;
+ top = top || isnan(*ptop);
+ }
+ *ptop = top;
+ break;
+
+ case NINT:
+ top = *ptop;
+ *ptop = (epicsInt32) (top >= 0 ? top + 0.5 : top - 0.5);
+ break;
+
+ case RANDOM:
+ *++ptop = calcRandom();
+ break;
+
+ case REL_OR:
+ top = *ptop--;
+ *ptop = *ptop || top;
+ break;
+
+ case REL_AND:
+ top = *ptop--;
+ *ptop = *ptop && top;
+ break;
+
+ case REL_NOT:
+ *ptop = ! *ptop;
+ break;
/* For bitwise operations on values with bit 31 set, double values
* must first be cast to unsigned to correctly set that bit; the
@@ -293,92 +293,92 @@ epicsShareFunc long
* cast to a signed integer before converting to the double result.
*/
- case BIT_OR:
- utop = *ptop--;
- *ptop = (epicsInt32) ((epicsUInt32) *ptop | utop);
- break;
+ case BIT_OR:
+ utop = *ptop--;
+ *ptop = (epicsInt32) ((epicsUInt32) *ptop | utop);
+ break;
- case BIT_AND:
- utop = *ptop--;
- *ptop = (epicsInt32) ((epicsUInt32) *ptop & utop);
- break;
+ case BIT_AND:
+ utop = *ptop--;
+ *ptop = (epicsInt32) ((epicsUInt32) *ptop & utop);
+ break;
- case BIT_EXCL_OR:
- utop = *ptop--;
- *ptop = (epicsInt32) ((epicsUInt32) *ptop ^ utop);
- break;
+ case BIT_EXCL_OR:
+ utop = *ptop--;
+ *ptop = (epicsInt32) ((epicsUInt32) *ptop ^ utop);
+ break;
- case BIT_NOT:
- utop = *ptop;
- *ptop = (epicsInt32) ~utop;
- break;
+ case BIT_NOT:
+ utop = *ptop;
+ *ptop = (epicsInt32) ~utop;
+ break;
/* The shift operators use signed integers, so a right-shift will
* extend the sign bit into the left-hand end of the value. The
* double-casting through unsigned here is important, see above.
*/
- case RIGHT_SHIFT:
- utop = *ptop--;
- *ptop = ((epicsInt32) (epicsUInt32) *ptop) >> (utop & 31);
- break;
-
- case LEFT_SHIFT:
- utop = *ptop--;
- *ptop = ((epicsInt32) (epicsUInt32) *ptop) << (utop & 31);
- break;
-
- case NOT_EQ:
- top = *ptop--;
- *ptop = *ptop != top;
- break;
-
- case LESS_THAN:
- top = *ptop--;
- *ptop = *ptop < top;
- break;
-
- case LESS_OR_EQ:
- top = *ptop--;
- *ptop = *ptop <= top;
- break;
-
- case EQUAL:
- top = *ptop--;
- *ptop = *ptop == top;
- break;
-
- case GR_OR_EQ:
- top = *ptop--;
- *ptop = *ptop >= top;
- break;
-
- case GR_THAN:
- top = *ptop--;
- *ptop = *ptop > top;
- break;
-
- case COND_IF:
- if (*ptop-- == 0.0 &&
- cond_search(&pinst, COND_ELSE)) return -1;
- break;
-
- case COND_ELSE:
- if (cond_search(&pinst, COND_END)) return -1;
- break;
-
- case COND_END:
- break;
-
- default:
- errlogPrintf("calcPerform: Bad Opcode %d at %p\n", op, pinst-1);
- return -1;
- }
+ case RIGHT_SHIFT:
+ utop = *ptop--;
+ *ptop = ((epicsInt32) (epicsUInt32) *ptop) >> (utop & 31);
+ break;
+
+ case LEFT_SHIFT:
+ utop = *ptop--;
+ *ptop = ((epicsInt32) (epicsUInt32) *ptop) << (utop & 31);
+ break;
+
+ case NOT_EQ:
+ top = *ptop--;
+ *ptop = *ptop != top;
+ break;
+
+ case LESS_THAN:
+ top = *ptop--;
+ *ptop = *ptop < top;
+ break;
+
+ case LESS_OR_EQ:
+ top = *ptop--;
+ *ptop = *ptop <= top;
+ break;
+
+ case EQUAL:
+ top = *ptop--;
+ *ptop = *ptop == top;
+ break;
+
+ case GR_OR_EQ:
+ top = *ptop--;
+ *ptop = *ptop >= top;
+ break;
+
+ case GR_THAN:
+ top = *ptop--;
+ *ptop = *ptop > top;
+ break;
+
+ case COND_IF:
+ if (*ptop-- == 0.0 &&
+ cond_search(&pinst, COND_ELSE)) return -1;
+ break;
+
+ case COND_ELSE:
+ if (cond_search(&pinst, COND_END)) return -1;
+ break;
+
+ case COND_END:
+ break;
+
+ default:
+ errlogPrintf("calcPerform: Bad Opcode %d at %p\n", op, pinst-1);
+ return -1;
+ }
}
/* The stack should now have one item on it, the expression value */
if (ptop != stack + 1)
- return -1;
+ return -1;
*presult = *ptop;
return 0;
}
@@ -394,55 +394,55 @@ calcArgUsage(const char *pinst, unsigned long *pinputs, unsigned long *pstores)
unsigned long stores = 0;
char op;
while ((op = *pinst++) != END_EXPRESSION) {
- switch (op) {
-
- case LITERAL_DOUBLE:
- pinst += sizeof(double);
- break;
- case LITERAL_INT:
- pinst += sizeof(epicsInt32);
- break;
- case MIN:
- case MAX:
- case FINITE:
- case ISNAN:
- pinst++;
- break;
-
- case FETCH_A:
- case FETCH_B:
- case FETCH_C:
- case FETCH_D:
- case FETCH_E:
- case FETCH_F:
- case FETCH_G:
- case FETCH_H:
- case FETCH_I:
- case FETCH_J:
- case FETCH_K:
- case FETCH_L:
- /* Don't claim to use an arg we already stored to */
- inputs |= (1 << (op - FETCH_A)) & ~stores;
- break;
-
- case STORE_A:
- case STORE_B:
- case STORE_C:
- case STORE_D:
- case STORE_E:
- case STORE_F:
- case STORE_G:
- case STORE_H:
- case STORE_I:
- case STORE_J:
- case STORE_K:
- case STORE_L:
- stores |= (1 << (op - STORE_A));
- break;
-
- default:
- break;
- }
+ switch (op) {
+
+ case LITERAL_DOUBLE:
+ pinst += sizeof(double);
+ break;
+ case LITERAL_INT:
+ pinst += sizeof(epicsInt32);
+ break;
+ case MIN:
+ case MAX:
+ case FINITE:
+ case ISNAN:
+ pinst++;
+ break;
+
+ case FETCH_A:
+ case FETCH_B:
+ case FETCH_C:
+ case FETCH_D:
+ case FETCH_E:
+ case FETCH_F:
+ case FETCH_G:
+ case FETCH_H:
+ case FETCH_I:
+ case FETCH_J:
+ case FETCH_K:
+ case FETCH_L:
+ /* Don't claim to use an arg we already stored to */
+ inputs |= (1 << (op - FETCH_A)) & ~stores;
+ break;
+
+ case STORE_A:
+ case STORE_B:
+ case STORE_C:
+ case STORE_D:
+ case STORE_E:
+ case STORE_F:
+ case STORE_G:
+ case STORE_H:
+ case STORE_I:
+ case STORE_J:
+ case STORE_K:
+ case STORE_L:
+ stores |= (1 << (op - STORE_A));
+ break;
+
+ default:
+ break;
+ }
}
if (pinputs) *pinputs = inputs;
if (pstores) *pstores = stores;
@@ -478,27 +478,27 @@ static int cond_search(const char **ppinst, int match)
int op;
while ((op = *pinst++) != END_EXPRESSION) {
- if (op == match && --count == 0) {
- *ppinst = pinst;
- return 0;
- }
- switch (op) {
- case LITERAL_DOUBLE:
- pinst += sizeof(double);
- break;
- case LITERAL_INT:
- pinst += sizeof(epicsInt32);
- break;
- case MIN:
- case MAX:
- case FINITE:
- case ISNAN:
- pinst++;
- break;
- case COND_IF:
- count++;
- break;
- }
+ if (op == match && --count == 0) {
+ *ppinst = pinst;
+ return 0;
+ }
+ switch (op) {
+ case LITERAL_DOUBLE:
+ pinst += sizeof(double);
+ break;
+ case LITERAL_INT:
+ pinst += sizeof(epicsInt32);
+ break;
+ case MIN:
+ case MAX:
+ case FINITE:
+ case ISNAN:
+ pinst++;
+ break;
+ case COND_IF:
+ count++;
+ break;
+ }
}
return 1;
}
diff --git a/modules/libcom/src/calc/postfix.c b/modules/libcom/src/calc/postfix.c
index 463ceea..4621bc9 100644
--- a/modules/libcom/src/calc/postfix.c
+++ b/modules/libcom/src/calc/postfix.c
@@ -32,16 +32,16 @@
/* element types */
typedef enum {
- OPERAND,
- LITERAL_OPERAND,
- STORE_OPERATOR,
- UNARY_OPERATOR,
- VARARG_OPERATOR,
- BINARY_OPERATOR,
- SEPERATOR,
- CLOSE_PAREN,
- CONDITIONAL,
- EXPR_TERMINATOR,
+ OPERAND,
+ LITERAL_OPERAND,
+ STORE_OPERATOR,
+ UNARY_OPERATOR,
+ VARARG_OPERATOR,
+ BINARY_OPERATOR,
+ SEPERATOR,
+ CLOSE_PAREN,
+ CONDITIONAL,
+ EXPR_TERMINATOR,
} element_type;
@@ -50,12 +50,12 @@ typedef enum {
* structure of an element
*/
typedef struct expression_element{
- char *name; /* character representation of an element */
- char in_stack_pri; /* priority on translation stack */
+ char *name; /* character representation of an element */
+ char in_stack_pri; /* priority on translation stack */
char in_coming_pri; /* priority in input string */
signed char runtime_effect; /* stack change, positive means push */
- element_type type; /* element type */
- rpn_opcode code; /* postfix opcode */
+ element_type type; /* element type */
+ rpn_opcode code; /* postfix opcode */
} ELEMENT;
/*
@@ -66,102 +66,102 @@ typedef struct expression_element{
* routine at the end of this file.
*/
static const ELEMENT operands[] = {
-/* name prio's stack element type opcode */
-{"!", 7, 8, 0, UNARY_OPERATOR, REL_NOT},
-{"(", 0, 8, 0, UNARY_OPERATOR, NOT_GENERATED},
-{"-", 7, 8, 0, UNARY_OPERATOR, UNARY_NEG},
-{".", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
-{"0", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
-{"0X", 0, 0, 1, LITERAL_OPERAND,LITERAL_INT},
-{"1", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
-{"2", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
-{"3", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
-{"4", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
-{"5", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
-{"6", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
-{"7", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
-{"8", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
-{"9", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
-{"A", 0, 0, 1, OPERAND, FETCH_A},
-{"ABS", 7, 8, 0, UNARY_OPERATOR, ABS_VAL},
-{"ACOS", 7, 8, 0, UNARY_OPERATOR, ACOS},
-{"ASIN", 7, 8, 0, UNARY_OPERATOR, ASIN},
-{"ATAN", 7, 8, 0, UNARY_OPERATOR, ATAN},
-{"ATAN2", 7, 8, -1, UNARY_OPERATOR, ATAN2},
-{"B", 0, 0, 1, OPERAND, FETCH_B},
-{"C", 0, 0, 1, OPERAND, FETCH_C},
-{"CEIL", 7, 8, 0, UNARY_OPERATOR, CEIL},
-{"COS", 7, 8, 0, UNARY_OPERATOR, COS},
-{"COSH", 7, 8, 0, UNARY_OPERATOR, COSH},
-{"D", 0, 0, 1, OPERAND, FETCH_D},
-{"D2R", 0, 0, 1, OPERAND, CONST_D2R},
-{"E", 0, 0, 1, OPERAND, FETCH_E},
-{"EXP", 7, 8, 0, UNARY_OPERATOR, EXP},
-{"F", 0, 0, 1, OPERAND, FETCH_F},
-{"FINITE", 7, 8, 0, VARARG_OPERATOR,FINITE},
-{"FLOOR", 7, 8, 0, UNARY_OPERATOR, FLOOR},
-{"G", 0, 0, 1, OPERAND, FETCH_G},
-{"H", 0, 0, 1, OPERAND, FETCH_H},
-{"I", 0, 0, 1, OPERAND, FETCH_I},
-{"INF", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
-{"ISINF", 7, 8, 0, UNARY_OPERATOR, ISINF},
-{"ISNAN", 7, 8, 0, VARARG_OPERATOR,ISNAN},
-{"J", 0, 0, 1, OPERAND, FETCH_J},
-{"K", 0, 0, 1, OPERAND, FETCH_K},
-{"L", 0, 0, 1, OPERAND, FETCH_L},
-{"LN", 7, 8, 0, UNARY_OPERATOR, LOG_E},
-{"LOG", 7, 8, 0, UNARY_OPERATOR, LOG_10},
-{"LOGE", 7, 8, 0, UNARY_OPERATOR, LOG_E},
-{"MAX", 7, 8, 0, VARARG_OPERATOR,MAX},
-{"MIN", 7, 8, 0, VARARG_OPERATOR,MIN},
-{"NINT", 7, 8, 0, UNARY_OPERATOR, NINT},
-{"NAN", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
-{"NOT", 7, 8, 0, UNARY_OPERATOR, BIT_NOT},
-{"PI", 0, 0, 1, OPERAND, CONST_PI},
-{"R2D", 0, 0, 1, OPERAND, CONST_R2D},
-{"RNDM", 0, 0, 1, OPERAND, RANDOM},
-{"SIN", 7, 8, 0, UNARY_OPERATOR, SIN},
-{"SINH", 7, 8, 0, UNARY_OPERATOR, SINH},
-{"SQR", 7, 8, 0, UNARY_OPERATOR, SQU_RT},
-{"SQRT", 7, 8, 0, UNARY_OPERATOR, SQU_RT},
-{"TAN", 7, 8, 0, UNARY_OPERATOR, TAN},
-{"TANH", 7, 8, 0, UNARY_OPERATOR, TANH},
-{"VAL", 0, 0, 1, OPERAND, FETCH_VAL},
-{"~", 7, 8, 0, UNARY_OPERATOR, BIT_NOT},
+/* name prio's stack element type opcode */
+{"!", 7, 8, 0, UNARY_OPERATOR, REL_NOT},
+{"(", 0, 8, 0, UNARY_OPERATOR, NOT_GENERATED},
+{"-", 7, 8, 0, UNARY_OPERATOR, UNARY_NEG},
+{".", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
+{"0", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
+{"0X", 0, 0, 1, LITERAL_OPERAND,LITERAL_INT},
+{"1", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
+{"2", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
+{"3", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
+{"4", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
+{"5", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
+{"6", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
+{"7", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
+{"8", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
+{"9", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
+{"A", 0, 0, 1, OPERAND, FETCH_A},
+{"ABS", 7, 8, 0, UNARY_OPERATOR, ABS_VAL},
+{"ACOS", 7, 8, 0, UNARY_OPERATOR, ACOS},
+{"ASIN", 7, 8, 0, UNARY_OPERATOR, ASIN},
+{"ATAN", 7, 8, 0, UNARY_OPERATOR, ATAN},
+{"ATAN2", 7, 8, -1, UNARY_OPERATOR, ATAN2},
+{"B", 0, 0, 1, OPERAND, FETCH_B},
+{"C", 0, 0, 1, OPERAND, FETCH_C},
+{"CEIL", 7, 8, 0, UNARY_OPERATOR, CEIL},
+{"COS", 7, 8, 0, UNARY_OPERATOR, COS},
+{"COSH", 7, 8, 0, UNARY_OPERATOR, COSH},
+{"D", 0, 0, 1, OPERAND, FETCH_D},
+{"D2R", 0, 0, 1, OPERAND, CONST_D2R},
+{"E", 0, 0, 1, OPERAND, FETCH_E},
+{"EXP", 7, 8, 0, UNARY_OPERATOR, EXP},
+{"F", 0, 0, 1, OPERAND, FETCH_F},
+{"FINITE", 7, 8, 0, VARARG_OPERATOR,FINITE},
+{"FLOOR", 7, 8, 0, UNARY_OPERATOR, FLOOR},
+{"G", 0, 0, 1, OPERAND, FETCH_G},
+{"H", 0, 0, 1, OPERAND, FETCH_H},
+{"I", 0, 0, 1, OPERAND, FETCH_I},
+{"INF", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
+{"ISINF", 7, 8, 0, UNARY_OPERATOR, ISINF},
+{"ISNAN", 7, 8, 0, VARARG_OPERATOR,ISNAN},
+{"J", 0, 0, 1, OPERAND, FETCH_J},
+{"K", 0, 0, 1, OPERAND, FETCH_K},
+{"L", 0, 0, 1, OPERAND, FETCH_L},
+{"LN", 7, 8, 0, UNARY_OPERATOR, LOG_E},
+{"LOG", 7, 8, 0, UNARY_OPERATOR, LOG_10},
+{"LOGE", 7, 8, 0, UNARY_OPERATOR, LOG_E},
+{"MAX", 7, 8, 0, VARARG_OPERATOR,MAX},
+{"MIN", 7, 8, 0, VARARG_OPERATOR,MIN},
+{"NINT", 7, 8, 0, UNARY_OPERATOR, NINT},
+{"NAN", 0, 0, 1, LITERAL_OPERAND,LITERAL_DOUBLE},
+{"NOT", 7, 8, 0, UNARY_OPERATOR, BIT_NOT},
+{"PI", 0, 0, 1, OPERAND, CONST_PI},
+{"R2D", 0, 0, 1, OPERAND, CONST_R2D},
+{"RNDM", 0, 0, 1, OPERAND, RANDOM},
+{"SIN", 7, 8, 0, UNARY_OPERATOR, SIN},
+{"SINH", 7, 8, 0, UNARY_OPERATOR, SINH},
+{"SQR", 7, 8, 0, UNARY_OPERATOR, SQU_RT},
+{"SQRT", 7, 8, 0, UNARY_OPERATOR, SQU_RT},
+{"TAN", 7, 8, 0, UNARY_OPERATOR, TAN},
+{"TANH", 7, 8, 0, UNARY_OPERATOR, TANH},
+{"VAL", 0, 0, 1, OPERAND, FETCH_VAL},
+{"~", 7, 8, 0, UNARY_OPERATOR, BIT_NOT},
};
static const ELEMENT operators[] = {
-/* name prio's stack element type opcode */
-{"!=", 3, 3, -1, BINARY_OPERATOR,NOT_EQ},
-{"#", 3, 3, -1, BINARY_OPERATOR,NOT_EQ},
-{"%", 5, 5, -1, BINARY_OPERATOR,MODULO},
-{"&", 2, 2, -1, BINARY_OPERATOR,BIT_AND},
-{"&&", 2, 2, -1, BINARY_OPERATOR,REL_AND},
-{")", 0, 0, 0, CLOSE_PAREN, NOT_GENERATED},
-{"*", 5, 5, -1, BINARY_OPERATOR,MULT},
-{"**", 6, 6, -1, BINARY_OPERATOR,POWER},
-{"+", 4, 4, -1, BINARY_OPERATOR,ADD},
-{",", 0, 0, 0, SEPERATOR, NOT_GENERATED},
-{"-", 4, 4, -1, BINARY_OPERATOR,SUB},
-{"/", 5, 5, -1, BINARY_OPERATOR,DIV},
-{":", 0, 0, -1, CONDITIONAL, COND_ELSE},
-{":=", 0, 0, -1, STORE_OPERATOR, STORE_A},
-{";", 0, 0, 0, EXPR_TERMINATOR,NOT_GENERATED},
-{"<", 3, 3, -1, BINARY_OPERATOR,LESS_THAN},
-{"<<", 2, 2, -1, BINARY_OPERATOR,LEFT_SHIFT},
-{"<=", 3, 3, -1, BINARY_OPERATOR,LESS_OR_EQ},
-{"=", 3, 3, -1, BINARY_OPERATOR,EQUAL},
-{"==", 3, 3, -1, BINARY_OPERATOR,EQUAL},
-{">", 3, 3, -1, BINARY_OPERATOR,GR_THAN},
-{">=", 3, 3, -1, BINARY_OPERATOR,GR_OR_EQ},
-{">>", 2, 2, -1, BINARY_OPERATOR,RIGHT_SHIFT},
-{"?", 0, 0, -1, CONDITIONAL, COND_IF},
-{"AND", 2, 2, -1, BINARY_OPERATOR,BIT_AND},
-{"OR", 1, 1, -1, BINARY_OPERATOR,BIT_OR},
-{"XOR", 1, 1, -1, BINARY_OPERATOR,BIT_EXCL_OR},
-{"^", 6, 6, -1, BINARY_OPERATOR,POWER},
-{"|", 1, 1, -1, BINARY_OPERATOR,BIT_OR},
-{"||", 1, 1, -1, BINARY_OPERATOR,REL_OR},
+/* name prio's stack element type opcode */
+{"!=", 3, 3, -1, BINARY_OPERATOR,NOT_EQ},
+{"#", 3, 3, -1, BINARY_OPERATOR,NOT_EQ},
+{"%", 5, 5, -1, BINARY_OPERATOR,MODULO},
+{"&", 2, 2, -1, BINARY_OPERATOR,BIT_AND},
+{"&&", 2, 2, -1, BINARY_OPERATOR,REL_AND},
+{")", 0, 0, 0, CLOSE_PAREN, NOT_GENERATED},
+{"*", 5, 5, -1, BINARY_OPERATOR,MULT},
+{"**", 6, 6, -1, BINARY_OPERATOR,POWER},
+{"+", 4, 4, -1, BINARY_OPERATOR,ADD},
+{",", 0, 0, 0, SEPERATOR, NOT_GENERATED},
+{"-", 4, 4, -1, BINARY_OPERATOR,SUB},
+{"/", 5, 5, -1, BINARY_OPERATOR,DIV},
+{":", 0, 0, -1, CONDITIONAL, COND_ELSE},
+{":=", 0, 0, -1, STORE_OPERATOR, STORE_A},
+{";", 0, 0, 0, EXPR_TERMINATOR,NOT_GENERATED},
+{"<", 3, 3, -1, BINARY_OPERATOR,LESS_THAN},
+{"<<", 2, 2, -1, BINARY_OPERATOR,LEFT_SHIFT},
+{"<=", 3, 3, -1, BINARY_OPERATOR,LESS_OR_EQ},
+{"=", 3, 3, -1, BINARY_OPERATOR,EQUAL},
+{"==", 3, 3, -1, BINARY_OPERATOR,EQUAL},
+{">", 3, 3, -1, BINARY_OPERATOR,GR_THAN},
+{">=", 3, 3, -1, BINARY_OPERATOR,GR_OR_EQ},
+{">>", 2, 2, -1, BINARY_OPERATOR,RIGHT_SHIFT},
+{"?", 0, 0, -1, CONDITIONAL, COND_IF},
+{"AND", 2, 2, -1, BINARY_OPERATOR,BIT_AND},
+{"OR", 1, 1, -1, BINARY_OPERATOR,BIT_OR},
+{"XOR", 1, 1, -1, BINARY_OPERATOR,BIT_EXCL_OR},
+{"^", 6, 6, -1, BINARY_OPERATOR,POWER},
+{"|", 1, 1, -1, BINARY_OPERATOR,BIT_OR},
+{"||", 1, 1, -1, BINARY_OPERATOR,REL_OR},
};
@@ -180,22 +180,22 @@ static int
if (**ppsrc == '\0') return FALSE;
if (opnd) {
- ptable = operands;
- pel = ptable + NELEMENTS(operands) - 1;
+ ptable = operands;
+ pel = ptable + NELEMENTS(operands) - 1;
} else {
- ptable = operators;
- pel = ptable + NELEMENTS(operators) - 1;
+ ptable = operators;
+ pel = ptable + NELEMENTS(operators) - 1;
}
while (pel >= ptable) {
- size_t len = strlen(pel->name);
-
- if (epicsStrnCaseCmp(*ppsrc, pel->name, len) == 0) {
- *ppel = pel;
- *ppsrc += len;
- return TRUE;
- }
- --pel;
+ size_t len = strlen(pel->name);
+
+ if (epicsStrnCaseCmp(*ppsrc, pel->name, len) == 0) {
+ *ppel = pel;
+ *ppsrc += len;
+ return TRUE;
+ }
+ --pel;
}
return FALSE;
}
@@ -218,10 +218,10 @@ epicsShareFunc long
char *pnext;
if (psrc == NULL || *psrc == '\0' ||
- pout == NULL || perror == NULL) {
- if (perror) *perror = CALC_ERR_NULL_ARG;
- if (pout) *pout = END_EXPRESSION;
- return -1;
+ pout == NULL || perror == NULL) {
+ if (perror) *perror = CALC_ERR_NULL_ARG;
+ if (pout) *pout = END_EXPRESSION;
+ return -1;
}
/* place the expression elements into postfix */
@@ -229,13 +229,13 @@ epicsShareFunc long
*perror = CALC_ERR_NONE;
while (get_element(operand_needed, &psrc, &pel)) {
- switch (pel->type) {
+ switch (pel->type) {
- case OPERAND:
- *pout++ = pel->code;
- runtime_depth += pel->runtime_effect;
- operand_needed = FALSE;
- break;
+ case OPERAND:
+ *pout++ = pel->code;
+ runtime_depth += pel->runtime_effect;
+ operand_needed = FALSE;
+ break;
case LITERAL_OPERAND:
runtime_depth += pel->runtime_effect;
@@ -278,204 +278,204 @@ epicsShareFunc long
operand_needed = FALSE;
break;
- case STORE_OPERATOR:
- if (pout == pdest || pstacktop > stack ||
- *--pout < FETCH_A || *pout > FETCH_L) {
- *perror = CALC_ERR_BAD_ASSIGNMENT;
- goto bad;
- }
- /* Convert fetch into a store on the stack */
- *++pstacktop = *pel;
- pstacktop->code = STORE_A + *pout - FETCH_A;
- runtime_depth -= 1;
- operand_needed = TRUE;
- break;
-
- case UNARY_OPERATOR:
- case VARARG_OPERATOR:
- /* Move operators of >= priority to the output */
- while ((pstacktop > stack) &&
- (pstacktop->in_stack_pri >= pel->in_coming_pri)) {
- *pout++ = pstacktop->code;
- if (pstacktop->type == VARARG_OPERATOR) {
- *pout++ = 1 - pstacktop->runtime_effect;
- }
- runtime_depth += pstacktop->runtime_effect;
- pstacktop--;
- }
-
- /* Push new operator onto stack */
- pstacktop++;
- *pstacktop = *pel;
- break;
-
- case BINARY_OPERATOR:
- /* Move operators of >= priority to the output */
- while ((pstacktop > stack) &&
- (pstacktop->in_stack_pri >= pel->in_coming_pri)) {
- *pout++ = pstacktop->code;
- if (pstacktop->type == VARARG_OPERATOR) {
- *pout++ = 1 - pstacktop->runtime_effect;
- }
- runtime_depth += pstacktop->runtime_effect;
- pstacktop--;
- }
-
- /* Push new operator onto stack */
- pstacktop++;
- *pstacktop = *pel;
-
- operand_needed = TRUE;
- break;
-
- case SEPERATOR:
- /* Move operators to the output until open paren */
- while (pstacktop->name[0] != '(') {
- if (pstacktop <= stack+1) {
- *perror = CALC_ERR_BAD_SEPERATOR;
- goto bad;
- }
- *pout++ = pstacktop->code;
- if (pstacktop->type == VARARG_OPERATOR) {
- *pout++ = 1 - pstacktop->runtime_effect;
- }
- runtime_depth += pstacktop->runtime_effect;
- pstacktop--;
- }
- operand_needed = TRUE;
- pstacktop->runtime_effect -= 1;
- break;
-
- case CLOSE_PAREN:
- /* Move operators to the output until matching paren */
- while (pstacktop->name[0] != '(') {
- if (pstacktop <= stack+1) {
- *perror = CALC_ERR_PAREN_NOT_OPEN;
- goto bad;
- }
- *pout++ = pstacktop->code;
- if (pstacktop->type == VARARG_OPERATOR) {
- *pout++ = 1 - pstacktop->runtime_effect;
- }
- runtime_depth += pstacktop->runtime_effect;
- pstacktop--;
- }
- pstacktop--; /* remove ( from stack */
- /* if there is a vararg operator before the opening paren,
- it inherits the (opening) paren's stack effect */
- if ((pstacktop > stack) &&
- pstacktop->type == VARARG_OPERATOR) {
- pstacktop->runtime_effect = (pstacktop+1)->runtime_effect;
- /* check for no arguments */
- if (pstacktop->runtime_effect > 0) {
- *perror = CALC_ERR_INCOMPLETE;
- goto bad;
- }
- }
- break;
-
- case CONDITIONAL:
- /* Move operators of > priority to the output */
- while ((pstacktop > stack) &&
- (pstacktop->in_stack_pri > pel->in_coming_pri)) {
- *pout++ = pstacktop->code;
- if (pstacktop->type == VARARG_OPERATOR) {
- *pout++ = 1 - pstacktop->runtime_effect;
- }
- runtime_depth += pstacktop->runtime_effect;
- pstacktop--;
- }
-
- /* Add new element to the output */
- *pout++ = pel->code;
- runtime_depth += pel->runtime_effect;
-
- /* For : operator, also push COND_END code to stack */
- if (pel->name[0] == ':') {
- if (--cond_count < 0) {
- *perror = CALC_ERR_CONDITIONAL;
- goto bad;
- }
- pstacktop++;
- *pstacktop = *pel;
- pstacktop->code = COND_END;
- pstacktop->runtime_effect = 0;
- } else {
- cond_count++;
- }
-
- operand_needed = TRUE;
- break;
-
- case EXPR_TERMINATOR:
- /* Move everything from stack to the output */
- while (pstacktop > stack) {
- if (pstacktop->name[0] == '(') {
- *perror = CALC_ERR_PAREN_OPEN;
- goto bad;
- }
- *pout++ = pstacktop->code;
- if (pstacktop->type == VARARG_OPERATOR) {
- *pout++ = 1 - pstacktop->runtime_effect;
- }
- runtime_depth += pstacktop->runtime_effect;
- pstacktop--;
- }
-
- if (cond_count != 0) {
- *perror = CALC_ERR_CONDITIONAL;
- goto bad;
- }
- if (runtime_depth > 1) {
- *perror = CALC_ERR_TOOMANY;
- goto bad;
- }
-
- operand_needed = TRUE;
- break;
-
- default:
- *perror = CALC_ERR_INTERNAL;
- goto bad;
- }
-
- if (runtime_depth < 0) {
- *perror = CALC_ERR_UNDERFLOW;
- goto bad;
- }
- if (runtime_depth >= CALCPERFORM_STACK) {
- *perror = CALC_ERR_OVERFLOW;
- goto bad;
- }
+ case STORE_OPERATOR:
+ if (pout == pdest || pstacktop > stack ||
+ *--pout < FETCH_A || *pout > FETCH_L) {
+ *perror = CALC_ERR_BAD_ASSIGNMENT;
+ goto bad;
+ }
+ /* Convert fetch into a store on the stack */
+ *++pstacktop = *pel;
+ pstacktop->code = STORE_A + *pout - FETCH_A;
+ runtime_depth -= 1;
+ operand_needed = TRUE;
+ break;
+
+ case UNARY_OPERATOR:
+ case VARARG_OPERATOR:
+ /* Move operators of >= priority to the output */
+ while ((pstacktop > stack) &&
+ (pstacktop->in_stack_pri >= pel->in_coming_pri)) {
+ *pout++ = pstacktop->code;
+ if (pstacktop->type == VARARG_OPERATOR) {
+ *pout++ = 1 - pstacktop->runtime_effect;
+ }
+ runtime_depth += pstacktop->runtime_effect;
+ pstacktop--;
+ }
+
+ /* Push new operator onto stack */
+ pstacktop++;
+ *pstacktop = *pel;
+ break;
+
+ case BINARY_OPERATOR:
+ /* Move operators of >= priority to the output */
+ while ((pstacktop > stack) &&
+ (pstacktop->in_stack_pri >= pel->in_coming_pri)) {
+ *pout++ = pstacktop->code;
+ if (pstacktop->type == VARARG_OPERATOR) {
+ *pout++ = 1 - pstacktop->runtime_effect;
+ }
+ runtime_depth += pstacktop->runtime_effect;
+ pstacktop--;
+ }
+
+ /* Push new operator onto stack */
+ pstacktop++;
+ *pstacktop = *pel;
+
+ operand_needed = TRUE;
+ break;
+
+ case SEPERATOR:
+ /* Move operators to the output until open paren */
+ while (pstacktop->name[0] != '(') {
+ if (pstacktop <= stack+1) {
+ *perror = CALC_ERR_BAD_SEPERATOR;
+ goto bad;
+ }
+ *pout++ = pstacktop->code;
+ if (pstacktop->type == VARARG_OPERATOR) {
+ *pout++ = 1 - pstacktop->runtime_effect;
+ }
+ runtime_depth += pstacktop->runtime_effect;
+ pstacktop--;
+ }
+ operand_needed = TRUE;
+ pstacktop->runtime_effect -= 1;
+ break;
+
+ case CLOSE_PAREN:
+ /* Move operators to the output until matching paren */
+ while (pstacktop->name[0] != '(') {
+ if (pstacktop <= stack+1) {
+ *perror = CALC_ERR_PAREN_NOT_OPEN;
+ goto bad;
+ }
+ *pout++ = pstacktop->code;
+ if (pstacktop->type == VARARG_OPERATOR) {
+ *pout++ = 1 - pstacktop->runtime_effect;
+ }
+ runtime_depth += pstacktop->runtime_effect;
+ pstacktop--;
+ }
+ pstacktop--; /* remove ( from stack */
+ /* if there is a vararg operator before the opening paren,
+ it inherits the (opening) paren's stack effect */
+ if ((pstacktop > stack) &&
+ pstacktop->type == VARARG_OPERATOR) {
+ pstacktop->runtime_effect = (pstacktop+1)->runtime_effect;
+ /* check for no arguments */
+ if (pstacktop->runtime_effect > 0) {
+ *perror = CALC_ERR_INCOMPLETE;
+ goto bad;
+ }
+ }
+ break;
+
+ case CONDITIONAL:
+ /* Move operators of > priority to the output */
+ while ((pstacktop > stack) &&
+ (pstacktop->in_stack_pri > pel->in_coming_pri)) {
+ *pout++ = pstacktop->code;
+ if (pstacktop->type == VARARG_OPERATOR) {
+ *pout++ = 1 - pstacktop->runtime_effect;
+ }
+ runtime_depth += pstacktop->runtime_effect;
+ pstacktop--;
+ }
+
+ /* Add new element to the output */
+ *pout++ = pel->code;
+ runtime_depth += pel->runtime_effect;
+
+ /* For : operator, also push COND_END code to stack */
+ if (pel->name[0] == ':') {
+ if (--cond_count < 0) {
+ *perror = CALC_ERR_CONDITIONAL;
+ goto bad;
+ }
+ pstacktop++;
+ *pstacktop = *pel;
+ pstacktop->code = COND_END;
+ pstacktop->runtime_effect = 0;
+ } else {
+ cond_count++;
+ }
+
+ operand_needed = TRUE;
+ break;
+
+ case EXPR_TERMINATOR:
+ /* Move everything from stack to the output */
+ while (pstacktop > stack) {
+ if (pstacktop->name[0] == '(') {
+ *perror = CALC_ERR_PAREN_OPEN;
+ goto bad;
+ }
+ *pout++ = pstacktop->code;
+ if (pstacktop->type == VARARG_OPERATOR) {
+ *pout++ = 1 - pstacktop->runtime_effect;
+ }
+ runtime_depth += pstacktop->runtime_effect;
+ pstacktop--;
+ }
+
+ if (cond_count != 0) {
+ *perror = CALC_ERR_CONDITIONAL;
+ goto bad;
+ }
+ if (runtime_depth > 1) {
+ *perror = CALC_ERR_TOOMANY;
+ goto bad;
+ }
+
+ operand_needed = TRUE;
+ break;
+
+ default:
+ *perror = CALC_ERR_INTERNAL;
+ goto bad;
+ }
+
+ if (runtime_depth < 0) {
+ *perror = CALC_ERR_UNDERFLOW;
+ goto bad;
+ }
+ if (runtime_depth >= CALCPERFORM_STACK) {
+ *perror = CALC_ERR_OVERFLOW;
+ goto bad;
+ }
}
if (*psrc != '\0') {
- *perror = CALC_ERR_SYNTAX;
- goto bad;
+ *perror = CALC_ERR_SYNTAX;
+ goto bad;
}
/* Move everything from stack to the output */
while (pstacktop > stack) {
- if (pstacktop->name[0] == '(') {
- *perror = CALC_ERR_PAREN_OPEN;
- goto bad;
- }
- *pout++ = pstacktop->code;
- if (pstacktop->type == VARARG_OPERATOR) {
- *pout++ = 1 - pstacktop->runtime_effect;
- }
- runtime_depth += pstacktop->runtime_effect;
- pstacktop--;
+ if (pstacktop->name[0] == '(') {
+ *perror = CALC_ERR_PAREN_OPEN;
+ goto bad;
+ }
+ *pout++ = pstacktop->code;
+ if (pstacktop->type == VARARG_OPERATOR) {
+ *pout++ = 1 - pstacktop->runtime_effect;
+ }
+ runtime_depth += pstacktop->runtime_effect;
+ pstacktop--;
}
*pout = END_EXPRESSION;
if (cond_count != 0) {
- *perror = CALC_ERR_CONDITIONAL;
- goto bad;
+ *perror = CALC_ERR_CONDITIONAL;
+ goto bad;
}
if (operand_needed || runtime_depth != 1) {
- *perror = CALC_ERR_INCOMPLETE;
- goto bad;
+ *perror = CALC_ERR_INCOMPLETE;
+ goto bad;
}
return 0;
@@ -493,24 +493,24 @@ epicsShareFunc const char *
calcErrorStr(short error)
{
static const char *errStrs[] = {
- "No error",
- "Too many results returned",
- "Badly formed numeric literal",
- "Bad assignment target",
- "Comma without enclosing parentheses",
- "Close parenthesis found without open",
- "Parenthesis still open at end of expression",
- "Unbalanced conditional ?: operators",
- "Incomplete expression, operand missing",
- "Not enough operands provided",
- "Runtime stack overflow",
- "Syntax error, unknown operator/operand",
- "NULL or empty input argument to postfix()",
- "Internal error, unknown element type",
+ "No error",
+ "Too many results returned",
+ "Badly formed numeric literal",
+ "Bad assignment target",
+ "Comma without enclosing parentheses",
+ "Close parenthesis found without open",
+ "Parenthesis still open at end of expression",
+ "Unbalanced conditional ?: operators",
+ "Incomplete expression, operand missing",
+ "Not enough operands provided",
+ "Runtime stack overflow",
+ "Syntax error, unknown operator/operand",
+ "NULL or empty input argument to postfix()",
+ "Internal error, unknown element type",
};
if (error < CALC_ERR_NONE || error > CALC_ERR_INTERNAL)
- return NULL;
+ return NULL;
return errStrs[error];
}
@@ -523,104 +523,104 @@ epicsShareFunc void
calcExprDump(const char *pinst)
{
static const char *opcodes[] = {
- "End Expression",
+ "End Expression",
/* Operands */
- "LITERAL_DOUBLE", "LITERAL_INT", "VAL",
- "FETCH_A", "FETCH_B", "FETCH_C", "FETCH_D", "FETCH_E", "FETCH_F",
- "FETCH_G", "FETCH_H", "FETCH_I", "FETCH_J", "FETCH_K", "FETCH_L",
+ "LITERAL_DOUBLE", "LITERAL_INT", "VAL",
+ "FETCH_A", "FETCH_B", "FETCH_C", "FETCH_D", "FETCH_E", "FETCH_F",
+ "FETCH_G", "FETCH_H", "FETCH_I", "FETCH_J", "FETCH_K", "FETCH_L",
/* Assignment */
- "STORE_A", "STORE_B", "STORE_C", "STORE_D", "STORE_E", "STORE_F",
- "STORE_G", "STORE_H", "STORE_I", "STORE_J", "STORE_K", "STORE_L",
+ "STORE_A", "STORE_B", "STORE_C", "STORE_D", "STORE_E", "STORE_F",
+ "STORE_G", "STORE_H", "STORE_I", "STORE_J", "STORE_K", "STORE_L",
/* Trigonometry Constants */
- "CONST_PI",
- "CONST_D2R",
- "CONST_R2D",
+ "CONST_PI",
+ "CONST_D2R",
+ "CONST_R2D",
/* Arithmetic */
- "UNARY_NEG",
- "ADD",
- "SUB",
- "MULT",
- "DIV",
- "MODULO",
- "POWER",
+ "UNARY_NEG",
+ "ADD",
+ "SUB",
+ "MULT",
+ "DIV",
+ "MODULO",
+ "POWER",
/* Algebraic */
- "ABS_VAL",
- "EXP",
- "LOG_10",
- "LOG_E",
- "MAX",
- "MIN",
- "SQU_RT",
+ "ABS_VAL",
+ "EXP",
+ "LOG_10",
+ "LOG_E",
+ "MAX",
+ "MIN",
+ "SQU_RT",
/* Trigonometric */
- "ACOS",
- "ASIN",
- "ATAN",
- "ATAN2",
- "COS",
- "COSH",
- "SIN",
- "SINH",
- "TAN",
- "TANH",
+ "ACOS",
+ "ASIN",
+ "ATAN",
+ "ATAN2",
+ "COS",
+ "COSH",
+ "SIN",
+ "SINH",
+ "TAN",
+ "TANH",
/* Numeric */
- "CEIL",
- "FLOOR",
- "FINITE",
- "ISINF",
- "ISNAN",
- "NINT",
- "RANDOM",
+ "CEIL",
+ "FLOOR",
+ "FINITE",
+ "ISINF",
+ "ISNAN",
+ "NINT",
+ "RANDOM",
/* Boolean */
- "REL_OR",
- "REL_AND",
- "REL_NOT",
+ "REL_OR",
+ "REL_AND",
+ "REL_NOT",
/* Bitwise */
- "BIT_OR",
- "BIT_AND",
- "BIT_EXCL_OR",
- "BIT_NOT",
- "RIGHT_SHIFT",
- "LEFT_SHIFT",
+ "BIT_OR",
+ "BIT_AND",
+ "BIT_EXCL_OR",
+ "BIT_NOT",
+ "RIGHT_SHIFT",
+ "LEFT_SHIFT",
/* Relationals */
- "NOT_EQ",
- "LESS_THAN",
- "LESS_OR_EQ",
- "EQUAL",
- "GR_OR_EQ",
- "GR_THAN",
+ "NOT_EQ",
+ "LESS_THAN",
+ "LESS_OR_EQ",
+ "EQUAL",
+ "GR_OR_EQ",
+ "GR_THAN",
/* Conditional */
- "COND_IF",
- "COND_ELSE",
- "COND_END",
+ "COND_IF",
+ "COND_ELSE",
+ "COND_END",
/* Misc */
- "NOT_GENERATED"
+ "NOT_GENERATED"
};
char op;
double lit_d;
epicsInt32 lit_i;
while ((op = *pinst) != END_EXPRESSION) {
- switch (op) {
- case LITERAL_DOUBLE:
- memcpy(&lit_d, ++pinst, sizeof(double));
- printf("\tDouble %g\n", lit_d);
- pinst += sizeof(double);
- break;
- case LITERAL_INT:
- memcpy(&lit_i, ++pinst, sizeof(epicsInt32));
- printf("\tInteger %d (0x%x)\n", lit_i, lit_i);
- pinst += sizeof(epicsInt32);
- break;
- case MIN:
- case MAX:
- case FINITE:
- case ISNAN:
- printf("\t%s, %d arg(s)\n", opcodes[(int) op], *++pinst);
- pinst++;
- break;
- default:
- printf("\t%s\n", opcodes[(int) op]);
- pinst++;
- }
+ switch (op) {
+ case LITERAL_DOUBLE:
+ memcpy(&lit_d, ++pinst, sizeof(double));
+ printf("\tDouble %g\n", lit_d);
+ pinst += sizeof(double);
+ break;
+ case LITERAL_INT:
+ memcpy(&lit_i, ++pinst, sizeof(epicsInt32));
+ printf("\tInteger %d (0x%x)\n", lit_i, lit_i);
+ pinst += sizeof(epicsInt32);
+ break;
+ case MIN:
+ case MAX:
+ case FINITE:
+ case ISNAN:
+ printf("\t%s, %d arg(s)\n", opcodes[(int) op], *++pinst);
+ pinst++;
+ break;
+ default:
+ printf("\t%s\n", opcodes[(int) op]);
+ pinst++;
+ }
}
}
diff --git a/modules/libcom/src/calc/postfixPvt.h b/modules/libcom/src/calc/postfixPvt.h
index 53efb32..b087e20 100644
--- a/modules/libcom/src/calc/postfixPvt.h
+++ b/modules/libcom/src/calc/postfixPvt.h
@@ -28,77 +28,77 @@
/* RPN opcodes */
typedef enum {
- END_EXPRESSION = 0,
+ END_EXPRESSION = 0,
/* Operands */
- LITERAL_DOUBLE, LITERAL_INT, FETCH_VAL,
- FETCH_A, FETCH_B, FETCH_C, FETCH_D, FETCH_E, FETCH_F,
- FETCH_G, FETCH_H, FETCH_I, FETCH_J, FETCH_K, FETCH_L,
+ LITERAL_DOUBLE, LITERAL_INT, FETCH_VAL,
+ FETCH_A, FETCH_B, FETCH_C, FETCH_D, FETCH_E, FETCH_F,
+ FETCH_G, FETCH_H, FETCH_I, FETCH_J, FETCH_K, FETCH_L,
/* Assignment */
- STORE_A, STORE_B, STORE_C, STORE_D, STORE_E, STORE_F,
- STORE_G, STORE_H, STORE_I, STORE_J, STORE_K, STORE_L,
+ STORE_A, STORE_B, STORE_C, STORE_D, STORE_E, STORE_F,
+ STORE_G, STORE_H, STORE_I, STORE_J, STORE_K, STORE_L,
/* Trigonometry Constants */
- CONST_PI,
- CONST_D2R,
- CONST_R2D,
+ CONST_PI,
+ CONST_D2R,
+ CONST_R2D,
/* Arithmetic */
- UNARY_NEG,
- ADD,
- SUB,
- MULT,
- DIV,
- MODULO,
- POWER,
+ UNARY_NEG,
+ ADD,
+ SUB,
+ MULT,
+ DIV,
+ MODULO,
+ POWER,
/* Algebraic */
- ABS_VAL,
- EXP,
- LOG_10,
- LOG_E,
- MAX,
- MIN,
- SQU_RT,
+ ABS_VAL,
+ EXP,
+ LOG_10,
+ LOG_E,
+ MAX,
+ MIN,
+ SQU_RT,
/* Trigonometric */
- ACOS,
- ASIN,
- ATAN,
- ATAN2,
- COS,
- COSH,
- SIN,
- SINH,
- TAN,
- TANH,
+ ACOS,
+ ASIN,
+ ATAN,
+ ATAN2,
+ COS,
+ COSH,
+ SIN,
+ SINH,
+ TAN,
+ TANH,
/* Numeric */
- CEIL,
- FLOOR,
- FINITE,
- ISINF,
- ISNAN,
- NINT,
- RANDOM,
+ CEIL,
+ FLOOR,
+ FINITE,
+ ISINF,
+ ISNAN,
+ NINT,
+ RANDOM,
/* Boolean */
- REL_OR,
- REL_AND,
- REL_NOT,
+ REL_OR,
+ REL_AND,
+ REL_NOT,
/* Bitwise */
- BIT_OR,
- BIT_AND,
- BIT_EXCL_OR,
- BIT_NOT,
- RIGHT_SHIFT,
- LEFT_SHIFT,
+ BIT_OR,
+ BIT_AND,
+ BIT_EXCL_OR,
+ BIT_NOT,
+ RIGHT_SHIFT,
+ LEFT_SHIFT,
/* Relationals */
- NOT_EQ,
- LESS_THAN,
- LESS_OR_EQ,
- EQUAL,
- GR_OR_EQ,
- GR_THAN,
+ NOT_EQ,
+ LESS_THAN,
+ LESS_OR_EQ,
+ EQUAL,
+ GR_OR_EQ,
+ GR_THAN,
/* Conditional */
- COND_IF,
- COND_ELSE,
- COND_END,
+ COND_IF,
+ COND_ELSE,
+ COND_END,
/* Misc */
- NOT_GENERATED
+ NOT_GENERATED
} rpn_opcode;
#endif /* INCpostfixPvth */
diff --git a/modules/libcom/src/cppStd/epicsAlgorithm.h b/modules/libcom/src/cppStd/epicsAlgorithm.h
index 2085024..ead7151 100644
--- a/modules/libcom/src/cppStd/epicsAlgorithm.h
+++ b/modules/libcom/src/cppStd/epicsAlgorithm.h
@@ -8,7 +8,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
// epicsAlgorithm.h
-// Authors: Jeff Hill & Andrew Johnson
+// Authors: Jeff Hill & Andrew Johnson
#ifndef __EPICS_ALGORITHM_H__
#define __EPICS_ALGORITHM_H__
diff --git a/modules/libcom/src/cxxTemplates/epicsSingleton.h b/modules/libcom/src/cxxTemplates/epicsSingleton.h
index 2c63d3f..efbcb69 100644
--- a/modules/libcom/src/cxxTemplates/epicsSingleton.h
+++ b/modules/libcom/src/cxxTemplates/epicsSingleton.h
@@ -49,11 +49,11 @@ public:
reference ( epicsSingleton & );
reference ( const reference & );
~reference ();
- // this somewhat convoluted reference of the return
- // type ref through the epicsSingleton template is
- // required for the archaic Tornado gnu compiler
+ // this somewhat convoluted reference of the return
+ // type ref through the epicsSingleton template is
+ // required for the archaic Tornado gnu compiler
typename epicsSingleton < TYPE > :: reference &
- operator = ( const reference & );
+ operator = ( const reference & );
TYPE * operator -> ();
const TYPE * operator -> () const;
TYPE & operator * ();
diff --git a/modules/libcom/src/cxxTemplates/epicsSingletonMutex.cpp b/modules/libcom/src/cxxTemplates/epicsSingletonMutex.cpp
index 8cd69d9..b790be3 100644
--- a/modules/libcom/src/cxxTemplates/epicsSingletonMutex.cpp
+++ b/modules/libcom/src/cxxTemplates/epicsSingletonMutex.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
@@ -30,7 +30,7 @@ static epicsMutex * pEPICSSigletonMutex = 0;
extern "C" void SingletonMutexOnce ( void * /* pParm */ )
{
// This class exists for the purpose of avoiding file scope
- // object chicken and egg problems. Therefore, pEPICSSigletonMutex
+ // object chicken and egg problems. Therefore, pEPICSSigletonMutex
// is never destroyed.
pEPICSSigletonMutex = newEpicsMutex;
}
@@ -38,7 +38,7 @@ extern "C" void SingletonMutexOnce ( void * /* pParm */ )
void SingletonUntyped :: incrRefCount ( PBuild pBuild )
{
epicsThreadOnce ( & epicsSigletonOnceFlag, SingletonMutexOnce, 0 );
- epicsGuard < epicsMutex >
+ epicsGuard < epicsMutex >
guard ( *pEPICSSigletonMutex );
assert ( _refCount < SIZE_MAX );
if ( _refCount == 0 ) {
@@ -49,7 +49,7 @@ void SingletonUntyped :: incrRefCount ( PBuild pBuild )
void SingletonUntyped :: decrRefCount ( PDestroy pDestroy )
{
- epicsGuard < epicsMutex >
+ epicsGuard < epicsMutex >
guard ( *pEPICSSigletonMutex );
assert ( _refCount > 0 );
_refCount--;
diff --git a/modules/libcom/src/cxxTemplates/resourceLib.cpp b/modules/libcom/src/cxxTemplates/resourceLib.cpp
index f3a9a99..5aab8e8 100644
--- a/modules/libcom/src/cxxTemplates/resourceLib.cpp
+++ b/modules/libcom/src/cxxTemplates/resourceLib.cpp
@@ -4,10 +4,10 @@
* Copyright (c) 2002 The Regents of the University of California, as
* Operator of Los Alamos National Laboratory.
* EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
+/*
* Author: Jeff Hill
*/
diff --git a/modules/libcom/src/cxxTemplates/resourceLib.h b/modules/libcom/src/cxxTemplates/resourceLib.h
index 7b61e23..8bf7889 100644
--- a/modules/libcom/src/cxxTemplates/resourceLib.h
+++ b/modules/libcom/src/cxxTemplates/resourceLib.h
@@ -229,8 +229,8 @@ public:
void idAssignAdd ( ITEM & item );
private:
unsigned allocId;
- chronIntIdResTable ( const chronIntIdResTable & );
- chronIntIdResTable & operator = ( const chronIntIdResTable & );
+ chronIntIdResTable ( const chronIntIdResTable & );
+ chronIntIdResTable & operator = ( const chronIntIdResTable & );
};
//
@@ -244,7 +244,7 @@ public:
chronIntIdRes ();
private:
void setId (unsigned newId);
- chronIntIdRes (const chronIntIdRes & );
+ chronIntIdRes (const chronIntIdRes & );
friend class chronIntIdResTable<ITEM>;
};
@@ -278,9 +278,9 @@ private:
//
template <class T, class ID>
inline resTable<T,ID>::resTable () :
- pTable ( 0 ), nextSplitIndex ( 0 ), hashIxMask ( 0 ),
- hashIxSplitMask ( 0 ), nBitsHashIxSplitMask ( 0 ),
- logBaseTwoTableSize ( 0 ), nInUse ( 0 ) {}
+ pTable ( 0 ), nextSplitIndex ( 0 ), hashIxMask ( 0 ),
+ hashIxSplitMask ( 0 ), nBitsHashIxSplitMask ( 0 ),
+ logBaseTwoTableSize ( 0 ), nInUse ( 0 ) {}
template <class T, class ID>
inline unsigned resTable<T,ID>::resTableBitMask ( const unsigned nBits )
@@ -531,18 +531,18 @@ void resTable<T,ID>::setTableSize ( const unsigned newTableSize )
return;
}
- //
- // count the number of bits in newTableSize and round up
+ //
+ // count the number of bits in newTableSize and round up
// to the next power of two
- //
+ //
unsigned newMask = newTableSize - 1;
- unsigned nbits;
- for ( nbits = 0; nbits < sizeof (newTableSize) * CHAR_BIT; nbits++ ) {
- unsigned nBitsMask = resTableBitMask ( nbits );
- if ( ( newMask & ~nBitsMask ) == 0){
- break;
- }
- }
+ unsigned nbits;
+ for ( nbits = 0; nbits < sizeof (newTableSize) * CHAR_BIT; nbits++ ) {
+ unsigned nBitsMask = resTableBitMask ( nbits );
+ if ( ( newMask & ~nBitsMask ) == 0){
+ break;
+ }
+ }
setTableSizePrivate ( nbits );
}
@@ -572,13 +572,13 @@ bool resTable<T,ID>::setTableSizePrivate ( unsigned logBaseTwoTableSizeIn )
}
catch ( ... ){
if ( ! this->pTable ) {
- throw;
+ throw;
}
return false;
}
// run the constructors using placement new
- unsigned i;
+ unsigned i;
for ( i = 0u; i < oldTableOccupiedSize; i++ ) {
new ( &pNewTable[i] ) tsSLList<T> ( this->pTable[i] );
}
@@ -937,13 +937,13 @@ inline chronIntIdResTable<ITEM>::chronIntIdResTable () :
template <class ITEM>
inline chronIntIdResTable<ITEM>::chronIntIdResTable ( const chronIntIdResTable<ITEM> & ) :
- resTable<ITEM, chronIntId> (), allocId(1u) {}
+ resTable<ITEM, chronIntId> (), allocId(1u) {}
template <class ITEM>
inline chronIntIdResTable<ITEM> & chronIntIdResTable<ITEM>::
- operator = ( const chronIntIdResTable<ITEM> & )
+ operator = ( const chronIntIdResTable<ITEM> & )
{
- return *this;
+ return *this;
}
//
diff --git a/modules/libcom/src/env/envDefs.h b/modules/libcom/src/env/envDefs.h
index 2490702..d9d7c5a 100644
--- a/modules/libcom/src/env/envDefs.h
+++ b/modules/libcom/src/env/envDefs.h
@@ -7,21 +7,21 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
- * Author: Roger A. Cole
- * Date: 07-20-91
+ * Author: Roger A. Cole
+ * Date: 07-20-91
*
*/
/****************************************************************************
-* TITLE envDefs.h - definitions for environment get/set routines
+* TITLE envDefs.h - definitions for environment get/set routines
*
* DESCRIPTION
-* This file defines the environment parameters for EPICS. These
-* ENV_PARAM's are created in envData.c by bldEnvData for
-* use by EPICS programs running under UNIX and VxWorks.
+* This file defines the environment parameters for EPICS. These
+* ENV_PARAM's are created in envData.c by bldEnvData for
+* use by EPICS programs running under UNIX and VxWorks.
*
-* User programs can define their own environment parameters for their
-* own use--the only caveat is that such parameters aren't automatically
-* setup by EPICS.
+* User programs can define their own environment parameters for their
+* own use--the only caveat is that such parameters aren't automatically
+* setup by EPICS.
*
*****************************************************************************/
@@ -35,8 +35,8 @@ extern "C" {
#include "shareLib.h"
typedef struct envParam {
- char *name; /* text name of the parameter */
- char *pdflt;
+ char *name; /* text name of the parameter */
+ char *pdflt;
} ENV_PARAM;
/*
@@ -80,19 +80,19 @@ epicsShareExtern const ENV_PARAM *env_param_list[];
struct in_addr;
epicsShareFunc char * epicsShareAPI
- envGetConfigParam(const ENV_PARAM *pParam, int bufDim, char *pBuf);
+ envGetConfigParam(const ENV_PARAM *pParam, int bufDim, char *pBuf);
epicsShareFunc const char * epicsShareAPI
- envGetConfigParamPtr(const ENV_PARAM *pParam);
+ envGetConfigParamPtr(const ENV_PARAM *pParam);
epicsShareFunc long epicsShareAPI
- envPrtConfigParam(const ENV_PARAM *pParam);
+ envPrtConfigParam(const ENV_PARAM *pParam);
epicsShareFunc long epicsShareAPI
- envGetInetAddrConfigParam(const ENV_PARAM *pParam, struct in_addr *pAddr);
+ envGetInetAddrConfigParam(const ENV_PARAM *pParam, struct in_addr *pAddr);
epicsShareFunc long epicsShareAPI
- envGetDoubleConfigParam(const ENV_PARAM *pParam, double *pDouble);
+ envGetDoubleConfigParam(const ENV_PARAM *pParam, double *pDouble);
epicsShareFunc long epicsShareAPI
- envGetLongConfigParam(const ENV_PARAM *pParam, long *pLong);
+ envGetLongConfigParam(const ENV_PARAM *pParam, long *pLong);
epicsShareFunc unsigned short epicsShareAPI envGetInetPortConfigParam
- (const ENV_PARAM *pEnv, unsigned short defaultPort);
+ (const ENV_PARAM *pEnv, unsigned short defaultPort);
epicsShareFunc long epicsShareAPI
envGetBoolConfigParam(const ENV_PARAM *pParam, int *pBool);
epicsShareFunc long epicsShareAPI epicsPrtEnvParams(void);
diff --git a/modules/libcom/src/fdmgr/fdManager.cpp b/modules/libcom/src/fdmgr/fdManager.cpp
index 3bbc648..5244047 100644
--- a/modules/libcom/src/fdmgr/fdManager.cpp
+++ b/modules/libcom/src/fdmgr/fdManager.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
//
// File descriptor management C++ class library
@@ -15,7 +15,7 @@
// johill at lanl.gov
// 505 665 1831
//
-// NOTES:
+// NOTES:
// 1) This library is not thread safe
//
@@ -39,19 +39,19 @@ const unsigned uSecPerSec = 1000u * mSecPerSec;
// fdManager::fdManager()
//
// hopefully its a reasonable guess that select() and epicsThreadSleep()
-// will have the same sleep quantum
+// will have the same sleep quantum
//
-epicsShareFunc fdManager::fdManager () :
- sleepQuantum ( epicsThreadSleepQuantum () ),
+epicsShareFunc fdManager::fdManager () :
+ sleepQuantum ( epicsThreadSleepQuantum () ),
fdSetsPtr ( new fd_set [fdrNEnums] ),
- pTimerQueue ( 0 ), maxFD ( 0 ), processInProg ( false ),
+ pTimerQueue ( 0 ), maxFD ( 0 ), processInProg ( false ),
pCBReg ( 0 )
{
int status = osiSockAttach ();
assert (status);
for ( size_t i = 0u; i < fdrNEnums; i++ ) {
- FD_ZERO ( &fdSetsPtr[i] );
+ FD_ZERO ( &fdSetsPtr[i] );
}
}
@@ -83,7 +83,7 @@ epicsShareFunc void fdManager::process (double delay)
this->lazyInitTimerQueue ();
//
- // no recursion
+ // no recursion
//
if (this->processInProg) {
return;
@@ -106,7 +106,7 @@ epicsShareFunc void fdManager::process (double delay)
bool ioPending = false;
tsDLIter < fdReg > iter = this->regList.firstIter ();
while ( iter.valid () ) {
- FD_SET(iter->getFD(), &this->fdSetsPtr[iter->getType()]);
+ FD_SET(iter->getFD(), &this->fdSetsPtr[iter->getType()]);
ioPending = true;
++iter;
}
@@ -152,7 +152,7 @@ epicsShareFunc void fdManager::process (double delay)
//
// Tag current fdReg so that we
- // can detect if it was deleted
+ // can detect if it was deleted
// during the call back
//
this->pCBReg = pReg;
@@ -160,7 +160,7 @@ epicsShareFunc void fdManager::process (double delay)
if (this->pCBReg != NULL) {
//
// check only after we see that it is non-null so
- // that we dont trigger bounds-checker dangling pointer
+ // that we dont trigger bounds-checker dangling pointer
// error
//
assert (this->pCBReg==pReg);
@@ -177,8 +177,8 @@ epicsShareFunc void fdManager::process (double delay)
}
else if ( status < 0 ) {
int errnoCpy = SOCKERRNO;
-
- // dont depend on flags being properly set if
+
+ // dont depend on flags being properly set if
// an error is retuned from select
for ( size_t i = 0u; i < fdrNEnums; i++ ) {
FD_ZERO ( &fdSetsPtr[i] );
@@ -189,9 +189,9 @@ epicsShareFunc void fdManager::process (double delay)
//
if ( errnoCpy != SOCK_EINTR ) {
char sockErrBuf[64];
- epicsSocketConvertErrnoToString (
+ epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
- fprintf ( stderr,
+ fprintf ( stderr,
"fdManager: select failed because \"%s\"\n",
sockErrBuf );
}
@@ -245,7 +245,7 @@ void fdReg::show(unsigned level) const
//
void fdRegId::show ( unsigned level ) const
{
- printf ( "fdRegId at %p\n",
+ printf ( "fdRegId at %p\n",
static_cast <const void *> ( this ) );
if ( level > 1u ) {
printf ( "\tfd = %d, type = %d\n",
@@ -259,7 +259,7 @@ void fdRegId::show ( unsigned level ) const
void fdManager::installReg (fdReg ®)
{
this->maxFD = max ( this->maxFD, reg.getFD()+1 );
- // Most applications will find that its important to push here to
+ // Most applications will find that its important to push here to
// the front of the list so that transient writes get executed
// first allowing incoming read protocol to find that outgoing
// buffer space is newly available.
@@ -281,7 +281,7 @@ void fdManager::removeReg (fdReg ®In)
pItemFound = this->fdTbl.remove (regIn);
if (pItemFound!=®In) {
- fprintf(stderr,
+ fprintf(stderr,
"fdManager::removeReg() bad fd registration object\n");
return;
}
@@ -293,7 +293,7 @@ void fdManager::removeReg (fdReg ®In)
if (this->pCBReg == ®In) {
this->pCBReg = 0;
}
-
+
switch (regIn.state) {
case fdReg::active:
this->activeList.remove (regIn);
@@ -337,19 +337,19 @@ epicsShareFunc fdReg *fdManager::lookUpFD (const SOCKET fd, const fdRegType type
return NULL;
}
fdRegId id (fd,type);
- return this->fdTbl.lookup(id);
+ return this->fdTbl.lookup(id);
}
//
// fdReg::fdReg()
//
-fdReg::fdReg (const SOCKET fdIn, const fdRegType typIn,
- const bool onceOnlyIn, fdManager &managerIn) :
- fdRegId (fdIn,typIn), state (limbo),
+fdReg::fdReg (const SOCKET fdIn, const fdRegType typIn,
+ const bool onceOnlyIn, fdManager &managerIn) :
+ fdRegId (fdIn,typIn), state (limbo),
onceOnly (onceOnlyIn), manager (managerIn)
-{
+{
if (!FD_IN_FDSET(fdIn)) {
- fprintf (stderr, "%s: fd > FD_SETSIZE ignored\n",
+ fprintf (stderr, "%s: fd > FD_SETSIZE ignored\n",
__FILE__);
return;
}
diff --git a/modules/libcom/src/fdmgr/fdmgr.cpp b/modules/libcom/src/fdmgr/fdmgr.cpp
index 342bae8..5c108ff 100644
--- a/modules/libcom/src/fdmgr/fdmgr.cpp
+++ b/modules/libcom/src/fdmgr/fdmgr.cpp
@@ -5,7 +5,7 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
//
// File descriptor management C++ class library
@@ -15,7 +15,7 @@
// johill at lanl.gov
// 505 665 1831
//
-// NOTES:
+// NOTES:
// 1) the routines in this file provide backward compatibility with the original
// "C" based file descriptor manager API
// 2) This library is _not_ thread safe
@@ -27,7 +27,7 @@
#include "epicsAssert.h"
#include "fdManager.h"
#include "fdmgr.h"
-
+
static const fdRegType fdiToFdRegType[] = {fdrRead, fdrWrite, fdrException};
static const unsigned fdiToFdRegTypeNElements = sizeof (fdiToFdRegType) / sizeof (fdiToFdRegType[0]);
const unsigned mSecPerSec = 1000u;
@@ -41,16 +41,16 @@ public:
class noFunctionSpecified {};
class doubleDelete {};
- epicsShareFunc fdRegForOldFdmgr (const SOCKET fdIn, const fdRegType type,
- const bool onceOnly, fdManager &manager, pCallBackFDMgr pFunc, void *pParam);
+ epicsShareFunc fdRegForOldFdmgr (const SOCKET fdIn, const fdRegType type,
+ const bool onceOnly, fdManager &manager, pCallBackFDMgr pFunc, void *pParam);
epicsShareFunc ~fdRegForOldFdmgr ();
private:
pCallBackFDMgr pFunc;
void *pParam;
- epicsShareFunc virtual void callBack ();
- fdRegForOldFdmgr ( const fdRegForOldFdmgr & );
- fdRegForOldFdmgr & operator = ( const fdRegForOldFdmgr & );
+ epicsShareFunc virtual void callBack ();
+ fdRegForOldFdmgr ( const fdRegForOldFdmgr & );
+ fdRegForOldFdmgr & operator = ( const fdRegForOldFdmgr & );
};
class oldFdmgr;
@@ -60,8 +60,8 @@ class oldFdmgr;
//
class timerForOldFdmgr : public epicsTimerNotify, public chronIntIdRes<timerForOldFdmgr> {
public:
- epicsShareFunc timerForOldFdmgr (oldFdmgr &fdmgr, double delay, pCallBackFDMgr pFunc, void *pParam);
- epicsShareFunc virtual ~timerForOldFdmgr ();
+ epicsShareFunc timerForOldFdmgr (oldFdmgr &fdmgr, double delay, pCallBackFDMgr pFunc, void *pParam);
+ epicsShareFunc virtual ~timerForOldFdmgr ();
//
// exceptions
@@ -75,8 +75,8 @@ private:
void *pParam;
unsigned id;
epicsShareFunc expireStatus expire ( const epicsTime & currentTime );
- timerForOldFdmgr ( const timerForOldFdmgr & );
- timerForOldFdmgr & operator = ( const timerForOldFdmgr & );
+ timerForOldFdmgr ( const timerForOldFdmgr & );
+ timerForOldFdmgr & operator = ( const timerForOldFdmgr & );
};
class oldFdmgr : public fdManager {
@@ -88,8 +88,8 @@ public:
private:
chronIntIdResTable <timerForOldFdmgr> resTbl;
- oldFdmgr ( const oldFdmgr & );
- oldFdmgr & operator = ( const oldFdmgr & );
+ oldFdmgr ( const oldFdmgr & );
+ oldFdmgr & operator = ( const oldFdmgr & );
};
#ifdef _MSC_VER
@@ -104,11 +104,11 @@ template class resTable<timerForOldFdmgr, chronIntId>;
# pragma warning ( pop )
#endif
-epicsShareFunc fdRegForOldFdmgr::fdRegForOldFdmgr
- (const SOCKET fdIn, const fdRegType typeIn,
- const bool onceOnlyIn, fdManager &managerIn,
+epicsShareFunc fdRegForOldFdmgr::fdRegForOldFdmgr
+ (const SOCKET fdIn, const fdRegType typeIn,
+ const bool onceOnlyIn, fdManager &managerIn,
pCallBackFDMgr pFuncIn, void *pParamIn) :
- fdReg (fdIn, typeIn, onceOnlyIn, managerIn),
+ fdReg (fdIn, typeIn, onceOnlyIn, managerIn),
pFunc (pFuncIn), pParam (pParamIn)
{
if (pFuncIn==NULL) {
@@ -128,9 +128,9 @@ epicsShareFunc void fdRegForOldFdmgr::callBack ()
(*this->pFunc) (this->pParam);
}
-timerForOldFdmgr::timerForOldFdmgr ( oldFdmgr &fdmgrIn,
+timerForOldFdmgr::timerForOldFdmgr ( oldFdmgr &fdmgrIn,
double delayIn, pCallBackFDMgr pFuncIn, void * pParamIn ) :
- timer ( fdmgrIn.createTimer() ),
+ timer ( fdmgrIn.createTimer() ),
fdmgr ( fdmgrIn ), pFunc ( pFuncIn ), pParam( pParamIn )
{
if ( pFuncIn == NULL ) {
@@ -183,8 +183,8 @@ extern "C" epicsShareFunc fdmgrAlarmId epicsShareAPI fdmgr_add_timeout (
while (true) {
try {
- pTimer = new timerForOldFdmgr
- (*pfdm, delay, pFunc, pParam);
+ pTimer = new timerForOldFdmgr
+ (*pfdm, delay, pFunc, pParam);
}
catch (...)
{
@@ -268,9 +268,9 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback (
return 0;
}
}
-
+
extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_callback (
- fdctx *pfdctx, SOCKET fd, enum fdi_type fdi)
+ fdctx *pfdctx, SOCKET fd, enum fdi_type fdi)
{
oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
fdReg *pFDR;
@@ -323,14 +323,14 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_delete (fdctx *pfdctx)
*/
extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_fd (fdctx *pfdctx, SOCKET fd)
{
- return fdmgr_clear_callback(pfdctx, fd, fdi_read);
+ return fdmgr_clear_callback(pfdctx, fd, fdi_read);
}
/*
* depricated interface
*/
-extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_fd (
+extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_fd (
fdctx *pfdctx, SOCKET fd, void (*pfunc)(void *pParam), void *param)
{
- return fdmgr_add_callback (pfdctx, fd, fdi_read, pfunc, param);
+ return fdmgr_add_callback (pfdctx, fd, fdi_read, pfunc, param);
}
diff --git a/modules/libcom/src/fdmgr/fdmgr.h b/modules/libcom/src/fdmgr/fdmgr.h
index a227335..a815357 100644
--- a/modules/libcom/src/fdmgr/fdmgr.h
+++ b/modules/libcom/src/fdmgr/fdmgr.h
@@ -10,7 +10,7 @@
/* fdmgr.h
*
* Header file associated with a file descriptor manager
- * for use with the UNIX system call select
+ * for use with the UNIX system call select
*
* Author Jeffrey O. Hill
* hill at atdiv.lanl.gov
@@ -48,7 +48,7 @@ typedef void (*pCallBackFDMgr)(void *);
* all versions:
*
* #if defined (NEW_FDMGR_ALARMID)
- * fdmgrAlarmId XXXX
+ * fdmgrAlarmId XXXX
* #elif defined (NEW_FDMGR_ALARM)
* fdmgrAlarm *XXXX;
* #else
@@ -75,10 +75,10 @@ epicsShareFunc fdctx * epicsShareAPI fdmgr_init(void);
*/
#define fdmgrNoAlarm 0
epicsShareFunc fdmgrAlarmId epicsShareAPI fdmgr_add_timeout(
-fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
-struct timeval *ptimeout, /* relative delay from current time */
-pCallBackFDMgr pfunc, /* function (handler) to call */
-void *param /* first parameter passed to the func */
+fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
+struct timeval *ptimeout, /* relative delay from current time */
+pCallBackFDMgr pfunc, /* function (handler) to call */
+void *param /* first parameter passed to the func */
);
/*
@@ -86,8 +86,8 @@ void *param /* first parameter passed to the func */
* yet.
*/
epicsShareFunc int epicsShareAPI fdmgr_clear_timeout(
-fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
-fdmgrAlarmId id /* alarm to delete */
+fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
+fdmgrAlarmId id /* alarm to delete */
);
/*
@@ -108,11 +108,11 @@ fdmgrAlarmId id /* alarm to delete */
*
*/
epicsShareFunc int epicsShareAPI fdmgr_add_callback(
-fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
-SOCKET fd, /* file descriptor */
-enum fdi_type fdi, /* file descriptor interest type */
-pCallBackFDMgr pfunc, /* function (handler) to call */
-void *param /* first parameter passed to the func */
+fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
+SOCKET fd, /* file descriptor */
+enum fdi_type fdi, /* file descriptor interest type */
+pCallBackFDMgr pfunc, /* function (handler) to call */
+void *param /* first parameter passed to the func */
);
/*
@@ -121,9 +121,9 @@ void *param /* first parameter passed to the func */
*
*/
epicsShareFunc int epicsShareAPI fdmgr_clear_callback(
-fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
-SOCKET fd, /* file descriptor */
-enum fdi_type fdi /* file descriptor interest type */
+fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
+SOCKET fd, /* file descriptor */
+enum fdi_type fdi /* file descriptor interest type */
);
/*
@@ -136,8 +136,8 @@ enum fdi_type fdi /* file descriptor interest type */
*
*/
epicsShareFunc int epicsShareAPI fdmgr_pend_event(
-fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
-struct timeval *ptimeout
+fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
+struct timeval *ptimeout
);
@@ -145,18 +145,18 @@ struct timeval *ptimeout
* obsolete interface
*/
epicsShareFunc int epicsShareAPI fdmgr_clear_fd(
-fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
-SOCKET fd
+fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
+SOCKET fd
);
/*
* obsolete interface
*/
epicsShareFunc int epicsShareAPI fdmgr_add_fd(
-fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
-SOCKET fd,
-pCallBackFDMgr pfunc, /* function (handler) to call */
-void *param
+fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
+SOCKET fd,
+pCallBackFDMgr pfunc, /* function (handler) to call */
+void *param
);
epicsShareFunc int epicsShareAPI fdmgr_delete(fdctx *pfdctx);
diff --git a/modules/libcom/src/flex/flexdef.h b/modules/libcom/src/flex/flexdef.h
index cf972b2..58b6fd9 100644
--- a/modules/libcom/src/flex/flexdef.h
+++ b/modules/libcom/src/flex/flexdef.h
@@ -108,16 +108,16 @@
* that can be used. This definition is currently not used.
*/
#define FREE_EPSILON(state) \
- (transchar[state] == SYM_EPSILON && \
- trans2[state] == NO_TRANSITION && \
- finalst[state] != state)
+ (transchar[state] == SYM_EPSILON && \
+ trans2[state] == NO_TRANSITION && \
+ finalst[state] != state)
/* returns true if an nfa state has an epsilon out-transition character
* and both slots are free
*/
#define SUPER_FREE_EPSILON(state) \
- (transchar[state] == SYM_EPSILON && \
- trans1[state] == NO_TRANSITION) \
+ (transchar[state] == SYM_EPSILON && \
+ trans1[state] == NO_TRANSITION) \
/* maximum number of NFA states that can comprise a DFA state. It's real
* big because if there's a lot of rules, the initial state will have a
@@ -150,28 +150,28 @@
*/
#define NIL 0
-#define JAM -1 /* to mark a missing DFA transition */
+#define JAM -1 /* to mark a missing DFA transition */
#define NO_TRANSITION NIL
-#define UNIQUE -1 /* marks a symbol as an e.c. representative */
-#define INFINITY -1 /* for x{5,} constructions */
+#define UNIQUE -1 /* marks a symbol as an e.c. representative */
+#define INFINITY -1 /* for x{5,} constructions */
-#define INITIAL_MAX_CCLS 100 /* max number of unique character classes */
+#define INITIAL_MAX_CCLS 100 /* max number of unique character classes */
#define MAX_CCLS_INCREMENT 100
/* size of table holding members of character classes */
#define INITIAL_MAX_CCL_TBL_SIZE 500
#define MAX_CCL_TBL_SIZE_INCREMENT 250
-#define INITIAL_MAX_RULES 100 /* default maximum number of rules */
+#define INITIAL_MAX_RULES 100 /* default maximum number of rules */
#define MAX_RULES_INCREMENT 100
-#define INITIAL_MNS 2000 /* default maximum number of nfa states */
-#define MNS_INCREMENT 1000 /* amount to bump above by if it's not enough */
+#define INITIAL_MNS 2000 /* default maximum number of nfa states */
+#define MNS_INCREMENT 1000 /* amount to bump above by if it's not enough */
-#define INITIAL_MAX_DFAS 1000 /* default maximum number of dfa states */
+#define INITIAL_MAX_DFAS 1000 /* default maximum number of dfa states */
#define MAX_DFAS_INCREMENT 1000
-#define JAMSTATE -32766 /* marks a reference to the state that always jams */
+#define JAMSTATE -32766 /* marks a reference to the state that always jams */
/* enough so that if it's subtracted from an NFA state number, the result
* is guaranteed to be negative
@@ -187,13 +187,13 @@
#define INITIAL_MAX_TEMPLATE_XPAIRS 2500
#define MAX_TEMPLATE_XPAIRS_INCREMENT 2500
-#define SYM_EPSILON (CSIZE + 1) /* to mark transitions on the symbol epsilon */
+#define SYM_EPSILON (CSIZE + 1) /* to mark transitions on the symbol epsilon */
-#define INITIAL_MAX_SCS 40 /* maximum number of start conditions */
-#define MAX_SCS_INCREMENT 40 /* amount to bump by if it's not enough */
+#define INITIAL_MAX_SCS 40 /* maximum number of start conditions */
+#define MAX_SCS_INCREMENT 40 /* amount to bump by if it's not enough */
-#define ONE_STACK_SIZE 500 /* stack of states with only one out-transition */
-#define SAME_TRANS -1 /* transition is the same as "default" entry for state */
+#define ONE_STACK_SIZE 500 /* stack of states with only one out-transition */
+#define SAME_TRANS -1 /* transition is the same as "default" entry for state */
/* the following percentages are used to tune table compression:
@@ -247,7 +247,7 @@
*/
#define PROT_SAVE_SIZE 2000
-#define MSP 50 /* maximum number of saved protos (protos on the proto queue) */
+#define MSP 50 /* maximum number of saved protos (protos on the proto queue) */
/* maximum number of out-transitions a state can have that we'll rummage
* around through the interior of the internal fast table looking for a
@@ -537,7 +537,7 @@ extern int end_of_buffer_state;
* cclng - true for a given ccl if the ccl is negated
* cclreuse - counts how many times a ccl is re-used
* current_max_ccl_tbl_size - current limit on number of characters needed
- * to represent the unique ccl's
+ * to represent the unique ccl's
* ccltbl - holds the characters in each ccl - indexed by cclmap
*/
@@ -557,7 +557,7 @@ extern Char *ccltbl;
* numeps - number of epsilon NFA states created
* eps2 - number of epsilon states which have 2 out-transitions
* num_reallocs - number of times it was necessary to realloc() a group
- * of arrays
+ * of arrays
* tmpuses - number of DFA states that chain to templates
* totnst - total number of NFA states used to make DFA states
* peakpairs - peak number of transition pairs we had to store internally
@@ -577,42 +577,42 @@ void *allocate_array(int size, int element_size);
void *reallocate_array(void *array, int size, int element_size);
#define allocate_integer_array(size) \
- (int *) allocate_array( size, sizeof( int ) )
+ (int *) allocate_array( size, sizeof( int ) )
#define reallocate_integer_array(array,size) \
- (int *) reallocate_array( (void *) array, size, sizeof( int ) )
+ (int *) reallocate_array( (void *) array, size, sizeof( int ) )
#define allocate_int_ptr_array(size) \
- (int **) allocate_array( size, sizeof( int * ) )
+ (int **) allocate_array( size, sizeof( int * ) )
#define allocate_char_ptr_array(size) \
- (char **) allocate_array( size, sizeof( char * ) )
+ (char **) allocate_array( size, sizeof( char * ) )
#define allocate_dfaacc_union(size) \
- (union dfaacc_union *) \
- allocate_array( size, sizeof( union dfaacc_union ) )
+ (union dfaacc_union *) \
+ allocate_array( size, sizeof( union dfaacc_union ) )
#define reallocate_int_ptr_array(array,size) \
- (int **) reallocate_array( (void *) array, size, sizeof( int * ) )
+ (int **) reallocate_array( (void *) array, size, sizeof( int * ) )
#define reallocate_char_ptr_array(array,size) \
- (char **) reallocate_array( (void *) array, size, sizeof( char * ) )
+ (char **) reallocate_array( (void *) array, size, sizeof( char * ) )
#define reallocate_dfaacc_union(array, size) \
- (union dfaacc_union *) \
- reallocate_array( (void *) array, size, sizeof( union dfaacc_union ) )
+ (union dfaacc_union *) \
+ reallocate_array( (void *) array, size, sizeof( union dfaacc_union ) )
#define allocate_character_array(size) \
- (Char *) allocate_array( size, sizeof( Char ) )
+ (Char *) allocate_array( size, sizeof( Char ) )
#define reallocate_character_array(array,size) \
- (Char *) reallocate_array( (void *) array, size, sizeof( Char ) )
+ (Char *) reallocate_array( (void *) array, size, sizeof( Char ) )
#if 0 /* JRW this might couse truuble... but not for IOC usage */
/* used to communicate between scanner and parser. The type should really
* be YYSTYPE, but we can't easily get our hands on it.
*/
-#ifdef __alpha /* inconsistency with parse.y, line 57... on Alpha */
+#ifdef __alpha /* inconsistency with parse.y, line 57... on Alpha */
extern long yylval;
#else
extern int yylval;
@@ -625,9 +625,9 @@ extern int yylval;
/* from file ccl.c */
-extern void ccladd (int, int); /* Add a single character to a ccl */
-extern int cclinit (void); /* make an empty ccl */
-extern void cclnegate (int); /* negate a ccl */
+extern void ccladd (int, int); /* Add a single character to a ccl */
+extern int cclinit (void); /* make an empty ccl */
+extern void cclnegate (int); /* negate a ccl */
/* list the members of a set of characters in CCL form */
extern void list_character_set (FILE*, int[]);
@@ -638,7 +638,7 @@ extern void list_character_set (FILE*, int[]);
/* increase the maximum number of dfas */
extern void increase_max_dfas (void);
-extern void ntod (void); /* convert a ndfa to a dfa */
+extern void ntod (void); /* convert a ndfa to a dfa */
/* from file ecs.c */
@@ -661,7 +661,7 @@ extern void mkechar (int, int[], int[]);
/* from file gen.c */
-extern void make_tables (void); /* generate transition tables */
+extern void make_tables (void); /* generate transition tables */
/* from file main.c */
@@ -686,7 +686,7 @@ extern void bubble (int [], int);
/* shell sort a character array */
extern void cshell (Char [], int, int);
-extern void dataend (void); /* finish up a block of data declarations */
+extern void dataend (void); /* finish up a block of data declarations */
/* report an error message and terminate */
extern void flexerror (char[]) NORETURN;
@@ -706,7 +706,7 @@ extern void line_directive_out (FILE*);
/* generate a data statment for a two-dimensional array */
extern void mk2data (int);
-extern void mkdata (int); /* generate a data statement */
+extern void mkdata (int); /* generate a data statement */
/* return the integer represented by a string of digits */
extern int myctoi (Char []);
@@ -743,8 +743,8 @@ extern void mark_beginning_as_normal (int);
/* make a machine that branches to two machines */
extern int mkbranch (int, int);
-extern int mkclos (int); /* convert a machine into a closure */
-extern int mkopt (int); /* make a machine optional */
+extern int mkclos (int); /* convert a machine into a closure */
+extern int mkopt (int); /* make a machine optional */
/* make a machine that matches either one of two machines */
extern int mkor (int, int);
@@ -752,12 +752,12 @@ extern int mkor (int, int);
/* convert a machine into a positive closure */
extern int mkposcl (int);
-extern int mkrep (int, int, int); /* make a replicated machine */
+extern int mkrep (int, int, int); /* make a replicated machine */
/* create a state with a transition on a given symbol */
extern int mkstate (int);
-extern void new_rule (void); /* initialize for a new rule */
+extern void new_rule (void); /* initialize for a new rule */
/* from file parse.y */
@@ -768,18 +768,18 @@ extern void format_pinpoint_message (char[], char[]);
/* write out a message, pinpointing its location */
extern void pinpoint_message (char[]);
-extern void synerr (char []); /* report a syntax error */
-/* extern int yyparse ();*/ /* the YACC parser */
+extern void synerr (char []); /* report a syntax error */
+/* extern int yyparse ();*/ /* the YACC parser */
/* from file scan.l */
-extern int flexscan (); /* the Flex-generated scanner for flex */
+extern int flexscan (); /* the Flex-generated scanner for flex */
/* open the given file (if NULL, stdin) for scanning */
extern void set_input_file (char*);
-extern int yywrap (); /* wrapup a file in the lexical analyzer */
+extern int yywrap (); /* wrapup a file in the lexical analyzer */
/* from file sym.c */
@@ -790,8 +790,8 @@ extern void cclinstal (Char [], int);
/* lookup the number associated with character class */
extern int ccllookup (Char []);
-extern void ndinstal (char[], Char[]); /* install a name definition */
-extern void scinstal (char[], int); /* make a start condition */
+extern void ndinstal (char[], Char[]); /* install a name definition */
+extern void scinstal (char[], int); /* make a start condition */
/* lookup the number associated with a start condition */
extern int sclookup (char[]);
@@ -802,9 +802,9 @@ extern int sclookup (char[]);
/* build table entries for dfa state */
extern void bldtbl (int[], int, int, int, int);
-extern void cmptmps (void); /* compress template table entries */
-extern void inittbl (void); /* initialize transition tables */
-extern void mkdeftbl (void); /* make the default, "jam" table entries */
+extern void cmptmps (void); /* compress template table entries */
+extern void inittbl (void); /* initialize transition tables */
+extern void mkdeftbl (void); /* make the default, "jam" table entries */
/* create table entries for a state (or state fragment) which has
* only one out-transition */
diff --git a/modules/libcom/src/freeList/freeList.h b/modules/libcom/src/freeList/freeList.h
index 77ebfb8..47ddea7 100644
--- a/modules/libcom/src/freeList/freeList.h
+++ b/modules/libcom/src/freeList/freeList.h
@@ -7,7 +7,7 @@
* and higher are distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/* Author: Marty Kraimer Date: 04-19-94 */
+/* Author: Marty Kraimer Date: 04-19-94 */
#ifndef INCfreeListh
#define INCfreeListh
diff --git a/modules/libcom/src/gpHash/gpHash.h b/modules/libcom/src/gpHash/gpHash.h
index d9c0dd2..364982a 100644
--- a/modules/libcom/src/gpHash/gpHash.h
+++ b/modules/libcom/src/gpHash/gpHash.h
@@ -19,10 +19,10 @@
#include "ellLib.h"
typedef struct{
- ELLNODE node;
- const char *name; /*address of name placed in directory*/
- void *pvtid; /*private name for subsystem user*/
- void *userPvt; /*private for user*/
+ ELLNODE node;
+ const char *name; /*address of name placed in directory*/
+ void *pvtid; /*private name for subsystem user*/
+ void *userPvt; /*private for user*/
} GPHENTRY;
struct gphPvt;
diff --git a/modules/libcom/src/iocsh/iocsh.cpp b/modules/libcom/src/iocsh/iocsh.cpp
index 97d1101..3fb94ce 100644
--- a/modules/libcom/src/iocsh/iocsh.cpp
+++ b/modules/libcom/src/iocsh/iocsh.cpp
@@ -4,7 +4,7 @@
* Copyright (c) 2002 The Regents of the University of California, as
* Operator of Los Alamos National Laboratory.
* EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* iocsh.cpp */
/* Author: Marty Kraimer Date: 27APR2000 */
@@ -229,7 +229,7 @@ const iocshVarDef * epicsShareAPI iocshFindVariable(const char *name)
/*
* Free storage created by iocshRegister/iocshRegisterVariable
*/
-void epicsShareAPI iocshFree(void)
+void epicsShareAPI iocshFree(void)
{
struct iocshCommand *pc;
struct iocshVariable *pv;
@@ -568,7 +568,7 @@ iocshBody (const char *pathname, const char *commandLine, const char *macros)
iocshContext *context;
char ** defines = NULL;
int ret = 0;
-
+
iocshInit();
/*
@@ -618,19 +618,19 @@ iocshBody (const char *pathname, const char *commandLine, const char *macros)
fprintf(epicsGetStderr(), "Out of memory!\n");
return -1;
}
-
+
/*
* Parse macro definitions, this check occurs before creating the
* macro handle to simplify cleanup.
*/
-
+
if (macros) {
if (macParseDefns(NULL, macros, &defines) < 0) {
free(redirects);
return -1;
}
}
-
+
// Check for existing context or construct a new one.
context = (iocshContext *) epicsThreadPrivateGet(iocshContextId);
@@ -642,7 +642,7 @@ iocshBody (const char *pathname, const char *commandLine, const char *macros)
free(context);
return -1;
}
-
+
epicsThreadPrivateSet(iocshContextId, (void *) context);
}
MAC_HANDLE *handle = context->handle;
@@ -652,7 +652,7 @@ iocshBody (const char *pathname, const char *commandLine, const char *macros)
macPushScope(handle);
macInstallMacros(handle, defines);
-
+
wasOkToBlock = epicsThreadIsOkToBlock();
epicsThreadSetOkToBlock(1);
@@ -972,7 +972,7 @@ iocshBody (const char *pathname, const char *commandLine, const char *macros)
stopRedirect(filename, lineno, redirects);
}
macPopScope(handle);
-
+
if (!scope.outer) {
macDeleteHandle(handle);
free(context);
@@ -1031,11 +1031,11 @@ iocshRun(const char *cmd, const char *macros)
* Needed to work around the necessary limitations of macLib and
* environment variables. In every other case of macro expansion
* it is the expected outcome that defined macros override any
- * environment variables.
+ * environment variables.
*
- * iocshLoad/Run turn this on its head as it is very likely that
- * an epicsEnvSet command may be run within the context of their
- * calls. Thus, it would be expected that the new value would be
+ * iocshLoad/Run turn this on its head as it is very likely that
+ * an epicsEnvSet command may be run within the context of their
+ * calls. Thus, it would be expected that the new value would be
* returned in any future macro expansion.
*
* To do so, the epicsEnvSet command needs to be able to access
@@ -1046,10 +1046,10 @@ void epicsShareAPI
iocshEnvClear(const char *name)
{
iocshContext *context;
-
+
if (iocshContextId) {
context = (iocshContext *) epicsThreadPrivateGet(iocshContextId);
-
+
if (context != NULL) {
macPutValue(context->handle, name, NULL);
}
diff --git a/modules/libcom/src/misc/epicsUnitTest.h b/modules/libcom/src/misc/epicsUnitTest.h
index b019933..5d25210 100644
--- a/modules/libcom/src/misc/epicsUnitTest.h
+++ b/modules/libcom/src/misc/epicsUnitTest.h
@@ -24,18 +24,18 @@ extern "C" {
epicsShareFunc void testPlan(int tests);
epicsShareFunc int testOkV(int pass, const char *fmt, va_list pvar);
epicsShareFunc int testOk(int pass, const char *fmt, ...)
- EPICS_PRINTF_STYLE(2, 3);
+ EPICS_PRINTF_STYLE(2, 3);
epicsShareFunc void testPass(const char *fmt, ...)
- EPICS_PRINTF_STYLE(1, 2);
+ EPICS_PRINTF_STYLE(1, 2);
epicsShareFunc void testFail(const char *fmt, ...)
- EPICS_PRINTF_STYLE(1, 2);
+ EPICS_PRINTF_STYLE(1, 2);
epicsShareFunc void testSkip(int skip, const char *why);
epicsShareFunc void testTodoBegin(const char *why);
epicsShareFunc void testTodoEnd(void);
epicsShareFunc int testDiag(const char *fmt, ...)
- EPICS_PRINTF_STYLE(1, 2);
+ EPICS_PRINTF_STYLE(1, 2);
epicsShareFunc void testAbort(const char *fmt, ...)
- EPICS_PRINTF_STYLE(1, 2);
+ EPICS_PRINTF_STYLE(1, 2);
epicsShareFunc int testDone(void);
#define testOk1(cond) testOk(cond, "%s", #cond)
diff --git a/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp b/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp
index ec2c16d..bdb0ba7 100644
--- a/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp
+++ b/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp
@@ -5,12 +5,12 @@
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution.
\*************************************************************************/
-/*
- * Author Jeffrey O. Hill
- * johill at lanl.gov
+/*
+ * Author Jeffrey O. Hill
+ * johill at lanl.gov
*/
#include <string>
@@ -33,27 +33,27 @@
#include "errlog.h"
// - this class implements the asynchronous DNS query
-// - it completes early with the host name in dotted IP address form
+// - it completes early with the host name in dotted IP address form
// if the ipAddrToAsciiEngine is destroyed before IO completion
// or if there are too many items already in the engine's queue.
-class ipAddrToAsciiTransactionPrivate :
+class ipAddrToAsciiTransactionPrivate :
public ipAddrToAsciiTransaction,
public tsDLNode < ipAddrToAsciiTransactionPrivate > {
public:
ipAddrToAsciiTransactionPrivate ( class ipAddrToAsciiEnginePrivate & engineIn );
virtual ~ipAddrToAsciiTransactionPrivate ();
osiSockAddr address () const;
- void show ( unsigned level ) const;
- void * operator new ( size_t size, tsFreeList
+ void show ( unsigned level ) const;
+ void * operator new ( size_t size, tsFreeList
< ipAddrToAsciiTransactionPrivate, 0x80 > & );
- epicsPlacementDeleteOperator (( void *, tsFreeList
+ epicsPlacementDeleteOperator (( void *, tsFreeList
< ipAddrToAsciiTransactionPrivate, 0x80 > & ))
osiSockAddr addr;
ipAddrToAsciiEnginePrivate & engine;
ipAddrToAsciiCallBack * pCB;
bool pending;
void ipAddrToAscii ( const osiSockAddr &, ipAddrToAsciiCallBack & );
- void release ();
+ void release ();
void operator delete ( void * );
private:
ipAddrToAsciiTransactionPrivate & operator = ( const ipAddrToAsciiTransactionPrivate & );
@@ -65,7 +65,7 @@ private:
# pragma warning ( disable:4660 )
#endif
-template class tsFreeList
+template class tsFreeList
< ipAddrToAsciiTransactionPrivate, 0x80 >;
#ifdef _MSC_VER
@@ -104,12 +104,12 @@ struct ipAddrToAsciiGlobal : public epicsThreadRunable {
// - this class executes the synchronous DNS query
// - it creates one thread
-class ipAddrToAsciiEnginePrivate :
+class ipAddrToAsciiEnginePrivate :
public ipAddrToAsciiEngine {
public:
ipAddrToAsciiEnginePrivate() :refcount(1u), released(false) {}
virtual ~ipAddrToA
- Replies:
- Re: [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 Dirk Zimoch via Core-talk
- Re: [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 Dirk Zimoch via Core-talk
- Re: [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 Dirk Zimoch via Core-talk
- Re: [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 Dirk Zimoch via Core-talk
- Re: [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 Ralph Lange via Core-talk
- Re: [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 Ralph Lange via Core-talk
- Re: [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 Dirk Zimoch via Core-talk
- Re: [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 Dirk Zimoch via Core-talk
- Re: [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 Ben Franksen via Core-talk
- Re: [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 mdavidsaver via Core-talk
- Re: [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 Dirk Zimoch via Core-talk
- [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 Dirk Zimoch via Core-talk
- Re: [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 Dirk Zimoch via Core-talk
- Re: [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 mdavidsaver via Core-talk
- Re: [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 mdavidsaver via Core-talk
- [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 mdavidsaver via Core-talk
- Navigate by Date:
- Prev:
Jenkins build is back to stable : epics-base-3.15-win64-test #299 APS Jenkins via Core-talk
- Next:
Jenkins build is still unstable: epics-pva2pva-linux32 #173 APS Jenkins via Core-talk
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
<2020>
2021
2022
2023
2024
- Navigate by Thread:
- Prev:
Jenkins build is back to stable : epics-base-3.15-test #185 APS Jenkins via Core-talk
- Next:
Re: [Merge] ~dirk.zimoch/epics-base:CleanupWhitespace into epics-base:7.0 Dirk Zimoch via Core-talk
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
<2020>
2021
2022
2023
2024
|
·
Home
·
News
·
About
·
Base
·
Modules
·
Extensions
·
Distributions
·
Download
·