Visecy
/
extern_interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(event): optimize event handling and remove inicpp dependency 

- Update event handling logic for better performance
- Remove unused inicpp dependency
- Fix typos and improve code readability
- Update build script for better portability
This commit is contained in:
ovizro 2024-12-27 20:49:00 +08:00
parent f46f39b2b2
commit 7c7827fddb
7 changed files with 18 additions and 703 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -46,4 +46,4 @@ cmake --build build -j6 --target test
- `type`：数据包类型 - `type`：数据包类型
- `len`：数据包长度，对于字符串类型数据应包含后缀`\0`的长度。 - `len`：数据包长度，对于字符串类型数据应包含后缀`\0`的长度。
- `data`：数据包数据 - `data`：数据包数据
6. `void exint_finialize()`：模块销毁函数，调用后模块会终止所有内部线程，释放所有资源。 6. `void exint_finalize()`：模块销毁函数，调用后模块会终止所有内部线程，释放所有资源。

2
include/external_interface_event.h
View File

@ -27,12 +27,12 @@ typedef struct _EventTrigger {
uint8_t args[ET_EVENT_TRIGGER_BUFFER_SIZE]; uint8_t args[ET_EVENT_TRIGGER_BUFFER_SIZE];
} EventTrigger; } EventTrigger;
#define EXINT_EVENT_PUBLIC static __inline
#ifndef EXINT_EVENT #ifndef EXINT_EVENT
#define EXINT_EVENT_PUBLIC_FUNC_NAME(name) exint_ ## name #define EXINT_EVENT_PUBLIC_FUNC_NAME(name) exint_ ## name
#else #else
#define EXINT_EVENT_PUBLIC_FUNC_NAME(name) exint_public_ ## name #define EXINT_EVENT_PUBLIC_FUNC_NAME(name) exint_public_ ## name
#endif #endif
#define EXINT_EVENT_PUBLIC static __inline
#define EXINT_EVENT_PUBLIC_FUNC(name) EXINT_EVENT_PUBLIC void EXINT_EVENT_PUBLIC_FUNC_NAME(name) #define EXINT_EVENT_PUBLIC_FUNC(name) EXINT_EVENT_PUBLIC void EXINT_EVENT_PUBLIC_FUNC_NAME(name)
EXINT_EVENT_PUBLIC_FUNC(event) EXINT_EVENT_PUBLIC_FUNC(event)

687
include/inicpp.hpp
View File

