cleanup code

extensions/ModbusSlave/mbslave.cc

@@ -77,7 +77,6 @@ int main(int argc, const char** argv)
 		dlogany << "(main): -------------- MBSlave START -------------------------\n\n";
 
 		act->run(false);
-		//        on_sigchild(SIGTERM);
 		return 0;
 	}
 	catch( const std::exception& e )
@@ -91,7 +90,6 @@ int main(int argc, const char** argv)
 		cerr << (p ? p.__cxa_exception_type()->name() : "null") << std::endl;
 	}
 
-	//  on_sigchild(SIGTERM);
 	return 1;
 }
 // --------------------------------------------------------------------------

extensions/UNetUDP/unetexchange.cc

@@ -58,7 +58,6 @@ int main( int argc, const char** argv )
 		dlogany << "(main): -------------- UDPReceiver START -------------------------\n\n";
 
 		act->run(false);
-		on_sigchild(SIGTERM);
 	}
 	catch( const uniset::Exception& ex )
 	{
@@ -69,6 +68,5 @@ int main( int argc, const char** argv )
 		dcrit << "(unetexchange): catch ..." << std::endl;
 	}
 
-	on_sigchild(SIGTERM);
 	return 0;
 }

extensions/UniNetwork/UniExchange.cc

@@ -223,6 +223,9 @@ void UniExchange::execute()
 			ptUpdate.reset();
 		}
 
+		if( cancelled )
+			break;
+
 		msleep(polltime);
 	}
 }

extensions/UniNetwork/start_fg.sh

 #!/bin/sh
 
-export LD_LIBRARY_PATH="../../lib/.libs;../lib/.libs"
-
 ulimit -Sc 10000000000
 
 ./uniset2-start.sh -f ./uniset2-network --confile test.xml \
  --smemory-id SharedMemory \
- --unet-id UniExchange
+ --unet-id UniExchange $*
 

extensions/UniNetwork/stop.sh

+../../Utilities/scripts/uniset2-stop.sh
\ No newline at end of file

extensions/UniNetwork/test.xml

+../../conf/test.xml
\ No newline at end of file

extensions/UniNetwork/uninet.cc

@@ -68,7 +68,7 @@ int main(int argc, const char** argv)
 		act->broadcast( sm.transport_msg() );
 		act->run(true);
 		uex->execute();
-		on_sigchild(SIGTERM);
+		act->join();
 		return 0;
 	}
 	catch( const std::exception& ex )
@@ -80,6 +80,5 @@ int main(int argc, const char** argv)
 		dcrit << "(uninetwork): catch(...)" << endl;
 	}
 
-	on_sigchild(SIGTERM);
 	return 1;
 }

extensions/UniNetwork/uniset2-functions.sh

+../../Utilities/scripts/uniset2-functions.sh
\ No newline at end of file

extensions/UniNetwork/uniset2-start.sh

+../../Utilities/scripts/uniset2-start.sh
\ No newline at end of file