diff --git a/Socket.cpp b/Socket.cpp index 05cf652..36c1fc4 100644 --- a/Socket.cpp +++ b/Socket.cpp @@ -17,7 +17,6 @@ namespace core { shutDown = true; onUnregister(); ePoll.unregisterSocket(this); -// coreutils::Log(coreutils::LOG_DEBUG_4) << "BMAXFree on socket " << descriptor; free(buffer); if(descriptor == -1) return; @@ -63,7 +62,7 @@ namespace core { void Socket::onUnregistered() {} bool Socket::eventReceived(struct epoll_event event, long long eventId) { -// coreutils::Log(coreutils::LOG_DEBUG_3) << "eventReceived " << eventId << ": " << descriptor << ":" << event.events; + lock.lock(); inHandler = true; if(event.events & EPOLLRDHUP) { readHangup = true; @@ -80,6 +79,7 @@ namespace core { shutdown(); } inHandler = false; + lock.unlock(); return !shutDown; } @@ -138,9 +138,10 @@ namespace core { outlock.lock(); fifo.emplace(data); outlock.unlock(); -// coreutils::Log(coreutils::LOG_DEBUG_4) << "inHandler " << descriptor << " " << inHandler << ":" << shutDown << ":[" << data << "]"; - if(!inHandler && sender != this) + if(sender != this) + lock.lock(); ePoll.resetSocket(this); + lock.unlock(); return 1; } diff --git a/Socket.h b/Socket.h index 05734c7..682ff5f 100644 --- a/Socket.h +++ b/Socket.h @@ -167,6 +167,7 @@ namespace core { std::string text; int descriptor = -1; std::mutex outlock; + std::mutex lock; bool readHangup = false; volatile bool inHandler = false; diff --git a/html/Socket_8h_source.html b/html/Socket_8h_source.html index 3435fa3..d97372c 100644 --- a/html/Socket_8h_source.html +++ b/html/Socket_8h_source.html @@ -147,48 +147,49 @@ $(function() {
167  std::string text;
168  int descriptor = -1;
169  std::mutex outlock;
-
170  bool readHangup = false;
-
171  volatile bool inHandler = false;
-
172 
-
173  //-------------------------------------------------------------------------------------
-
174  // the writeSocket is called when epoll has received a write request for a socket.
-
175  // Writing data to this socket is queued in the streambuf and permission is requested
-
176  // to write to the socket. This routine handles the writing of the streambuf data
-
177  // buffer to the socket.
-
178  //-------------------------------------------------------------------------------------
-
179 
-
180  void writeSocket();
-
181 
-
182  // int_type underflow();
-
183 // int_type uflow();
-
184 // int_type pbackfail(int_type ch);
-
185 // streamsize showmanyc();
-
186 
-
187  char *buffer; // This is a pointer to the managed buffer space.
-
188  int length; // This is the length of the buffer.
-
189 
-
190  std::queue<std::string> fifo;
-
191 
-
192  };
-
193 
-
194 }
-
195 
-
196 #endif
-
197 
+
170  std::mutex lock;
+
171  bool readHangup = false;
+
172  volatile bool inHandler = false;
+
173 
+
174  //-------------------------------------------------------------------------------------
+
175  // the writeSocket is called when epoll has received a write request for a socket.
+
176  // Writing data to this socket is queued in the streambuf and permission is requested
+
177  // to write to the socket. This routine handles the writing of the streambuf data
+
178  // buffer to the socket.
+
179  //-------------------------------------------------------------------------------------
+
180 
+
181  void writeSocket();
+
182 
+
183  // int_type underflow();
+
184 // int_type uflow();
+
185 // int_type pbackfail(int_type ch);
+
186 // streamsize showmanyc();
+
187 
+
188  char *buffer; // This is a pointer to the managed buffer space.
+
189  int length; // This is the length of the buffer.
+
190 
+
191  std::queue<std::string> fifo;
+
192 
+
193  };
+
194 
+
195 }
+
196 
+
197 #endif
+
198 
core::EPoll
Definition: EPoll.h:31
core::Socket
Definition: Socket.h:34
-
core::Socket::getDescriptor
int getDescriptor()
Get the descriptor for the socket.
Definition: Socket.cpp:44
-
core::Socket::eventReceived
bool eventReceived(struct epoll_event event, long long eventId)
Parse epoll event and call specified callbacks.
Definition: Socket.cpp:65
-
core::Socket::onRegistered
virtual void onRegistered()
Called after the socket has been registered with epoll processing.
Definition: Socket.cpp:59
+
core::Socket::getDescriptor
int getDescriptor()
Get the descriptor for the socket.
Definition: Socket.cpp:43
+
core::Socket::eventReceived
bool eventReceived(struct epoll_event event, long long eventId)
Parse epoll event and call specified callbacks.
Definition: Socket.cpp:64
+
core::Socket::onRegistered
virtual void onRegistered()
Called after the socket has been registered with epoll processing.
Definition: Socket.cpp:58
core::Socket::receiveData
virtual void receiveData(coreutils::ZString &buffer)
Definition: Socket.cpp:94
core::Socket::Socket
Socket(EPoll &ePoll, std::string text="")
Definition: Socket.cpp:11
core::Socket::write
int write(std::string data, Socket *sender)
Definition: Socket.cpp:137
-
core::Socket::onRegister
virtual void onRegister()
Called before the socket has registered with the epoll processing.
Definition: Socket.cpp:57
+
core::Socket::onRegister
virtual void onRegister()
Called before the socket has registered with the epoll processing.
Definition: Socket.cpp:56
core::Socket::~Socket
virtual ~Socket()
Definition: Socket.cpp:16
-
core::Socket::setDescriptor
void setDescriptor(int descriptor)
Set the descriptor for the socket.
Definition: Socket.cpp:29
+
core::Socket::setDescriptor
void setDescriptor(int descriptor)
Set the descriptor for the socket.
Definition: Socket.cpp:28
core::Socket::onDataReceived
virtual void onDataReceived(std::string data)
Called when data is received from the socket.
Definition: Socket.cpp:86
-
core::Socket::onUnregistered
virtual void onUnregistered()
Called when the socket has finished unregistering for the epoll processing.
Definition: Socket.cpp:63
-
core::Socket::shutdown
void shutdown(std::string text="unknown")
Definition: Socket.cpp:155
+
core::Socket::onUnregistered
virtual void onUnregistered()
Called when the socket has finished unregistering for the epoll processing.
Definition: Socket.cpp:62
+
core::Socket::shutdown
void shutdown(std::string text="unknown")
Definition: Socket.cpp:156
diff --git a/html/classcore_1_1ConsoleSession-members.html b/html/classcore_1_1ConsoleSession-members.html index 64d2121..17f67a5 100644 --- a/html/classcore_1_1ConsoleSession-members.html +++ b/html/classcore_1_1ConsoleSession-members.html @@ -111,8 +111,8 @@ $(function() { setColor(int color) (defined in core::TerminalSession)core::TerminalSession setCursorLocation(int x, int y)core::TerminalSession setDescriptor(int descriptor)core::Socket - shutDown (defined in core::Socket)core::Socket - shutdown(std::string text="unknown")core::Socket + shutdown(std::string text="unknown")core::Socket + shutDown (defined in core::Socket)core::Socket Socket(EPoll &ePoll, std::string text="")core::Socket TCPSession(EPoll &ePoll, TCPServer &server, std::string text="") (defined in core::TCPSession)core::TCPSession TCPSocket(EPoll &ePoll) (defined in core::TCPSocket)core::TCPSocket diff --git a/html/classcore_1_1TCPSocket-members.html b/html/classcore_1_1TCPSocket-members.html index 1670a03..2eebd92 100644 --- a/html/classcore_1_1TCPSocket-members.html +++ b/html/classcore_1_1TCPSocket-members.html @@ -90,8 +90,8 @@ $(function() { reset (defined in core::Socket)core::Socket setBufferSize(int length) (defined in core::Socket)core::Socketprotected setDescriptor(int descriptor)core::Socket - shutdown(std::string text="unknown")core::Socket - shutDown (defined in core::Socket)core::Socket + shutDown (defined in core::Socket)core::Socket + shutdown(std::string text="unknown")core::Socket Socket(EPoll &ePoll, std::string text="")core::Socket TCPSocket(EPoll &ePoll) (defined in core::TCPSocket)core::TCPSocket TCPSocket(EPoll &ePoll, std::string text) (defined in core::TCPSocket)core::TCPSocket diff --git a/html/classcore_1_1TLSSession-members.html b/html/classcore_1_1TLSSession-members.html index 67952b1..7c6b511 100644 --- a/html/classcore_1_1TLSSession-members.html +++ b/html/classcore_1_1TLSSession-members.html @@ -99,8 +99,8 @@ $(function() { setBlockSize(int size=0)core::TCPSessionprotected setBufferSize(int length) (defined in core::Socket)core::Socketprotected setDescriptor(int descriptor)core::Socket - shutDown (defined in core::Socket)core::Socket - shutdown(std::string text="unknown")core::Socket + shutdown(std::string text="unknown")core::Socket + shutDown (defined in core::Socket)core::Socket Socket(EPoll &ePoll, std::string text="")core::Socket TCPSession(EPoll &ePoll, TCPServer &server, std::string text="") (defined in core::TCPSession)core::TCPSession TCPSocket(EPoll &ePoll) (defined in core::TCPSocket)core::TCPSocket diff --git a/html/search/all_d.js b/html/search/all_d.js index d517407..9261f26 100644 --- a/html/search/all_d.js +++ b/html/search/all_d.js @@ -1,9 +1,5 @@ var searchData= [ ['whitelist_71',['whiteList',['../classcore_1_1TCPServer.html#abad6300b6234ca8b69cef9128755342e',1,'core::TCPServer']]], -<<<<<<< HEAD ['write_72',['write',['../classcore_1_1Socket.html#a4ed587f31d080115c00828f90b1e28bb',1,'core::Socket']]] -======= - ['write_72',['write',['../classcore_1_1Socket.html#a1413c826307ef0f29d7457770af675e3',1,'core::Socket']]] ->>>>>>> subscription ]; diff --git a/html/search/functions_b.js b/html/search/functions_b.js index 76abd14..25ce0a9 100644 --- a/html/search/functions_b.js +++ b/html/search/functions_b.js @@ -1,8 +1,4 @@ var searchData= [ -<<<<<<< HEAD ['write_146',['write',['../classcore_1_1Socket.html#a4ed587f31d080115c00828f90b1e28bb',1,'core::Socket']]] -======= - ['write_146',['write',['../classcore_1_1Socket.html#a1413c826307ef0f29d7457770af675e3',1,'core::Socket']]] ->>>>>>> subscription ];