@ -1,687 +0,0 @@
/*
* MIT License
*
* Copyright (c) 2023 dujingning <djn2019x@163.com> <https://github.com/dujingning/inicpp.git>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#ifndef __JN_INICPP_H__
#define __JN_INICPP_H__
#include <cstddef>
#include <algorithm>
#include <fstream>
#include <string>
#include <list>
#include <map>
// for std::string <==> std::wstring convert
#include <codecvt>
#include <locale>
#ifdef INICPP_DEBUG
#include <array>
#include <ctime>
#include <iostream>
class TimeFormatter
{
public:
static std::string format(const std::string &format = "%Y-%m-%d %H:%M:%S")
{
std::time_t t = std::time(nullptr);
std::tm tm = *std::localtime(&t);
std::array<char, 100> buffer;
std::strftime(buffer.data(), buffer.size(), format.c_str(), &tm);
return buffer.data();
}
};
#define CODE_INFO std::string(" | Code:\'file:") + std::string(__FILE__) + ",function:" + std::string(__FUNCTION__) + ",line:" + std::to_string(__LINE__) + '\''
#define INI_DEBUG(x) std::cout << "INICPP " << TimeFormatter::format() << " : " << x << CODE_INFO << std::endl
#else // #ifdef INICPP_DEBUG
#define INI_DEBUG(x)
#endif // #ifdef INICPP_DEBUG
namespace inicpp
{
typedef struct KeyValueNode
{
std::string Value = "";
int lineNumber = -1; // text line start with 1
} KeyValueNode;
class section
{
public:
section() : _sectionName()
{
}
explicit section(const std::string &sectionName) : _sectionName(sectionName)
{
}
const std::string &name()
{
return _sectionName;
}
const std::string getValue(const std::string &Key)
{
if (!_sectionMap.count(Key))
{
return "";
}
return _sectionMap[Key].Value;
}
void setName(const std::string &name, const int &lineNumber)
{
_sectionName = name;
_lineNumber = lineNumber;
}
void setValue(const std::string &Key, const std::string &Value, const int line)
{
_sectionMap[Key].Value = Value;
_sectionMap[Key].lineNumber = line;
}
void append(section &sec)
{
_sectionMap.insert(sec._sectionMap.begin(), sec._sectionMap.end());
}
bool isKeyExist(const std::string &Key)
{
return !_sectionMap.count(Key) ? false : true;
}
int getEndSection()
{
int line = -1;
if (_sectionMap.empty() && _sectionName != "")
{
return _lineNumber;
}
for (const auto &data : _sectionMap)
{
if (data.second.lineNumber > line)
{
line = data.second.lineNumber;
}
}
return line;
}
int getLine(const std::string &Key)
{
if (!_sectionMap.count(Key))
{
return -1;
}
return _sectionMap[Key].lineNumber;
}
const std::string operator[](const std::string &Key)
{
if (!_sectionMap.count(Key))
{
return "";
}
return _sectionMap[Key].Value;
}
void clear()
{
_lineNumber = -1;
_sectionName.clear();
_sectionMap.clear();
}
bool isEmpty() const
{
return _sectionMap.empty();
}
int toInt(const std::string &Key)
{
if (!_sectionMap.count(Key))
{
return 0;
}
int result = 0;
try
{
result = std::stoi(_sectionMap[Key].Value);
}
catch (const std::invalid_argument &e)
{
INI_DEBUG("Invalid argument: " << e.what() << ",input:\'" << _sectionMap[Key].Value << "\'");
}
catch (const std::out_of_range &e)
{
INI_DEBUG("Out of range: " << e.what() << ",input:\'" << _sectionMap[Key].Value << "\'");
}
return result;
}
std::string toString(const std::string &Key)
{
if (!_sectionMap.count(Key))
{
return "";
}
return _sectionMap[Key].Value;
}
std::wstring toWString(const std::string &Key)
{
std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
return converter.from_bytes(toString(Key));
}
double toDouble(const std::string &Key)
{
if (!_sectionMap.count(Key))
{
return 0.0;
}
double result = 0.0;
try
{
result = std::stod(_sectionMap[Key].Value);
}
catch (const std::invalid_argument &e)
{
INI_DEBUG("Invalid argument: " << e.what() << ",input:\'" << _sectionMap[Key].Value << "\'");
}
catch (const std::out_of_range &e)
{
INI_DEBUG("Out of range: " << e.what() << ",input:\'" << _sectionMap[Key].Value << "\'");
}
return result;
}
// todo : add toString() / toInt() / toDouble()
private:
std::string _sectionName;
std::map<std::string, KeyValueNode> _sectionMap;
int _lineNumber = -1; // text line start with 1
};
class ini
{
public:
void addSection(section &sec)
{
if (_iniInfoMap.count(sec.name())) // if exist,need to merge
{
_iniInfoMap[sec.name()].append(sec);
return;
}
_iniInfoMap.emplace(sec.name(), sec);
return;
}
void removeSection(const std::string &sectionName)
{
if (!_iniInfoMap.count(sectionName))
{
return;
}
_iniInfoMap.erase(sectionName);
return;
}
bool isSectionExists(const std::string &sectionName)
{
return !_iniInfoMap.count(sectionName) ? false : true;
}
// may contains default of Unnamed section with ""
std::list<std::string> getSectionsList()
{
std::list<std::string> sectionList;
for (const auto &data : _iniInfoMap)
{
if (data.first == "" && data.second.isEmpty()) // default section: no section name,if empty,not count it.
{
continue;
}
sectionList.emplace_back(data.first);
}
return sectionList;
}
const section &operator[](const std::string &sectionName)
{
if (!_iniInfoMap.count(sectionName))
{
return _iniInfoMap[""];
}
return _iniInfoMap[sectionName];
}
inline std::size_t getSectionSize()
{
return _iniInfoMap.size();
}
std::string getValue(const std::string &sectionName, const std::string &Key)
{
if (!_iniInfoMap.count(sectionName))
{
return "";
}
return _iniInfoMap[sectionName][Key];
}
// for none section
int getLine(const std::string &Key)
{
if (!_iniInfoMap.count(""))
{
return -1;
}
return _iniInfoMap[""].getLine(Key);
}
// for section-key
int getLine(const std::string &sectionName, const std::string &Key)
{
if (!_iniInfoMap.count(sectionName))
{
return -1;
}
return _iniInfoMap[sectionName].getLine(Key);
}
inline void clear() { _iniInfoMap.clear(); }
inline bool empty() { return _iniInfoMap.empty(); }
protected:
std::map<std::string /*Section Name*/, section> _iniInfoMap;
};
// todo if file is modified,never write back
class IniManager
{
public:
explicit IniManager(const std::string &configFileName) : _configFileName(configFileName)
{
parse();
}
~IniManager()
{
_iniFile.close();
}
section operator[](const std::string &sectionName)
{
return _iniData[sectionName];
}
void parse()
{
_iniFile.open(_configFileName, std::ifstream::in | std::ifstream::out | std::fstream::app);
if (!_iniFile.is_open())
{
INI_DEBUG("Failed to open the input INI file for parsing!");
return;
}
_iniData.clear();
_iniFile.seekg(0, _iniFile.beg);
std::string data, sectionName;
int sectionLine = -1;
section sectionRecord;
_SumOfLines = 1;
do
{
std::getline(_iniFile, data);
if (!filterData(data))
{
++_SumOfLines;
continue;
}
if (data.find('[') == 0) // section
{
if (!sectionRecord.isEmpty() || sectionRecord.name() != "")
{
_iniData.addSection(sectionRecord);
}
size_t first = data.find('[');
size_t last = data.find(']');
if (last == std::string::npos)
{
++_SumOfLines;
continue;
}
sectionName = data.substr(first + 1, last - first - 1);
sectionLine = _SumOfLines;
sectionRecord.clear();
sectionRecord.setName(sectionName, sectionLine);
}
size_t pos = data.find('=');
if (pos != std::string::npos)
{ // k=v
std::string key = data.substr(0, pos);
std::string value = data.substr(pos + 1);
trimEdges(key);
trimEdges(value);
sectionRecord.setValue(key, value, _SumOfLines);
}
++_SumOfLines;
} while (!_iniFile.eof());
if (!sectionRecord.isEmpty())
{
sectionRecord.setName(sectionName, -1);
_iniData.addSection(sectionRecord);
}
if (_iniFile.is_open())
{
_iniFile.close();
}
}
bool modify(const std::string &Section, const std::string &Key, const std::string &Value, const std::string &comment = "")
{ // todo: insert comment before k=v
parse();
if (Key == "" || Value == "")
{
INI_DEBUG("Invalid parameter input: Key[" << Key << "],Value[" << Value << "]");
return false;
}
std::string keyValueData = Key + "=" + Value + "\n";
if (comment.length() > 0)
{
keyValueData = comment + "\n" + keyValueData;
if (comment[0] != ';')
{
keyValueData = ";" + keyValueData;
}
}
const std::string &tempFile = ".temp.ini";
std::fstream input(_configFileName, std::ifstream::in | std::ifstream::out | std::fstream::app);
std::ofstream output(tempFile);
if (!input.is_open())
{
INI_DEBUG("Failed to open the input INI file for modification!");
return false;
}
if (!output.is_open())
{
INI_DEBUG("Failed to open the input INI file for modification!");
return false;
}
int line_number_mark = -1;
bool isInputDataWited = false;
do
{
// exist key at one section replace it, or need to create it
if (_iniData.isSectionExists(Section))
{
line_number_mark = (*this)[Section].getLine(Key);
if (line_number_mark == -1)
{ // section exist, key not exist
line_number_mark = (*this)[Section].getEndSection();
std::string lineData;
int input_line_number = 0;
while (std::getline(input, lineData))
{
++input_line_number;
if (input_line_number == (line_number_mark + 1))
{ // new line,append to next line
isInputDataWited = true;
output << keyValueData;
}
output << lineData << "\n";
}
if (input.eof() && !isInputDataWited)
{
isInputDataWited = true;
output << keyValueData;
}
break;
}
}
if (line_number_mark <= 0) // not found key at config file
{
input.seekg(0, input.beg);
bool isHoldSection = false;
std::string newLine = "\n\n";
if (Section != "" && Section.find("[") == std::string::npos && Section.find("]") == std::string::npos && Section.find("=") == std::string::npos)
{
if (_iniData.empty() || _iniData.getSectionSize() <= 0)
{
newLine.clear();
}
isHoldSection = true;
}
// 1.section is exist or empty section
if (_iniData.isSectionExists(Section) || Section == "")
{
// write key/value to head
if (isHoldSection)
{
output << newLine << "[" << Section << "]" << "\n";
}
output << keyValueData;
// write others
std::string lineData;
while (std::getline(input, lineData))
{
output << lineData << "\n";
}
}
// 2.section is not exist
else
{
// write others
std::string lineData;
while (std::getline(input, lineData))
{
output << lineData << "\n";
}
// write key/value to end
if (isHoldSection)
{
output << newLine << "[" << Section << "]" << "\n";
}
output << keyValueData;
}
break;
}
else
{ // found, replace it
std::string lineData;
int input_line_number = 0;
while (std::getline(input, lineData))
{
++input_line_number;
// delete old comment if new comment is set
if (input_line_number == (line_number_mark - 1) && lineData.length() > 0 && lineData[0] == ';' && comment != "")
{
continue;
}
if (input_line_number == line_number_mark)
{ // replace to this line
output << keyValueData;
}
else
{
output << lineData << "\n";
}
}
break;
}
INI_DEBUG("error! inicpp lost process of modify function");
return false;
} while (false);
// clear work
input.close();
output.close();
std::remove(_configFileName.c_str());
std::rename(tempFile.c_str(), _configFileName.c_str());
// reload
parse();
return true;
}
bool modify(const std::string &Section, const std::string &Key, const int &Value, const std::string &comment = "")
{
std::string stringValue = std::to_string(Value);
return modify(Section, Key, stringValue, comment);
}
bool modify(const std::string &Section, const std::string &Key, const double &Value, const std::string &comment = "")
{
std::string stringValue = std::to_string(Value);
return modify(Section, Key, stringValue, comment);
}
bool modify(const std::string &Section, const std::string &Key, const std::wstring &Value, const std::string &comment = "")
{
std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
std::string stringValue = converter.to_bytes(Value);
return modify(Section, Key, stringValue, comment);
}
bool modifyComment(const std::string &Section, const std::string &Key, const std::string &comment)
{
return modify(Section, Key, (*this)[Section][Key], comment);
}
bool isSectionExists(const std::string &sectionName)
{
return _iniData.isSectionExists(sectionName);
}
inline std::list<std::string> getSectionsList()
{
return _iniData.getSectionsList();
}
private:
bool filterData(std::string &data)
{
if (data.length() == 0)
{
return false;
}
if (data[0] == ';')
{
return false;
}
if (data[0] == '#')
{
return false;
}
return true;
}
void trimEdges(std::string &data)
{
// remove left ' ' and '\t'
data.erase(data.begin(), std::find_if(data.begin(), data.end(), [](unsigned char c)
{ return !std::isspace(c); }));
// remove right ' ' and '\t'
data.erase(std::find_if(data.rbegin(), data.rend(), [](unsigned char c)
{ return !std::isspace(c); })
.base(),
data.end());
INI_DEBUG( "trimEdges data:|" << data << "|");
}
private:
ini _iniData;
int _SumOfLines;
std::fstream _iniFile;
std::string _configFileName;
};
}
#endif

