#define MAX_RECURRING_DIAGNOSTIC_FREQUENCY_HZ 10
#define MAX_SIMULTANEOUS_DIAG_REQUESTS 50
-#define MAX_REQUEST_ENTRIES 50
+#define TIMERFD_ACCURACY 0
#define MICRO 1000000
diagnostic_manager_t::diagnostic_manager_t()
- : request_list_entries_(MAX_REQUEST_ENTRIES, new active_diagnostic_request_t()), initialized_{false}
+ : initialized_{false}
{}
bool diagnostic_manager_t::initialize(std::shared_ptr<can_bus_dev_t> cbd)
DEBUG(binder_interface, "Clearing existing diagnostic requests");
cleanup_active_requests(true);
}
-
- for(uint8_t i = 0; i < MAX_REQUEST_ENTRIES; i++)
- {
- free_request_entries_.push_back(request_list_entries_.back());
- request_list_entries_.pop_back();
- }
}
/// CAN filters it used.
void diagnostic_manager_t::cancel_request(active_diagnostic_request_t* entry)
{
- free_request_entries_.push_back(entry);
+
/* TODO: implement acceptance filters.
if(entry.arbitration_id_ == OBD2_FUNCTIONAL_BROADCAST_ID) {
for(uint32_t filter = OBD2_FUNCTIONAL_RESPONSE_START;
find_and_erase(entry, recurring_requests_);
if(force)
cancel_request(entry);
- else
- {
- DEBUG(binder_interface, "Moving completed recurring request to the back of the queue: %s", request_string);
- recurring_requests_.push_back(entry);
- }
}
else
{
- DEBUG(binder_interface, "Cancelling completed, non-recurring request: %s", request_string);
+ DEBUG(binder_interface, "cleanup_request: Cancelling completed, non-recurring request: %s", request_string);
find_and_erase(entry, non_recurring_requests_);
cancel_request(entry);
}
}
}
-/// @brief Clean up the request list, move as many to the free list as possible
+/// @brief Clean up the request list
void diagnostic_manager_t::cleanup_active_requests(bool force)
{
for(auto& entry : non_recurring_requests_)
- cleanup_request(entry, force);
+ if (entry != nullptr)
+ cleanup_request(entry, force);
for(auto& entry : recurring_requests_)
- cleanup_request(entry, force);
+ if (entry != nullptr)
+ cleanup_request(entry, force);
}
-/// @brief Note that this pops it off of whichver list it was on and returns it, so make
-/// sure to add it to some other list or it'll be lost.
+/// @brief Will return the active_diagnostic_request_t pointer of found request or nullptr if
+/// not found.
active_diagnostic_request_t* diagnostic_manager_t::find_recurring_request(const DiagnosticRequest* request)
{
for (auto& entry : recurring_requests_)
{
- active_diagnostic_request_t* candidate = entry;
- if(diagnostic_request_equals(&candidate->get_handle()->request, request))
+ if(entry != nullptr)
{
- find_and_erase(entry, recurring_requests_);
- return entry;
- break;
+ if(diagnostic_request_equals(&entry->get_handle()->request, request))
+ {
+ return entry;
+ break;
+ }
}
}
return nullptr;
return bus_;
}
-active_diagnostic_request_t* diagnostic_manager_t::get_free_entry()
-{
- if (free_request_entries_.empty())
- return nullptr;
-
- active_diagnostic_request_t* adr = free_request_entries_.back();
- free_request_entries_.pop_back();
- return adr;
-}
-
bool diagnostic_manager_t::add_request(DiagnosticRequest* request, const std::string name,
bool wait_for_multiple_responses, const DiagnosticResponseDecoder decoder,
const DiagnosticResponseCallback callback)
cleanup_active_requests(false);
bool added = true;
- active_diagnostic_request_t* entry = get_free_entry();
- if (entry != nullptr)
+ if (non_recurring_requests_.size() <= MAX_SIMULTANEOUS_DIAG_REQUESTS)
{
// TODO: implement Acceptance Filter
// if(updateRequiredAcceptanceFilters(bus, request)) {
- entry = new active_diagnostic_request_t(bus_, request, name,
+ active_diagnostic_request_t* entry = new active_diagnostic_request_t(bus_, request, name,
wait_for_multiple_responses, decoder, callback, 0);
entry->set_handle(shims_, request);
}
else
{
- WARNING(binder_interface, "There isn't enough request entry. Vector exhausted %d/%d", (int)request_list_entries_.size(), (int)request_list_entries_.max_size());
+ WARNING(binder_interface, "There isn't enough request entry. Vector exhausted %d/%d", (int)non_recurring_requests_.size());
+ non_recurring_requests_.resize(MAX_SIMULTANEOUS_DIAG_REQUESTS);
added = false;
}
return added;
bool added = true;
if(find_recurring_request(request) == nullptr)
{
- active_diagnostic_request_t* entry = get_free_entry();
-
- if(entry != nullptr)
+ if(recurring_requests_.size() <= MAX_SIMULTANEOUS_DIAG_REQUESTS)
{
sd_event_source *source;
// TODO: implement Acceptance Filter
//if(updateRequiredAcceptanceFilters(bus, request)) {
- entry = new active_diagnostic_request_t(bus_, request, name,
- wait_for_multiple_responses, decoder, callback, frequencyHz);
- entry->set_handle(shims_, request);
-
- char request_string[128] = {0};
- diagnostic_request_to_string(&entry->get_handle()->request, request_string,
- sizeof(request_string));
-
- find_and_erase(entry, recurring_requests_);
- DEBUG(binder_interface, "Added recurring diagnostic request (freq: %f) on bus %s: %s",
- frequencyHz, bus_->get_device_name().c_str(), request_string);
-
- if(sd_event_add_time(afb_daemon_get_event_loop(binder_interface->daemon), &source,
- CLOCK_MONOTONIC, (uint64_t)frequencyHz*MICRO, 0,send_request, request) >= 0)
- {
- if(sd_event_source_set_enabled(source, SD_EVENT_ON) >= 0)
- recurring_requests_.push_back(entry);
- else
- {
- ERROR(binder_interface, "add_reccurring_request: Request has not been enabled, it will occurs only one time");
- free_request_entries_.push_back(entry);
- added = false;
- }
- }
- else
- {
- ERROR(binder_interface, "add_recurring_request: Request fails to be schedule through event loop");
- free_request_entries_.push_back(entry);
- added = false;
- }
+ active_diagnostic_request_t* entry = new active_diagnostic_request_t(bus_, request, name,
+ wait_for_multiple_responses, decoder, callback, frequencyHz);
+ entry->set_handle(shims_, request);
+
+ char request_string[128] = {0};
+ diagnostic_request_to_string(&entry->get_handle()->request, request_string,
+ sizeof(request_string));
+
+ DEBUG(binder_interface, "add_recurring_request: Added recurring diagnostic request (freq: %f) on bus %s: %s",
+ frequencyHz, bus_->get_device_name().c_str(), request_string);
+
+ uint64_t usec;
+ sd_event_now(afb_daemon_get_event_loop(binder_interface->daemon), CLOCK_MONOTONIC, &usec);
+ if(sd_event_add_time(afb_daemon_get_event_loop(binder_interface->daemon), &source,
+ CLOCK_MONOTONIC, usec, TIMERFD_ACCURACY, send_request, request) < 0)
+ {
+ ERROR(binder_interface, "add_recurring_request: Request fails to be schedule through event loop");
+ added = false;
+ }
+ recurring_requests_.push_back(entry);
}
else
{
- WARNING(binder_interface, "There isn't enough request entry. Vector exhausted %d/%d", (int)request_list_entries_.size(), (int)request_list_entries_.max_size());
- free_request_entries_.push_back(entry);
+ WARNING(binder_interface, "add_recurring_request: There isn't enough request entry. Vector exhausted %d/%d", (int)recurring_requests_.size(), MAX_SIMULTANEOUS_DIAG_REQUESTS);
+ recurring_requests_.resize(MAX_SIMULTANEOUS_DIAG_REQUESTS);
added = false;
}
}
else
{
- DEBUG(binder_interface, "Can't add request, one already exists with same key");
+ DEBUG(binder_interface, "add_recurring_request: Can't add request, one already exists with same key");
added = false;
}
return added;
DiagnosticRequest* request = (DiagnosticRequest*)userdata;
active_diagnostic_request_t* adr = dm.find_recurring_request(request);
- if(adr != nullptr && adr->get_can_bus_dev() == dm.get_can_bus_dev() && adr->should_send() &&
- dm.clear_to_send(adr))
+// if(adr != nullptr && adr->get_can_bus_dev() == dm.get_can_bus_dev() && adr->should_send() &&
+// dm.clear_to_send(adr))
+ if(adr != nullptr && adr->get_can_bus_dev() == dm.bus_)
{
- DEBUG(binder_interface, "Got active_diagnostic_request from recurring_requests_ queue.");
adr->get_frequency_clock().tick();
- start_diagnostic_request(&dm.get_shims(), adr->get_handle());
+ start_diagnostic_request(&dm.shims_, adr->get_handle());
if(adr->get_handle()->completed && !adr->get_handle()->success)
{
- DEBUG(binder_interface, "Fatal error sending diagnostic request");
+ DEBUG(binder_interface, "send_request: Fatal error sending diagnostic request");
return 0;
}
adr->get_timeout_clock().tick();
adr->set_in_flight(true);
- return 1;
+
+ if(adr->get_recurring())
+ {
+ usec = usec + (uint64_t)(frequency_clock_t::frequency_to_period(adr->get_frequency_clock().get_frequency())*MICRO);
+ DEBUG(binder_interface, "send_request: Event loop state: %d. usec: %ld", sd_event_get_state(afb_daemon_get_event_loop(binder_interface->daemon)), usec);
+ if(sd_event_source_set_time(s, usec+1000000) >= 0)
+ if(sd_event_source_set_enabled(s, SD_EVENT_ON) >= 0)
+ return 1;
+ }
}
+ sd_event_source_unref(s);
+ ERROR(binder_interface, "send_request: Something goes wrong when submitting a new request to the CAN bus");
return -1;
}
return can_bus_dev->shims_send(arbitration_id, data, size);
}
-void diagnostic_manager_t::shims_logger(const char* m, ...)
+void diagnostic_manager_t::shims_logger(const char* format, ...)
{
- DEBUG(binder_interface, "%s", m);
+ va_list args;
+ va_start(args, format);
+
+ char buffer[256];
+ vsnprintf(buffer, 256, format, args);
+
+ DEBUG(binder_interface, "shims_logger: %s", buffer);
}
void diagnostic_manager_t::shims_timer()
{}
-