Run diag timers in Diag task context

Diag proto is running in a different instance. Update the timers to also use the same instance. Change-Id: Ib396d7665a96268918bda0c350a87373202c2686 closes-bug: #1729581
Juniper · Nov 14, 2017 · 75ffa4e · 75ffa4e
1 parent d4c4798
commit 75ffa4e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/vnsw/agent/diag/diag.cc b/src/vnsw/agent/diag/diag.cc
@@ -30,7 +30,9 @@ DiagEntry::DiagEntry(const std::string &sip, const std::string &dip,
     proto_(proto), sport_(sport), dport_(dport),
     vrf_name_(vrf_name), diag_table_(diag_table), timeout_(timeout),
     timer_(TimerManager::CreateTimer(*(diag_table->agent()->event_manager())->io_service(), 
-    "DiagTimeoutHandler", TaskScheduler::GetInstance()->GetTaskId("Agent::Diag"), 0)),
+                         "DiagTimeoutHandler",
+                         TaskScheduler::GetInstance()->GetTaskId("Agent::Diag"),
+                         PktHandler::DIAG)),
     max_attempts_(attempts), seq_no_(0) {
 }
 
@@ -114,7 +116,8 @@ DiagTable::DiagTable(Agent *agent):agent_(agent) {
     diag_proto_.reset(
         new DiagProto(agent, *(agent->event_manager())->io_service()));
     entry_op_queue_ = new WorkQueue<DiagEntryOp *>
-                    (TaskScheduler::GetInstance()->GetTaskId("Agent::Diag"), 0,
+                    (TaskScheduler::GetInstance()->GetTaskId("Agent::Diag"),
+                     PktHandler::DIAG,
                      boost::bind(&DiagTable::Process, this, _1));
     entry_op_queue_->set_name("Diagnostics Table");
     index_ = 1;

diff --git a/src/vnsw/agent/diag/segment_health_check.cc b/src/vnsw/agent/diag/segment_health_check.cc
@@ -21,7 +21,8 @@ SegmentHealthCheckPkt::SegmentHealthCheckPkt(HealthCheckInstanceService *svc,
     delay_timer_ = TimerManager::CreateTimer
         (*(diag_table->agent()->event_manager())->io_service(),
          "SegmentHCDelayTimeoutHandler",
-         TaskScheduler::GetInstance()->GetTaskId("Agent::Diag"), 0);
+         TaskScheduler::GetInstance()->GetTaskId("Agent::Diag"),
+         PktHandler::DIAG);
 }