13
mak
View File

@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
mkdir -p build && cd $(dirname $0)/build set -e
BASEDIR=$(cd "$(dirname "$0")"; pwd)
mkdir -p ${BASEDIR}/build && cd ${BASEDIR}/build
if echo "$@" | grep -iq r; then if echo "$@" | grep -iq r; then
BUILD_TYPE=RELEASE BUILD_TYPE=RELEASE
@ -9,15 +12,15 @@ fi
if echo "$@" | grep -iq e; then if echo "$@" | grep -iq e; then
#------ compile for euler ------------------- #------ compile for euler -------------------
TOOLCHAIN=../../toolchains/armv7l_openeuler_setup.cmake TOOLCHAIN=${BASEDIR}/toolchains/armv7l_openeuler_setup.cmake
BUILD_PREFIX=armv7l-openeular BUILD_PREFIX=armv7l-openeular
else else
#------- compile for arm32 ------------------ #------- compile for arm32 ------------------
TOOLCHAIN=../../toolchains/armv7l_linux_setup.cmake TOOLCHAIN=${BASEDIR}/toolchains/armv7l_linux_setup.cmake
BUILD_PREFIX=armv7l-linux BUILD_PREFIX=armv7l-linux
fi fi
mkdir -p ${BUILD_PREFIX} && cd ${BUILD_PREFIX} mkdir -p ${BUILD_PREFIX} && cd ${BUILD_PREFIX}
rm -f CMakeCache.txt rm -f CMakeCache.txt
cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN} -DEXECUTABLE_OUTPUT_PATH=../../bin/${BUILD_PREFIX} -DLIBRARY_OUTPUT_PATH=../../lib/${BUILD_PREFIX} ../.. cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN} -DEXECUTABLE_OUTPUT_PATH=${BASEDIR}/bin/${BUILD_PREFIX} -DLIBRARY_OUTPUT_PATH=${BASEDIR}/lib/${BUILD_PREFIX} ../..
cmake --build . -j 4 -- cmake --build . -j 6 --

