X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcomm%2Finternal%2FPoll.cpp;h=a9aa01951393c8836cbb5a7fc2d4bb2611982626;hb=f34b8069233e9e09208339bb79d8576c1ff962e1;hp=44a12219d265485f139de172bb6cf0444288ebf1;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git diff --git a/source/comm/internal/Poll.cpp b/source/comm/internal/Poll.cpp index 44a1221..a9aa019 100644 --- a/source/comm/internal/Poll.cpp +++ b/source/comm/internal/Poll.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not Nothingness Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// http://redmine.teslayout.com/projects/anna-suite -// -// 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 the copyright holder 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 // #include @@ -44,7 +16,7 @@ using namespace anna; void comm::Poll::setTimeout(const Millisecond &timeout) -throw() { +{ if((a_timeout.tv_sec = timeout / 1000) == 0) a_timeout.tv_usec = timeout * 1000; else @@ -60,7 +32,7 @@ throw() { // Para las dos implementacion el NULL => espera hasta que llegue un mensaje. //-------------------------------------------------------------------------------------------- void comm::Poll::waitMessage() -throw(RuntimeException) { +noexcept(false) { if(a_ptrTimeout == NULL) a_pollr = select(a_maxfd, (fd_set*) anna_memcpy(&a_fdset, &a_fdmask, sizeof(fd_set)), NULL); else { @@ -82,7 +54,7 @@ throw(RuntimeException) { // (1) Una vez que ha tratado detectado la activada desactiva el indicador //----------------------------------------------------------------------------------------- int comm::Poll::fetch() -throw() { +{ int result = -1; while(a_pollr > 0) { @@ -105,7 +77,7 @@ throw() { } void comm::Poll::insert(const int fd) -throw() { +{ FD_SET(fd, &a_fdmask); if(a_maxfd < fd) a_maxfd = fd; @@ -119,7 +91,7 @@ throw() { // de pendientes de tratar. //--------------------------------------------------------------------------------------- void comm::Poll::erase(const int fd) -throw() { +{ FD_CLR(fd, &a_fdmask); if(FD_ISSET(fd, &a_fdset) && a_pollr > 0) { // (1)