X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdiagnostic%2Fdiagnostic-manager.cpp;h=e3a78d0f69f431246b78ddb6ac0a3404f87806e7;hb=3aa89d6f3d38ce0513d8698f2ae7b23f8c6edfb9;hp=fcfd1994052abc46d51802098ce6d230ce8a2f34;hpb=7a014d3b795401a2a728398dea8b06dcb931c119;p=apps%2Flow-level-can-service.git

diff --git a/src/diagnostic/diagnostic-manager.cpp b/src/diagnostic/diagnostic-manager.cpp
index fcfd199..e3a78d0 100644
--- a/src/diagnostic/diagnostic-manager.cpp
+++ b/src/diagnostic/diagnostic-manager.cpp
@@ -166,18 +166,17 @@ void diagnostic_manager_t::cancel_request(active_diagnostic_request_t* entry)
 /// @param[in] force - Force the cleaning or not ?
 void diagnostic_manager_t::cleanup_request(active_diagnostic_request_t* entry, bool force)
 {
-	if((force || (entry->get_in_flight() && entry->request_completed())) && entry != nullptr)
+	if((force || (entry != nullptr && entry->get_in_flight() && entry->request_completed())))
 	{
 		entry->set_in_flight(false);
 
 		char request_string[128] = {0};
 		diagnostic_request_to_string(&entry->get_handle()->request,
 			request_string, sizeof(request_string));
-		if(entry->get_recurring())
+		if(force && entry->get_recurring())
 		{
 			find_and_erase(entry, recurring_requests_);
-			if(force)
-				cancel_request(entry);
+			cancel_request(entry);
 			DEBUG(binder_interface, "cleanup_request: Cancelling completed, recurring request: %s", request_string);
 		}
 		else
@@ -273,13 +272,13 @@ bool diagnostic_manager_t::add_request(DiagnosticRequest* request, const std::st
 
 			find_and_erase(entry, non_recurring_requests_);
 			DEBUG(binder_interface, "Added one-time diagnostic request on bus %s: %s",
-					bus_, request_string);
+					bus_.c_str(), request_string);
 
 			non_recurring_requests_.push_back(entry);
 	}
 	else
 	{
-		WARNING(binder_interface, "There isn't enough request entry. Vector exhausted %d/%d", (int)non_recurring_requests_.size());
+		WARNING(binder_interface, "There isn't enough request entry. Vector exhausted %d/%d", (int)non_recurring_requests_.size(), MAX_SIMULTANEOUS_DIAG_REQUESTS);
 		non_recurring_requests_.resize(MAX_SIMULTANEOUS_DIAG_REQUESTS);
 		added = false;
 	}
@@ -289,7 +288,7 @@ bool diagnostic_manager_t::add_request(DiagnosticRequest* request, const std::st
 bool diagnostic_manager_t::validate_optional_request_attributes(float frequencyHz)
 {
 	if(frequencyHz > MAX_RECURRING_DIAGNOSTIC_FREQUENCY_HZ) {
-		DEBUG(binder_interface, "Requested recurring diagnostic frequency %d is higher than maximum of %d",
+		DEBUG(binder_interface, "Requested recurring diagnostic frequency %lf is higher than maximum of %d",
 			frequencyHz, MAX_RECURRING_DIAGNOSTIC_FREQUENCY_HZ);
 		return false;
 	}
@@ -370,17 +369,27 @@ bool diagnostic_manager_t::add_recurring_request(DiagnosticRequest* request, con
 					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_.c_str(), request_string);
+			//start_diagnostic_request(&shims_, entry->get_handle());
+			//char request_string[128] = {0};
+			//diagnostic_request_to_string(&entry->get_handle()->request, request_string,
+			//		sizeof(request_string));
 
 			uint64_t usec;
-			sd_event_now(afb_daemon_get_event_loop(binder_interface->daemon), CLOCK_MONOTONIC, &usec);
+			sd_event_now(afb_daemon_get_event_loop(binder_interface->daemon), CLOCK_BOOTTIME, &usec);
+			if(recurring_requests_.size() > 0)
+			{
+				DEBUG(binder_interface, "add_recurring_request: Added 100ms to usec to stagger sending requests");
+				usec += 100000;
+			}
+
+			DEBUG(binder_interface, "add_recurring_request: Added recurring diagnostic request (freq: %f) on bus %s at %ld. Event loop state: %d",
+					frequencyHz,
+					bus_.c_str(),
+					usec,
+					sd_event_get_state(afb_daemon_get_event_loop(binder_interface->daemon)));
+
 			if(sd_event_add_time(afb_daemon_get_event_loop(binder_interface->daemon), &source,
-					CLOCK_MONOTONIC, usec, TIMERFD_ACCURACY, send_request, request) < 0)
+					CLOCK_BOOTTIME, usec, TIMERFD_ACCURACY, send_request, request) < 0)
 			{
 				ERROR(binder_interface, "add_recurring_request: Request fails to be schedule through event loop");
 				added = false;
@@ -411,7 +420,8 @@ bool diagnostic_manager_t::conflicting(active_diagnostic_request_t* request, act
 }
 
 
-/// @brief Returns true if there are no other active requests to the same arbitration ID.
+/// @brief Returns true if there are no other active requests to the same arbitration ID
+/// and if there aren't more than 8 requests in flight at the same time.
 bool diagnostic_manager_t::clear_to_send(active_diagnostic_request_t* request) const
 {
 	int total_in_flight = 0;
@@ -438,7 +448,7 @@ bool diagnostic_manager_t::clear_to_send(active_diagnostic_request_t* request) c
 
 int diagnostic_manager_t::reschedule_request(sd_event_source *s, uint64_t usec, active_diagnostic_request_t* adr)
 {
-	usec = usec + (uint64_t)(frequency_clock_t::frequency_to_period(adr->get_frequency_clock().get_frequency())*MICRO);
+	usec = usec + (uint64_t)(adr->get_frequency_clock().frequency_to_period());
 	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) >= 0)
 		if(sd_event_source_set_enabled(s, SD_EVENT_ON) >= 0)
@@ -464,6 +474,7 @@ int diagnostic_manager_t::send_request(sd_event_source *s, uint64_t usec, void *
 	DiagnosticRequest* request = (DiagnosticRequest*)userdata;
 	active_diagnostic_request_t* adr = dm.find_recurring_request(request);
 
+	dm.cleanup_active_requests(false);
 	if(adr != nullptr && adr->get_can_bus_dev() == dm.get_can_bus_dev() && adr->should_send() &&
 		dm.clear_to_send(adr))
 	{
@@ -480,13 +491,13 @@ int diagnostic_manager_t::send_request(sd_event_source *s, uint64_t usec, void *
 		adr->set_in_flight(true);
 	}
 
-	if(adr->get_recurring())
+	if(adr != nullptr && adr->get_recurring())
 	{
 		return dm.reschedule_request(s, usec, adr);
 	}
 
 	sd_event_source_unref(s);
-	ERROR(binder_interface, "send_request: Something goes wrong when submitting a new request to the CAN bus");
+	NOTICE(binder_interface, "send_request: Request doesn't exist anymore. Canceling.'");
 	return -2;
 }