From b73dbd3f41f714e96bf3168ff81a1f688b872a24 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Sat, 30 May 2015 01:34:05 +0300 Subject: [PATCH] Padding optimization in TransferSender --- .../include/uavcan/transport/transfer_sender.hpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libuavcan/include/uavcan/transport/transfer_sender.hpp b/libuavcan/include/uavcan/transport/transfer_sender.hpp index 6c45e524bb..2b95c20b42 100644 --- a/libuavcan/include/uavcan/transport/transfer_sender.hpp +++ b/libuavcan/include/uavcan/transport/transfer_sender.hpp @@ -20,16 +20,17 @@ namespace uavcan class UAVCAN_EXPORT TransferSender { const MonotonicDuration max_transfer_interval_; - DataTypeID data_type_id_; + + Dispatcher& dispatcher_; + TransferPriority priority_; CanTxQueue::Qos qos_; TransferCRC crc_base_; + DataTypeID data_type_id_; CanIOFlags flags_; uint8_t iface_mask_; bool allow_anonymous_transfers_; - Dispatcher& dispatcher_; - void registerError() const; public: @@ -43,24 +44,24 @@ public: TransferSender(Dispatcher& dispatcher, const DataTypeDescriptor& data_type, CanTxQueue::Qos qos, MonotonicDuration max_transfer_interval = getDefaultMaxTransferInterval()) : max_transfer_interval_(max_transfer_interval) + , dispatcher_(dispatcher) , priority_(TransferPriorityNormal) , qos_(CanTxQueue::Qos()) , flags_(CanIOFlags(0)) , iface_mask_(AllIfacesMask) , allow_anonymous_transfers_(false) - , dispatcher_(dispatcher) { init(data_type, qos); } TransferSender(Dispatcher& dispatcher, MonotonicDuration max_transfer_interval = getDefaultMaxTransferInterval()) : max_transfer_interval_(max_transfer_interval) + , dispatcher_(dispatcher) , priority_(TransferPriorityNormal) , qos_(CanTxQueue::Qos()) , flags_(CanIOFlags(0)) , iface_mask_(AllIfacesMask) , allow_anonymous_transfers_(false) - , dispatcher_(dispatcher) { } void init(const DataTypeDescriptor& dtid, CanTxQueue::Qos qos);