Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_CANManager: use NEW_NOTHROW for new(std::nothrow)

This commit is contained in:
Andrew Tridgell 2024-05-27 11:24:09 +10:00
parent a71585b9b8
commit 02456875e7
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/AP_CANManager/AP_CANManager.cpp
View File

@ -129,7 +129,7 @@ void AP_CANManager::init()
#endif #endif
// We only allocate log buffer only when under debug // We only allocate log buffer only when under debug
if (_loglevel != AP_CANManager::LOG_NONE) { if (_loglevel != AP_CANManager::LOG_NONE) {
_log_buf = new char[LOG_BUFFER_SIZE]; _log_buf = NEW_NOTHROW char[LOG_BUFFER_SIZE];
_log_pos = 0; _log_pos = 0;
} }
@ -152,7 +152,7 @@ void AP_CANManager::init()
if (hal_mutable.can[i] == nullptr) { if (hal_mutable.can[i] == nullptr) {
// So if this interface is not allocated allocate it here, // So if this interface is not allocated allocate it here,
// also pass the index of the CANBus // also pass the index of the CANBus
hal_mutable.can[i] = new HAL_CANIface(i); hal_mutable.can[i] = NEW_NOTHROW HAL_CANIface(i);
} }
// Initialise the interface we just allocated // Initialise the interface we just allocated
@ -201,7 +201,7 @@ void AP_CANManager::init()
// Allocate the set type of Driver // Allocate the set type of Driver
#if HAL_ENABLE_DRONECAN_DRIVERS #if HAL_ENABLE_DRONECAN_DRIVERS
if (drv_type[drv_num] == AP_CAN::Protocol::DroneCAN) { if (drv_type[drv_num] == AP_CAN::Protocol::DroneCAN) {
_drivers[drv_num] = _drv_param[drv_num]._uavcan = new AP_DroneCAN(drv_num); _drivers[drv_num] = _drv_param[drv_num]._uavcan = NEW_NOTHROW AP_DroneCAN(drv_num);
if (_drivers[drv_num] == nullptr) { if (_drivers[drv_num] == nullptr) {
AP_BoardConfig::allocation_error("uavcan %d", i + 1); AP_BoardConfig::allocation_error("uavcan %d", i + 1);
@ -213,7 +213,7 @@ void AP_CANManager::init()
#endif #endif
#if HAL_PICCOLO_CAN_ENABLE #if HAL_PICCOLO_CAN_ENABLE
if (drv_type[drv_num] == AP_CAN::Protocol::PiccoloCAN) { if (drv_type[drv_num] == AP_CAN::Protocol::PiccoloCAN) {
_drivers[drv_num] = _drv_param[drv_num]._piccolocan = new AP_PiccoloCAN; _drivers[drv_num] = _drv_param[drv_num]._piccolocan = NEW_NOTHROW AP_PiccoloCAN;
if (_drivers[drv_num] == nullptr) { if (_drivers[drv_num] == nullptr) {
AP_BoardConfig::allocation_error("PiccoloCAN %d", drv_num + 1); AP_BoardConfig::allocation_error("PiccoloCAN %d", drv_num + 1);
@ -266,7 +266,7 @@ void AP_CANManager::init()
WITH_SEMAPHORE(_sem); WITH_SEMAPHORE(_sem);
for (uint8_t i = 0; i < HAL_NUM_CAN_IFACES; i++) { for (uint8_t i = 0; i < HAL_NUM_CAN_IFACES; i++) {
if ((AP_CAN::Protocol) _drv_param[i]._driver_type.get() == AP_CAN::Protocol::DroneCAN) { if ((AP_CAN::Protocol) _drv_param[i]._driver_type.get() == AP_CAN::Protocol::DroneCAN) {
_drivers[i] = _drv_param[i]._uavcan = new AP_DroneCAN(i); _drivers[i] = _drv_param[i]._uavcan = NEW_NOTHROW AP_DroneCAN(i);
if (_drivers[i] == nullptr) { if (_drivers[i] == nullptr) {
AP_BoardConfig::allocation_error("uavcan %d", i + 1); AP_BoardConfig::allocation_error("uavcan %d", i + 1);
@ -312,7 +312,7 @@ bool AP_CANManager::register_driver(AP_CAN::Protocol dtype, AP_CANDriver *driver
if (hal_mutable.can[i] == nullptr) { if (hal_mutable.can[i] == nullptr) {
// if this interface is not allocated allocate it here, // if this interface is not allocated allocate it here,
// also pass the index of the CANBus // also pass the index of the CANBus
hal_mutable.can[i] = new HAL_CANIface(i); hal_mutable.can[i] = NEW_NOTHROW HAL_CANIface(i);
} }
// Initialise the interface we just allocated // Initialise the interface we just allocated
@ -467,7 +467,7 @@ void AP_CANManager::handle_can_frame(const mavlink_message_t &msg)
uint8_t buffer_size = 20; uint8_t buffer_size = 20;
while (frame_buffer == nullptr && buffer_size > 0) { while (frame_buffer == nullptr && buffer_size > 0) {
// we'd like 20 frames, but will live with less // we'd like 20 frames, but will live with less
frame_buffer = new ObjectBuffer<BufferFrame>(buffer_size); frame_buffer = NEW_NOTHROW ObjectBuffer<BufferFrame>(buffer_size);
if (frame_buffer != nullptr && frame_buffer->get_size() != 0) { if (frame_buffer != nullptr && frame_buffer->get_size() != 0) {
// register a callback for when frames can't be sent immediately // register a callback for when frames can't be sent immediately
hal.scheduler->register_io_process(FUNCTOR_BIND_MEMBER(&AP_CANManager::process_frame_buffer, void)); hal.scheduler->register_io_process(FUNCTOR_BIND_MEMBER(&AP_CANManager::process_frame_buffer, void));
@ -577,7 +577,7 @@ void AP_CANManager::handle_can_filter_modify(const mavlink_message_t &msg)
// common case of replacing with identical list // common case of replacing with identical list
return; return;
} }
new_ids = new uint16_t[p.num_ids]; new_ids = NEW_NOTHROW uint16_t[p.num_ids];
if (new_ids != nullptr) { if (new_ids != nullptr) {
num_new_ids = p.num_ids; num_new_ids = p.num_ids;
memcpy((void*)new_ids, (const void *)p.ids, p.num_ids*sizeof(uint16_t)); memcpy((void*)new_ids, (const void *)p.ids, p.num_ids*sizeof(uint16_t));
@ -590,7 +590,7 @@ void AP_CANManager::handle_can_filter_modify(const mavlink_message_t &msg)
// nothing changing // nothing changing
return; return;
} }
new_ids = new uint16_t[can_forward.num_filter_ids+p.num_ids]; new_ids = NEW_NOTHROW uint16_t[can_forward.num_filter_ids+p.num_ids];
if (new_ids == nullptr) { if (new_ids == nullptr) {
return; return;
} }

4
libraries/AP_CANManager/AP_CANSensor.cpp
View File

@ -197,7 +197,7 @@ MultiCAN::MultiCAN(ForwardCanFrame cf, AP_CAN::Protocol can_type, const char *dr
CANSensor(driver_name) CANSensor(driver_name)
{ {
if (callbacks == nullptr) { if (callbacks == nullptr) {
callbacks = new MultiCANLinkedList(); callbacks = NEW_NOTHROW MultiCANLinkedList();
} }
if (callbacks == nullptr) { if (callbacks == nullptr) {
AP_BoardConfig::allocation_error("Failed to create multican callback"); AP_BoardConfig::allocation_error("Failed to create multican callback");
@ -220,7 +220,7 @@ void MultiCAN::handle_frame(AP_HAL::CANFrame &frame)
// register a callback for a CAN frame by adding it to the linked list // register a callback for a CAN frame by adding it to the linked list
void MultiCAN::MultiCANLinkedList::register_callback(ForwardCanFrame callback) void MultiCAN::MultiCANLinkedList::register_callback(ForwardCanFrame callback)
{ {
CANSensor_Multi* newNode = new CANSensor_Multi(); CANSensor_Multi* newNode = NEW_NOTHROW CANSensor_Multi();
if (newNode == nullptr) { if (newNode == nullptr) {
AP_BoardConfig::allocation_error("Failed to create multican node"); AP_BoardConfig::allocation_error("Failed to create multican node");
} }