X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fhw_xapp_main.cc;h=1771797997a2b4dc858938cfe798d600e97a8b85;hb=refs%2Fchanges%2F42%2F4042%2F2;hp=655f4522123f06b1ac7fa1dc8ce105c0b820c2f8;hpb=0f5c234d5da8897f2f831e02ff03912e582ba6e9;p=ric-app%2Fhw.git

diff --git a/src/hw_xapp_main.cc b/src/hw_xapp_main.cc
index 655f452..1771797 100644
--- a/src/hw_xapp_main.cc
+++ b/src/hw_xapp_main.cc
@@ -60,40 +60,28 @@ int main(int argc, char *argv[]){
 
 
 	//Create Subscription Handler if Xapp deals with Subscription.
-	bool sub_required = true;
 	std::unique_ptr<SubscriptionHandler> sub_handler = std::make_unique<SubscriptionHandler>();
 
 	//create HelloWorld Xapp Instance.
 	std::unique_ptr<Xapp> hw_xapp;
-	if(sub_required)
-		hw_xapp = std::make_unique<Xapp>(std::ref(config),std::ref(*rmr), std::ref(*sub_handler));
-	else
-		hw_xapp = std::make_unique<Xapp>(std::ref(config),std::ref(*rmr));
+	hw_xapp = std::make_unique<Xapp>(std::ref(config),std::ref(*rmr));
 
 	mdclog_write(MDCLOG_INFO, "Created Hello World Xapp Instance");
 
 	sleep(1);
 	//Startup E2 subscription and A1 policy
-	hw_xapp->startup();
+	hw_xapp->startup(std::ref(*sub_handler));
 
 
 	//start listener threads and register message handlers.
 	int num_threads = std::stoi(config[XappSettings::SettingName::THREADS]);
-	for(int j=0; j < num_threads; j++) {
-		std::unique_ptr<XappMsgHandler> mp_handler;
-		if(sub_required)
-			mp_handler = std::make_unique<XappMsgHandler>(config[XappSettings::SettingName::XAPP_ID], std::ref(*sub_handler));
-		else
-			mp_handler = std::make_unique<XappMsgHandler>(config[XappSettings::SettingName::XAPP_ID]);
-
-		hw_xapp->register_handler(std::ref(*mp_handler));
-	}
-
 	mdclog_write(MDCLOG_INFO, "Starting Listener Threads. Number of Workers = %d", num_threads);
 
-	hw_xapp->Run();
+	std::unique_ptr<XappMsgHandler> mp_handler = std::make_unique<XappMsgHandler>(config[XappSettings::SettingName::XAPP_ID]);
+	hw_xapp->start_xapp_receiver(std::ref(*mp_handler));
+
+	sleep(1);
 
-	//Delete all subscriptions if any based on Xapp Mode.
 	//xapp->shutdown();
 
  	while(1){