Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-27 02:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor MessageReader into WireDecoder.

Browse Source 
Change-Id: If5842b4f6b9a7db3d3de515cd71324ab7ee82f50
This commit is contained in:
Peter Johnson
2015-06-21 21:43:05 -07:00
parent 03bae15b96
commit c2063f3a88
4 changed files with 308 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
src/nt_messagereader.cpp
View File

@@ -24,30 +24,13 @@ MessageHandler::anchor()
MessageReader::MessageReader(MessageHandler &handler,
raw_istream& is,
unsigned int proto_rev)
: m_handler(handler)
, m_is(is)
: WireDecoder(is, proto_rev)
, m_handler(handler)
{
m_allocated = 1024;
m_buf = (char *)std::malloc(m_allocated);
m_proto_rev = proto_rev;
m_error = 0;
}
MessageReader::~MessageReader()
{
std::free(m_buf);
}
void
MessageReader::Realloc(std::size_t len)
{
if (m_allocated >= len)
return;
std::size_t newlen = m_allocated * 2;
while (newlen < len)
newlen *= 2;
m_buf = (char *)std::realloc(m_buf, newlen);
m_allocated = newlen;
}
bool
@@ -191,7 +174,8 @@ MessageReader::Run()
if (!Read16(&uid)) return false;
unsigned long size;
if (!ReadULEB128(&size)) return false;
if (!Read(size)) return false;
char *buf;
if (!Read(&buf, size)) return false;
}
case NT_MSG_RPC_RESPONSE:
{
@@ -205,7 +189,8 @@ MessageReader::Run()
if (!Read16(&uid)) return false;
unsigned long size;
if (!ReadULEB128(&size)) return false;
if (!Read(size)) return false;
char *buf;
if (!Read(&buf, size)) return false;
}
default:
m_error = "unrecognized message type";
@@ -213,138 +198,3 @@ MessageReader::Run()
}
return true;
}
bool
MessageReader::ReadType(NT_Type *type)
{
if (!Read(1)) return false;
size_t len = NT_ReadType(m_buf, type, m_proto_rev);
if (len == 0)
{
m_error = "unrecognized value type";
return false;
}
return true;
}
bool
MessageReader::ReadValue(NT_Type type, NT_Value *value)
{
value->type = type;
value->last_change = 0;
switch (type)
{
case NT_BOOLEAN:
{
unsigned int v;
if (!Read8(&v)) return false;
value->data.v_boolean = v ? 1 : 0;
break;
}
case NT_DOUBLE:
{
if (!Read(8)) return false;
char *buf = m_buf;
value->data.v_double = ReadDouble(buf);
break;
}
case NT_STRING:
if (!ReadString(&value->data.v_string)) return false;
break;
case NT_RAW:
case NT_RPC:
if (m_proto_rev < 0x0300u)
{
m_error = "received raw or RPC value in protocol < 3.0";
return false;
}
if (!ReadString(&value->data.v_raw)) return false;
break;
case NT_BOOLEAN_ARRAY:
{
// size
unsigned int size;
if (!Read8(&size)) return false;
value->data.arr_boolean.size = size;
// array values
if (!Read(size)) return false;
value->data.arr_boolean.arr = (int *)std::malloc(size * sizeof(int));
for (unsigned int i=0; i<size; ++i)
value->data.arr_boolean.arr[i] = m_buf[i] ? 1 : 0;
break;
}
case NT_DOUBLE_ARRAY:
{
// size
unsigned int size;
if (!Read8(&size)) return false;
value->data.arr_double.size = size;
// array values
if (!Read(size*8)) return false;
value->data.arr_double.arr =
(double *)std::malloc(size * sizeof(double));
char *buf = m_buf;
for (unsigned int i=0; i<size; ++i)
value->data.arr_double.arr[i] = ReadDouble(buf);
break;
}
case NT_STRING_ARRAY:
{
// size
unsigned int size;
if (!Read8(&size)) return false;
value->data.arr_string.size = size;
// array values
if (!Read(size*8)) return false;
value->data.arr_string.arr =
(NT_String *)std::malloc(size * sizeof(NT_String));
for (unsigned int i=0; i<size; ++i)
{
if (!ReadString(&value->data.arr_string.arr[i]))
{
// cleanup to avoid memory leaks
for (unsigned int j=0; j<i; ++j)
{
std::free(value->data.arr_string.arr[j].str);
}
std::free(value->data.arr_string.arr);
return false;
}
}
break;
}
default:
m_error = "invalid type when trying to read value";
return false;
}
return true;
}
bool
MessageReader::ReadString(NT_String *str)
{
if (m_proto_rev < 0x0300u)
{
unsigned int v;
if (!Read16(&v)) return false;
str->len = v;
}
else
{
unsigned long v;
if (!ReadULEB128(&v)) return false;
str->len = v;
}
str->str = (char *)std::malloc(str->len + 1);
if (!m_is.read(str->str, str->len))
{
std::free(str->str);
str->str = 0;
return false;
}
str->str[str->len] = '\0';
return true;
}