diff options
| -rwxr-xr-x | generator/nanopb_generator.py | 58 | ||||
| -rw-r--r-- | tests/message_sizes/SConscript | 11 | ||||
| -rw-r--r-- | tests/message_sizes/dummy.c | 9 | ||||
| -rw-r--r-- | tests/message_sizes/messages1.proto | 27 | ||||
| -rw-r--r-- | tests/message_sizes/messages2.proto | 8 |
5 files changed, 105 insertions, 8 deletions
diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py index 130ff932..ebb020b7 100755 --- a/generator/nanopb_generator.py +++ b/generator/nanopb_generator.py @@ -94,6 +94,44 @@ assert varint_max_size(0) == 1 assert varint_max_size(127) == 1 assert varint_max_size(128) == 2 +class EncodedSize: + '''Class used to represent the encoded size of a field or a message. + Consists of a combination of symbolic sizes and integer sizes.''' + def __init__(self, value = 0, symbols = []): + if isinstance(value, (str, Names)): + symbols = [str(value)] + value = 0 + self.value = value + self.symbols = symbols + + def __add__(self, other): + if isinstance(other, int): + return EncodedSize(self.value + other, self.symbols) + elif isinstance(other, (str, Names)): + return EncodedSize(self.value, self.symbols + [str(other)]) + elif isinstance(other, EncodedSize): + return EncodedSize(self.value + other.value, self.symbols + other.symbols) + else: + raise ValueError("Cannot add size: " + repr(other)) + + def __mul__(self, other): + if isinstance(other, int): + return EncodedSize(self.value * other, [str(other) + '*' + s for s in self.symbols]) + else: + raise ValueError("Cannot multiply size: " + repr(other)) + + def __str__(self): + if not self.symbols: + return str(self.value) + else: + return '(' + str(self.value) + ' + ' + ' + '.join(self.symbols) + ')' + + def upperlimit(self): + if not self.symbols: + return self.value + else: + return 2**32 - 1 + class Enum: def __init__(self, names, desc, enum_options): '''desc is EnumDescriptorProto''' @@ -301,23 +339,27 @@ class Field: if self.allocation != 'STATIC': return None - encsize = self.enc_size if self.pbtype == 'MESSAGE': for msg in allmsgs: if msg.name == self.submsgname: encsize = msg.encoded_size(allmsgs) if encsize is None: return None # Submessage size is indeterminate - encsize += varint_max_size(encsize) # submsg length is encoded also + + # Include submessage length prefix + encsize += varint_max_size(encsize.upperlimit()) break else: # Submessage cannot be found, this currently occurs when # the submessage type is defined in a different file. - return None - - if encsize is None: + # Instead of direct numeric value, reference the size that + # has been #defined in the other file. + encsize = EncodedSize(self.submsgname + 'size') + elif self.enc_size is None: raise RuntimeError("Could not determine encoded size for %s.%s" % (self.struct_name, self.name)) + else: + encsize = EncodedSize(self.enc_size) encsize += varint_max_size(self.tag << 3) # Tag + wire type @@ -362,7 +404,7 @@ class ExtensionRange(Field): # We exclude extensions from the count, because they cannot be known # until runtime. Other option would be to return None here, but this # way the value remains useful if extensions are not used. - return 0 + return EncodedSize(0) class ExtensionField(Field): def __init__(self, struct_name, desc, field_options): @@ -491,7 +533,7 @@ class Message: '''Return the maximum size that this message can take when encoded. If the size cannot be determined, returns None. ''' - size = 0 + size = EncodedSize(0) for field in self.fields: fsize = field.encoded_size(allmsgs) if fsize is None: @@ -674,7 +716,7 @@ def generate_header(dependencies, headername, enums, messages, extensions, optio msize = msg.encoded_size(messages) if msize is not None: identifier = '%s_size' % msg.name - yield '#define %-40s %d\n' % (identifier, msize) + yield '#define %-40s %s\n' % (identifier, msize) yield '\n' yield '#ifdef __cplusplus\n' diff --git a/tests/message_sizes/SConscript b/tests/message_sizes/SConscript new file mode 100644 index 00000000..e7524e02 --- /dev/null +++ b/tests/message_sizes/SConscript @@ -0,0 +1,11 @@ +# Test the generation of message size #defines + +Import('env') + +incpath = env.Clone() +incpath.Append(PROTOCPATH = '#message_sizes') + +incpath.NanopbProto("messages1") +incpath.NanopbProto("messages2") + +incpath.Program(['dummy.c', 'messages1.pb.c', 'messages2.pb.c']) diff --git a/tests/message_sizes/dummy.c b/tests/message_sizes/dummy.c new file mode 100644 index 00000000..767ad463 --- /dev/null +++ b/tests/message_sizes/dummy.c @@ -0,0 +1,9 @@ +/* Just test that the file can be compiled successfully. */ + +#include "messages2.pb.h" + +int main() +{ + return xmit_size; +} + diff --git a/tests/message_sizes/messages1.proto b/tests/message_sizes/messages1.proto new file mode 100644 index 00000000..48af55a3 --- /dev/null +++ b/tests/message_sizes/messages1.proto @@ -0,0 +1,27 @@ +enum MessageStatus { + FAIL = 0; + OK = 1; +}; + +message MessageInfo { + required fixed32 msg_id = 1; + optional fixed32 interface_id = 2; +} + +message MessageResponseInfo { + required fixed64 interface_id = 1; + required fixed32 seq = 2; + required fixed32 msg_id = 3; +} + +message MessageHeader { + required MessageInfo info = 1; + optional MessageResponseInfo response_info = 2; + optional MessageResponse response = 3; +} + +message MessageResponse { + required MessageStatus status = 1; + required fixed32 seq = 2; +} + diff --git a/tests/message_sizes/messages2.proto b/tests/message_sizes/messages2.proto new file mode 100644 index 00000000..19fc11ef --- /dev/null +++ b/tests/message_sizes/messages2.proto @@ -0,0 +1,8 @@ +import 'nanopb.proto'; +import 'messages1.proto'; + +message xmit { + required MessageHeader header = 1; + required bytes data = 2 [(nanopb).max_size = 128]; +} + |