Show timing information about scan requests in debug log

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index d234d0908804dde12bca69c85c95ec395c0e5619..308e82e94a069957ca9edc775b563ae62f93c50c 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -2745,8 +2745,14 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                break;
 #ifndef CONFIG_NO_SCAN_PROCESSING
        case EVENT_SCAN_STARTED:
+               os_get_reltime(&wpa_s->scan_start_time);
                if (wpa_s->own_scan_requested) {
-                       wpa_dbg(wpa_s, MSG_DEBUG, "Own scan request started a scan");
+                       struct os_reltime diff;
+
+                       os_reltime_sub(&wpa_s->scan_start_time,
+                                      &wpa_s->scan_trigger_time, &diff);
+                       wpa_dbg(wpa_s, MSG_DEBUG, "Own scan request started a scan in %ld.%06ld seconds",
+                               diff.sec, diff.usec);
                        wpa_s->own_scan_requested = 0;
                        wpa_s->own_scan_running = 1;
                        if (wpa_s->last_scan_req == MANUAL_SCAN_REQ &&
@@ -2763,6 +2769,15 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                }
                break;
        case EVENT_SCAN_RESULTS:
+               if (os_reltime_initialized(&wpa_s->scan_start_time)) {
+                       struct os_reltime now, diff;
+                       os_get_reltime(&now);
+                       os_reltime_sub(&now, &wpa_s->scan_start_time, &diff);
+                       wpa_s->scan_start_time.sec = 0;
+                       wpa_s->scan_start_time.usec = 0;
+                       wpa_dbg(wpa_s, MSG_DEBUG, "Scan completed in %ld.%06ld seconds",
+                               diff.sec, diff.usec);
+               }
                wpa_supplicant_event_scan_results(wpa_s, data);
                wpa_s->own_scan_running = 0;
                wpa_s->external_scan_running = 0;

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 4d8826fa3c90087a1e8d77ee017e7117851bd532..9dbf5235e838bba3e828bc9c39d73de1f65478f4 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -478,7 +478,7 @@ struct wpa_supplicant {
                 */
                MANUAL_SCAN_REQ
        } scan_req, last_scan_req;
-       struct os_reltime scan_trigger_time;
+       struct os_reltime scan_trigger_time, scan_start_time;
        int scan_runs; /* number of scan runs since WPS was started */
        int *next_scan_freqs;
        int *manual_scan_freqs;