From f61e1ef7589da893b9b54448224dc0961515eb40 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 26 Oct 2007 19:48:31 +0000 Subject: Session resume support in client & broker: Client can resume a session after voluntary suspend() or network failure. Frames lost in network failure are automatically re-transmitted for transparent re-connection. client::Session improvements: - Locking to avoid races between network & user threads. - Replaced client::StateManager with sys::StateMonitor - avoid heap allocation. qpid::Exception clean up: - use QPID_MSG consistently to format exception messages. - throw typed exceptions (in reply_exceptions.h) for AMQP exceptions. - re-throw correct typed exception on client for exceptions from broker. - Removed QpidError.h rubygen/templates/constants.rb: - constants.h: Added FOO_CLASS_ID and FOO_BAR_METHOD_ID constants. - reply_constants.h: Added throwReplyException(code, text) log::Logger: - Fixed shutdown race in Statement::~Initializer() git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@588761 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/sys/posix/Shlib.cpp | 9 ++++----- cpp/src/qpid/sys/posix/Socket.cpp | 4 +--- cpp/src/qpid/sys/posix/check.cpp | 39 --------------------------------------- cpp/src/qpid/sys/posix/check.h | 36 ++++-------------------------------- 4 files changed, 9 insertions(+), 79 deletions(-) delete mode 100644 cpp/src/qpid/sys/posix/check.cpp (limited to 'cpp/src/qpid/sys/posix') diff --git a/cpp/src/qpid/sys/posix/Shlib.cpp b/cpp/src/qpid/sys/posix/Shlib.cpp index 2630337408..1552aa06b5 100644 --- a/cpp/src/qpid/sys/posix/Shlib.cpp +++ b/cpp/src/qpid/sys/posix/Shlib.cpp @@ -19,8 +19,7 @@ */ #include "qpid/sys/Shlib.h" - -#include +#include "qpid/Exception.h" #include @@ -32,7 +31,7 @@ void Shlib::load(const char* name) { handle = ::dlopen(name, RTLD_NOW); const char* error = ::dlerror(); if (error) { - THROW_QPID_ERROR(INTERNAL_ERROR, error); + throw Exception(QPID_MSG(error)); } } @@ -42,7 +41,7 @@ void Shlib::unload() { ::dlclose(handle); const char* error = ::dlerror(); if (error) { - THROW_QPID_ERROR(INTERNAL_ERROR, error); + throw Exception(QPID_MSG(error)); } handle = 0; } @@ -53,7 +52,7 @@ void* Shlib::getSymbol(const char* name) { void* sym = ::dlsym(handle, name); const char* error = ::dlerror(); if (error) - THROW_QPID_ERROR(INTERNAL_ERROR, error); + throw Exception(QPID_MSG(error)); return sym; } diff --git a/cpp/src/qpid/sys/posix/Socket.cpp b/cpp/src/qpid/sys/posix/Socket.cpp index c7a83df581..f0cc8cd5a5 100644 --- a/cpp/src/qpid/sys/posix/Socket.cpp +++ b/cpp/src/qpid/sys/posix/Socket.cpp @@ -21,7 +21,6 @@ #include "qpid/sys/Socket.h" -#include "qpid/QpidError.h" #include "check.h" #include "PrivatePosix.h" @@ -60,8 +59,7 @@ std::string SocketPrivate::getName(bool local, bool includeService) const result = ::getpeername(fd, (::sockaddr*)&name, &namelen); } - if (result < 0) - throw QPID_POSIX_ERROR(errno); + QPID_POSIX_CHECK(result); char servName[NI_MAXSERV]; char dispName[NI_MAXHOST]; diff --git a/cpp/src/qpid/sys/posix/check.cpp b/cpp/src/qpid/sys/posix/check.cpp deleted file mode 100644 index 408679caa8..0000000000 --- a/cpp/src/qpid/sys/posix/check.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include -#include "check.h" - -namespace qpid { -namespace sys { - -std::string -PosixError::getMessage(int errNo) -{ - char buf[512]; - return std::string(strerror_r(errNo, buf, sizeof(buf))); -} - -PosixError::PosixError(int errNo, const qpid::SrcLine& loc) throw() - : qpid::QpidError(INTERNAL_ERROR + errNo, getMessage(errNo), loc) -{ } - -}} diff --git a/cpp/src/qpid/sys/posix/check.h b/cpp/src/qpid/sys/posix/check.h index 7fa7b69d3b..f864bf8762 100644 --- a/cpp/src/qpid/sys/posix/check.h +++ b/cpp/src/qpid/sys/posix/check.h @@ -22,41 +22,13 @@ * */ -#include -#include -#include "qpid/QpidError.h" - -namespace qpid { -namespace sys { - -/** - * Exception with message from errno. - */ -class PosixError : public qpid::QpidError -{ - public: - static std::string getMessage(int errNo); - - PosixError(int errNo, const qpid::SrcLine& location) throw(); - - ~PosixError() throw() {} - - int getErrNo() { return errNo; } +#include "qpid/Exception.h" - Exception::auto_ptr clone() const throw() { return Exception::auto_ptr(new PosixError(*this)); } - - void throwSelf() const { throw *this; } - - private: - int errNo; -}; - -}} +#include -/** Create a PosixError for the current file/line and errno. */ -#define QPID_POSIX_ERROR(errNo) ::qpid::sys::PosixError(errNo, SRCLINE) +#define QPID_POSIX_ERROR(ERRNO) qpid::Exception(QPID_MSG(qpid::strError(ERRNO)) << " " << ERRNO) -/** Throw QPID_POSIX_ERROR(errno) if RESULT is less than zero */ +/** THROW QPID_POSIX_ERROR(errno) if RESULT is less than zero */ #define QPID_POSIX_CHECK(RESULT) \ if ((RESULT) < 0) throw QPID_POSIX_ERROR((errno)) -- cgit v1.2.1