Merge a3edb54 into 4efa937

modules/ca/src/client/access.cpp

@@ -324,7 +324,7 @@ int epicsStdCall ca_create_channel (
         *chanptr = pChanNotify;
         pChanNotify->initiateConnect ( guard );
         // no need to worry about a connect preempting here because
-        // the connect sequence will not start untill initiateConnect()
+        // the connect sequence will not start until initiateConnect()
         // is called
     }
     catch ( cacChannel::badString & ) {
@@ -384,9 +384,9 @@ int epicsStdCall ca_clear_channel ( chid pChan )
         // we will definately stall out here if all of the
         // following are true
         //
-        // o user creates non-preemtive mode client library context
+        // o user creates non-preemptive mode client library context
         // o user doesnt periodically call a ca function
-        // o user calls this function from an auxiillary thread
+        // o user calls this function from an auxiliary thread
         //
         CallbackGuard cbGuard ( cac.cbMutex );
         epicsGuard < epicsMutex > guard ( cac.mutex );
@@ -720,7 +720,7 @@ int epicsStdCall ca_context_status ( ca_client_context * pcac, unsigned level )
 /*
  * ca_current_context ()
  *
- * used when an auxillary thread needs to join a CA client context started
+ * used when an auxiliary thread needs to join a CA client context started
  * by another thread
  */
 // extern "C"
@@ -740,7 +740,7 @@ struct ca_client_context * epicsStdCall ca_current_context ()
 /*
  * ca_attach_context ()
  *
- * used when an auxillary thread needs to join a CA client context started
+ * used when an auxiliary thread needs to join a CA client context started
  * by another thread
  */
 // extern "C"

modules/ca/src/client/acctst.c

@@ -494,7 +494,7 @@ void verifyConnectionHandlerConnect ( appChan *pChans, unsigned chanCount,
 /*
  * verifyBlockingConnect ()
  *
- * 1) verify that we dont print a disconnect message when
+ * 1) verify that we don't print a disconnect message when
  * we delete the last channel
  *
  * 2) verify that we delete the connection to the IOC
@@ -645,7 +645,7 @@ void verifyBlockingConnect ( appChan *pChans, unsigned chanCount,
         status = ca_pend_io ( 1e-16 );
         if ( status == ECA_TIMEOUT ) {
             /*
-             * we end up here if the channel isnt on the same host
+             * we end up here if the channel isn't on the same host
              */
             epicsThreadSleep ( 0.1 );
             ca_poll ();
@@ -1112,7 +1112,7 @@ void verifyHighThroughputRead ( chid chan, unsigned interestLevel )
     unsigned i;
 
     /*
-     * verify we dont jam up on many uninterrupted
+     * verify we don't jam up on many uninterrupted
      * solicitations
      */
     if ( ca_read_access (chan) ) {
@@ -1152,7 +1152,7 @@ void verifyHighThroughputWrite ( chid chan, unsigned interestLevel  )
 }
 
 /*
- * verify we dont jam up on many uninterrupted
+ * verify we don't jam up on many uninterrupted
  * get callback requests
  */
 void verifyHighThroughputReadCallback ( chid chan, unsigned interestLevel )
@@ -1181,7 +1181,7 @@ void verifyHighThroughputReadCallback ( chid chan, unsigned interestLevel )
 }
 
 /*
- * verify we dont jam up on many uninterrupted
+ * verify we don't jam up on many uninterrupted
  * put callback request
  */
 void verifyHighThroughputWriteCallback ( chid chan, unsigned interestLevel )
@@ -1395,7 +1395,7 @@ static void multiSubscrDestroyNoLateCallbackThread ( void * pParm )
 
         /*
          * raise the priority of the current thread hoping to improve our
-         * likelyhood of detecting a bug
+         * likelihood of detecting a bug
          */
         priorityOfTestThread = epicsThreadGetPrioritySelf ();
         epicsThreadSetPriority ( epicsThreadGetIdSelf(), epicsThreadPriorityHigh );
@@ -1445,7 +1445,7 @@ static void multiSubscrDestroyNoLateCallbackThread ( void * pParm )
 }
 
 /*
- * verify that, in a preemtive callback mode client, a subscription callback never
+ * verify that, in a preemptive callback mode client, a subscription callback never
  * comes after the subscription is destroyed
  */
 static void multiSubscrDestroyNoLateCallbackTest ( const char *pName, unsigned interestLevel )
