}
}
-int read(sd_event_source *s, int fd, uint32_t revents, void *userdata)
+static void push_n_notify(const can_message_t& cm)
{
- can_signal_t* sig= (can_signal_t*)userdata;
- sig->read_socket();
+ can_bus_t& cbm = configuration_t::instance().get_can_bus_manager();
+ std::lock_guard<std::mutex> can_message_lock(cbm.get_can_message_mutex());
+ { cbm.push_new_can_message(cm); }
+ cbm.get_new_can_message_cv().notify_one();
+}
+
+int read_message(sd_event_source *s, int fd, uint32_t revents, void *userdata)
+{
+ can_message_t cm;
+ can_signal_t* sig;
+ diagnostic_manager_t& diag_m = configuration_t::instance().get_diagnostic_manager();
+
+ if(userdata != nullptr)
+ {
+ sig = (can_signal_t*)userdata;
+ utils::socketcan_bcm_t s = sig->get_socket();
+ s >> cm;
+ }
+ else
+ {
+ utils::socketcan_bcm_t s = diag_m.get_socket();
+ s >> cm;
+ }
+
+ push_n_notify(cm);
/* check if error or hangup */
if ((revents & (EPOLLERR|EPOLLRDHUP|EPOLLHUP)) != 0)
{
sd_event_source_unref(s);
- sig->get_socket().close();
- sig->create_rx_filter();
+ if(userdata != nullptr)
+ {
+ sig->get_socket().close();
+ sig->create_rx_filter();
+ NOTICE(binder_interface, "%s: Recreated RX_SETUP BCM job for signal: %s", __FUNCTION__, sig->get_name().c_str());
+ }
+ else
+ {
+ diag_m.get_socket().close();
+ diag_m.cleanup_active_requests(true);
+ ERROR(binder_interface, "%s: Error on diagnostic manager socket, cancelling active requests.", __FUNCTION__);
+ }
+ return -1;
}
+
return 0;
}
+
///******************************************************************************
///
/// Subscription and unsubscription
///
static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const struct utils::signals_found& signals)
{
- int ret, rets = 0;
+ int rets = 0;
//TODO: Implement way to dynamically call the right function no matter
// how much signals types we have.
for(const auto& sig : signals.diagnostic_messages)
{
+ int ret = 0;
diagnostic_manager_t& diag_m = conf.get_diagnostic_manager();
DiagnosticRequest* diag_req = conf.get_request_from_diagnostic_message(sig->get_name());
// poll a PID for nothing.
if(sig->get_supported() && subscribe)
{
- float frequency = sig->get_frequency();
- subscribe = diag_m.add_recurring_request(
- diag_req, sig->get_name().c_str(), false, sig->get_decoder(), sig->get_callback(), (float)frequency);
- //TODO: Adding callback requesting ignition status: diag_req, sig.c_str(), false, diagnostic_message_t::decode_obd2_response, diagnostic_message_t::check_ignition_status, frequency);
+ float frequency = sig->get_frequency();
+ diag_m.add_recurring_request(diag_req, sig->get_name().c_str(), false, sig->get_decoder(), sig->get_callback(), (float)frequency);
+ //TODO: Adding callback requesting ignition status: diag_req, sig.c_str(), false, diagnostic_message_t::decode_obd2_response, diagnostic_message_t::check_ignition_status, frequency);
}
else
{
return -1;
}
struct sd_event_source* e_source;
- sd_event_add_io(afb_daemon_get_event_loop(binder_interface->daemon), &e_source, sig->get_socket().socket(), EPOLLIN, read, sig.get());
+ sd_event_add_io(afb_daemon_get_event_loop(binder_interface->daemon), &e_source, sig->get_socket().socket(), EPOLLIN, read_message, sig.get());
rets++;
DEBUG(binder_interface, "%s: signal: %s subscribed", __FUNCTION__, sig->get_name().c_str());
}
return rets;
}
-static int process_args(struct afb_req request, std::vector<std::string> args, bool subscribe)
+static int process_args(struct afb_req request, const std::map<std::string, struct event_filter_t>& args, bool subscribe)
{
struct utils::signals_found sf;
int ok = 0, total = 0;
for(const auto& sig: args)
{
- openxc_DynamicField search_key = build_DynamicField(sig);
+ openxc_DynamicField search_key = build_DynamicField(sig.first);
sf = utils::signals_manager_t::instance().find_signals(search_key);
total = (int)sf.can_signals.size() + (int)sf.diagnostic_messages.size();
if (sf.can_signals.empty() && sf.diagnostic_messages.empty())
- NOTICE(binder_interface, "%s: No signal(s) found for %s.", __FUNCTION__, sig.c_str());
+ NOTICE(binder_interface, "%s: No signal(s) found for %s.", __FUNCTION__, sig.first.c_str());
else
ok = subscribe_unsubscribe_signals(request, subscribe, sf);
}
return ok;
}
-static const std::vector<std::string> parse_args_from_request(struct afb_req request, bool subscribe)
+static int parse_filter(json_object* event, struct event_filter_t* event_filter)
{
- int i, n;
- std::vector<std::string> ret;
- struct json_object *args, *a, *x;
+ struct json_object *filter, *obj;
+ int ret = 0;
+
+ if (json_object_object_get_ex(event, "filter", &filter))
+ {
+ event_filter->frequency = -1.0;
+ event_filter->min = -1.0;
+ event_filter->max = -1.0;
+ if (json_object_object_get_ex(filter, "frequency", &obj)
+ && json_object_get_type(obj) == json_type_double)
+ {
+ event_filter->frequency = json_object_get_double(obj);
+ ret += 1;
+ }
+ if (json_object_object_get_ex(filter, "min", &obj)
+ && json_object_get_type(obj) == json_type_double)
+ {
+ event_filter->min = json_object_get_double(obj);
+ ret += 2;
+ }
+ if (json_object_object_get_ex(filter, "max", &obj)
+ && json_object_get_type(obj) == json_type_double)
+ {
+ event_filter->max = json_object_get_double(obj);
+ ret += 4;
+ }
+ }
+
+ return ret;
+}
+static const std::map<std::string, struct event_filter_t> parse_args_from_request(struct afb_req request)
+{
+ int i, n;
+ std::map<std::string, struct event_filter_t> ret;
+ struct json_object *args, *event, *x;
+ struct event_filter_t event_filter;
+
/* retrieve signals to subscribe */
args = afb_req_json(request);
- if (args == NULL || !json_object_object_get_ex(args, "event", &a))
+ if (args == NULL || !json_object_object_get_ex(args, "event", &event))
{
- ret.push_back("*");
+ event = json_object_new_string("*");
+ parse_filter(event, &event_filter);
+ ret["*"] = event_filter;
}
- else if (json_object_get_type(a) != json_type_array)
+ else if (json_object_get_type(event) != json_type_array)
{
- ret.push_back(json_object_get_string(a));
+ const std::string event_pattern = std::string(json_object_get_string(event));
+ parse_filter(event, &event_filter);
+ ret[event_pattern] = event_filter;
}
else
{
- n = json_object_array_length(a);
+ n = json_object_array_length(event);
for (i = 0 ; i < n ; i++)
{
- x = json_object_array_get_idx(a, i);
- ret.push_back(json_object_get_string(x));
+ x = json_object_array_get_idx(event, i);
+ const std::string event_pattern = std::string(json_object_get_string(x));
+ parse_filter(x, &event_filter);
+ ret[event_pattern] = event_filter;
}
}
void subscribe(struct afb_req request)
{
- std::vector<std::string> args;
bool subscribe = true;
- args = parse_args_from_request(request, subscribe);
+ const std::map<std::string, struct event_filter_t> args = parse_args_from_request(request);
if (process_args(request, args, subscribe) > 0)
afb_req_success(request, NULL, NULL);
void unsubscribe(struct afb_req request)
{
- std::vector<std::string> args;
bool subscribe = false;
- args = parse_args_from_request(request, subscribe);
+ const std::map<std::string, struct event_filter_t> args = parse_args_from_request(request);
if (process_args(request, args, subscribe) > 0)
afb_req_success(request, NULL, NULL);
Code Review / apps / low-level-can-service.git / blobdiff