X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcomm%2Fcomm.hpp;h=4101d04b89de4ce066e6f70ef1a4c9467e8d0a1e;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=86fb1001818486883b9ba922c0d40828661d554a;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git diff --git a/include/anna/comm/comm.hpp b/include/anna/comm/comm.hpp index 86fb100..4101d04 100644 --- a/include/anna/comm/comm.hpp +++ b/include/anna/comm/comm.hpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not Nothingness Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// https://bitbucket.org/testillano/anna -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // #ifndef anna_comm_comm_hpp @@ -73,7 +45,7 @@ antes de dar la respuesta. public: MyCommunicator () {;} - void setDelay (const Millisecond &delay) throw () { a_delay = delay; } + void setDelay (const Millisecond &delay) { a_delay = delay; } private: Request a_request; @@ -81,7 +53,7 @@ antes de dar la respuesta. Millisecond a_delay; void eventReceiveMessage (comm::ClientSocket &, const DataBlock& data) - throw (RuntimeException); + noexcept(false); }; class ArithmeticServer : public comm::Application { @@ -92,8 +64,8 @@ antes de dar la respuesta. MyCommunicator a_communicator; comm::ServerSocket* a_serverSocket; - void initialize () throw (RuntimeException); - void run () throw (RuntimeException); + void initialize () noexcept(false); + void run () noexcept(false); }; using namespace std; @@ -138,7 +110,7 @@ antes de dar la respuesta. // Inicializa el servidor de sockets. //----------------------------------------------------------------------------------------- void ArithmeticServer::initialize () - throw (RuntimeException) + noexcept(false) { CommandLine& cl (CommandLine::instantiate ()); @@ -153,7 +125,7 @@ antes de dar la respuesta. // Cuando hay un nuevo mensaje invocar�a Communicator::eventReceiveMessage //----------------------------------------------------------------------------------------- void ArithmeticServer::run () - throw (RuntimeException) + noexcept(false) { CommandLine& cl (CommandLine::instantiate ()); @@ -173,7 +145,7 @@ antes de dar la respuesta. // transport: Instancia del transporto que ha interpretado el mensaje (getMessage). //----------------------------------------------------------------------------------------- void MyCommunicator::eventReceiveMessage (ClientSocket& clientSocket, const DataBlock& data) - throw (RuntimeException) + noexcept(false) { LOGMETHOD (TraceMethod tm ("MyCommunicator", "eventReceiveMessage", ANNA_FILE_LOCATION)); @@ -256,14 +228,14 @@ determinado de peticiones por segundo. public: Sender () : Clock ("Sender", 250), a_messageBySecond (0), a_nquarter (0) {;} - void setMessageBySecond (const int messageBySecond) throw () { a_messageBySecond = messageBySecond; } + void setMessageBySecond (const int messageBySecond) { a_messageBySecond = messageBySecond; } private: int a_messageBySecond; int a_nquarter; test::Request a_request; - void tick () throw (RuntimeException); + void tick () noexcept(false); }; //----------------------------------------------------------------------------------------- @@ -281,14 +253,14 @@ determinado de peticiones por segundo. test::Response a_response; void eventReceiveMessage (ClientSocket &, const DataBlock&) - throw (RuntimeException); + noexcept(false); }; class HeavyClient : public anna::comm::Application { public: HeavyClient (); - Server* getServer () const throw () { return a_server; } + Server* getServer () const { return a_server; } private: MyCommunicator a_communicator; @@ -296,8 +268,8 @@ determinado de peticiones por segundo. Sender a_sender; Server* a_server; - void initialize () throw (RuntimeException); - void run () throw (RuntimeException); + void initialize () noexcept(false); + void run () noexcept(false); }; using namespace std; @@ -347,7 +319,7 @@ determinado de peticiones por segundo. // Configura el men para que trabaje con el comunicador de esta aplicacin. //----------------------------------------------------------------------------------------- void HeavyClient::initialize () - throw (RuntimeException) + noexcept(false) { CommandLine& cl (CommandLine::instantiate ()); @@ -364,7 +336,7 @@ determinado de peticiones por segundo. // atender las peticiones. //----------------------------------------------------------------------------------------- void HeavyClient::run () - throw (RuntimeException) + noexcept(false) { a_timeController.activate (a_sender); @@ -378,7 +350,7 @@ determinado de peticiones por segundo. // transport: Instancia del transporto que ha interpretado el mensaje (getMessage). //----------------------------------------------------------------------------------------- void MyCommunicator::eventReceiveMessage (ClientSocket&, const DataBlock& data) - throw (RuntimeException) + noexcept(false) { a_response.decode (data); @@ -389,7 +361,7 @@ determinado de peticiones por segundo. } void Sender::tick () - throw (RuntimeException) + noexcept(false) { Server* server = static_cast (anna::app::functions::getApp ()).getServer (); Communicator* communicator = anna::app::functions::component (ANNA_FILE_LOCATION);