dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

parameters: tinybson fill total document length for bson compatibility

This commit is contained in:
Daniel Agar 2021-04-09 20:58:03 -04:00
parent b9e0a16594
commit edc445a1b2
4 changed files with 76 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmake/px4_add_common_flags.cmake
View File

@ -95,21 +95,17 @@ function(px4_add_common_flags)
# compiler specific flags # compiler specific flags
if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang")) if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang"))
# force color for clang (needed for clang + ccache) add_compile_options(
add_compile_options(-fcolor-diagnostics) -fcolor-diagnostics # force color for clang (needed for clang + ccache)
# force absolute paths -fdiagnostics-absolute-paths # force absolute paths
add_compile_options(-fdiagnostics-absolute-paths)
# QuRT 6.4.X compiler identifies as Clang but does not support this option -Qunused-arguments
if (NOT "${PX4_PLATFORM}" STREQUAL "qurt")
add_compile_options(
-Qunused-arguments
-Wno-unknown-warning-option -Wno-c99-designator
-Wno-unused-const-variable -Wno-unknown-warning-option
-Wno-varargs -Wno-unused-const-variable
) -Wno-varargs
endif() )
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")

2
src/lib/parameters/parameters.cpp
View File

@ -1436,6 +1436,8 @@ param_import_internal(int fd, bool mark_saved)
} while (result > 0); } while (result > 0);
PX4_INFO("BSON document size %d bytes, decoded %d bytes", decoder.total_document_size, decoder.total_decoded_size);
return result; return result;
} }

85
src/lib/parameters/tinybson/tinybson.cpp
View File

