no longer need to specify hash table size

src/ca/cadef.h

@@ -194,8 +194,7 @@ epicsShareFunc enum channel_state epicsShareAPI ca_state (chid chan);
 /*  Must be called once before calling any of the other routines        */
 /************************************************************************/
 epicsShareFunc int epicsShareAPI ca_task_initialize (void);
-epicsShareFunc int epicsShareAPI ca_context_create ( 
-                   int preemptiveCallBackEnable, unsigned maxNumberOfChannels );
+epicsShareFunc int epicsShareAPI ca_context_create (int preemptiveCallBackEnable);
 
 /************************************************************************/
 /*  Remove CA facility from your task                                   */
@@ -927,12 +926,13 @@ typedef void * caClientCtx;
 epicsShareFunc int epicsShareAPI ca_current_context (caClientCtx *pCurrentContext);
 epicsShareFunc int epicsShareAPI ca_attach_context (caClientCtx context);
 
-epicsShareFunc int epicsShareAPI ca_channel_status (epicsThreadId tid);
+
 epicsShareFunc int epicsShareAPI ca_client_status (unsigned level);
 
 /*
  * deprecated
  */
+epicsShareFunc int epicsShareAPI ca_channel_status (epicsThreadId tid);
 epicsShareFunc int epicsShareAPI ca_import (epicsThreadId tid);
 epicsShareFunc int epicsShareAPI ca_import_cancel (epicsThreadId tid);
 

src/ca/casw.cpp

@@ -100,7 +100,7 @@ int main ( int, char ** )
         return -1;
     }
 
-    resTable < bhe, inetAddrID > beaconTable ( 1024 );
+    resTable < bhe, inetAddrID > beaconTable;
     while ( 1 ) {
 
         addrSize = ( osiSocklen_t ) sizeof ( addr );

src/ca/catime.c

@@ -494,7 +494,7 @@ int catime ( char *channelName, unsigned channelCount, enum appendNumberFlag app
         return -1;
     }
 
-    SEVCHK ( ca_context_create ( 0, channelCount * 2 ), "Unable to initialize" );
+    SEVCHK ( ca_context_create ( 0 ), "Unable to initialize" );
 
     if ( appNF == appendNumber ) {
         printf ( "Testing with %u channels named %snnn\n", 

src/ca/oldAccess.h

@@ -188,8 +188,7 @@ private:
 class oldCAC : public cacNotify
 {
 public:
-    oldCAC ( bool enablePreemptiveCallback = false, 
-        unsigned maxNumberOfChannels = 32768 );
+    oldCAC ( bool enablePreemptiveCallback = false );
     virtual ~oldCAC ();
     void changeExceptionEvent ( caExceptionHandler *pfunc, void *arg );
     void registerForFileDescriptorCallBack ( CAFDHANDLER *pFunc, void *pArg );

src/ca/oldCAC.cpp

@@ -20,9 +20,8 @@
 
 #include "oldAccess.h"
 
-oldCAC::oldCAC ( bool enablePreemptiveCallback,
-                unsigned maxNumberOfChannels ) :
-    clientCtx ( * new cac ( *this, enablePreemptiveCallback, maxNumberOfChannels ) ),
+oldCAC::oldCAC ( bool enablePreemptiveCallback ) :
+    clientCtx ( * new cac ( *this, enablePreemptiveCallback ) ),
     ca_exception_func ( 0 ), ca_exception_arg ( 0 ), 
     pVPrintfFunc ( errlogVprintf ), fdRegFunc ( 0 ), fdRegArg ( 0 )
 {

src/cas/example/simple/exServer.cc

@@ -49,8 +49,6 @@ pvInfo exServer::billy (-1.0, "billy", 10.0f, -10.0f, excasIoAsync, 1u);
 //
 exServer::exServer ( const char * const pvPrefix, 
                     unsigned aliasCount, bool scanOnIn ) : 
-    caServer (pvListNElem+2u),
-    stringResTbl (pvListNElem*(aliasCount+1u)+2u),
     simultAsychIOCount (0u),
     scanOn (scanOnIn)
 {

src/cas/generic/caServer.cc

@@ -54,7 +54,7 @@
 //
 // caServer::caServer()
 //
-epicsShareFunc caServer::caServer (unsigned pvCountEstimateIn)
+epicsShareFunc caServer::caServer ()
 {
     static bool init = false;
     
@@ -63,7 +63,7 @@ epicsShareFunc caServer::caServer (unsigned pvCountEstimateIn)
         init = true;
     }    
 
-    this->pCAS = new caServerI(*this, pvCountEstimateIn);
+    this->pCAS = new caServerI(*this);
     if (this->pCAS==NULL) {
         errMessage (S_cas_noMemory, " - unable to create caServer");
         throw S_cas_noMemory;

src/cas/generic/caServerI.cc

@@ -50,8 +50,7 @@ static const double CAServerMinBeaconPeriod = 1.0e-3; // seconds
 //
 // caServerI::caServerI()
 //
-caServerI::caServerI (caServer &tool, unsigned nPV) :
-    chronIntIdResTable<casRes>(nPV*2u),
+caServerI::caServerI (caServer &tool) :
     //
     // Set up periodic beacon interval
     // (exponential back off to a plateau

src/cas/generic/casdef.h

@@ -246,7 +246,7 @@ class caServer {
 	friend class casPVI;
 
 public:
-	epicsShareFunc caServer (unsigned pvCountEstimate=1024u);
+	epicsShareFunc caServer ();
 	epicsShareFunc virtual ~caServer() = 0;
 
 	//

src/cas/generic/server.h

@@ -781,8 +781,6 @@ private:
 	casEventRegistry        ®
 };
 
-static const unsigned casEventRegistryHashTableSize = 256u;
-
 //
 // casEventRegistry
 //
@@ -790,9 +788,7 @@ class casEventRegistry : private resTable <casEventMaskEntry, stringId> {
     friend class casEventMaskEntry;
 public:
     
-    casEventRegistry () :  
-        resTable<casEventMaskEntry, stringId> (casEventRegistryHashTableSize), 
-        maskBitAllocator(0) {}
+    casEventRegistry () : maskBitAllocator(0) {}
     
     virtual ~casEventRegistry();
     
@@ -821,7 +817,7 @@ class caServerI :
 	private chronIntIdResTable<casRes>,
 	public casEventRegistry {
 public:
-	caServerI ( caServer &tool, unsigned pvCountEstimate );
+	caServerI ( caServer &tool );
 	~caServerI ();
 
 	//