aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Logger: unify singleton naming to _singleton and get_singleton()

Browse Source
This commit is contained in:
Tom Pittenger 2019-02-10 10:05:22 -08:00 committed by Tom Pittenger
parent 3bbd80a5de
commit 21db5e1a5c
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/AP_Logger/AP_Logger.cpp
View File

@ -8,7 +8,7 @@
#include "AP_Logger_MAVLink.h"
#include <GCS_MAVLink/GCS.h>
AP_Logger *AP_Logger::_instance;
AP_Logger *AP_Logger::_singleton;
extern const AP_HAL::HAL& hal;
@ -79,11 +79,11 @@ AP_Logger::AP_Logger(const AP_Int32 &log_bitmask)
: _log_bitmask(log_bitmask)
{
AP_Param::setup_object_defaults(this, var_info);
if (_instance != nullptr) {
if (_singleton != nullptr) {
AP_HAL::panic("AP_Logger must be singleton");
}
_instance = this;
_singleton = this;
}
void AP_Logger::Init(const struct LogStructure *structures, uint8_t num_types)
@ -1067,7 +1067,11 @@ void AP_Logger::Write_Event(Log_Event id)
WriteCriticalBlock(&pkt, sizeof(pkt));
}
AP_Logger &AP::logger()
namespace AP {
AP_Logger &logger()
{
return *AP_Logger::instance();
return *AP_Logger::get_singleton();
}
};

6
libraries/AP_Logger/AP_Logger.h
View File

@ -123,8 +123,8 @@ public:
AP_Logger &operator=(const AP_Logger&) = delete;
// get singleton instance
static AP_Logger *instance(void) {
return _instance;
static AP_Logger *get_singleton(void) {
return _singleton;
}
// initialisation
@ -376,7 +376,7 @@ private:
void backend_starting_new_log(const AP_Logger_Backend *backend);
static AP_Logger *_instance;
static AP_Logger *_singleton;
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
bool validate_structure(const struct LogStructure *logstructure, int16_t offset);