[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi/libCERTI SocketSHM.cc Exception.cc RingBu...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi/libCERTI SocketSHM.cc Exception.cc RingBu... |
|
Date: |
Mon, 29 Mar 2010 18:24:20 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 10/03/29 18:24:20
Modified files:
libCERTI : SocketSHM.cc Exception.cc RingBuffer.cc
Exception.hh
Log message:
Suppress CERTI_EXCEPTION now declared within libhla
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketSHM.cc?cvsroot=certi&r1=3.2&r2=3.3
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Exception.cc?cvsroot=certi&r1=3.19&r2=3.20
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/RingBuffer.cc?cvsroot=certi&r1=3.2&r2=3.3
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Exception.hh?cvsroot=certi&r1=3.9&r2=3.10
Patches:
Index: SocketSHM.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketSHM.cc,v
retrieving revision 3.2
retrieving revision 3.3
diff -u -b -r3.2 -r3.3
--- SocketSHM.cc 28 Mar 2010 11:42:34 -0000 3.2
+++ SocketSHM.cc 29 Mar 2010 18:24:20 -0000 3.3
@@ -19,7 +19,7 @@
try {
_Sem_full_SC->Attach(libhla::ipc::Semaphore::buildSemName(_Name+"_FULL_SC")) ;
}
- catch(certi::SharedMemoryNotAttached& e)
+ catch(libhla::ipc::SHM::SharedMemoryNotAttached& e)
{
std::cout << "SocketSHM::Connect() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::SocketNotConnected("Connect() failed."));
@@ -27,7 +27,7 @@
try {
_Sem_empty_SC->Attach(libhla::ipc::Semaphore::buildSemName(_Name+"_EMPTY_SC")) ;
}
- catch(certi::SharedMemoryNotAttached& e)
+ catch(libhla::ipc::SHM::SharedMemoryNotAttached& e)
{
std::cout << "SocketSHM::Connect() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::SocketNotConnected("Connect() failed."));
@@ -37,7 +37,7 @@
try {
_Sem_full_CS->Attach(libhla::ipc::Semaphore::buildSemName(_Name+"_FULL_CS")) ;
}
- catch(certi::SharedMemoryNotAttached& e)
+ catch(libhla::ipc::SHM::SharedMemoryNotAttached& e)
{
std::cout << "SocketSHM::Connect() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::SocketNotConnected("Connect() failed."));
@@ -45,7 +45,7 @@
try {
_Sem_empty_CS->Attach(libhla::ipc::Semaphore::buildSemName(_Name+"_EMPTY_CS")) ;
}
- catch(certi::SharedMemoryNotAttached& e)
+ catch(libhla::ipc::SHM::SharedMemoryNotAttached& e)
{
std::cout << "SocketSHM::Connect() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::SocketNotConnected("Connect() failed."));
@@ -67,7 +67,7 @@
try {
_Sem_empty_SC->P() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(libhla::ipc::Semaphore::SemaphoreHandlingError& e)
{
std::cout << "SocketSHM::Send() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotSent("Send() failed.")) ;
@@ -78,7 +78,7 @@
try {
_Sem_full_SC->V() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(libhla::ipc::Semaphore::SemaphoreHandlingError& e)
{
std::cout << "SocketSHM::Send() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotSent("Send() failed.")) ;
@@ -88,7 +88,7 @@
try {
_Sem_empty_CS->P() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(libhla::ipc::Semaphore::SemaphoreHandlingError& e)
{
std::cout << "SocketSHM::Send() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotSent("Send() failed.")) ;
@@ -99,7 +99,7 @@
try {
_Sem_full_CS->V() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(libhla::ipc::Semaphore::SemaphoreHandlingError& e)
{
std::cout << "SocketSHM::Send() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotSent("Send() failed.")) ;
@@ -125,7 +125,7 @@
try {
_Sem_full_CS->P() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(libhla::ipc::Semaphore::SemaphoreHandlingError& e)
{
std::cout << "SocketSHM::Receive() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotReceived("Receive() failed.")) ;
@@ -136,7 +136,7 @@
try {
_Sem_empty_CS->V() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(libhla::ipc::Semaphore::SemaphoreHandlingError& e)
{
std::cout << "SocketSHM::Receive() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotReceived("Receive() failed.")) ;
@@ -146,7 +146,7 @@
try {
_Sem_full_SC->P() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(libhla::ipc::Semaphore::SemaphoreHandlingError& e)
{
std::cout << "SocketSHM::Receive() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotReceived("Receive() failed.")) ;
@@ -157,7 +157,7 @@
try {
_Sem_empty_SC->V() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(libhla::ipc::Semaphore::SemaphoreHandlingError& e)
{
std::cout << "SocketSHM::Receive() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotReceived("Receive() failed.")) ;
@@ -182,12 +182,12 @@
try {
_Shm_SC->Close() ;
}
-catch (certi::SharedMemoryNotClosed& e)
+catch (libhla::ipc::SHM::SharedMemoryNotClosed& e)
{
std::cout << "SocketSHM::Close() Exception. " << "Name is : " << e._name
<< " Reason is : " << e._reason << std::endl ;
throw (certi::SocketNotClosed("Close() failed.")) ;
}
-catch (certi::HandleNotClosed& e)
+catch (libhla::ipc::SHM::HandleNotClosed& e)
{
std::cout << "SocketSHM::Close() Exception. " << "Name is : " << e._name
<< " Reason is : " << e._reason << std::endl ;
throw (certi::SocketNotClosed("Close() failed.")) ;
@@ -195,12 +195,12 @@
try {
_Shm_CS->Close() ;
}
-catch (certi::SharedMemoryNotClosed& e)
+catch (libhla::ipc::SHM::SharedMemoryNotClosed& e)
{
std::cout << "SocketSHM::Close() Exception. " << "Name is : " << e._name
<< " Reason is : " << e._reason << std::endl ;
throw (certi::SocketNotClosed("Close() failed.")) ;
}
-catch (certi::HandleNotClosed& e)
+catch (libhla::ipc::SHM::HandleNotClosed& e)
{
std::cout << "SocketSHM::Close() Exception. " << "Name is : " << e._name
<< " Reason is : " << e._reason << std::endl ;
throw (certi::SocketNotClosed("Close() failed.")) ;
Index: Exception.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Exception.cc,v
retrieving revision 3.19
retrieving revision 3.20
diff -u -b -r3.19 -r3.20
--- Exception.cc 16 Jan 2010 20:17:14 -0000 3.19
+++ Exception.cc 29 Mar 2010 18:24:20 -0000 3.20
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Exception.cc,v 3.19 2010/01/16 20:17:14 erk Exp $
+// $Id: Exception.cc,v 3.20 2010/03/29 18:24:20 erk Exp $
// ----------------------------------------------------------------------------
#include "Exception.hh"
@@ -133,13 +133,6 @@
long certi::UnknownLabel::_type = certi::e_UnknownLabel ;
long certi::NetworkError::_type = certi::e_NetworkError ;
long certi::NetworkSignal::_type = certi::e_NetworkSignal ;
-long certi::SharedMemoryNotOpen::_type = certi::e_SharedMemoryNotOpen ;
-long certi::SharedMemoryNotAttached::_type = certi::e_SharedMemoryNotAttached ;
-long certi::SharedMemoryNotClosed::_type = certi::e_SharedMemoryNotClosed ;
-long certi::HandleNotClosed::_type = certi::e_HandleNotClosed ;
-long certi::SemaphoreNotCreated::_type = certi::e_SemaphoreNotCreated ;
-long certi::SemaphoreNotOpen::_type = certi::e_SemaphoreNotOpen ;
-long certi::SemaphoreHandlingError::_type = certi::e_SemaphoreHandlingError ;
long certi::SocketNotConnected::_type = certi::e_SocketNotConnected ;
long certi::MessageNotSent::_type = certi::e_MessageNotSent ;
long certi::MessageNotReceived::_type = certi::e_MessageNotReceived ;
@@ -179,4 +172,4 @@
Debug(PD_Exception, pdExcept) << msg.str();
return msg.str();
}
-// $Id: Exception.cc,v 3.19 2010/01/16 20:17:14 erk Exp $
+// $Id: Exception.cc,v 3.20 2010/03/29 18:24:20 erk Exp $
Index: RingBuffer.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/RingBuffer.cc,v
retrieving revision 3.2
retrieving revision 3.3
diff -u -b -r3.2 -r3.3
--- RingBuffer.cc 28 Mar 2010 11:42:34 -0000 3.2
+++ RingBuffer.cc 29 Mar 2010 18:24:20 -0000 3.3
@@ -95,7 +95,7 @@
try {
_Sem_SC->Create_Init(1,
Semaphore::buildSemName(RingBuffer_Name+"_BUFFER_SC")) ;
}
- catch(certi::SemaphoreNotCreated& e)
+ catch(Semaphore::SemaphoreNotCreated& e)
{
std::cout << "RingBuffer::RingBuffer() Exception. " << "Name is : "
<< e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotCreated("RingBuffer() failed.")) ;;
@@ -105,7 +105,7 @@
try {
_Sem_CS->Create_Init(1,
Semaphore::buildSemName(RingBuffer_Name+"_BUFFER_CS")) ;
}
- catch(certi::SemaphoreNotCreated& e)
+ catch(Semaphore::SemaphoreNotCreated& e)
{
std::cout << "RingBuffer::RingBuffer() Exception. " << "Name is : "
<< e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotCreated("RingBuffer() failed.")) ;;
@@ -162,7 +162,7 @@
try {
_Shm_SC->Open() ;
}
- catch(certi::SharedMemoryNotOpen& e)
+ catch(SHM::SharedMemoryNotOpen& e)
{
std::cout << "RingBuffer::RingBuffer() Exception. " << "Name is : "
<< e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotCreated("RingBuffer() failed.")) ;;
@@ -170,7 +170,7 @@
try {
_Shm_SC->Attach() ;
}
- catch(certi::SharedMemoryNotAttached& e)
+ catch(SHM::SharedMemoryNotAttached& e)
{
std::cout << "RingBuffer::RingBuffer() Exception. " << "Name is : "
<< e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotCreated("RingBuffer() failed.")) ;;
@@ -178,7 +178,7 @@
try {
_Pw_Pr_SC->Open() ;
}
- catch(certi::SharedMemoryNotOpen& e)
+ catch(SHM::SharedMemoryNotOpen& e)
{
std::cout << "RingBuffer::RingBuffer() Exception. " << "Name is : "
<< e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotCreated("RingBuffer() failed.")) ;;
@@ -186,7 +186,7 @@
try {
_Pw_Pr_SC->Attach() ;
}
- catch(certi::SharedMemoryNotAttached& e)
+ catch(SHM::SharedMemoryNotAttached& e)
{
std::cout << "RingBuffer::RingBuffer() Exception. " << "Name is : "
<< e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotCreated("RingBuffer() failed.")) ;;
@@ -202,7 +202,7 @@
try {
_Shm_CS->Open() ;
}
- catch(certi::SharedMemoryNotOpen& e)
+ catch(SHM::SharedMemoryNotOpen& e)
{
std::cout << "RingBuffer::RingBuffer() Exception. " << "Name is : "
<< e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotCreated("RingBuffer() failed.")) ;;
@@ -210,7 +210,7 @@
try {
_Shm_CS->Attach() ;
}
- catch(certi::SharedMemoryNotAttached& e)
+ catch(SHM::SharedMemoryNotAttached& e)
{
std::cout << "RingBuffer::RingBuffer() Exception. " << "Name is : "
<< e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotCreated("RingBuffer() failed.")) ;;
@@ -218,7 +218,7 @@
try {
_Pw_Pr_CS->Open() ;
}
- catch(certi::SharedMemoryNotOpen& e)
+ catch(SHM::SharedMemoryNotOpen& e)
{
std::cout << "RingBuffer::RingBuffer() Exception. " << "Name is : "
<< e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotCreated("RingBuffer() failed.")) ;;
@@ -226,7 +226,7 @@
try {
_Pw_Pr_CS->Attach() ;
}
- catch(certi::SharedMemoryNotAttached& e)
+ catch(SHM::SharedMemoryNotAttached& e)
{
std::cout << "RingBuffer::RingBuffer() Exception. " << "Name is : "
<< e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotCreated("RingBuffer() failed.")) ;;
@@ -249,7 +249,7 @@
try {
_Sem_SC->Attach(Semaphore::buildSemName(_Name+"_BUFFER_SC")) ;
}
- catch(certi::SemaphoreNotOpen& e)
+ catch(Semaphore::SemaphoreNotOpen& e)
{
std::cout << "RingBuffer::Attach() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotAttached("Attach() failed.")) ;;
@@ -259,7 +259,7 @@
try {
_Sem_CS->Attach(Semaphore::buildSemName(_Name+"_BUFFER_CS")) ;
}
- catch(certi::SemaphoreNotOpen& e)
+ catch(Semaphore::SemaphoreNotOpen& e)
{
std::cout << "RingBuffer::Attach() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotAttached("Attach() failed.")) ;;
@@ -270,7 +270,7 @@
try {
_Shm_SC->Open() ;
}
- catch(certi::SharedMemoryNotOpen& e)
+ catch(SHM::SharedMemoryNotOpen& e)
{
std::cout << "RingBuffer::Attach() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotAttached("Attach() failed.")) ;;
@@ -278,7 +278,7 @@
try {
_Shm_SC->Attach() ;
}
- catch(certi::SharedMemoryNotAttached& e)
+ catch(SHM::SharedMemoryNotAttached& e)
{
std::cout << "RingBuffer::Attach() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotAttached("Attach() failed.")) ;;
@@ -286,7 +286,7 @@
try {
_Pw_Pr_SC->Open() ;
}
- catch(certi::SharedMemoryNotOpen& e)
+ catch(SHM::SharedMemoryNotOpen& e)
{
std::cout << "RingBuffer::Attach() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotAttached("Attach() failed.")) ;;
@@ -294,7 +294,7 @@
try {
_Pw_Pr_SC->Attach() ;
}
- catch(certi::SharedMemoryNotAttached& e)
+ catch(SHM::SharedMemoryNotAttached& e)
{
std::cout << "RingBuffer::Attach() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotAttached("Attach() failed.")) ;;
@@ -311,7 +311,7 @@
try {
_Shm_CS->Open() ;
}
- catch(certi::SharedMemoryNotOpen& e)
+ catch(SHM::SharedMemoryNotOpen& e)
{
std::cout << "RingBuffer::Attach() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotAttached("Attach() failed.")) ;;
@@ -319,7 +319,7 @@
try {
_Shm_CS->Attach() ;
}
- catch(certi::SharedMemoryNotAttached& e)
+ catch(SHM::SharedMemoryNotAttached& e)
{
std::cout << "RingBuffer::Attach() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotAttached("Attach() failed.")) ;;
@@ -327,7 +327,7 @@
try {
_Pw_Pr_CS->Open() ;
}
- catch(certi::SharedMemoryNotOpen& e)
+ catch(SHM::SharedMemoryNotOpen& e)
{
std::cout << "RingBuffer::Attach() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotAttached("Attach() failed.")) ;;
@@ -335,7 +335,7 @@
try {
_Pw_Pr_CS->Attach() ;
}
- catch(certi::SharedMemoryNotAttached& e)
+ catch(SHM::SharedMemoryNotAttached& e)
{
std::cout << "RingBuffer::Attach() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotAttached("Attach() failed.")) ;;
@@ -366,7 +366,7 @@
try {
_Sem_SC->Delete() ;
}
- catch(certi::HandleNotClosed& e)
+ catch(SHM::HandleNotClosed& e)
{
std::cout << "RingBuffer::~RingBuffer() Exception. " << "Name is : "
<< e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotDeleted("~RingBuffer() failed.")) ;;
@@ -376,7 +376,7 @@
try {
_Sem_CS->Delete() ;
}
- catch(certi::HandleNotClosed& e)
+ catch(SHM::HandleNotClosed& e)
{
std::cout << "RingBuffer::~RingBuffer() Exception. " << "Name is : "
<< e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotDeleted("~RingBuffer() failed.")) ;;
@@ -411,7 +411,7 @@
try {
_Sem_SC->P() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(Semaphore::SemaphoreHandlingError& e)
{
std::cout << "RingBuffer::Send() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotSent("RingBuffer::Send() failed.")) ;;
@@ -427,7 +427,7 @@
try {
_Sem_SC->V() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(Semaphore::SemaphoreHandlingError& e)
{
std::cout << "RingBuffer::Send() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotSent("RingBuffer::Send() failed.")) ;;
@@ -473,7 +473,7 @@
try {
_Sem_SC->V() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(Semaphore::SemaphoreHandlingError& e)
{
std::cout << "RingBuffer::Send() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotSent("RingBuffer::Send() failed.")) ;;
@@ -483,7 +483,7 @@
try {
_Sem_CS->P() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(Semaphore::SemaphoreHandlingError& e)
{
std::cout << "RingBuffer::Send() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotSent("RingBuffer::Send() failed.")) ;;
@@ -499,7 +499,7 @@
try {
_Sem_CS->V() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(Semaphore::SemaphoreHandlingError& e)
{
std::cout << "RingBuffer::Send() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotSent("RingBuffer::Send() failed.")) ;;
@@ -546,7 +546,7 @@
try {
_Sem_CS->V() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(Semaphore::SemaphoreHandlingError& e)
{
std::cout << "RingBuffer::Send() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotSent("RingBuffer::Send() failed.")) ;;
@@ -579,7 +579,7 @@
try {
_Sem_CS->P() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(Semaphore::SemaphoreHandlingError& e)
{
std::cout << "RingBuffer::Receive() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotReceived("RingBuffer::Receive() failed.")) ;;
@@ -591,7 +591,7 @@
try {
_Sem_CS->V() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(Semaphore::SemaphoreHandlingError& e)
{
std::cout << "RingBuffer::Send() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotReceived("RingBuffer::Receive() failed.")) ;;
@@ -653,7 +653,7 @@
try {
_Sem_CS->V() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(Semaphore::SemaphoreHandlingError& e)
{
std::cout << "RingBuffer::Receive() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotReceived("RingBuffer::Receive() failed.")) ;;
@@ -663,7 +663,7 @@
try {
_Sem_SC->P() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(Semaphore::SemaphoreHandlingError& e)
{
std::cout << "RingBuffer::Receive() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotReceived("RingBuffer::Receive() failed.")) ;;
@@ -675,7 +675,7 @@
try {
_Sem_SC->V() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(Semaphore::SemaphoreHandlingError& e)
{
std::cout << "RingBuffer::Receive() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotReceived("RingBuffer::Receive() failed.")) ;
@@ -733,7 +733,7 @@
try {
_Sem_SC->V() ;
}
- catch(certi::SemaphoreHandlingError& e)
+ catch(Semaphore::SemaphoreHandlingError& e)
{
std::cout << "RingBuffer::Receive() Exception. " << "Name is : " <<
e._name << " Reason is : " << e._reason << std::endl ;
throw (certi::MessageNotReceived("RingBuffer::Receive() failed.")) ;;
@@ -754,12 +754,12 @@
try {
_Shm_SC->Close() ;
}
-catch(certi::SharedMemoryNotClosed& e)
+catch(SHM::SharedMemoryNotClosed& e)
{
std::cout << "RingBuffer::Close() Exception. " << "Name is : " << e._name
<< " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotClosed("RingBuffer::Close() failed.")) ;;
}
-catch(certi::HandleNotClosed& e)
+catch(SHM::HandleNotClosed& e)
{
std::cout << "RingBuffer::Close() Exception. " << "Name is : " << e._name
<< " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotClosed("RingBuffer::Close() failed.")) ;;
@@ -767,12 +767,12 @@
try {
_Shm_CS->Close() ;
}
-catch(certi::SharedMemoryNotClosed& e)
+catch(SHM::SharedMemoryNotClosed& e)
{
std::cout << "RingBuffer::Close() Exception. " << "Name is : " << e._name
<< " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotClosed("RingBuffer::Close() failed.")) ;;
}
-catch(certi::HandleNotClosed& e)
+catch(SHM::HandleNotClosed& e)
{
std::cout << "RingBuffer::Close() Exception. " << "Name is : " << e._name
<< " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotClosed("RingBuffer::Close() failed.")) ;;
@@ -780,12 +780,12 @@
try {
_Pw_Pr_SC->Close() ;
}
-catch(certi::SharedMemoryNotClosed& e)
+catch(SHM::SharedMemoryNotClosed& e)
{
std::cout << "RingBuffer::Close() Exception. " << "Name is : " << e._name
<< " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotClosed("RingBuffer::Close() failed.")) ;;
}
-catch(certi::HandleNotClosed& e)
+catch(SHM::HandleNotClosed& e)
{
std::cout << "RingBuffer::Close() Exception. " << "Name is : " << e._name
<< " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotClosed("RingBuffer::Close() failed.")) ;;
@@ -793,12 +793,12 @@
try {
_Pw_Pr_CS->Close() ;
}
-catch(certi::SharedMemoryNotClosed& e)
+catch(SHM::SharedMemoryNotClosed& e)
{
std::cout << "RingBuffer::Close() Exception. " << "Name is : " << e._name
<< " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotClosed("RingBuffer::Close() failed.")) ;;
}
-catch(certi::HandleNotClosed& e)
+catch(SHM::HandleNotClosed& e)
{
std::cout << "RingBuffer::Close() Exception. " << "Name is : " << e._name
<< " Reason is : " << e._reason << std::endl ;
throw (certi::RingBufferNotClosed("RingBuffer::Close() failed.")) ;;
Index: Exception.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Exception.hh,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -b -r3.9 -r3.10
--- Exception.hh 16 Jan 2010 20:17:14 -0000 3.9
+++ Exception.hh 29 Mar 2010 18:24:20 -0000 3.10
@@ -20,7 +20,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Exception.hh,v 3.9 2010/01/16 20:17:14 erk Exp $
+// $Id: Exception.hh,v 3.10 2010/03/29 18:24:20 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_EXCEPTION_HH
@@ -105,13 +105,6 @@
e_SaveInProgress,
e_SaveNotInitiated,
e_SecurityError,
- e_SharedMemoryNotOpen,
- e_SharedMemoryNotAttached,
- e_SharedMemoryNotClosed,
- e_SemaphoreNotCreated,
- e_SemaphoreNotOpen,
- e_SemaphoreHandlingError,
- e_HandleNotClosed,
e_SocketNotConnected,
e_MessageNotSent,
e_MessageNotReceived,
@@ -287,17 +280,10 @@
CERTI_EXCEPTION(UnknownLabel)
CERTI_EXCEPTION(NetworkSignal)
CERTI_EXCEPTION(NetworkError)
-CERTI_EXCEPTION(SharedMemoryNotOpen)
-CERTI_EXCEPTION(SharedMemoryNotAttached)
-CERTI_EXCEPTION(SharedMemoryNotClosed)
-CERTI_EXCEPTION(SemaphoreNotOpen)
-CERTI_EXCEPTION(SemaphoreHandlingError)
-CERTI_EXCEPTION(SemaphoreNotCreated)
CERTI_EXCEPTION(SocketNotConnected)
CERTI_EXCEPTION(MessageNotSent)
CERTI_EXCEPTION(MessageNotReceived)
CERTI_EXCEPTION(SocketNotClosed)
-CERTI_EXCEPTION(HandleNotClosed)
CERTI_EXCEPTION(RingBufferNotCreated)
CERTI_EXCEPTION(RingBufferNotClosed)
CERTI_EXCEPTION(RingBufferNotDeleted)
@@ -313,4 +299,4 @@
#endif // _CERTI_EXCEPTION_HH
-// $Id: Exception.hh,v 3.9 2010/01/16 20:17:14 erk Exp $
+// $Id: Exception.hh,v 3.10 2010/03/29 18:24:20 erk Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi/libCERTI SocketSHM.cc Exception.cc RingBu...,
certi-cvs <=