brmlab/brmlife
4
0
Fork 0
mirror of https://github.com/brmlab/brmlife.git synced 2025-08-03 10:23:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Connection: Abstract out buf_incomplete() macro

Browse source
This commit is contained in:
Petr Baudis 2011-11-27 05:05:43 +01:00
parent a151a2985d
commit a36deeb1db
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
connection.cc
View file

@ -10,6 +10,9 @@
#include "agent.h" #include "agent.h"
#include "connection.h" #include "connection.h"
#define buf_incomplete(buf) \
(buf.find("\r\n") == std::string::npos || (buf.find("\r\n") > 0 && buf.find("\r\n\r\n") == std::string::npos))
void void
connection::senses(int tick_id, class agent &a) connection::senses(int tick_id, class agent &a)
{ {
@ -50,7 +53,7 @@ void
connection::actions(class agent &agent) connection::actions(class agent &agent)
{ {
pthread_mutex_lock(&buf_lock); pthread_mutex_lock(&buf_lock);
if (in_buf.find("\r\n\r\n") == std::string::npos) { if (buf_incomplete(in_buf)) {
/* Not enough data, needs to wait until next turn, sorry. */ /* Not enough data, needs to wait until next turn, sorry. */
pthread_mutex_unlock(&buf_lock); pthread_mutex_unlock(&buf_lock);
return; return;
@ -155,7 +158,7 @@ connection::thread_loop(void)
bool want_moar = false; bool want_moar = false;
pthread_mutex_lock(&buf_lock); pthread_mutex_lock(&buf_lock);
in_buf.append(cbuf, len); in_buf.append(cbuf, len);
want_moar = (in_buf.find("\r\n\r\n") == std::string::npos); want_moar = buf_incomplete(in_buf);
pthread_mutex_unlock(&buf_lock); pthread_mutex_unlock(&buf_lock);
if (!want_moar) if (!want_moar)
break; break;