@@ -1563,7 +1563,7 @@ void multiSubscriptionDeleteTest ( chid chan, unsigned interestLevel  )
 /*
  * singleSubscriptionDeleteTest
  *
- * verify that we dont fail when we repeatedly create
+ * verify that we don't fail when we repeatedly create
  * and delete only one subscription with a high level of
  * traffic on it
  */
@@ -1617,7 +1617,7 @@ void singleSubscriptionDeleteTest ( chid chan, unsigned interestLevel  )
 /*
  * channelClearWithEventTrafficTest
  *
- * verify that we can delete a channel that has subcriptions
+ * verify that we can delete a channel that has subscriptions
  * attached with heavy update traffic
  */
 void channelClearWithEventTrafficTest ( const char *pName, unsigned interestLevel )
@@ -2481,7 +2481,7 @@ void monitorUpdateTest ( chid chan, unsigned interestLevel )
     showProgress ( interestLevel );
 
     /*
-     * attempt to uncover problems where the last event isnt sent
+     * attempt to uncover problems where the last event isn't sent
      * and hopefully get into a flow control situation
      */
     prevPassCount = 0u;
@@ -2522,7 +2522,7 @@ void monitorUpdateTest ( chid chan, unsigned interestLevel )
             ca_poll (); /* emulate typical GUI */
             for ( j = 0; j < NELEMENTS ( test ); j++ ) {
                 /*
-                 * we shouldnt see old monitors because
+                 * we shouldn't see old monitors because
                  * we resubscribed
                  */
                 verify ( test[j].count <= i + 2 );
@@ -3016,7 +3016,7 @@ void testMultithreadSubscr ( void * pParm )
 }
 
 /*
- * test installation of subscriptions similar to usage paterns
+ * test installation of subscriptions similar to usage patterns
  * employed by modern versions of the sequencer
  */
 void verifyMultithreadSubscr ( const char * pName, unsigned interestLevel )
@@ -3111,7 +3111,7 @@ void fdManagerVerify ( const char * pName, unsigned interestLevel )
     status = ca_flush_io ();
     verify ( status == ECA_NORMAL );
 
