diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2017-02-28 16:05:37 +0100 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-02-28 21:45:49 +0100 |
commit | 2e93fc880e497ac553111ba27f2de4b44ea94027 (patch) | |
tree | adfab9bad8904c56df6fdb0682e13ad154ebcc7f /src/can_event_push.cpp | |
parent | c009c3c329d30acfb6be3a8ed0671a9a07266546 (diff) |
Make the thread function members of can_bus_t and can_bus_dev_t objects.
Change-Id: I3cf06998c6ff6d859c7fdf6bf52a9b6ff061c556
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/can_event_push.cpp')
-rw-r--r-- | src/can_event_push.cpp | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/src/can_event_push.cpp b/src/can_event_push.cpp deleted file mode 100644 index 3baaaf77..00000000 --- a/src/can_event_push.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2015, 2016 "IoT.bzh" - * Author "Romain Forlot" <romain.forlot@iot.bzh> - * Author "Loic Collignon" <loic.collignon@iot.bzh> - * - * 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. - */ - -#include "can_event_push.hpp" - -#include "can-bus.hpp" -#include "can-signals.hpp" -#include "openxc-utils.hpp" - -#include "can_decode_message.hpp" - -void can_event_push(can_bus_t& can_bus) -{ - openxc_VehicleMessage v_message; - openxc_SimpleMessage s_message; - json_object* jo; - - while(can_bus.is_pushing()) - { - { - std::unique_lock<std::mutex> decoded_can_message_lock(can_bus.get_decoded_can_message_mutex()); - can_bus.get_new_decoded_can_message().wait(decoded_can_message_lock); - v_message = can_bus.next_vehicle_message(); - } - - s_message = get_simple_message(v_message); - - { - std::lock_guard<std::mutex> subscribed_signals_lock(get_subscribed_signals_mutex()); - std::map<std::string, struct afb_event> subscribed_signals = get_subscribed_signals(); - const auto& it_event = subscribed_signals.find(s_message.name); - if(it_event != subscribed_signals.end() && afb_event_is_valid(it_event->second)) - { - jo = json_object_new_object(); - jsonify_simple(s_message, jo); - afb_event_push(it_event->second, jo); - } - } - } -}
\ No newline at end of file |