13
src/event.cpp
View File

@ -29,20 +29,17 @@ void exint_event(const char *event_name, size_t args_size, void *args) {
logger.warn("Event '%s' not found", event_name); logger.warn("Event '%s' not found", event_name);
return; return;
} }
std::shared_ptr<uint8_t[]> data(new uint8_t[args_size]); std::shared_ptr<uint8_t[]> data;
memcpy(data.get(), args, args_size);
for (auto &pair : it->second) { for (auto &pair : it->second) {
if (!_event_thread_count.load()) { if (!_event_thread_count.load()) {
logger.debug("Run event %s synchronous", event_name);
pair.first(event_name, args_size, args, pair.second); pair.first(event_name, args_size, args, pair.second);
continue; continue;
} }
uint8_t* args_copy; if (!data && args_size != 0) {
if (args_size == 0) { data = std::shared_ptr<uint8_t[]>(new uint8_t[args_size]);
args_copy = NULL; memcpy(data.get(), args, args_size);
} else {
args_copy = new uint8_t[args_size];
memcpy(args_copy, args, args_size);
} }
_event_queue.Push(std::make_tuple(event_name, pair.first, args_size, data, pair.second)); _event_queue.Push(std::make_tuple(event_name, pair.first, args_size, data, pair.second));
} }

2
src/external_interface.cpp
View File

@ -1,8 +1,8 @@
#include <pthread.h> #include <pthread.h>
#include <fstream>
#include "logging/logger.hpp" #include "logging/logger.hpp"
#include "comframe.h" #include "comframe.h"
#include "CCfgFileParser.h" #include "CCfgFileParser.h"
#include "inicpp.hpp"
#include "transport/serial_port.hpp" #include "transport/serial_port.hpp"
#include "transport/udp.hpp" #include "transport/udp.hpp"
#include "exint/detail.hpp" #include "exint/detail.hpp"

2
tests/test_event.cpp
View File

@ -1,6 +1,7 @@
#include <vector> #include <vector>
#include <thread> #include <thread>
#include <unistd.h> #include <unistd.h>
#include "logging/interface.h"
#include "exint/event.h" #include "exint/event.h"
#include "exint/detail.hpp" #include "exint/detail.hpp"
#include "c_testcase.h" #include "c_testcase.h"
@ -13,6 +14,7 @@ ON_EVENT_EX(test, _test_handler, nullptr) {
} }
SETUP { SETUP {
log_set_level(LOG_LEVEL_DEBUG);
g_vec.clear(); g_vec.clear();
return 0; return 0;
} }