-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
sync-with-eclipse-ecal-2024-07-17 #73
Merged
Merged
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
1b9dee5
sync-with-eclipse-ecal-2024-07-17
rex-schilasky 9a54764
boolean return
rex-schilasky e911e27
small adaptions
rex-schilasky ce076d0
configuration fixed for publisher/subcriber definitions
rex-schilasky 48bd168
partly reverted
rex-schilasky 6eedea0
pub/sub config included in build
rex-schilasky 07f4cfe
test should work independently
rex-schilasky File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* =========================== LICENSE ================================= | ||
| * | ||
| * Copyright (C) 2016 - 2024 Continental Corporation | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * =========================== LICENSE ================================= | ||
| */ | ||
|
|
||
| /** | ||
| * @file ecal_application_config.h | ||
| * @brief eCAL configuration for applications | ||
| **/ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <string> | ||
| #include <ecal/ecal_os.h> | ||
| #include <cstddef> | ||
|
|
||
| namespace eCAL | ||
| { | ||
| namespace Application | ||
| { | ||
| namespace Sys | ||
| { | ||
| struct Configuration | ||
| { | ||
| std::string filter_excl; //!< | ||
| }; | ||
| } | ||
|
|
||
| namespace Startup | ||
| { | ||
| struct Configuration | ||
| { | ||
| std::string terminal_emulator; //!< | ||
| }; | ||
| } | ||
|
|
||
| struct Configuration | ||
| { | ||
| Sys::Configuration sys; //!< | ||
| Startup::Configuration startup; //!< | ||
| }; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* =========================== LICENSE ================================= | ||
| * | ||
| * Copyright (C) 2016 - 2024 Continental Corporation | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * =========================== LICENSE ================================= | ||
| */ | ||
|
|
||
| /** | ||
| * @file configuration.h | ||
| * @brief eCAL configuration interface | ||
| **/ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <ecal/config/application.h> | ||
| #include <ecal/config/monitoring.h> | ||
| #include <ecal/config/registration.h> | ||
| #include <ecal/config/service.h> | ||
| #include <ecal/config/logging.h> | ||
| #include <ecal/config/transport_layer.h> | ||
| #include <ecal/config/user_arguments.h> | ||
| #include <ecal/config/publisher.h> | ||
| #include <ecal/config/subscriber.h> | ||
| #include <ecal/config/time.h> | ||
| #include <ecal/types/ecal_custom_data_types.h> | ||
|
|
||
|
|
||
| #include "ecal/ecal_os.h" | ||
| #include "ecal/ecal_log_level.h" | ||
|
|
||
| #include <string> | ||
| #include <vector> | ||
| #include <iostream> | ||
| #include <chrono> | ||
|
|
||
| namespace eCAL | ||
| { | ||
| struct Configuration | ||
| { | ||
| Registration::Configuration registration{}; | ||
| TransportLayer::Configuration transport_layer{}; | ||
| Monitoring::Configuration monitoring{}; | ||
| Subscriber::Configuration subscriber{}; | ||
| Publisher::Configuration publisher{}; | ||
| Time::Configuration timesync{}; | ||
| Service::Configuration service{}; | ||
| Application::Configuration application{}; | ||
| Logging::Configuration logging{}; | ||
| Cli::Configuration command_line_arguments{}; | ||
|
|
||
| ECAL_API Configuration(); | ||
| ECAL_API Configuration(int argc_, char** argv_); | ||
| ECAL_API Configuration(std::vector<std::string>& args_); | ||
|
|
||
| ECAL_API void InitConfigWithDefaultIni(); | ||
| ECAL_API void InitConfig(std::string ini_path_ = std::string("")); | ||
|
|
||
| ECAL_API std::string GetIniFilePath(); | ||
|
|
||
| friend class CmdParser; | ||
|
|
||
| protected: | ||
| std::string ecal_ini_file_path{}; | ||
|
|
||
| private: | ||
| ECAL_API void Init(std::vector<std::string>& args_); | ||
| }; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* =========================== LICENSE ================================= | ||
| * | ||
| * Copyright (C) 2016 - 2024 Continental Corporation | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * =========================== LICENSE ================================= | ||
| */ | ||
|
|
||
| /** | ||
| * @file ecal_logging_config.h | ||
| * @brief eCAL configuration for logging | ||
| **/ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <ecal/ecal_log_level.h> | ||
|
|
||
| namespace eCAL | ||
| { | ||
| namespace Logging | ||
| { | ||
| struct Configuration | ||
| { | ||
| eCAL_Logging_Filter filter_log_con{}; /*!< Log messages logged to console (all, info, warning, error, fatal, debug1, debug2, debug3, debug4) | ||
| (Default: info, warning, error, fatal)*/ | ||
| eCAL_Logging_Filter filter_log_file{}; //!< Log messages to logged into file system (Default: "") | ||
| eCAL_Logging_Filter filter_log_udp{}; //!< Log messages logged via udp network (Default: info, warning, error, fatal) | ||
| }; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* =========================== LICENSE ================================= | ||
| * | ||
| * Copyright (C) 2016 - 2024 Continental Corporation | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * =========================== LICENSE ================================= | ||
| */ | ||
|
|
||
| /** | ||
| * @file ecal_monitoring_config.h | ||
| * @brief eCAL configuration for monitoring | ||
| **/ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <ecal/types/ecal_custom_data_types.h> | ||
|
|
||
| namespace eCAL | ||
| { | ||
| namespace Monitoring | ||
| { | ||
| namespace UDP | ||
| { | ||
| struct Configuration | ||
| { | ||
| }; | ||
| } | ||
|
|
||
| namespace SHM | ||
| { | ||
| struct Configuration | ||
| { | ||
| std::string shm_monitoring_domain{}; //!< Domain name for shared memory based monitoring/registration (Default: ecal_mon) | ||
| size_t shm_monitoring_queue_size{}; //!< Queue size of monitoring/registration events (Default: 1024) | ||
| }; | ||
| } | ||
|
|
||
| struct Configuration | ||
| { | ||
| eCAL::Types::ConstrainedInteger<1000, 1000> monitoring_timeout{}; //!< Timeout for topic monitoring in ms (Default: 5000) | ||
| UDP::Configuration udp_options{}; | ||
| SHM::Configuration shm_options{}; | ||
|
|
||
| std::string filter_excl{}; //!< Topics blacklist as regular expression (will not be monitored) (Default: "__.*") | ||
| std::string filter_incl{}; //!< Topics whitelist as regular expression (will be monitored only) (Default: "") | ||
| }; | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: function 'eCAL::Configuration::Init' has a definition with different parameter names [readability-inconsistent-declaration-parameter-name]
Additional context
ecal/core/src/config/ecal_config_initializer.cpp:229: the definition seen here
ecal/core/include/ecal/config/configuration.h:77: differing parameters are named here: ('args_'), in definition: ('arguments_')