#include <time.h>
#include <linux/can.h>
#include <json-c/json.h>
-#include <systemd/sd-event.h>
#include "openxc.pb.h"
#include "configuration.hpp"
static int make_subscription_unsubscription(struct afb_req request, const std::string& sig_name, std::map<std::string, struct afb_event>& s, bool subscribe)
{
/* Make the subscription or unsubscription to the event */
- if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, s[sig_name.c_str()])) < 0)
+ if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, s[sig_name])) < 0)
{
- ERROR(binder_interface, "Operation goes wrong for signal: %s", sig_name);
+ ERROR(binder_interface, "Operation goes wrong for signal: %s", sig_name.c_str());
return 0;
}
return 1;
s[sig_name] = afb_daemon_make_event(binder_interface->daemon, sig_name.c_str());
if (!afb_event_is_valid(s[sig_name]))
{
- ERROR(binder_interface, "Can't create an event, something goes wrong.");
+ ERROR(binder_interface, "Can't create an event for %s, something goes wrong.", sig_name.c_str());
return 0;
}
return 1;
}
-static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, const std::string& sig, DiagnosticRequest* diag_req, int frequency)
-{
- int ret;
- sd_event_source *source;
-
- std::lock_guard<std::mutex> subscribed_signals_lock(get_subscribed_signals_mutex());
- std::map<std::string, struct afb_event>& s = get_subscribed_signals();
- if (s.find(sig) != s.end() && !afb_event_is_valid(s[sig]))
- {
- if(!subscribe)
- {
- NOTICE(binder_interface, "Event isn't valid, it can't be unsubscribed.");
- ret = -1;
- }
- else
- {
- /* Event it isn't valid anymore, recreate it */
- sd_event_add_time(afb_daemon_get_event_loop(binder_interface->daemon), &source, CLOCK_MONOTONIC, frequency, 0,
- configuration_t::instance().get_diagnostic_manager().send_request, diag_req);
- ret = create_event_handle(sig, s);
- }
- }
- else
- {
- /* Event doesn't exist , so let's create it */
- struct afb_event empty_event = {nullptr, nullptr};
- subscribed_signals[sig] = empty_event;
- ret = create_event_handle(sig, s);
- }
-
- /* Check whether or not the event handler has been correctly created and
- * make the subscription/unsubscription operation is so.
- */
- if (ret <= 0)
- return ret;
- return make_subscription_unsubscription(request, sig, s, subscribe);
-}
-
static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, const std::string& sig)
{
int ret;
static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<std::string>& signals)
{
int rets = 0;
- //TODO: Implement way to dynamically call the right function no matter
+
+ //TODO: Implement way to dynamically call the right function no matter
// how much signals types we have.
- const std::string& can_prefix = configuration_t::instance().get_can_signals().front().get_prefix();
- const std::string& obd2_prefix = configuration_t::instance().get_obd2_signals().front().get_prefix();
for(const std::string& sig : signals)
{
int ret;
- if (sig.find_first_of(can_prefix.c_str(), 0, can_prefix.size()))
- ret = subscribe_unsubscribe_signal(request, subscribe, sig);
- else if (sig.find_first_of(obd2_prefix.c_str(), 0, obd2_prefix.size()))
+ if (active_diagnostic_request_t::is_diagnostic_signal(sig) && subscribe)
{
std::vector<obd2_signal_t*> found;
configuration_t::instance().find_obd2_signals(build_DynamicField(sig), found);
configuration_t::instance().get_diagnostic_manager().add_recurring_request(
diag_req, sig.c_str(), false, obd2_signal_t::decode_obd2_response, nullptr, (float)frequency);
//TODO: Adding callback requesting ignition status: diag_req, sig.c_str(), false, obd2_signal_t::decode_obd2_response, obd2_signal_t::check_ignition_status, frequency);
- ret = subscribe_unsubscribe_signal(request, subscribe, sig, diag_req,frequency);
}
- else
- ret = -1;
+ ret = subscribe_unsubscribe_signal(request, subscribe, sig);
if(ret <= 0)
return ret;
+
rets++;
DEBUG(binder_interface, "Signal: %s subscribed", sig.c_str());
}
ret = 0;
ret = subscribe_unsubscribe_signals(request, subscribe, signals);
- NOTICE(binder_interface, "Subscribed correctly to %d/%d signal(s).", ret, (int)signals.size());
+ NOTICE(binder_interface, "Subscribed/unsubscribe correctly to %d/%d signal(s).", ret, (int)signals.size());
return ret;
}
/**
* @brief Initialize the binding.
- *
+ *
* @param[in] service Structure which represent the Application Framework Binder.
- *
+ *
* @return Exit code, zero if success.
*/
int afbBindingV1ServiceInit(struct afb_service service)
/// Initialize CAN socket
if(can_bus_manager.init_can_dev() == 0)
- {
can_bus_manager.start_threads();
- return 0;
- }
- /// Initialize Diagnostic manager that will handle obd2 requests
- diagnostic_manager_t& diag_manager = configuration_t::instance().get_diagnostic_manager();
- diag_manager.initialize(can_bus_manager.get_can_devices().front());
+ /// Initialize Diagnostic manager that will handle obd2 requests.
+ /// We pass by default the first CAN bus device to its Initialization.
+ /// TODO: be able to choose the CAN bus device that will be use as Diagnostic bus.
+ if(configuration_t::instance().get_diagnostic_manager().initialize(can_bus_manager.get_can_devices().front()))
+ return 0;
ERROR(binder_interface, "There was something wrong with CAN device Initialization. Check your config file maybe");
return 1;
Code Review / apps / low-level-can-service.git / blobdiff