-    /* look for infinite loop in fd manager schedualing */
+    /* look for infinite loop in fd manager scheduling */
     epicsTimeGetCurrent ( & begin );
     eventCount = 0u;
     while ( 1 ) {
@@ -3175,7 +3175,7 @@ void verifyConnectWithDisconnectedChannels (
      * we should be able to connect to a valid
      * channel within a reasonable delay even
      * though there is one permanently
-     * diasconnected channel
+     * disconnected channel
      */
     status = ca_pend_io ( timeoutToPendIO );
     verify ( status == ECA_NORMAL );
@@ -3491,7 +3491,7 @@ int acctst ( const char * pName, unsigned interestLevel, unsigned channelCount,
 
     /*
      * CA pend event delay accuracy test
-     * (CA asssumes that search requests can be sent
+     * (CA assumes that search requests can be sent
      * at least every 25 mS on all supported os)
      */
     printf ( "\n" );

modules/ca/src/client/bhe.cpp

@@ -130,8 +130,8 @@ bool bhe::updatePeriod (
     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
+    // this block is entered if the beacon was created as a side effect of
+    // creating a connection and so we don't yet know the first beacon time
     // and  sequence number
     //
     if ( this->timeStamp == epicsTime () ) {
@@ -154,7 +154,7 @@ bool bhe::updatePeriod (
         return false;
     }
 
-    // 1) detect beacon duplications due to redundant routes
+    // 1) detect beacon duplication due to redundant routes
     // 2) detect lost beacons due to input queue overrun or damage
     if ( CA_V410 ( protocolRevision ) ) {
         unsigned beaconSeqAdvance;
@@ -175,7 +175,7 @@ bool bhe::updatePeriod (
 
         // 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)
+        // or a beacon due to input queue overrun)
         if ( beaconSeqAdvance > 1 &&  beaconSeqAdvance < 4 ) {
             logBeaconDiscard ( beaconSeqAdvance, currentTime );
             return false;
@@ -244,8 +244,8 @@ bool bhe::updatePeriod (
         /*
          * Is this an IOC seen because of an IOC reboot
          * (beacon come at a higher rate just after the
-         * IOC reboots). Lower tolarance here because we
-         * dont have to worry about lost beacons.
+         * IOC reboots). Lower tolerance here because we
+         * don't have to worry about lost beacons.
          *
          * It may be possible to get false triggers here
          * if the client is busy, but this does not cause

modules/ca/src/client/caProto.h

@@ -58,8 +58,8 @@
 #define CA_REPEATER_PORT        (CA_PORT_BASE+CA_MAJOR_PROTOCOL_REVISION*2u+1u)
 
 /*
- * 1500 (max of ethernet and 802.{2,3} MTU) - 20(IP) - 8(UDP)
- * (the MTU of Ethernet is currently independent of its speed varient)
+ * 1500 (max of Ethernet and 802.{2,3} MTU) - 20(IP) - 8(UDP)
+ * (the MTU of Ethernet is currently independent of its speed variant)
  */
 #define ETHERNET_MAX_UDP        ( 1500u - 20u - 8u )
 #define MAX_UDP_RECV            ( 0xffff + 16u ) /* allow large frames to be received in the future */
@@ -117,7 +117,7 @@ typedef ca_uint32_t     caResId;
 
 /*
  * for use with search and not_found (if search fails and
- * its not a broadcast tell the client to look elesewhere)
+ * its not a broadcast tell the client to look elsewhere)
  */
 #define DOREPLY     10u
 #define DONTREPLY   5u
@@ -176,7 +176,7 @@ typedef struct ca_hdr {
 struct  mon_info {
     ca_float32_t    m_lval;     /* low delta */
     ca_float32_t    m_hval;     /* high delta */
-    ca_float32_t    m_toval;    /* period btween samples */
+    ca_float32_t    m_toval;    /* period between samples */
     ca_uint16_t     m_mask;     /* event select mask */
     ca_uint16_t     m_pad;      /* extend to 32 bits */
 };

modules/ca/src/client/ca_client_context.cpp

@@ -224,7 +224,7 @@ void ca_client_context::changeExceptionEvent (
     epicsGuard < epicsMutex > guard ( this->mutex );
     this->ca_exception_func = pfunc;
     this->ca_exception_arg = arg;
-// should block here until releated callback in progress completes
+// should block here until related callback in progress completes
 }
 
 void ca_client_context::replaceErrLogHandler (
@@ -237,7 +237,7 @@ void ca_client_context::replaceErrLogHandler (
     else {
         this->pVPrintfFunc = epicsVprintf;
     }
-// should block here until releated callback in progress completes
+// should block here until related callback in progress completes
 }
 
 void ca_client_context::registerForFileDescriptorCallBack (
@@ -252,7 +252,7 @@ void ca_client_context::registerForFileDescriptorCallBack (
         // w/o having sent the wakeup message
         this->_sendWakeupMsg ();
     }
-// should block here until releated callback in progress completes
+// should block here until related callback in progress completes
 }
 
 int ca_client_context :: printFormated (
@@ -768,9 +768,9 @@ LIBCA_API int epicsStdCall ca_clear_subscription ( evid pMon )
       // we will definately stall out here if all of the
       // following are true
       //
-      // o user creates non-preemtive mode client library context
+      // o user creates non-preemptive mode client library context
       // o user doesnt periodically call a ca function
-      // o user calls this function from an auxiillary thread
+      // o user calls this function from an auxiliary thread
       //
       CallbackGuard cbGuard ( cac.cbMutex );
       epicsGuard < epicsMutex > guard ( cac.mutex );

modules/ca/src/client/cac.cpp

@@ -285,7 +285,7 @@ cac::~cac ()
     // this blocks until the UDP thread exits so that
     // it will not sneak in any new clients
     //
-    // lock intentionally not held here so that we dont deadlock
+    // lock intentionally not held here so that we don't deadlock
     // waiting for the UDP thread to exit while it is waiting to
     // get the lock.
     {
@@ -312,7 +312,7 @@ cac::~cac ()
     //
     // wait for all tcp threads to exit
     //
-    // this will block for oustanding sends to go out so dont
+    // this will block for outstanding sends to go out so don't
     // hold a lock while waiting
     //
     {
@@ -411,7 +411,7 @@ void cac::show (
 
     ::printf ( "Channel Access Client Context at %p for user %s\n",
         static_cast <const void *> ( this ), this->pUserName );
-    // this also supresses the "defined, but not used"
+    // this also suppresses the "defined, but not used"
     // warning message
     ::printf ( "\trevision \"%s\"\n", pVersionCAC );
 

modules/ca/src/client/cadef.h

@@ -129,7 +129,7 @@ typedef unsigned CA_SYNC_GID;
 #define CA_OP_CONN_UP       6
 #define CA_OP_CONN_DOWN     7
 
-/* depricated */
+/* deprecated */
 #define CA_OP_SEARCH        2
 
 /*
@@ -464,7 +464,7 @@ LIBCA_API int epicsStdCall ca_array_get_callback
 /*  Specify a function to be executed whenever significant changes      */
 /*  occur to a channel.                                                 */
 /*  NOTES:                                                              */
-/*  1)  Evid may be omited by passing a NULL pointer                    */
+/*  1)  Evid may be omitted by passing a NULL pointer                    */
 /*                                                                      */
 /*  2)  An array count of zero specifies the native db count            */
 /*                                                                      */
@@ -837,7 +837,7 @@ LIBCA_API double epicsStdCall ca_beacon_period (chid chan);
 LIBCA_API double epicsStdCall ca_receive_watchdog_delay (chid chan);
 
 /*
- * used when an auxillary thread needs to join a CA client context started
+ * used when an auxiliary thread needs to join a CA client context started
  * by another thread
  */
 LIBCA_API struct ca_client_context * epicsStdCall ca_current_context ();

modules/ca/src/client/casw.cpp

@@ -224,7 +224,7 @@ int main ( int argc, char ** argv )
                  *   always set this field to INADDR_ANY
                  *
                  * clients always assume that if this
-                 * field is set to something that isnt INADDR_ANY
+                 * field is set to something that isn't INADDR_ANY
                  * then it is the overriding IP address of the server.
                  */
                 ina.sin_family = AF_INET;
@@ -235,7 +235,7 @@ int main ( int argc, char ** argv )
                 }
                 else {
                     /*
-                     * old servers dont supply this and the
+                     * old servers don't supply this and the
                      * default port must be assumed
                      */
                     ina.sin_port = htons ( serverPort );

modules/ca/src/client/comBuf.cpp

@@ -45,7 +45,7 @@ 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 isn't inline
 // shrinks the GNU compiled object code
 void comBuf::throwInsufficentBytesException ()
 {

modules/ca/src/client/comQueRecv.cpp

@@ -196,7 +196,7 @@ epicsUInt16 comQueRecv::popUInt16 ()
     if ( ! pComBuf ) {
         comBuf::throwInsufficentBytesException ();
     }
-    // try first for all in one buffer efficent version
+    // try first for all in one buffer efficient version
     epicsUInt16 tmp = 0;
     comBuf::popStatus status = pComBuf->pop ( tmp );
     if ( status.success ) {
@@ -215,7 +215,7 @@ epicsUInt32 comQueRecv::popUInt32 ()
     if ( ! pComBuf ) {
         comBuf::throwInsufficentBytesException ();
     }
-    // try first for all in one buffer efficent version
+    // try first for all in one buffer efficient version
     epicsUInt32 tmp = 0;
     comBuf::popStatus status = pComBuf->pop ( tmp );
     if ( status.success ) {
@@ -230,7 +230,7 @@ epicsUInt32 comQueRecv::popUInt32 ()
 
 bool comQueRecv::popOldMsgHeader ( caHdrLargeArray & msg )
 {
-    // try first for all in one buffer efficent version
+    // try first for all in one buffer efficient version
     comBuf * pComBuf = this->bufs.first ();
     if ( ! pComBuf ) {
         return false;