@ -54,17 +54,20 @@
#define CODER_CHECK(_c) do { if (_c->dead) { debug("coder dead"); return -1; }} while(0) #define CODER_CHECK(_c) do { if (_c->dead) { debug("coder dead"); return -1; }} while(0)
#define CODER_KILL(_c, _reason) do { debug("killed: %s", _reason); _c->dead = true; return -1; } while(0) #define CODER_KILL(_c, _reason) do { debug("killed: %s", _reason); _c->dead = true; return -1; } while(0)
#define BSON_READ read
#define BSON_WRITE write
#define BSON_FSYNC fsync
static int static int
read_x(bson_decoder_t decoder, void *p, size_t s) read_x(bson_decoder_t decoder, void *p, size_t s)
{ {
CODER_CHECK(decoder); CODER_CHECK(decoder);
if (decoder->fd > -1) { if (decoder->fd > -1) {
return (BSON_READ(decoder->fd, p, s) == s) ? 0 : -1; int ret = ::read(decoder->fd, p, s);
if (ret == s) {
decoder->total_decoded_size += ret;
return 0;
}
return -1;
} }
if (decoder->buf != nullptr) { if (decoder->buf != nullptr) {
@ -79,6 +82,7 @@ read_x(bson_decoder_t decoder, void *p, size_t s)
memcpy(p, (decoder->buf + decoder->bufpos), s); memcpy(p, (decoder->buf + decoder->bufpos), s);
decoder->bufpos += s; decoder->bufpos += s;
decoder->total_decoded_size += s;
return 0; return 0;
} }
@ -113,8 +117,6 @@ read_double(bson_decoder_t decoder, double *d)
int int
bson_decoder_init_file(bson_decoder_t decoder, int fd, bson_decoder_callback callback, void *priv) bson_decoder_init_file(bson_decoder_t decoder, int fd, bson_decoder_callback callback, void *priv)
{ {
int32_t junk;
decoder->fd = fd; decoder->fd = fd;
decoder->buf = nullptr; decoder->buf = nullptr;
decoder->dead = false; decoder->dead = false;
@ -123,12 +125,17 @@ bson_decoder_init_file(bson_decoder_t decoder, int fd, bson_decoder_callback cal
decoder->nesting = 1; decoder->nesting = 1;
decoder->pending = 0; decoder->pending = 0;
decoder->node.type = BSON_UNDEFINED; decoder->node.type = BSON_UNDEFINED;
decoder->total_decoded_size = 0;
/* read and discard document size */ // read document size
if (read_int32(decoder, &junk)) { decoder->total_document_size = 0;
CODER_KILL(decoder, "failed discarding length");
if (read_int32(decoder, &decoder->total_document_size)) {
CODER_KILL(decoder, "failed reading length");
} }
debug("total document size = %d", decoder->total_document_size);
/* ready for decoding */ /* ready for decoding */
return 0; return 0;
} }
@ -137,8 +144,6 @@ int
bson_decoder_init_buf(bson_decoder_t decoder, void *buf, unsigned bufsize, bson_decoder_callback callback, bson_decoder_init_buf(bson_decoder_t decoder, void *buf, unsigned bufsize, bson_decoder_callback callback,
void *priv) void *priv)
{ {
int32_t len;
/* argument sanity */ /* argument sanity */
if ((buf == nullptr) || (callback == nullptr)) { if ((buf == nullptr) || (callback == nullptr)) {
return -1; return -1;
@ -162,13 +167,18 @@ bson_decoder_init_buf(bson_decoder_t decoder, void *buf, unsigned bufsize, bson_
decoder->nesting = 1; decoder->nesting = 1;
decoder->pending = 0; decoder->pending = 0;
decoder->node.type = BSON_UNDEFINED; decoder->node.type = BSON_UNDEFINED;
decoder->total_decoded_size = 0;
/* read and discard document size */ // read document size
if (read_int32(decoder, &len)) { decoder->total_document_size = 0;
if (read_int32(decoder, &decoder->total_document_size)) {
CODER_KILL(decoder, "failed reading length"); CODER_KILL(decoder, "failed reading length");
} }
if ((len > 0) && (len > (int)decoder->bufsize)) { debug("total document size = %d", decoder->total_document_size);
if ((decoder->total_document_size > 0) && (decoder->total_document_size > (int)decoder->bufsize)) {
CODER_KILL(decoder, "document length larger than buffer"); CODER_KILL(decoder, "document length larger than buffer");
} }
@ -340,7 +350,14 @@ write_x(bson_encoder_t encoder, const void *p, size_t s)
/* bson file encoder (non-buffered) */ /* bson file encoder (non-buffered) */
if (encoder->fd > -1 && encoder->buf == nullptr) { if (encoder->fd > -1 && encoder->buf == nullptr) {
return (BSON_WRITE(encoder->fd, p, s) == (int)s) ? 0 : -1; int ret = ::write(encoder->fd, p, s);
if (ret == s) {
encoder->total_document_size += ret;
return 0;
}
return -1;
} }
/* do we need to extend the buffer? */ /* do we need to extend the buffer? */
@ -350,11 +367,12 @@ write_x(bson_encoder_t encoder, const void *p, size_t s)
if (encoder->fd > -1) { if (encoder->fd > -1) {
// write to disk // write to disk
debug("writing buffer (%d) to disk", encoder->bufpos); debug("writing buffer (%d) to disk", encoder->bufpos);
int ret = BSON_WRITE(encoder->fd, encoder->buf, encoder->bufpos); int ret = ::write(encoder->fd, encoder->buf, encoder->bufpos);
if (ret == (int)encoder->bufpos) { if (ret == (int)encoder->bufpos) {
// reset buffer to beginning and continue // reset buffer to beginning and continue
encoder->bufpos = 0; encoder->bufpos = 0;
encoder->total_document_size += ret;
if ((encoder->bufpos + s) > encoder->bufsize) { if ((encoder->bufpos + s) > encoder->bufsize) {
CODER_KILL(encoder, "fixed-size buffer overflow"); CODER_KILL(encoder, "fixed-size buffer overflow");
@ -431,6 +449,7 @@ bson_encoder_init_file(bson_encoder_t encoder, int fd)
encoder->fd = fd; encoder->fd = fd;
encoder->buf = nullptr; encoder->buf = nullptr;
encoder->dead = false; encoder->dead = false;
encoder->total_document_size = 0;
if (write_int32(encoder, 0)) { if (write_int32(encoder, 0)) {
CODER_KILL(encoder, "write error on document length"); CODER_KILL(encoder, "write error on document length");
@ -448,6 +467,7 @@ bson_encoder_init_buf_file(bson_encoder_t encoder, int fd, void *buf, unsigned b
encoder->bufsize = bufsize; encoder->bufsize = bufsize;
encoder->dead = false; encoder->dead = false;
encoder->realloc_ok = false; encoder->realloc_ok = false;
encoder->total_document_size = 0;
if (write_int32(encoder, 0)) { if (write_int32(encoder, 0)) {
CODER_KILL(encoder, "write error on document length"); CODER_KILL(encoder, "write error on document length");
@ -473,6 +493,8 @@ bson_encoder_init_buf(bson_encoder_t encoder, void *buf, unsigned bufsize)
encoder->realloc_ok = false; encoder->realloc_ok = false;
} }
encoder->total_document_size = 0;
if (write_int32(encoder, 0)) { if (write_int32(encoder, 0)) {
CODER_KILL(encoder, "write error on document length"); CODER_KILL(encoder, "write error on document length");
} }
@ -489,13 +511,31 @@ bson_encoder_fini(bson_encoder_t encoder)
CODER_KILL(encoder, "write error on document terminator"); CODER_KILL(encoder, "write error on document terminator");
} }
if (encoder->fd > -1 && encoder->buf != nullptr) { if (encoder->fd > -1 && encoder->buf != nullptr && encoder->bufpos > 0) {
/* write final buffer to disk */ /* write final buffer to disk */
int ret = BSON_WRITE(encoder->fd, encoder->buf, encoder->bufpos); int ret = ::write(encoder->fd, encoder->buf, encoder->bufpos);
if (ret != (int)encoder->bufpos) { if (ret == (int)encoder->bufpos) {
encoder->total_document_size += ret;
} else {
CODER_KILL(encoder, "write error"); CODER_KILL(encoder, "write error");
} }
}
// record document size
if (encoder->fd > -1) {
if (lseek(encoder->fd, 0, SEEK_SET) == 0) {
debug("writing document size %d to beginning of file", encoder->total_document_size);
if (::write(encoder->fd, &encoder->total_document_size,
sizeof(encoder->total_document_size)) != sizeof(encoder->total_document_size)) {
CODER_KILL(encoder, "write error on document length");
}
}
::fsync(encoder->fd);
} else if (encoder->buf != nullptr) { } else if (encoder->buf != nullptr) {
/* update buffer length */ /* update buffer length */
@ -503,11 +543,6 @@ bson_encoder_fini(bson_encoder_t encoder)
memcpy(encoder->buf, &len, sizeof(len)); memcpy(encoder->buf, &len, sizeof(len));
} }
/* sync file */
if (encoder->fd > -1) {
BSON_FSYNC(encoder->fd);
}
return 0; return 0;
} }

5
src/lib/parameters/tinybson/tinybson.h
View File

@ -116,6 +116,9 @@ struct bson_decoder_s {
unsigned nesting; unsigned nesting;
struct bson_node_s node; struct bson_node_s node;
int32_t pending; int32_t pending;
int32_t total_document_size;
int32_t total_decoded_size;
}; };
/** /**
@ -182,6 +185,8 @@ typedef struct bson_encoder_s {
bool realloc_ok; bool realloc_ok;
bool dead; bool dead;
int32_t total_document_size;
} *bson_encoder_t; } *bson_encoder_t;
/** /**