Commit c61586a2 authored by jan.koester's avatar jan.koester
Browse files

ops

parent 79cb17b8

src/event/epoll.cpp

+2 −7
Original line number Diff line number Diff line
@@ -144,10 +144,9 @@ namespace netplus { 
        }



        int waitEventHandler(int timeout) {

            NetException exception;

            int evn = epoll_wait(_pollFD,_Events, _ServerSocket->getMaxconnections(), timeout);

            if (evn < 0 ) {

                NetException exception;



                char str[255];

                strerror_r_netplus(errno,str,255);
@@ -346,7 +345,7 @@ namespace netplus { 
                                    continue;

                                default:

                                    NetException  e;

                                    e[NetException::Error] << "EventWorker: Request type not kwon!";

                                    e[NetException::Error] << "EventWorker: Request type not known!";

                                    throw e;

                            }

                        }catch(NetException& e){
@@ -355,7 +354,6 @@ namespace netplus { 
                                    continue;

                                default:

                                    pollptr.CloseEventHandler(i,tid,args);

                                    throw e;

                            }

                        }

                    }
@@ -455,15 +453,12 @@ MAINWORKERLOOP: 
           }

        }



        std::cout << "start" << std::endl;

        for(auto i = threadpool.begin(); i!=threadpool.end(); ++i){

            i->join();

        }



        close(_pollFD);



        std::cout << "end" << std::endl;



        if (event::_Restart) {

            event::_Restart = false;

            goto MAINWORKERLOOP;

src/posix/tcp.cpp

+1 −5
Original line number Diff line number Diff line
@@ -154,8 +154,6 @@ void netplus::tcp::accept(socket *csock){ 


    copyAddrInfo(&csock->_SocketInfo,_SocketInfo,_SocketInfoLen);



    socklen_t len=0;



    *csock=::accept(_Socket,((struct addrinfo *)csock->_SocketInfo)->ai_addr,&((struct addrinfo *)csock->_SocketInfo)->ai_addrlen);

    

    if(csock->_Socket<0){
@@ -186,7 +184,7 @@ size_t netplus::tcp::sendData(void* data, unsigned long size,int flags){ 
    if(rval<0){

        int etype=NetException::Error;



        if(errno==EAGAIN)

        if(errno==EAGAIN || errno==EWOULDBLOCK)

            etype=NetException::Note;



        char errstr[512];
@@ -204,8 +202,6 @@ size_t netplus::tcp::sendData(void* data, unsigned long size,int flags){ 
size_t netplus::tcp::recvData(void* data, unsigned long size,int flags){

    NetException exception;



    socklen_t recvaddr=0;



    int recvsize=::recv(_Socket,

                            data,

                            size,