yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 09:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up of app.h

Browse Source 
app.h, generated from app.h_in, has unnecessary code duplication
and isn't a header file (it defines globals, static functions
and doesn't have a header guard, moreover, it has a 'using namespace
std;'). Because of this, a real headerfile that declares the stuff
defined in apps.h was missing leading to even more code duplication:
scattered forward declarations in .cpp files and an often repeated
type of std::map<std::string, px4_main_t>.

This patch moves cmake/qurt/apps.h_in to src/platforms/apps.cpp.in
(with some changes) and removes cmake/posix/apps.h_in.
Then src/platforms/apps.cpp.in is split into src/platforms/apps.cpp.in
and src/platforms/apps.h.in, splitting declarations from definitions.

A typedef is defined for the map (apps_map_type).

The main difference between cmake/posix/apps.h_in and
cmake/qurt/apps.h_in was that the first defined a global 'apps',
while qurt stores the apps in QShell. I opted to get rid of
the global variable (which are in general evil for various reasons)
and used the API of cmake/qurt/apps.h_in where a provided 'apps'
map is initialized with a call to init_app_map. Thus removing
the existing code duplication.
This commit is contained in:
Carlo Wood
2016-10-21 15:54:48 +02:00
committed by Julian Oes
parent c200ef88ed
commit 6fc30c76a6
12 changed files with 143 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/drivers/qshell/qurt/qshell.cpp
View File

@@ -41,7 +41,6 @@
#include "qshell.h"
#include <px4_log.h>
#include <px4_tasks.h>
#include <px4_time.h>
#include <px4_posix.h>
#include <px4_middleware.h>
@@ -63,17 +62,11 @@
#define MAX_ARGS 8 // max number of whitespace separated args after app name
extern void init_app_map(std::map<std::string, px4_main_t> &apps);
extern void list_builtins(std::map<std::string, px4_main_t> &apps);
using std::map;
using std::string;
px4::AppState QShell::appState;
QShell::QShell()
{
init_app_map(apps);
init_app_map(m_apps);
}
int QShell::main()
@@ -150,12 +143,12 @@ int QShell::run_cmd(const std::vector<std::string> &appargs)
std::string command = appargs[0];
if (command.compare("help") == 0) {
list_builtins(apps);
list_builtins(m_apps);
return 0;
}
//replaces app.find with iterator code to avoid null pointer exception
for (map<string, px4_main_t>::iterator it = apps.begin(); it != apps.end(); ++it) {
for (apps_map_type::iterator it = m_apps.begin(); it != m_apps.end(); ++it) {
if (it->first == command) {
// one for command name, one for null terminator
const char *arg[MAX_ARGS + 2];
@@ -176,11 +169,11 @@ int QShell::run_cmd(const std::vector<std::string> &appargs)
arg[i] = (char *)0;
//PX4_DEBUG_PRINTF(i);
if (apps[command] == NULL) {
if (m_apps[command] == NULL) {
PX4_ERR("Null function !!\n");
} else {
return apps[command](i, (char **)arg);
return m_apps[command](i, (char **)arg);
}
}