Status monitor, timeout for receive added

opc/exe/opc_server/src/opc_server.cpp

@@ -264,6 +264,7 @@ int main()
   errh_SetStatus( PWR__SRUN);
 
   soap_init( &soap);
+  soap.bind_flags = 0;
 
   for ( int k = 0; k < restarts + 1; k++) {
     m = soap_bind( &soap, NULL, opcsrv->m_config->Port, 100);

src/lib/statussrv/src/statussrv_utl.cpp

@@ -5,6 +5,7 @@
 #include "statussrv_utl.h"
 #include "co_time.h"
 #include "co_cdh.h"
+#include "co_cnf.h"
 #include "co_syi.h"
 #include "rt_pwr_msg.h"
 
@@ -12,6 +13,24 @@ static struct soap soap;
 static int init_done = 0;
 static int port = 18084;
 
+static void init()
+{
+  float timeout;
+  char timeoutstr[20];
+
+  if ( init_done)
+    return;
+
+  soap_init( &soap);
+
+  if ( cnf_get_value("statusMonitorTimeout", timeoutstr, sizeof(timeoutstr)) != 0 &&
+       sscanf( timeoutstr, "%f", &timeout) == 1)
+    soap.recv_timeout = -1000000 * timeout;  // Negative value is us, positive is s    
+  else
+    soap.recv_timeout = -200000;
+  init_done = 1;
+}
+
 static char *nname( const char *nodename)
 {
   static char n[80];
@@ -31,10 +50,8 @@ pwr_tStatus statussrv_GetStatus( const char *nodename, statussrv_sGetStatus *res
   pwr_tStatus sts = PWR__SUCCESS;
   char endpoint[80];
 
-  if ( !init_done) {
-    soap_init( &soap);
-    init_done = 1;
-  }
+  if ( !init_done)
+    init();
 
   sprintf( endpoint, "http://%s:%d", nname(nodename), port);
 
@@ -125,10 +142,8 @@ pwr_tStatus statussrv_GetExtStatus( const char *nodename, statussrv_sGetExtStatu
   pwr_tStatus sts = PWR__SUCCESS;
   char endpoint[80];
 
-  if ( !init_done) {
-    soap_init( &soap);
-    init_done = 1;
-  }
+  if ( !init_done)
+    init();
 
   sprintf( endpoint, "http://%s:%d", nname(nodename), port);
 
@@ -398,10 +413,8 @@ pwr_tStatus statussrv_Restart( const char *nodename)
   pwr_tStatus sts = PWR__SUCCESS;
   char endpoint[80];
 
-  if ( !init_done) {
-    soap_init( &soap);
-    init_done = 1;
-  }
+  if ( !init_done)
+    init();
 
   sprintf( endpoint, "http://%s:%d", nname(nodename), port);
 
@@ -428,10 +441,8 @@ pwr_tStatus statussrv_XttStart( const char *nodename, const char *opplace, const
   pwr_tStatus sts = PWR__SUCCESS;
   char endpoint[80];
 
-  if ( !init_done) {
-    soap_init( &soap);
-    init_done = 1;
-  }
+  if ( !init_done)
+    init();
 
   sprintf( endpoint, "http://%s:%d", nname(nodename), port);
 
@@ -476,10 +487,8 @@ pwr_tStatus statussrv_RtMonStart( const char *nodename, const char *lang, const
   pwr_tStatus sts = PWR__SUCCESS;
   char endpoint[80];
 
-  if ( !init_done) {
-    soap_init( &soap);
-    init_done = 1;
-  }
+  if ( !init_done)
+    init();
 
   sprintf( endpoint, "http://%s:%d", nname(nodename), port);
 

src/tools/pwre/src/os_cygwin/pwre_configure.sh

@@ -331,7 +331,7 @@ if test $pwre_hw == "hw_arm"; then
 
   echo "export pwre_conf_cc_define=\"$conf_cc_define\"" >> $cfile
   echo "export pwre_conf_libpwrco=\"-lpwr_co\"" >> $cfile
-  echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy\"" >> $cfile
+  echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_statussrv -lpwr_co -lpwr_msg_dummy\"" >> $cfile
   echo "export pwre_conf_libpwrdtt=\"-lpwr_dtt\"" >> $cfile
   echo "export pwre_conf_libpwrotherio=\"-lpwr_usbio_dummy -lpwr_usb_dummy -lpwr_cifx_dummy\"" >> $cfile
   echo "export pwre_conf_libpwrprofibus=\"-lpwr_pnak_dummy\"" >> $cfile
@@ -416,7 +416,7 @@ else
 
   echo "export pwre_conf_cc_define=\"$conf_cc_define\"" >> $cfile
   echo "export pwre_conf_libpwrco=\"-lpwr_co\"" >> $cfile
-  echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy\"" >> $cfile
+  echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_statussrv -lpwr_co -lpwr_msg_dummy\"" >> $cfile
   echo "export pwre_conf_libpwrdtt=\"-lpwr_dtt\"" >> $cfile
   echo "export pwre_conf_libpwrotherio=\"-lpwr_usbio_dummy -lpwr_usb_dummy -lpwr_cifx_dummy\"" >> $cfile
   echo "export pwre_conf_libpwrprofibus=\"-lpwr_pnak_dummy\"" >> $cfile

src/tools/pwre/src/os_freebsd/pwre_configure.sh

@@ -329,7 +329,7 @@ echo "export wb_rtt=\$pwr_exe/wb_rtt" >> $cfile
 
 echo "export pwre_conf_cc_define=\"$conf_cc_define\"" >> $cfile
 echo "export pwre_conf_libpwrco=\"-lpwr_co\"" >> $cfile
-echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy\"" >> $cfile
+echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_statussrv -lpwr_co -lpwr_msg_dummy\"" >> $cfile
 echo "export pwre_conf_libpwrdtt=\"-lpwr_dtt\"" >> $cfile
 echo "export pwre_conf_libpwrotherio=\"-lpwr_usbio_dummy -lpwr_usb_dummy\"" >> $cfile
 echo "export pwre_conf_libpwrxtt=\"-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow\"" >> $cfile

src/tools/pwre/src/os_linux/pwre_configure.sh

@@ -389,7 +389,7 @@ if [ $pwre_hw == "hw_arm" ] && [ $ebuild -eq 1 ]; then
 
   echo "export pwre_conf_cc_define=\"$conf_cc_define\"" >> $cfile
   echo "export pwre_conf_libpwrco=\"-lpwr_co\"" >> $cfile
-  echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy\"" >> $cfile
+  echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_statussrv -lpwr_co -lpwr_msg_dummy\"" >> $cfile
   echo "export pwre_conf_libpwrdtt=\"-lpwr_dtt\"" >> $cfile
   echo "export pwre_conf_libpwrotherio=\"-lpwr_usbio_dummy -lpwr_usb_dummy -lpwr_cifx_dummy\"" >> $cfile
   echo "export pwre_conf_libpwrprofibus=\"-lpwr_pnak_dummy\"" >> $cfile
@@ -492,7 +492,7 @@ else
 
   echo "export pwre_conf_cc_define=\"$conf_cc_define\"" >> $cfile
   echo "export pwre_conf_libpwrco=\"-lpwr_co\"" >> $cfile
-  echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy\"" >> $cfile
+  echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_statussrv -lpwr_co -lpwr_msg_dummy\"" >> $cfile
   echo "export pwre_conf_libpwrdtt=\"-lpwr_dtt\"" >> $cfile
   echo "export pwre_conf_libpwrotherio=\"-lpwr_usbio_dummy -lpwr_usb_dummy -lpwr_cifx_dummy -lpwr_nodave_dummy -lpwr_epl_dummy\"" >> $cfile
   echo "export pwre_conf_libpwrprofibus=\"-lpwr_pnak_dummy\"" >> $cfile

src/tools/pwre/src/os_macos/pwre_configure.sh

@@ -329,7 +329,7 @@ echo "export PKG_CONFIG_PATH=/sw/fink/pkgconfig" >> $cfile
 
 echo "export pwre_conf_cc_define=\"$conf_cc_define\"" >> $cfile
 echo "export pwre_conf_libpwrco=\"-lpwr_co\"" >> $cfile
-echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy\"" >> $cfile
+echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_statussrv -lpwr_co -lpwr_msg_dummy\"" >> $cfile
 echo "export pwre_conf_libpwrdtt=\"-lpwr_dtt\"" >> $cfile
 echo "export pwre_conf_libpwrotherio=\"-lpwr_usbio_dummy -lpwr_usb_dummy\"" >> $cfile
 echo "export pwre_conf_libpwrxtt=\"-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow\"" >> $cfile

src/tools/pwre/src/os_mingw/pwre_configure.sh

@@ -333,7 +333,7 @@ echo "export PKG_CONFIG_PATH=/sw/fink/pkgconfig" >> $cfile
 
 echo "export pwre_conf_cc_define=\"$conf_cc_define\"" >> $cfile
 echo "export pwre_conf_libpwrco=\"-lpwr_co\"" >> $cfile
-echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy\"" >> $cfile
+echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_statussrv -lpwr_co -lpwr_msg_dummy\"" >> $cfile
 echo "export pwre_conf_libpwrdtt=\"-lpwr_dtt\"" >> $cfile
 echo "export pwre_conf_libpwrotherio=\"-lpwr_usbio_dummy -lpwr_usb_dummy\"" >> $cfile
 echo "export pwre_conf_libpwrxtt=\"-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow\"" >> $cfile

src/tools/pwre/src/os_openbsd/pwre_configure.sh

@@ -331,7 +331,7 @@ echo "export wb_rtt=\$pwr_exe/wb_rtt" >> $cfile
 
 echo "export pwre_conf_cc_define=\"$conf_cc_define\"" >> $cfile
 echo "export pwre_conf_libpwrco=\"-lpwr_co\"" >> $cfile
-echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy\"" >> $cfile
+echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_statussrv -lpwr_co -lpwr_msg_dummy\"" >> $cfile
 echo "export pwre_conf_libpwrdtt=\"-lpwr_dtt\"" >> $cfile
 echo "export pwre_conf_libpwrotherio=\"-lpwr_usbio_dummy -lpwr_usb_dummy\"" >> $cfile
 echo "export pwre_conf_libpwrxtt=\"-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow\"" >> $cfile

src/tools/pwre/src/os_templ/pwre_configure.sh

@@ -271,7 +271,7 @@ done
 
 echo "export pwre_conf_cc_define=\"$conf_cc_define\"" >> $cfile
 echo "export pwre_conf_libpwrco=\"-lpwr_co\"" >> $cfile
-echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy\"" >> $cfile
+echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_statussrv -lpwr_co -lpwr_msg_dummy\"" >> $cfile
 echo "export pwre_conf_libpwrotherio=\"-lpwr_usbio_dummy -lpwr_usb_dummy\"" >> $cfile
 echo "export pwre_conf_libpwrxtt=\"-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow\"" >> $cfile
 echo "export pwre_conf_libpwrxttgtk=\" -lpwr_xtt_gtk -lpwr_ge_gtk -lpwr_cow_gtk -lpwr_flow_gtk -lpwr_glow_gtk\"" >> $cfile