Merge "Introspect enhancements to configure latency measurements"

Juniper · Jun 23, 2016 · 92fb820 · 92fb820
2 parents 3e3bf71 + d31d238
commit 92fb820
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 5 deletions.
diff --git a/src/base/queue_task.h b/src/base/queue_task.h
@@ -437,7 +437,7 @@ class WorkQueue {
     uint32_t task_starts() const { return task_starts_; }
     uint32_t max_queue_len() const { return max_queue_len_; }
     bool measure_busy_time() const { return measure_busy_time_; }
-    void set_measure_busy_time(bool val) { measure_busy_time_ = val; }
+    void set_measure_busy_time(bool val) const { measure_busy_time_ = val; }
     uint64_t busy_time() const { return busy_time_; }
     void add_busy_time(uint64_t t) { busy_time_ += t; }
     void ClearStats() const {
@@ -669,7 +669,7 @@ class WorkQueue {
     mutable uint32_t task_starts_;
     mutable uint32_t max_queue_len_;
     mutable uint64_t busy_time_;
-    bool measure_busy_time_;
+    mutable bool measure_busy_time_;
 
     friend class QueueTaskTest;
     friend class QueueTaskShutdownTest;

diff --git a/src/base/task.h b/src/base/task.h
@@ -214,6 +214,9 @@ class TaskScheduler {
 
     // Enable logging of tasks exceeding configured latency
     void EnableLatencyThresholds(uint32_t execute, uint32_t schedule);
+    uint32_t schedule_delay() const { return schedule_delay_; }
+    uint32_t execute_delay() const { return execute_delay_; }
+
     bool measure_delay() const { return measure_delay_; }
     void SetLatencyThreshold(const std::string &name, uint32_t execute,
                              uint32_t schedule);

diff --git a/src/vnsw/agent/cmn/agent.cc b/src/vnsw/agent/cmn/agent.cc
@@ -866,3 +866,7 @@ void Agent::TaskTrace(const char *file_name, uint32_t line_no,
 bool Agent::MeasureQueueDelay() {
     return params_->measure_queue_delay();
 }
+
+void Agent::SetMeasureQueueDelay(bool val) {
+    return params_->set_measure_queue_delay(val);
+}
diff --git a/src/vnsw/agent/cmn/agent.h b/src/vnsw/agent/cmn/agent.h
@@ -1040,6 +1040,7 @@ class Agent {
         flow_stats_req_handler_ = req;
     }
 
+    void SetMeasureQueueDelay(bool val);
     bool MeasureQueueDelay();
     void TaskTrace(const char *file_name, uint32_t line_no, const Task *task,
                    const char *description, uint32_t delay);

diff --git a/src/vnsw/agent/init/agent_param.h b/src/vnsw/agent/init/agent_param.h
@@ -275,6 +275,7 @@ class AgentParam  {
     uint32_t pkt0_tx_buffer_count() const { return pkt0_tx_buffer_count_; }
     void set_pkt0_tx_buffer_count(uint32_t val) { pkt0_tx_buffer_count_ = val; }
     bool measure_queue_delay() const { return measure_queue_delay_; }
+    void set_measure_queue_delay(bool val) { measure_queue_delay_ = val; }
 protected:
     void set_hypervisor_mode(HypervisorMode m) { hypervisor_mode_ = m; }
     virtual void InitFromSystem();

diff --git a/src/vnsw/agent/oper/agent_profile.cc b/src/vnsw/agent/oper/agent_profile.cc
@@ -651,3 +651,19 @@ void SandeshFlowQueueSummaryRequest::HandleRequest() const {
     resp->set_context(context());
     resp->Response();
 }
+
+void SandeshSetProfileParams::HandleRequest() const {
+    SandeshProfileParams *resp = new SandeshProfileParams();
+    Agent *agent = Agent::GetInstance();
+    TaskScheduler *scheduler = agent->task_scheduler();
+
+    scheduler->EnableLatencyThresholds(get_task_exec_threshold() * 1000,
+                                       get_task_schedule_threshold() * 1000);
+    agent->SetMeasureQueueDelay(get_measure_queue_run_time());
+
+    resp->set_task_exec_threshold(scheduler->execute_delay()/1000);
+    resp->set_task_schedule_threshold(scheduler->schedule_delay()/1000);
+    resp->set_measure_queue_run_time(agent->MeasureQueueDelay());
+    resp->set_context(context());
+    resp->Response();
+}
diff --git a/src/vnsw/agent/oper/agent_profile.sandesh b/src/vnsw/agent/oper/agent_profile.sandesh
@@ -176,3 +176,22 @@ response sandesh SandeshTaskStatsList {
 request sandesh SandeshTaskStatsRequest {
     1: u16 count; // send data for last 'count' entries
 }
+
+/**
+ * Response message for SandeshSetTaskProfileParams
+ * Shows modified parameters
+ */
+response sandesh SandeshProfileParams {
+    1: u16    task_exec_threshold;
+    2: u16    task_schedule_threshold;
+    3: bool   measure_queue_run_time;
+}
+
+/**
+ * Request to tune to task-profiling parameters
+ */
+request sandesh SandeshSetProfileParams {
+    1: u16    task_exec_threshold;
+    2: u16    task_schedule_threshold;
+    3: bool   measure_queue_run_time;
+}
diff --git a/src/vnsw/agent/pkt/flow_proto.cc b/src/vnsw/agent/pkt/flow_proto.cc
@@ -745,8 +745,10 @@ static void SetFlowEventQueueStats(Agent *agent,
     stats->max_queue_count_ = queue->max_queue_len();
     stats->start_count_ = queue->task_starts();
     stats->busy_time_ = queue->busy_time();
-    if (agent->MeasureQueueDelay())
+    queue->set_measure_busy_time(agent->MeasureQueueDelay());
+    if (agent->MeasureQueueDelay()) {
         queue->ClearStats();
+    }
 }
 
 static void SetFlowMgmtQueueStats(Agent *agent,
@@ -759,6 +761,7 @@ static void SetFlowMgmtQueueStats(Agent *agent,
     stats->max_queue_count_ = queue->max_queue_len();
     stats->start_count_ = queue->task_starts();
     stats->busy_time_ = queue->busy_time();
+    queue->set_measure_busy_time(agent->MeasureQueueDelay());
     if (agent->MeasureQueueDelay())
         queue->ClearStats();
 }
@@ -773,6 +776,7 @@ static void SetPktHandlerQueueStats(Agent *agent,
     stats->max_queue_count_ = queue->max_queue_len();
     stats->start_count_ = queue->task_starts();
     stats->busy_time_ = queue->busy_time();
+    queue->set_measure_busy_time(agent->MeasureQueueDelay());
     if (agent->MeasureQueueDelay())
         queue->ClearStats();
 }

diff --git a/src/vnsw/agent/vrouter/flow_stats/flow_stats_manager.cc b/src/vnsw/agent/vrouter/flow_stats/flow_stats_manager.cc
@@ -405,6 +405,7 @@ static void SetQueueStats(Agent *agent, FlowStatsCollector *fsc,
     stats->max_queue_count_ = fsc->queue()->max_queue_len();
     stats->start_count_ = fsc->queue()->task_starts();
     stats->busy_time_ = fsc->queue()->busy_time();
+    fsc->queue()->set_measure_busy_time(agent->MeasureQueueDelay());
     if (agent->MeasureQueueDelay())
         fsc->queue()->ClearStats();
 }

diff --git a/src/vnsw/agent/vrouter/ksync/ksync_init.cc b/src/vnsw/agent/vrouter/ksync/ksync_init.cc
@@ -153,8 +153,10 @@ void KSync::SetProfileData(ProfileData *data) {
     stats->max_queue_count_ = tx_queue->max_queue_len();
     stats->start_count_ = tx_queue->read_events();
     stats->busy_time_ = tx_queue->busy_time();
-    if (agent()->MeasureQueueDelay())
+    tx_queue->set_measure_busy_time(agent()->MeasureQueueDelay());
+    if (agent()->MeasureQueueDelay()) {
         tx_queue->ClearStats();
+    }
 
     const KSyncSock::KSyncReceiveQueue *rx_queue =
         sock->get_receive_work_queue(0);
@@ -166,8 +168,10 @@ void KSync::SetProfileData(ProfileData *data) {
     stats->max_queue_count_ = rx_queue->max_queue_len();
     stats->start_count_ = rx_queue->task_starts();
     stats->busy_time_ = rx_queue->busy_time();
-    if (agent()->MeasureQueueDelay())
+    rx_queue->set_measure_busy_time(agent()->MeasureQueueDelay());
+    if (agent()->MeasureQueueDelay()) {
         rx_queue->ClearStats();
+    }
 }
 
 void KSync::VRouterInterfaceSnapshot() {