From 9c05191e9e8cdc82f79e3e545eeef0c97a2f8a21 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 13 Aug 1996 22:56:14 +0000 Subject: [PATCH] added init for mutex class --- src/cas/generic/caServerI.cc | 7 +++++++ src/cas/generic/casClient.cc | 7 +++++++ src/cas/generic/server.h | 19 ++++++++++++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/cas/generic/caServerI.cc b/src/cas/generic/caServerI.cc index eac4d14fd..1d9969411 100644 --- a/src/cas/generic/caServerI.cc +++ b/src/cas/generic/caServerI.cc @@ -29,6 +29,9 @@ * * History * $Log$ + * Revision 1.2 1996/08/05 19:25:17 jhill + * removed unused code + * * Revision 1.1.1.1 1996/06/20 00:28:15 jhill * ca server installation * @@ -138,6 +141,10 @@ caStatus caServerI::init() int status; int resLibStatus; + if (this->osiMutex::init()) { + return S_cas_noMemory; + } + status = caServerIO::init(); if (status) { return status; diff --git a/src/cas/generic/casClient.cc b/src/cas/generic/casClient.cc index b15a8c486..26eb379bd 100644 --- a/src/cas/generic/casClient.cc +++ b/src/cas/generic/casClient.cc @@ -29,6 +29,9 @@ * * History * $Log$ + * Revision 1.2 1996/07/09 22:54:31 jhill + * store msg copy in the ctx + * * Revision 1.1.1.1 1996/06/20 00:28:14 jhill * ca server installation * @@ -87,6 +90,10 @@ caStatus casClient::init() if (status) { return status; } + status = this->casCoreClient::init(); + if (status) { + return status; + } serverDebugLevel = this->ctx.getServer()->getDebugLevel(); if (serverDebugLevel>0u) { diff --git a/src/cas/generic/server.h b/src/cas/generic/server.h index 3abd3ef48..59fa35e1a 100644 --- a/src/cas/generic/server.h +++ b/src/cas/generic/server.h @@ -29,6 +29,9 @@ * * History * $Log$ + * Revision 1.8 1996/08/05 23:22:58 jhill + * gddScaler => gddScalar + * * Revision 1.7 1996/08/05 19:27:28 jhill * added process() * @@ -171,8 +174,8 @@ private: virtual void osdShow (unsigned level) const = 0; }; -#include // IO dependent #include // OS dependent +#include // IO dependent enum casProcCond {casProcOk, casProcDisconnect}; @@ -209,6 +212,13 @@ public: eventsOff(aitFalse) { } + init() + { + if (mutex.init()) { + return S_cas_noMemory; + } + return S_cas_success; + } ~casEventSys(); void show(unsigned level); @@ -535,6 +545,13 @@ class casCoreClient : public osiMutex, public ioBlocked, public casEventSys { public: casCoreClient(caServerI &serverInternal); + caStatus init() + { + if (this->osiMutex::init()) { + return S_cas_noMemory; + } + return this->casEventSys::init(); + } virtual ~casCoreClient(); virtual void destroy(); virtual caStatus disconnectChan(caResId id);