Merge "Agent init in DPDK is dependent on asio thread." into R3.0

Juniper · May 6, 2016 · f088e5e · f088e5e
2 parents f065c78 + 3908057
commit f088e5e
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 22 deletions.
diff --git a/src/vnsw/agent/contrail/main.cc b/src/vnsw/agent/contrail/main.cc
@@ -111,12 +111,8 @@ int main(int argc, char *argv[]) {
         return ret;
     }
 
-    // Wait till Init is done, before running event manager
-    init.Lock();
-
     Agent *agent = init.agent();
     agent->event_manager()->RunWithExceptionHandling();
 
-    init.Unlock();
     return 0;
 }
diff --git a/src/vnsw/agent/init/agent_init.cc b/src/vnsw/agent/init/agent_init.cc
@@ -89,9 +89,6 @@ void AgentInit::InitPlatform() {
 // Start of Agent init.
 // Trigger init in DBTable task context
 int AgentInit::Start() {
-    // lock till init is done
-    Lock();
-
     agent_->set_task_scheduler(TaskScheduler::GetInstance());
 
     // Init platform specific information
@@ -160,8 +157,6 @@ bool AgentInit::InitBase() {
     agent_->set_init_done(true);
     ConnectToControllerBase();
 
-    // Init is done
-    Unlock();
     return ret;
 }
 

diff --git a/src/vnsw/agent/init/agent_init.h b/src/vnsw/agent/init/agent_init.h
@@ -71,11 +71,6 @@ class AgentInit {
     virtual void RegisterDBClientsBase();
     virtual void RegisterDBClients() { }
 
-    // Blocking call to get init mutex;
-    // Used to synchronize event manager execution with init completion
-    virtual void Lock() { init_mutex_.lock(); }
-    virtual void Unlock() { init_mutex_.unlock(); }
-
     // Module specific inits. Called after DBTable and DBTable clients are
     // created
     virtual void InitModulesBase();

diff --git a/src/vnsw/agent/ovs_tor_agent/main.cc b/src/vnsw/agent/ovs_tor_agent/main.cc
@@ -77,11 +77,7 @@ int main(int argc, char *argv[]) {
         return ret;
     }
 
-    // Wait till Init is done, before running event manager
-    init.Lock();
-
     agent->event_manager()->RunWithExceptionHandling();
 
-    init.Unlock();
     return 0;
 }
diff --git a/src/vnsw/agent/vxlan_agent/linux/main.cc b/src/vnsw/agent/vxlan_agent/linux/main.cc
@@ -82,11 +82,7 @@ int main(int argc, char *argv[]) {
         return ret;
     }
 
-    // Wait till Init is done, before running event manager
-    init.Lock();
-
     agent->event_manager()->RunWithExceptionHandling();
 
-    init.Unlock();
     return 0;
 }