[Icathales 190] Fix crash at init

src/cryo_support/Parts.cpp

@@ -47,8 +47,8 @@ namespace CryoCooler_ns
   HWProxy_ns::ComState Part::get_com_state (void)
   {
     //DEBUG_STREAM << " Part::get_com_state <- " << std::endl;
-    if (cryo_itf)
-      this->com_state = cryo_itf->get_com_state ();
+    if (cryo_itf.get())
+      this->com_state = cryo_itf.get()->get_com_state ();
     else 
     {
       this->com_status += "\nlast error : Part::get_com_state() cannot get CryoCooler interface pointer  ...";
@@ -62,10 +62,10 @@ namespace CryoCooler_ns
   std::string Part::get_com_status (void)
   {
     //DEBUG_STREAM << " Part::get_com_status <- " << std::endl;
-    if (cryo_itf)
+    if (cryo_itf.get())
     {
-      this->com_status =  cryo_itf->get_com_status ();
-      this->com_status += "\nlast error : " + this->cryo_itf->get_last_error ();
+      this->com_status =  cryo_itf.get()->get_com_status ();
+      this->com_status += "\nlast error : " + this->cryo_itf.get()->get_last_error ();
     }
     else 
       this->com_status = "Part::get_com_state() cannot get CryoCooler interface pointer  ...";
@@ -82,8 +82,8 @@ namespace CryoCooler_ns
     float tmp = __NAN__;
     try 
     {
-      if(cryo_itf)
-        tmp = cryo_itf->get_real (offset);
+      if(cryo_itf.get())
+        tmp = cryo_itf.get()->get_real (offset);
     }
     catch (...)
     {
@@ -102,7 +102,7 @@ namespace CryoCooler_ns
     short tmp = -1;
     try
     {
-      if(cryo_itf)
+      if(cryo_itf.get())
         tmp = cryo_itf->get_int (offset);
     }
     catch (...)
@@ -129,8 +129,8 @@ namespace CryoCooler_ns
     bool tmp = false;
     try
     {
-      if(cryo_itf)
-        tmp = cryo_itf->get_bool (bit_offset, byte_offset);
+      if(cryo_itf.get())
+        tmp = cryo_itf.get()->get_bool (bit_offset, byte_offset);
     }
     catch (...)
     {
@@ -166,7 +166,7 @@ namespace CryoCooler_ns
     wr.byte_offset = offset;
     wr.value = v;
     msg->attach_data(wr);
-    this->cryo_itf->post(msg);
+    this->cryo_itf.get()->post(msg);
   }
 
   //- SetBool -----------------------------------------
@@ -194,7 +194,7 @@ namespace CryoCooler_ns
     wb.bit_offset = bit_offset;
     wb.value = v;
     msg->attach_data(wb);
-    this->cryo_itf->post(msg);
+    this->cryo_itf.get()->post(msg);
   }
 
   //- SendCmd -----------------------------------------
@@ -216,13 +216,13 @@ namespace CryoCooler_ns
     wi.byte_offset = offset;
     wi.value = 0;
     msg->attach_data(wi);
-    this->cryo_itf->post(msg);
+    this->cryo_itf.get()->post(msg);
   }
 
   // ============================================================================
   //- pseudo singleton
   // ============================================================================
-  CryoCooler_ns::CryoCoolerInterface* CryoCoolerCom::cryo_itf = 0;
+  yat::SharedPtr<CryoCooler_ns::CryoCoolerInterface> CryoCoolerCom::cryo_itf;
 
   //---------------------------------------------------------------------
   //- Cryocooler Class Implementation
@@ -283,19 +283,14 @@ namespace CryoCooler_ns
   CryoCoolerCom::~CryoCoolerCom ()
   {
     DEBUG_STREAM << "CryoCoolerCom::~CryoCoolerCom entering..." << std::endl;
-
-    //- never delete a YAT thread!
-    if (cryo_itf)
-      cryo_itf->exit ();
-
-    cryo_itf = 0;
+    cryo_itf.reset();
   }
 
   //- get the HWProxy instance ------------------------
-  /*static */ CryoCoolerInterface * CryoCoolerCom::get_cryo_itf (void)
+  yat::SharedPtr<CryoCoolerInterface> CryoCoolerCom::get_cryo_itf (void)
   {
     std::cout << "CryoCoolerCom::get_cryo_itf entering..." << std::endl;
-    if (! cryo_itf)
+    if (! cryo_itf.get())
     {
       std::cout << "CryoCoolerCom::get_cryo_itf could not get HWProxy ..." << std::endl;
       THROW_DEVFAILED(_CPTC("SOFTWARE_ERROR"),
@@ -310,31 +305,26 @@ namespace CryoCooler_ns
   void CryoCoolerCom::init (void)
   {
     DEBUG_STREAM << "CryoCoolerCom::init entering..." << std::endl;
-    if (cryo_itf)
+    if (cryo_itf.get())
       return;
 
     try 
     {
       DEBUG_STREAM << "CryoCoolerCom::init trying to create HWProxy" << std::endl;
-      cryo_itf = new CryoCoolerInterface (this->devimpl,
-                         this->plc_name,
-                         this->db_read_number,
-                         this->db_write_number,
-                         this->period,
-                         this->cryocooler_protocol
-                         );
 
-      if (!cryo_itf)
+      cryo_itf.reset(new CryoCoolerInterface (devimpl,plc_name, db_read_number,db_write_number,period,cryocooler_protocol), yat4tango::DeviceTaskExiter());
+
+      if (!cryo_itf.get())
       {
         ERROR_STREAM << "CryoCoolerCom::init could not instanciate CryoCooler Interface ..." << std::endl;
         throw std::bad_alloc();
       }
 	  
       //- Initialize hw proxy for DB_start, DB_end, DB_write
-      cryo_itf ->initialize();
+      cryo_itf.get()->initialize();
 	 
       //- go for CryoInterfaceS
-      cryo_itf->go ();
+      cryo_itf.get()->go ();
     }
     catch (std::bad_alloc)
     {
@@ -356,32 +346,32 @@ namespace CryoCooler_ns
   unsigned long CryoCoolerCom::ComSuccess (void) 
   { 
     //DEBUG_STREAM << "CryoCoolerCom::ComSuccess entering..." << std::endl;
-    return cryo_itf->get_com_success (); 
+    return cryo_itf.get()->get_com_success ();
   }
 
   unsigned long CryoCoolerCom::ComError (void) 
   { 
     //DEBUG_STREAM << "CryoCoolerCom::ComError entering..." << std::endl;
-    return cryo_itf->get_com_error (); 
+    return cryo_itf.get()->get_com_error ();
   }
 
   HWProxy_ns::ComState CryoCoolerCom::GetComState (void) 
   {
     //DEBUG_STREAM << "CryoCoolerCom::ComState entering..." << std::endl;
-    return cryo_itf->get_com_state ();
+    return cryo_itf.get()->get_com_state ();
   }
 
   std::string CryoCoolerCom::GetComStatus (void) 
   {
     //DEBUG_STREAM << "CryoCoolerCom::ComStatus entering..." << std::endl;
-    return (cryo_itf->get_com_status () + "\n" + cryo_itf->get_last_error ()); 
+    return (cryo_itf.get()->get_com_status () + "\n" + cryo_itf.get()->get_last_error ());
   }
 
   //- Stop On Get ---------------------------
   bool CryoCoolerCom::StopOn (void)
   {
     DEBUG_STREAM << "CryoCoolerCom::StopOn (read data) entering..." << std::endl;
-    bool tmp = cryo_itf->get_bool (stop_on_bit_offset, stop_on_byte_offset);
+    bool tmp = cryo_itf.get()->get_bool (stop_on_bit_offset, stop_on_byte_offset);
     return tmp;
   }
 
@@ -434,7 +424,7 @@ namespace CryoCooler_ns
   bool CryoCoolerCom::NoAlarm (void)
   {
     //DEBUG_STREAM << "CryoCoolerCom::NoAlarm read data entering..." << std::endl;
-    bool tmp = cryo_itf->get_bool (no_alarm_bit_offset, no_alarm_byte_offset);
+    bool tmp = cryo_itf.get()->get_bool (no_alarm_bit_offset, no_alarm_byte_offset);
     return tmp;
   }
 
@@ -442,7 +432,7 @@ namespace CryoCooler_ns
   bool CryoCoolerCom::Enabled (void)
   {
     //DEBUG_STREAM << "CryoCoolerCom::Enabled read data entering..." << std::endl;
-    bool tmp = cryo_itf->get_bool (enabled_bit_offset, enabled_byte_offset);
+    bool tmp = cryo_itf.get()->get_bool (enabled_bit_offset, enabled_byte_offset);
     return tmp;
   }
 
@@ -450,7 +440,7 @@ namespace CryoCooler_ns
   bool CryoCoolerCom::Ready (void)
   {
     //DEBUG_STREAM << "CryoCoolerCom::Ready read data entering..." << std::endl;
-    bool tmp = cryo_itf->get_bool (ready_bit_offset, ready_byte_offset);
+    bool tmp = cryo_itf.get()->get_bool (ready_bit_offset, ready_byte_offset);
     return tmp;
   }
 
@@ -458,7 +448,7 @@ namespace CryoCooler_ns
   bool CryoCoolerCom::UpsNoPowerFail (void)
   {
     //DEBUG_STREAM << "CryoCoolerCom::UpsNoPowerFail read data entering..." << std::endl;
-    bool tmp = cryo_itf->get_bool (ups_no_fail_bit_offset, ups_no_fail_byte_offset);
+    bool tmp = cryo_itf.get()->get_bool (ups_no_fail_bit_offset, ups_no_fail_byte_offset);
     return tmp;
   }
   
@@ -466,21 +456,21 @@ namespace CryoCooler_ns
   bool CryoCoolerCom::SensorCableConnected (void)
   {
     //DEBUG_STREAM << "CryoCoolerCom::SensorCableConnected read data entering..." << std::endl;
-    bool tmp = cryo_itf->get_bool (sensor_conn_bit_offset, sensor_conn_byte_offset);
+    bool tmp = cryo_itf.get()->get_bool (sensor_conn_bit_offset, sensor_conn_byte_offset);
     return tmp;
   }
   //- Get VALVE CABLE CONNECTED ---------------------------------
   bool CryoCoolerCom::ValveCableConnected (void)
   {
     //DEBUG_STREAM << "CryoCoolerCom::ValveCableConnected read data entering..." << std::endl;
-    bool tmp = cryo_itf->get_bool (valve_conn_bit_offset, valve_conn_byte_offset);
+    bool tmp = cryo_itf.get()->get_bool (valve_conn_bit_offset, valve_conn_byte_offset);
     return tmp;
   }
   //- Get HEATER CABLE CONNECTED ---------------------------------
   bool CryoCoolerCom::HeaterCableConnected (void)
   {
     //DEBUG_STREAM << "CryoCoolerCom::HeaterCableConnected read data entering..." << std::endl;
-    bool tmp = cryo_itf->get_bool (heater_conn_bit_offset, heater_conn_byte_offset);
+    bool tmp = cryo_itf.get()->get_bool (heater_conn_bit_offset, heater_conn_byte_offset);
     return tmp;
   }  
 

src/cryo_support/Parts.h

@@ -9,6 +9,7 @@
 //-
 #include <HWProxy.h>
 #include "CryoCoolerInterface.h"
+#include <yat/memory/SharedPtr.h>
 
 
 namespace CryoCooler_ns
@@ -53,7 +54,7 @@ namespace CryoCooler_ns
 
     protected : 
       //- the data "getter" class
-      CryoCoolerInterface * cryo_itf;
+      yat::SharedPtr<CryoCoolerInterface> cryo_itf;
       //- status and state data;
       std::string com_status;
       HWProxy_ns::ComState com_state;
@@ -102,10 +103,10 @@ namespace CryoCooler_ns
     bool HeaterCableConnected (void);
 
     //- public statis instance
-    static CryoCoolerInterface * get_cryo_itf ();
+    static  yat::SharedPtr<CryoCoolerInterface> get_cryo_itf ();
 	
   private :
-    static CryoCoolerInterface * cryo_itf;
+    static yat::SharedPtr<CryoCoolerInterface> cryo_itf;
     size_t period;
     Tango::DeviceImpl * devimpl;
     std::string plc_name;