Cleaned up socket scheduling. Very clean now.

Socket.cpp

@@ -17,7 +17,7 @@ namespace core {
    Socket::~Socket() {
       free(buffer);
       if(descriptor == -1)
-	return;
+		  return;
       onUnregister();
       ePoll.unregisterSocket(this);
       coreutils::Log(coreutils::LOG_DEBUG_3) << "Socket destroyed for socket " << descriptor << ".";
@@ -26,10 +26,9 @@ namespace core {
 
    void Socket::setDescriptor(int descriptor) {
       if((descriptor == -1) && (errno == 24)) {
-	 shutdown("Too many files open");
-	 throw coreutils::Exception("Too many files open. Refusing connection.");
+			shutdown("Too many files open");
+			throw coreutils::Exception("Too many files open. Refusing connection.");
       }
-      lock.lock();
       coreutils::Log(coreutils::LOG_DEBUG_3) << "Descriptor set to " << descriptor << " for Socket.";
       if(descriptor < 3)
         throw coreutils::Exception("Descriptor out of range", __FILE__, __LINE__);
@@ -37,7 +36,6 @@ namespace core {
       onRegister();
       ePoll.registerSocket(this);
       onRegistered();
-      lock.unlock();
    }
 
    int Socket::getDescriptor() {
@@ -63,29 +61,20 @@ namespace core {
    void Socket::onUnregistered() {}
 
    bool Socket::eventReceived(struct epoll_event event) {
-
-      lock.lock();
-
       if(event.events & EPOLLRDHUP) {
          readHangup = true;
          shutdown("hangup received");
       }
-
-      if(event.events & EPOLLIN) {
+      else if(event.events & EPOLLIN) {
          coreutils::ZString zbuffer(buffer, length);
       	receiveData(zbuffer);
       }
-
-      if(event.events & EPOLLWRNORM) {
+      else if(event.events & EPOLLWRNORM) {
 	      writeSocket();
       }
-
-      if(event.events & EPOLLHUP) {
+      else if(event.events & EPOLLHUP) {
          shutdown();
       }
-
-      lock.unlock();
-
       return !shutDown;
    }
 
@@ -107,9 +96,6 @@ namespace core {
       int len;
       int error = -1;
 
-//      for(int ix = 0; ix < buffer.getLength(); ++ix)
-//        buffer[ix] = 0;
-
       if((len = ::read(getDescriptor(), buffer.getData(), buffer.getLength())) >= 0) {
          coreutils::ZString zbuffer(buffer.getData(), len);
          coreutils::Log(coreutils::LOG_DEBUG_1) << zbuffer;
@@ -140,10 +126,9 @@ namespace core {
    void Socket::writeSocket() {
       if(fifo.size() > 0) {
       	 outlock.lock();
-         ::write(descriptor, fifo.front().c_str(), fifo.front().length());
+			if(!shutDown)
+			  ::write(descriptor, fifo.front().c_str(), fifo.front().length());
          fifo.pop();
-//	      if(shutDown && !needsToWrite())
-//	        delete this;
 	      outlock.unlock();
       }
    }
@@ -152,7 +137,7 @@ namespace core {
       outlock.lock();
       fifo.emplace(data);
       outlock.unlock();
-      ePoll.resetSocket(this);
+//      ePoll.resetSocket(this);
       return 1;
    }
 
@@ -168,8 +153,6 @@ namespace core {
       coreutils::Log(coreutils::LOG_DEBUG_2) << "Shutdown requested on socket " << descriptor << " with reason " << text << ".";
       shutDown = true;
       reset = false;
-      //      if(!needsToWrite())
-//      delete this;
    }
 
 }