AndyWhittaker
/
OpenPLC_v3
mirror of https://github.com/AndyWhittaker/OpenPLC_v3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR-786 Run cpplint against runtime and fix a large number of digressions

This commit is contained in:
Garret Fick 2019-11-19 13:54:53 -05:00
parent 84aeba7d36
commit 5c7ead0873
6 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/core/bootstrap.cpp
View File

@ -69,6 +69,10 @@ int config_handler(void* user_data, const char* section,
{
spdlog::set_level(spdlog::level::err);
}
else
{
spdlog::warn("Unknown log level {}", value);
}
}
else if (strcmp("enabled", name) == 0
&& oplc::ini_atob(value)
@ -151,8 +155,7 @@ void bootstrap()
struct sched_param sp;
sp.sched_priority = 30;
spdlog::info("Setting main thread priority to RT");
if (pthread_setschedparam(pthread_self(), SCHED_FIFO, &sp))
{
if (pthread_setschedparam(pthread_self(), SCHED_FIFO, &sp)) {
spdlog::warn("Failed to set main thread to real-time priority");
}
@ -171,8 +174,7 @@ void bootstrap()
// Our next step here is to start the main loop, so start any
// services that we want now.
for (auto it = config.services.begin(); it != config.services.end(); ++it)
{
for (auto it = config.services.begin(); it != config.services.end(); ++it) {
const char* service_config = "";
ServiceDefinition* def = services_find(it->c_str());
def->start(service_config);

3
runtime/core/dnp3s/dnp3.cpp
View File

@ -80,8 +80,7 @@ class Dnp3ToSpdLogger final : public openpal::ILogHandler, private openpal::Unco
spdlog::info("{}", entry.message);
}
static std::shared_ptr<openpal::ILogHandler>Create()
{
static std::shared_ptr<openpal::ILogHandler>Create() {
return std::make_shared<Dnp3ToSpdLogger>();
}

39
runtime/core/interactive_server.cpp
View File

@ -145,8 +145,7 @@ std::int8_t copy_command_config(const char *source, char target[],
/// @param port
/// @return the file descriptor for the socket, or less than 0 if a socket
/// if an error occurred.
int interactive_open_socket(uint16_t port)
{
int interactive_open_socket(uint16_t port) {
int socket_fd;
struct sockaddr_in server_addr;
@ -198,8 +197,7 @@ int interactive_open_socket(uint16_t port)
/// @param run A flag that is set to false when we should stop polling.
/// @param socket_fd The socket file descriptor we are listening on.
/// @return the client file descriptor.
int interactive_wait_new_client(volatile bool& run, int socket_fd)
{
int interactive_wait_new_client(volatile bool& run, int socket_fd) {
int client_fd;
struct sockaddr_in client_addr;
socklen_t client_len;
@ -244,37 +242,32 @@ void interactive_client_command(const char* command, int client_fd)
spdlog::trace("Process command received {}", command);
if (strncmp(command, "quit()", 6) == 0)
{
if (strncmp(command, "quit()", 6) == 0) {
spdlog::info("Issued quit() command");
run_openplc = 0;
}
else if (strncmp(command, "start_modbus(", 13) == 0)
{
else if (strncmp(command, "start_modbus(", 13) == 0) {
ServiceDefinition* def = services_find("modbusslave");
if (def && copy_command_config(command + 13, command_buffer, BUFFER_MAX_SIZE) == 0)
{
def->start(command_buffer);
}
}
else if (strncmp(command, "stop_modbus()", 13) == 0)
{
else if (strncmp(command, "stop_modbus()", 13) == 0) {
ServiceDefinition* def = services_find("modbusslave");
if (def) {
def->stop();
}
}
#ifdef OPLC_DNP3_OUTSTATION
else if (strncmp(command, "start_dnp3(", 11) == 0)
{
else if (strncmp(command, "start_dnp3(", 11) == 0) {
ServiceDefinition* def = services_find("dnp3s");
if (def && copy_command_config(command + 11, command_buffer, BUFFER_MAX_SIZE) == 0)
{
def->start(command_buffer);
}
}
else if (strncmp(command, "stop_dnp3()", 11) == 0)
{
else if (strncmp(command, "stop_dnp3()", 11) == 0) {
ServiceDefinition* def = services_find("dnp3s");
if (def) {
def->stop();
@ -284,8 +277,7 @@ void interactive_client_command(const char* command, int client_fd)
else if (strncmp(command, "start_enip(", 11) == 0) {
spdlog::info("Issued start_enip() command to start on port: {}", readCommandArgument(command));
enip_port = readCommandArgument(command);
if (run_enip)
{
if (run_enip) {
spdlog::info("EtherNet/IP server already active. Restarting on port: {}", enip_port);
//Stop Enip server
run_enip = 0;
@ -296,8 +288,7 @@ void interactive_client_command(const char* command, int client_fd)
run_enip = 1;
pthread_create(&enip_thread, NULL, enipThread, NULL);
}
else if (strncmp(command, "stop_enip()", 11) == 0)
{
else if (strncmp(command, "stop_enip()", 11) == 0) {
spdlog::info("Issued stop_enip() command");
if (run_enip)
{
@ -306,8 +297,7 @@ void interactive_client_command(const char* command, int client_fd)
spdlog::info("EtherNet/IP server was stopped");
}
}
else if (strncmp(command, "start_pstorage(", 15) == 0)
{
else if (strncmp(command, "start_pstorage(", 15) == 0) {
ServiceDefinition* def = services_find("pstorage");
if (def && copy_command_config(command + 15, command_buffer, BUFFER_MAX_SIZE) == 0)
{
@ -320,23 +310,20 @@ void interactive_client_command(const char* command, int client_fd)
def->stop();
}
}
else if (strncmp(command, "runtime_logs()", 14) == 0)
{
else if (strncmp(command, "runtime_logs()", 14) == 0) {
spdlog::debug("Issued runtime_logs() command");
std::string data = log_sink->data();
write(client_fd, data.c_str(), data.size());
return;
}
else if (strncmp(command, "exec_time()", 11) == 0)
{
else if (strncmp(command, "exec_time()", 11) == 0) {
time_t end_time;
time(&end_time);
int count_char = sprintf(command_buffer, "%llu\n", (unsigned long long)difftime(end_time, start_time));
write(client_fd, command_buffer, count_char);
return;
}
else
{
else {
int count_char = sprintf(command_buffer, "Error: unrecognized command\n");
write(client_fd, command_buffer, count_char);
return;

10
runtime/core/main.cpp
View File

@ -55,8 +55,7 @@ uint8_t run_openplc = 1; // Variable to control OpenPLC Runtime execution
/// \param ts
/// \param delay in milliseconds
////////////////////////////////////////////////////////////////////////////////
void sleep_until(struct timespec *ts, int delay)
{
void sleep_until(struct timespec *ts, int delay) {
ts->tv_nsec += delay;
if (ts->tv_nsec >= 1000*1000*1000)
{
@ -175,6 +174,13 @@ int main(int argc, char **argv)
{
std::lock_guard<std::mutex> guard(bufferLock);
// Make sure the buffer pointers are correct and
// attached to the user variables
glueVars();
// Read input image
updateBuffersIn();
updateCustomIn();
// Update input image table with data from slave devices
updateBuffersIn_MB();

3
runtime/core/pstorage.cpp
View File

@ -306,8 +306,7 @@ inline int8_t read_and_check(istream& input_stream, const char header[],
}
int8_t pstorage_read(istream& input_stream,
const GlueVariablesBinding& bindings)
{
const GlueVariablesBinding& bindings) {
// Read the file header - we define the file header as a constant that
// must be present as the header. We don't allow UTF BOMs here.
char header_check[FILE_HEADER_SIZE];

2
runtime/test/dnp3s/test_dnp3.cpp
View File

@ -133,7 +133,7 @@ SCENARIO("create_config", "")
{ IECLDT_IN, IECLST_BIT, 0, 0, IECVT_BOOL, &bool_var },
};
GlueVariablesBinding bindings(&glue_mutex, 1, glue_vars, nullptr);
auto input = "[dnp3s]\nbind_location=name:%IX0.0,group:12,index:1,"
auto input = "[dnp3s]\nbind_location=name:%IX0.0,group:12,index:1,";
std::stringstream input_stream(input);
auto config(dnp3_create_config(input_stream, bindings,
binary_commands, analog_commands,