diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-05-11 01:12:11 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-05-11 01:12:11 +0200 |
| commit | 6222973c39ee02ad52a5d0b4b400024157ff2eeb (patch) | |
| tree | 08fff1571d6089dd7674166aac6e424a9826b4b3 /CAN-binder/low-can-binding/utils/signals.hpp | |
| parent | d253ada94487232ccd33b68a69fd44ff7840fab7 (diff) | |
Massive use of shared_ptr about signal and diag message. WIP
Vector of shared_ptr is made to shared ownership about object around project.
This is the default returned value by getter methods when lookup and manipulating
them.
Change-Id: Id37947bb5994b629f4bf3faecc5ffac81c55e1e6
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder/low-can-binding/utils/signals.hpp')
| -rw-r--r-- | CAN-binder/low-can-binding/utils/signals.hpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/CAN-binder/low-can-binding/utils/signals.hpp b/CAN-binder/low-can-binding/utils/signals.hpp index 053433ae..95fd692f 100644 --- a/CAN-binder/low-can-binding/utils/signals.hpp +++ b/CAN-binder/low-can-binding/utils/signals.hpp @@ -32,8 +32,8 @@ namespace utils { struct signals_found { - std::vector<can_signal_t*> can_signals; - std::vector<diagnostic_message_t*> diagnostic_messages; + std::vector<std::shared_ptr<can_signal_t> > can_signals; + std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_messages; }; class signals_manager_t @@ -51,29 +51,29 @@ namespace utils std::map<std::string, struct afb_event>& get_subscribed_signals(); struct signals_found find_signals(const openxc_DynamicField &key); - void find_diagnostic_messages(const openxc_DynamicField &key, std::vector<diagnostic_message_t*>& found_signals); - void find_can_signals(const openxc_DynamicField &key, std::vector<can_signal_t*>& found_signals); + void find_diagnostic_messages(const openxc_DynamicField &key, std::vector<std::shared_ptr<diagnostic_message_t> >& found_signals); + void find_can_signals(const openxc_DynamicField &key, std::vector<std::shared_ptr<can_signal_t> >& found_signals); template <typename T> - void lookup_signals_by_name(const std::string& key, std::vector<T>& signals, std::vector<T*>& found_signals) + void lookup_signals_by_name(const std::string& key, std::vector<std::shared_ptr<T> > signals, std::vector<std::shared_ptr<T> > found_signals) { - for(T& s : signals) + for(std::shared_ptr<T> s : signals) { - if(::fnmatch(key.c_str(), s.get_generic_name().c_str(), FNM_CASEFOLD) == 0) - found_signals.push_back(&s); - else if(::fnmatch(key.c_str(), s.get_name().c_str(), FNM_CASEFOLD) == 0) - found_signals.push_back(&s); + if(::fnmatch(key.c_str(), s->get_generic_name().c_str(), FNM_CASEFOLD) == 0) + found_signals.push_back(s); + else if(::fnmatch(key.c_str(), s->get_name().c_str(), FNM_CASEFOLD) == 0) + found_signals.push_back(s); } } template <typename T> - void lookup_signals_by_id(const double key, std::vector<T>& signals, std::vector<T*>& found_signals) + void lookup_signals_by_id(const double key, std::vector<std::shared_ptr<T> > signals, std::vector<std::shared_ptr<T> > found_signals) { - for(T& s : signals) + for(std::shared_ptr<T> s : signals) { - if(configuration_t::instance().get_signal_id(s) == key) + if(configuration_t::instance().get_signal_id(*s) == key) { - found_signals.push_back(&s); + found_signals.push_back(s); } } } |