Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3211edf3 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Gerrit Code Review
Browse files

Merge "Removed alarm callback execution statistics"

parents 508295c4 b5c7df84

system/osi/src/alarm.cc

+8 −18
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ typedef struct { 
  size_t rescheduled_count;

  size_t total_updates;

  period_ms_t last_update_ms;

  stat_t callback_execution;

  stat_t overdue_scheduling;

  stat_t premature_scheduling;

} alarm_stats_t;
@@ -155,8 +154,7 @@ static void timer_callback(void* data); 
static void callback_dispatch(void* context);

static bool timer_create_internal(const clockid_t clock_id, timer_t* timer);

static void update_scheduling_stats(alarm_stats_t* stats, period_ms_t now_ms,

                                    period_ms_t deadline_ms,

                                    period_ms_t execution_delta_ms);

                                    period_ms_t deadline_ms);

// Registers |queue| for processing alarm callbacks on |thread|.

// |queue| may not be NULL. |thread| may not be NULL.

static void alarm_register_processing_queue(fixed_queue_t* queue,
@@ -584,14 +582,12 @@ static void alarm_ready_generic(alarm_t* alarm, 
  std::lock_guard<std::recursive_mutex> cb_lock(*alarm->callback_mutex);

  lock.unlock();



  period_ms_t t0 = now();

  callback(data);

  period_ms_t t1 = now();



  // Update the statistics

  CHECK(t1 >= t0);

  period_ms_t delta = t1 - t0;

  update_scheduling_stats(&alarm->stats, t0, deadline, delta);

  update_scheduling_stats(&alarm->stats, now(), deadline);



  // NOTE: Do NOT access "alarm" after the callback, as a safety precaution

  // in case the callback itself deleted the alarm.

  callback(data);

}



static void alarm_ready_mloop(alarm_t* alarm) {
@@ -697,13 +693,10 @@ static bool timer_create_internal(const clockid_t clock_id, timer_t* timer) { 
}



static void update_scheduling_stats(alarm_stats_t* stats, period_ms_t now_ms,

                                    period_ms_t deadline_ms,

                                    period_ms_t execution_delta_ms) {

                                    period_ms_t deadline_ms) {

  stats->total_updates++;

  stats->last_update_ms = now_ms;



  update_stat(&stats->callback_execution, execution_delta_ms);



  if (deadline_ms < now_ms) {

    // Overdue scheduling

    period_ms_t delta_ms = now_ms - deadline_ms;
@@ -750,7 +743,7 @@ void alarm_debug_dump(int fd) { 
    dprintf(fd, "%-51s: %zu / %zu / %zu / %zu\n",

            "    Action counts (sched/resched/exec/cancel)",

            stats->scheduled_count, stats->rescheduled_count,

            stats->callback_execution.count, stats->canceled_count);

            stats->total_updates, stats->canceled_count);



    dprintf(fd, "%-51s: %zu / %zu\n",

            "    Deviation counts (overdue/premature)",
@@ -762,9 +755,6 @@ void alarm_debug_dump(int fd) { 
            (unsigned long long)alarm->period,

            (long long)(alarm->deadline - just_now));



    dump_stat(fd, &stats->callback_execution,

              "    Callback execution time in ms (total/max/avg)");



    dump_stat(fd, &stats->overdue_scheduling,

              "    Overdue scheduling time in ms (total/max/avg)");