From a5403de468838eec51b375607272fdc248699333 Mon Sep 17 00:00:00 2001
From: Claudio Scafuri <claudio.scafuri@elettra.eu>
Date: Mon, 12 Dec 2022 16:05:58 +0100
Subject: [PATCH] 9.4.0 clean
---
Makefile | 2 +-
src/Socket2.cpp | 192 +++++++++++------------
src/Socket2.h | 61 +++++---
src/Socket2.xmi | 6 +-
src/Socket2Class.cpp | 295 ++++++++++++------------------------
src/Socket2Class.h | 68 ++++-----
src/Socket2StateMachine.cpp | 12 +-
src/main.cpp | 12 +-
8 files changed, 281 insertions(+), 367 deletions(-)
diff --git a/Makefile b/Makefile
index cc13223..1c86e53 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ NAME_SRV = socket2-srv
CXXFLAGS =
LDFLAGS =
-include ../makefiles/Make-9.3.3.in
+include ../makefiles/Make-9.4.0.in
test: bin/${NAME_SRV}
LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(SDKTARGETSYSROOT)/usr/lib $(LOADER) bin/${NAME_SRV} test -v4
diff --git a/src/Socket2.cpp b/src/Socket2.cpp
index 52b6015..589026f 100644
--- a/src/Socket2.cpp
+++ b/src/Socket2.cpp
@@ -86,11 +86,11 @@ namespace Socket2_ns
//--------------------------------------------------------
/**
* Method : Socket2::Socket2()
- * Description : Constructors for a Tango device
+ * Description: Constructors for a Tango device
* implementing the classSocket2
*/
//--------------------------------------------------------
-Socket2::Socket2(Tango::DeviceClass *cl, string &s)
+Socket2::Socket2(Tango::DeviceClass *cl, std::string &s)
: TANGO_BASE_CLASS(cl, s.c_str())
{
/*----- PROTECTED REGION ID(Socket2::constructor_1) ENABLED START -----*/
@@ -122,16 +122,21 @@ Socket2::Socket2(Tango::DeviceClass *cl, const char *s, const char *d)
/*----- PROTECTED REGION END -----*/ // Socket2::constructor_3
}
+//--------------------------------------------------------
+Socket2::~Socket2()
+{
+ delete_device();
+}
//--------------------------------------------------------
/**
* Method : Socket2::delete_device()
- * Description : will be called at device destruction or at init command
+ * Description: will be called at device destruction or at init command
*/
//--------------------------------------------------------
void Socket2::delete_device()
{
- DEBUG_STREAM << "Socket2::delete_device() " << device_name << endl;
+ DEBUG_STREAM << "Socket2::delete_device() " << device_name << std::endl;
/*----- PROTECTED REGION ID(Socket2::delete_device) ENABLED START -----*/
// Delete device allocated objects
@@ -146,27 +151,27 @@ void Socket2::delete_device()
//--------------------------------------------------------
/**
* Method : Socket2::init_device()
- * Description : will be called at device initialization.
+ * Description: will be called at device initialization.
*/
//--------------------------------------------------------
void Socket2::init_device()
{
- DEBUG_STREAM << "Socket2::init_device() create device " << device_name << endl;
+ DEBUG_STREAM << "Socket2::init_device() create device " << device_name << std::endl;
/*----- PROTECTED REGION ID(Socket2::init_device_before) ENABLED START -----*/
// Initialization before get_device_property() call
init_error.clear();
/*----- PROTECTED REGION END -----*/ // Socket2::init_device_before
-
+
// Get the device properties from database
get_device_property();
-
+
attr_InputLength_read = new Tango::DevLong[1];
attr_OutputLength_read = new Tango::DevLong[1];
attr_Reconnections_read = new Tango::DevLong[1];
- // No longer if mandatory property not set.
+ // No longer if mandatory property not set.
if (mandatoryNotDefined)
return;
@@ -180,7 +185,7 @@ void Socket2::init_device()
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
{
- ERROR_STREAM << "Fail to ignore SIGPIPE" << endl;
+ ERROR_STREAM << "Fail to ignore SIGPIPE" << std::endl;
}
resolve();
@@ -188,7 +193,7 @@ void Socket2::init_device()
}
catch (Tango::DevFailed &e)
{
- init_error = "Initialization failed: " + string(e.errors[0].desc);
+ init_error = "Initialization failed: " + std::string(e.errors[0].desc);
}
catch (...)
{
@@ -206,7 +211,7 @@ void Socket2::init_device()
//--------------------------------------------------------
/**
* Method : Socket2::get_device_property()
- * Description : Read database to initialize property data members.
+ * Description: Read database to initialize property data members.
*/
//--------------------------------------------------------
void Socket2::get_device_property()
@@ -233,7 +238,7 @@ void Socket2::get_device_property()
// Call database and extract values
if (Tango::Util::instance()->_UseDb==true)
get_db_device()->get_property(dev_prop);
-
+
// get instance on Socket2Class to get class property
Tango::DbDatum def_prop, cl_prop;
Socket2Class *ds_class =
@@ -311,24 +316,24 @@ void Socket2::get_device_property()
if (protocol == "udp")
{
proto = UDP;
- DEBUG_STREAM << "Using UDP protocol" << endl;
+ DEBUG_STREAM << "Using UDP protocol" << std::endl;
}
else
{
proto = TCP;
- DEBUG_STREAM << "Using TCP protocol" << endl;
+ DEBUG_STREAM << "Using TCP protocol" << std::endl;
}
transform(iOMultiplexing.begin(), iOMultiplexing.end(), iOMultiplexing.begin(), ::tolower);
if (iOMultiplexing == "sleep")
{
multiplexing = SLEEP;
- DEBUG_STREAM << "Using sleep IO multiplexing type" << endl;
+ DEBUG_STREAM << "Using sleep IO multiplexing type" << std::endl;
}
else
{
multiplexing = SELECT;
- DEBUG_STREAM << "Using select IO multiplexing type" << endl;
+ DEBUG_STREAM << "Using select IO multiplexing type" << std::endl;
}
/*----- PROTECTED REGION END -----*/ // Socket2::get_device_property_after
@@ -336,7 +341,7 @@ void Socket2::get_device_property()
//--------------------------------------------------------
/**
* Method : Socket2::check_mandatory_property()
- * Description : For mandatory properties check if defined in database.
+ * Description: For mandatory properties check if defined in database.
*/
//--------------------------------------------------------
void Socket2::check_mandatory_property(Tango::DbDatum &class_prop, Tango::DbDatum &dev_prop)
@@ -345,17 +350,15 @@ void Socket2::check_mandatory_property(Tango::DbDatum &class_prop, Tango::DbDatu
if (class_prop.is_empty() && dev_prop.is_empty())
{
TangoSys_OMemStream tms;
- tms << endl <<"Property \'" << dev_prop.name;
+ tms << std::endl <<"Property \'" << dev_prop.name;
if (Tango::Util::instance()->_UseDb==true)
tms << "\' is mandatory but not defined in database";
else
tms << "\' is mandatory but cannot be defined without database";
- string status(get_status());
- status += tms.str();
- set_status(status);
+ append_status(tms.str());
mandatoryNotDefined = true;
/*----- PROTECTED REGION ID(Socket2::check_mandatory_property) ENABLED START -----*/
- cerr << tms.str() << " for " << device_name << endl;
+ std::cerr << tms.str() << " for " << device_name << std::endl;
/*----- PROTECTED REGION END -----*/ // Socket2::check_mandatory_property
}
@@ -365,18 +368,17 @@ void Socket2::check_mandatory_property(Tango::DbDatum &class_prop, Tango::DbDatu
//--------------------------------------------------------
/**
* Method : Socket2::always_executed_hook()
- * Description : method always executed before any command is executed
+ * Description: method always executed before any command is executed
*/
//--------------------------------------------------------
void Socket2::always_executed_hook()
{
- DEBUG_STREAM << "Socket2::always_executed_hook() " << device_name << endl;
+ DEBUG_STREAM << "Socket2::always_executed_hook() " << device_name << std::endl;
if (mandatoryNotDefined)
{
- string status(get_status());
Tango::Except::throw_exception(
(const char *)"PROPERTY_NOT_SET",
- status.c_str(),
+ get_status().c_str(),
(const char *)"Socket2::always_executed_hook()");
}
/*----- PROTECTED REGION ID(Socket2::always_executed_hook) ENABLED START -----*/
@@ -399,12 +401,12 @@ void Socket2::always_executed_hook()
//--------------------------------------------------------
/**
* Method : Socket2::read_attr_hardware()
- * Description : Hardware acquisition for attributes
+ * Description: Hardware acquisition for attributes
*/
//--------------------------------------------------------
-void Socket2::read_attr_hardware(TANGO_UNUSED(vector<long> &attr_list))
+void Socket2::read_attr_hardware(TANGO_UNUSED(std::vector<long> &attr_list))
{
- DEBUG_STREAM << "Socket2::read_attr_hardware(vector<long> &attr_list) entering... " << endl;
+ DEBUG_STREAM << "Socket2::read_attr_hardware(std::vector<long> &attr_list) entering... " << std::endl;
/*----- PROTECTED REGION ID(Socket2::read_attr_hardware) ENABLED START -----*/
// Add your own code
@@ -415,7 +417,7 @@ void Socket2::read_attr_hardware(TANGO_UNUSED(vector<long> &attr_list))
//--------------------------------------------------------
/**
* Read attribute InputLength related method
- * Description:
+ *
*
* Data type: Tango::DevLong
* Attr type: Scalar
@@ -423,7 +425,7 @@ void Socket2::read_attr_hardware(TANGO_UNUSED(vector<long> &attr_list))
//--------------------------------------------------------
void Socket2::read_InputLength(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Socket2::read_InputLength(Tango::Attribute &attr) entering... " << endl;
+ DEBUG_STREAM << "Socket2::read_InputLength(Tango::Attribute &attr) entering... " << std::endl;
/*----- PROTECTED REGION ID(Socket2::read_InputLength) ENABLED START -----*/
// Set the attribute value
attr_InputLength_read[0] = input_queue_length() + data.size();
@@ -434,7 +436,7 @@ void Socket2::read_InputLength(Tango::Attribute &attr)
//--------------------------------------------------------
/**
* Read attribute OutputLength related method
- * Description:
+ *
*
* Data type: Tango::DevLong
* Attr type: Scalar
@@ -442,7 +444,7 @@ void Socket2::read_InputLength(Tango::Attribute &attr)
//--------------------------------------------------------
void Socket2::read_OutputLength(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Socket2::read_OutputLength(Tango::Attribute &attr) entering... " << endl;
+ DEBUG_STREAM << "Socket2::read_OutputLength(Tango::Attribute &attr) entering... " << std::endl;
/*----- PROTECTED REGION ID(Socket2::read_OutputLength) ENABLED START -----*/
// Set the attribute value
attr_OutputLength_read[0] = output_queue_length();
@@ -453,7 +455,7 @@ void Socket2::read_OutputLength(Tango::Attribute &attr)
//--------------------------------------------------------
/**
* Read attribute Reconnections related method
- * Description:
+ *
*
* Data type: Tango::DevLong
* Attr type: Scalar
@@ -461,7 +463,7 @@ void Socket2::read_OutputLength(Tango::Attribute &attr)
//--------------------------------------------------------
void Socket2::read_Reconnections(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Socket2::read_Reconnections(Tango::Attribute &attr) entering... " << endl;
+ DEBUG_STREAM << "Socket2::read_Reconnections(Tango::Attribute &attr) entering... " << std::endl;
/*----- PROTECTED REGION ID(Socket2::read_Reconnections) ENABLED START -----*/
// Set the attribute value
attr_Reconnections_read[0] = reconnections;
@@ -473,7 +475,7 @@ void Socket2::read_Reconnections(Tango::Attribute &attr)
//--------------------------------------------------------
/**
* Method : Socket2::add_dynamic_attributes()
- * Description : Create the dynamic attributes if any
+ * Description: Create the dynamic attributes if any
* for specified device.
*/
//--------------------------------------------------------
@@ -489,14 +491,14 @@ void Socket2::add_dynamic_attributes()
//--------------------------------------------------------
/**
* Command Write related method
- * Description:
*
- * @param argin
+ *
+ * @param argin
*/
//--------------------------------------------------------
void Socket2::write(const Tango::DevVarCharArray *argin)
{
- DEBUG_STREAM << "Socket2::Write() - " << device_name << endl;
+ DEBUG_STREAM << "Socket2::Write() - " << device_name << std::endl;
/*----- PROTECTED REGION ID(Socket2::write) ENABLED START -----*/
check_init();
@@ -526,7 +528,7 @@ void Socket2::write(const Tango::DevVarCharArray *argin)
::write(fd, argin_data + bytes_total, bytes_to_write - bytes_total);
if (bytes_written < 0)
{
- DEBUG_STREAM << strerror( errno ) << " (" << errno << ")" << endl;
+ DEBUG_STREAM << strerror( errno ) << " (" << errno << ")" << std::endl;
if( errno == EINTR )
{
continue;
@@ -536,11 +538,11 @@ void Socket2::write(const Tango::DevVarCharArray *argin)
{
delete argin_data;
- string error_mesg = "Connection refused";
+ std::string error_mesg = "Connection refused";
close();
open();
- DEBUG_STREAM << error_mesg << endl;
+ DEBUG_STREAM << error_mesg << std::endl;
set_state( Tango::FAULT );
set_status( error_mesg );
@@ -549,7 +551,7 @@ void Socket2::write(const Tango::DevVarCharArray *argin)
"Socket2::write()");
}
- ERROR_STREAM << "write() error not handled:" << endl;
+ ERROR_STREAM << "write() error not handled:" << std::endl;
assert( false );
}
else if( bytes_written == 0 )
@@ -590,11 +592,11 @@ void Socket2::write(const Tango::DevVarCharArray *argin)
if( (bytes_total - output_queue_length()) != bytes_to_write )
{
- string error_mesg = "Unable to send request to device";
+ std::string error_mesg = "Unable to send request to device";
close();
open();
- DEBUG_STREAM << error_mesg << endl;
+ DEBUG_STREAM << error_mesg << std::endl;
set_state( Tango::FAULT );
set_status( error_mesg );
@@ -608,16 +610,16 @@ void Socket2::write(const Tango::DevVarCharArray *argin)
//--------------------------------------------------------
/**
* Command Read related method
- * Description:
*
- * @param argin
- * @returns
+ *
+ * @param argin
+ * @returns
*/
//--------------------------------------------------------
Tango::DevVarCharArray *Socket2::read(Tango::DevLong argin)
{
Tango::DevVarCharArray *argout;
- DEBUG_STREAM << "Socket2::Read() - " << device_name << endl;
+ DEBUG_STREAM << "Socket2::Read() - " << device_name << std::endl;
/*----- PROTECTED REGION ID(Socket2::read) ENABLED START -----*/
check_init();
@@ -642,8 +644,8 @@ Tango::DevVarCharArray *Socket2::read(Tango::DevLong argin)
{
if ( ! wait_for( READ, &tout ) )
{
- string mesg( "No response from device" );
- DEBUG_STREAM << mesg << endl;
+ std::string mesg( "No response from device" );
+ DEBUG_STREAM << mesg << std::endl;
Tango::Except::throw_exception("",
mesg, "Socket2::read()");
}
@@ -663,16 +665,16 @@ Tango::DevVarCharArray *Socket2::read(Tango::DevLong argin)
//--------------------------------------------------------
/**
* Command ReadUntil related method
- * Description:
*
- * @param argin
- * @returns
+ *
+ * @param argin
+ * @returns
*/
//--------------------------------------------------------
Tango::DevVarCharArray *Socket2::read_until(const Tango::DevVarCharArray *argin)
{
Tango::DevVarCharArray *argout;
- DEBUG_STREAM << "Socket2::ReadUntil() - " << device_name << endl;
+ DEBUG_STREAM << "Socket2::ReadUntil() - " << device_name << std::endl;
/*----- PROTECTED REGION ID(Socket2::read_until) ENABLED START -----*/
check_init();
@@ -709,8 +711,8 @@ Tango::DevVarCharArray *Socket2::read_until(const Tango::DevVarCharArray *argin)
}
if ( ! found && ! wait_for( READ, &tout ) )
{
- string mesg( "No response from device" );
- DEBUG_STREAM << mesg << endl;
+ std::string mesg( "No response from device" );
+ DEBUG_STREAM << mesg << std::endl;
Tango::Except::throw_exception("",
mesg, "Socket2::read_until()");
}
@@ -731,7 +733,7 @@ Tango::DevVarCharArray *Socket2::read_until(const Tango::DevVarCharArray *argin)
//--------------------------------------------------------
/**
* Method : Socket2::add_dynamic_commands()
- * Description : Create the dynamic commands if any
+ * Description: Create the dynamic commands if any
* for specified device.
*/
//--------------------------------------------------------
@@ -751,7 +753,7 @@ void Socket2::check_init()
{
if (! init_error.empty() )
{
- DEBUG_STREAM << init_error << endl;
+ DEBUG_STREAM << init_error << std::endl;
Tango::Except::throw_exception( "",
init_error.c_str(),
"Socket2::check_init()");
@@ -760,13 +762,13 @@ void Socket2::check_init()
void Socket2::open()
{
- DEBUG_STREAM << "Creating the file descriptor..." << endl;
+ DEBUG_STREAM << "Creating the file descriptor..." << std::endl;
if ((fd = socket(PF_INET, proto == UDP? SOCK_DGRAM:SOCK_STREAM, 0)) == -1)
{
- string error_mesg = "Socket creation failed: "
- + string(strerror( errno ));
- ERROR_STREAM << error_mesg << endl;
+ std::string error_mesg = "Socket creation failed: "
+ + std::string(strerror( errno ));
+ ERROR_STREAM << error_mesg << std::endl;
assert( false);
Tango::Except::throw_exception( "",
error_mesg,
@@ -779,9 +781,9 @@ void Socket2::open()
{
::close( fd );
- string error_mesg = "Disabling Nagle failed: "
- + string(strerror( errno ));
- ERROR_STREAM << error_mesg << endl;
+ std::string error_mesg = "Disabling Nagle failed: "
+ + std::string(strerror( errno ));
+ ERROR_STREAM << error_mesg << std::endl;
assert( false);
Tango::Except::throw_exception( "",
error_mesg,
@@ -793,9 +795,9 @@ void Socket2::open()
{
::close( fd );
- string error_mesg = "Enabling reuseaddr flag failed: "
- + string(strerror( errno ));
- ERROR_STREAM << error_mesg << endl;
+ std::string error_mesg = "Enabling reuseaddr flag failed: "
+ + std::string(strerror( errno ));
+ ERROR_STREAM << error_mesg << std::endl;
assert( false);
Tango::Except::throw_exception( "",
error_mesg,
@@ -808,16 +810,16 @@ void Socket2::open()
{
::close( fd );
- string error_mesg = "Enabling O_NONBLOCK failed: "
- + string(strerror( errno ));
- ERROR_STREAM << error_mesg << endl;
+ std::string error_mesg = "Enabling O_NONBLOCK failed: "
+ + std::string(strerror( errno ));
+ ERROR_STREAM << error_mesg << std::endl;
assert( false);
Tango::Except::throw_exception( "",
error_mesg,
"Socket2::open()");
}
- DEBUG_STREAM << "Connecting..." << endl;
+ DEBUG_STREAM << "Connecting..." << std::endl;
::connect(fd, (sockaddr*)&sa, sizeof(sockaddr));
connecting = true;
@@ -825,7 +827,7 @@ void Socket2::open()
void Socket2::close()
{
- DEBUG_STREAM << "Closing the file descriptor..." << endl;
+ DEBUG_STREAM << "Closing the file descriptor..." << std::endl;
connecting = false;
@@ -835,18 +837,18 @@ void Socket2::close()
if( input_len + output_len)
{
WARN_STREAM << " Bytes dropped: " << input_len << " input, "
- << output_len << " output" << endl;
+ << output_len << " output" << std::endl;
}
if (::close(fd) == -1)
{
ERROR_STREAM << "Error closing file descriptor: "
- << strerror(errno) << endl;
+ << strerror(errno) << std::endl;
}
data.clear();
- DEBUG_STREAM << "File descriptor closed" << endl;
+ DEBUG_STREAM << "File descriptor closed" << std::endl;
}
int Socket2::input_queue_length()
@@ -871,7 +873,7 @@ int Socket2::output_queue_length()
void Socket2::resolve()
{
- DEBUG_STREAM << "Resolving " << hostname << "... " << endl;
+ DEBUG_STREAM << "Resolving " << hostname << "... " << std::endl;
char ipstr[INET6_ADDRSTRLEN];
sa_len = sizeof(sa);
@@ -906,8 +908,8 @@ void Socket2::resolve()
}
else
{
- string error_mesg = "Name resolution failed";
- ERROR_STREAM << error_mesg << endl;
+ std::string error_mesg = "Name resolution failed";
+ ERROR_STREAM << error_mesg << std::endl;
Tango::Except::throw_exception( "",
error_mesg,
"Socket2::resolve()");
@@ -920,11 +922,11 @@ void Socket2::check_connection( )
socklen_t len = sizeof so_error;
getsockopt(fd, SOL_SOCKET, SO_ERROR, &so_error, &len);
#ifndef NDEBUG
- DEBUG_STREAM << "getsockopt(): " << strerror( so_error ) << " (" << so_error << ")" << endl;
+ DEBUG_STREAM << "getsockopt(): " << strerror( so_error ) << " (" << so_error << ")" << std::endl;
#endif
bool do_reconnect = false;
- string error_mesg;
+ std::string error_mesg;
switch( so_error )
{
case EHOSTUNREACH:
@@ -963,7 +965,7 @@ void Socket2::check_connection( )
case ENOTDIR:
default:
ERROR_STREAM << "Socket error " << so_error
- << " not handled!" << endl;
+ << " not handled!" << std::endl;
abort( );
break;
case 0 /* SUCCESS */:
@@ -974,7 +976,7 @@ void Socket2::check_connection( )
{
close();
open();
- DEBUG_STREAM << error_mesg << endl;
+ DEBUG_STREAM << error_mesg << std::endl;
set_state( Tango::FAULT );
set_status( error_mesg );
}
@@ -1010,7 +1012,7 @@ bool Socket2::read(timeval *tv)
if( bytes_readed < 0 )
{
- DEBUG_STREAM << strerror( errno ) << " (" << errno << ")" << endl;
+ DEBUG_STREAM << strerror( errno ) << " (" << errno << ")" << std::endl;
if( errno == EINTR)
{
continue;
@@ -1021,7 +1023,7 @@ bool Socket2::read(timeval *tv)
close();
open();
- DEBUG_STREAM << "Server shutting down" << endl;
+ DEBUG_STREAM << "Server shutting down" << std::endl;
set_state(Tango::FAULT);
set_status("Server shutting down");
@@ -1065,7 +1067,7 @@ bool Socket2::wait_for_with_sleep( event_type et, timeval *tv )
if( output_queue_length() == 0 )
{
#ifndef NDEBUG
- DEBUG_STREAM << "Ready to write" << endl;
+ DEBUG_STREAM << "Ready to write" << std::endl;
#endif
return true;
}
@@ -1074,7 +1076,7 @@ bool Socket2::wait_for_with_sleep( event_type et, timeval *tv )
if( input_queue_length() != 0 )
{
#ifndef NDEBUG
- DEBUG_STREAM << "Ready to read" << endl;
+ DEBUG_STREAM << "Ready to read" << std::endl;
#endif
return read(tv);
}
@@ -1083,7 +1085,7 @@ bool Socket2::wait_for_with_sleep( event_type et, timeval *tv )
int usleep_ret = usleep(sleep_time.tv_usec);
#ifndef NDEBUG
- DEBUG_STREAM << "usleep(): " << usleep_ret << endl;
+ DEBUG_STREAM << "usleep(): " << usleep_ret << std::endl;
#else
(void)usleep_ret;
#endif
@@ -1113,13 +1115,13 @@ bool Socket2::wait_for_with_select( event_type et, timeval *tv )
int select_ret = select( fd + 1, &readfds, &writefds, &errorfds, tv );
#ifndef NDEBUG
- DEBUG_STREAM << "select(): " << select_ret << endl;
+ DEBUG_STREAM << "select(): " << select_ret << std::endl;
#endif
if( select_ret == -1 )
{
ERROR_STREAM << "Select() error " << select_ret << " not handled:"
- << strerror( errno ) << endl;
+ << strerror( errno ) << std::endl;
assert( false );
}
else if( select_ret == 0 )
@@ -1129,21 +1131,21 @@ bool Socket2::wait_for_with_select( event_type et, timeval *tv )
if (FD_ISSET(fd, &errorfds))
{
- ERROR_STREAM << "Select() error event not handled!" << endl;
+ ERROR_STREAM << "Select() error event not handled!" << std::endl;
assert( false );
}
if (FD_ISSET(fd, &writefds))
{
#ifndef NDEBUG
- DEBUG_STREAM << "Ready to write" << endl;
+ DEBUG_STREAM << "Ready to write" << std::endl;
#endif
}
if (FD_ISSET(fd, &readfds))
{
#ifndef NDEBUG
- DEBUG_STREAM << "Ready to read" << endl;
+ DEBUG_STREAM << "Ready to read" << std::endl;
#endif
return read(tv);
}
diff --git a/src/Socket2.h b/src/Socket2.h
index f2c95fb..44017d3 100644
--- a/src/Socket2.h
+++ b/src/Socket2.h
@@ -45,11 +45,22 @@
/*----- PROTECTED REGION END -----*/ // Socket2.h
+#ifdef TANGO_LOG
+ // cppTango after c934adea (Merge branch 'remove-cout-definition' into 'main', 2022-05-23)
+ // nothing to do
+#else
+ // cppTango 9.3-backports and older
+ #define TANGO_LOG cout
+ #define TANGO_LOG_INFO cout2
+ #define TANGO_LOG_DEBUG cout3
+#endif // TANGO_LOG
+
/**
* Socket2 class description:
*
*/
+
namespace Socket2_ns
{
/*----- PROTECTED REGION ID(Socket2::Additional Class Declarations) ENABLED START -----*/
@@ -64,7 +75,7 @@ class Socket2 : public TANGO_BASE_CLASS
/*----- PROTECTED REGION ID(Socket2::Data Members) ENABLED START -----*/
// Add your own data members
- string init_error;
+ std::string init_error;
sockaddr_in sa;
socklen_t sa_len;
@@ -79,7 +90,7 @@ class Socket2 : public TANGO_BASE_CLASS
enum event_type { READ, WRITE };
unsigned char buffer[ BUFFER_SIZE ];
- vector< unsigned char > data;
+ std::vector< unsigned char > data;
bool connecting;
long long reconnections;
@@ -91,15 +102,15 @@ class Socket2 : public TANGO_BASE_CLASS
// Device property data members
public:
// Hostname:
- string hostname;
+ std::string hostname;
// Port:
Tango::DevUShort port;
// Protocol:
- string protocol;
+ std::string protocol;
// Timeout:
Tango::DevLong timeout;
// IOMultiplexing: Use `sleep` for fixed sleep and `select` for the syscall of the same name
- string iOMultiplexing;
+ std::string iOMultiplexing;
bool mandatoryNotDefined;
@@ -117,7 +128,7 @@ public:
* @param cl Class.
* @param s Device Name
*/
- Socket2(Tango::DeviceClass *cl,string &s);
+ Socket2(Tango::DeviceClass *cl,std::string &s);
/**
* Constructs a newly device object.
*
@@ -136,7 +147,7 @@ public:
/**
* The device object destructor.
*/
- ~Socket2() {delete_device();};
+ ~Socket2();
// Miscellaneous methods
@@ -168,34 +179,34 @@ public:
//--------------------------------------------------------
/*
* Method : Socket2::read_attr_hardware()
- * Description : Hardware acquisition for attributes.
+ * Description: Hardware acquisition for attributes.
*/
//--------------------------------------------------------
- virtual void read_attr_hardware(vector<long> &attr_list);
+ virtual void read_attr_hardware(std::vector<long> &attr_list);
/**
* Attribute InputLength related methods
- * Description:
*
- * Data type: Tango::DevLong
+ *
+ * Data type: Tango::DevLong
* Attr type: Scalar
*/
virtual void read_InputLength(Tango::Attribute &attr);
virtual bool is_InputLength_allowed(Tango::AttReqType type);
/**
* Attribute OutputLength related methods
- * Description:
*
- * Data type: Tango::DevLong
+ *
+ * Data type: Tango::DevLong
* Attr type: Scalar
*/
virtual void read_OutputLength(Tango::Attribute &attr);
virtual bool is_OutputLength_allowed(Tango::AttReqType type);
/**
* Attribute Reconnections related methods
- * Description:
*
- * Data type: Tango::DevLong
+ *
+ * Data type: Tango::DevLong
* Attr type: Scalar
*/
virtual void read_Reconnections(Tango::Attribute &attr);
@@ -205,7 +216,7 @@ public:
//--------------------------------------------------------
/**
* Method : Socket2::add_dynamic_attributes()
- * Description : Add dynamic attributes if any.
+ * Description: Add dynamic attributes if any.
*/
//--------------------------------------------------------
void add_dynamic_attributes();
@@ -217,27 +228,27 @@ public:
public:
/**
* Command Write related method
- * Description:
*
- * @param argin
+ *
+ * @param argin
*/
virtual void write(const Tango::DevVarCharArray *argin);
virtual bool is_Write_allowed(const CORBA::Any &any);
/**
* Command Read related method
- * Description:
*
- * @param argin
- * @returns
+ *
+ * @param argin
+ * @returns
*/
virtual Tango::DevVarCharArray *read(Tango::DevLong argin);
virtual bool is_Read_allowed(const CORBA::Any &any);
/**
* Command ReadUntil related method
- * Description:
*
- * @param argin
- * @returns
+ *
+ * @param argin
+ * @returns
*/
virtual Tango::DevVarCharArray *read_until(const Tango::DevVarCharArray *argin);
virtual bool is_ReadUntil_allowed(const CORBA::Any &any);
@@ -246,7 +257,7 @@ public:
//--------------------------------------------------------
/**
* Method : Socket2::add_dynamic_commands()
- * Description : Add dynamic commands if any.
+ * Description: Add dynamic commands if any.
*/
//--------------------------------------------------------
void add_dynamic_commands();
diff --git a/src/Socket2.xmi b/src/Socket2.xmi
index 4405b3d..d25de10 100644
--- a/src/Socket2.xmi
+++ b/src/Socket2.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
- <classes name="Socket2" pogoRevision="9.4">
- <description description="" title="" sourcePath="/home/alessio/fermi/servers/socket2/src" language="Cpp" filestogenerate="XMI file,Code files,Protected Regions" license="GPL" hasMandatoryProperty="true" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <classes name="Socket2" pogoRevision="9.8">
+ <description description="" title="" sourcePath="/home/claudio/src/gitlab/cs/ds/socket2/src" language="Cpp" filestogenerate="XMI file,Code files,Protected Regions" license="GPL" hasMandatoryProperty="true" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<identification contact="at elettra.eu> - Alessio Igor Bogani <alessio.bogani" author="Alessio Igor Bogani <alessio.bogani" emailDomain="elettra.eu>" classFamily="Communication" siteSpecific="" platform="Unix Like" bus="Socket" manufacturer="none" reference=""/>
</description>
@@ -92,6 +92,6 @@
<states name="INIT" description="">
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</states>
- <preferences docHome="./doc_html" makefileHome="$(TANGO_HOME)"/>
+ <preferences docHome="./doc_html" makefileHome="/usr/local/tango-9.4.0/share/pogo/preferences"/>
</classes>
</pogoDsl:PogoSystem>
diff --git a/src/Socket2Class.cpp b/src/Socket2Class.cpp
index 514095c..a915d43 100644
--- a/src/Socket2Class.cpp
+++ b/src/Socket2Class.cpp
@@ -73,17 +73,20 @@ namespace Socket2_ns
//===================================================================
Socket2Class *Socket2Class::_instance = NULL;
+//===================================================================
+// Class constants
+//===================================================================
//--------------------------------------------------------
/**
- * method : Socket2Class::Socket2Class(string &s)
+ * method : Socket2Class::Socket2Class(std::string &s)
* description : constructor for the Socket2Class
*
* @param s The class name
*/
//--------------------------------------------------------
-Socket2Class::Socket2Class(string &s):Tango::DeviceClass(s)
+Socket2Class::Socket2Class(std::string &s):Tango::DeviceClass(s)
{
- cout2 << "Entering Socket2Class constructor" << endl;
+ TANGO_LOG_INFO << "Entering Socket2Class constructor" << std::endl;
set_default_property();
write_class_property();
@@ -91,7 +94,7 @@ Socket2Class::Socket2Class(string &s):Tango::DeviceClass(s)
/*----- PROTECTED REGION END -----*/ // Socket2Class::constructor
- cout2 << "Leaving Socket2Class constructor" << endl;
+ TANGO_LOG_INFO << "Leaving Socket2Class constructor" << std::endl;
}
//--------------------------------------------------------
@@ -125,10 +128,10 @@ Socket2Class *Socket2Class::init(const char *name)
{
try
{
- string s(name);
+ std::string s(name);
_instance = new Socket2Class(s);
}
- catch (bad_alloc &)
+ catch (std::bad_alloc &)
{
throw;
}
@@ -147,7 +150,7 @@ Socket2Class *Socket2Class::instance()
{
if (_instance == NULL)
{
- cerr << "Class is not initialised !!" << endl;
+ std::cerr << "Class is not initialised !!" << std::endl;
exit(-1);
}
return _instance;
@@ -171,7 +174,7 @@ Socket2Class *Socket2Class::instance()
//--------------------------------------------------------
CORBA::Any *WriteClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
{
- cout2 << "WriteClass::execute(): arrived" << endl;
+ TANGO_LOG_INFO << "WriteClass::execute(): arrived" << std::endl;
const Tango::DevVarCharArray *argin;
extract(in_any, argin);
((static_cast<Socket2 *>(device))->write(argin));
@@ -191,7 +194,7 @@ CORBA::Any *WriteClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_
//--------------------------------------------------------
CORBA::Any *ReadClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
{
- cout2 << "ReadClass::execute(): arrived" << endl;
+ TANGO_LOG_INFO << "ReadClass::execute(): arrived" << std::endl;
Tango::DevLong argin;
extract(in_any, argin);
return insert((static_cast<Socket2 *>(device))->read(argin));
@@ -210,7 +213,7 @@ CORBA::Any *ReadClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_a
//--------------------------------------------------------
CORBA::Any *ReadUntilClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
{
- cout2 << "ReadUntilClass::execute(): arrived" << endl;
+ TANGO_LOG_INFO << "ReadUntilClass::execute(): arrived" << std::endl;
const Tango::DevVarCharArray *argin;
extract(in_any, argin);
return insert((static_cast<Socket2 *>(device))->read_until(argin));
@@ -223,10 +226,10 @@ CORBA::Any *ReadUntilClass::execute(Tango::DeviceImpl *device, const CORBA::Any
//--------------------------------------------------------
/**
* Method : Socket2Class::get_class_property()
- * Description : Get the class property for specified name.
+ * Description: Get the class property for specified name.
*/
//--------------------------------------------------------
-Tango::DbDatum Socket2Class::get_class_property(string &prop_name)
+Tango::DbDatum Socket2Class::get_class_property(std::string &prop_name)
{
for (unsigned int i=0 ; i<cl_prop.size() ; i++)
if (cl_prop[i].name == prop_name)
@@ -238,10 +241,10 @@ Tango::DbDatum Socket2Class::get_class_property(string &prop_name)
//--------------------------------------------------------
/**
* Method : Socket2Class::get_default_device_property()
- * Description : Return the default value for device property.
+ * Description: Return the default value for device property.
*/
//--------------------------------------------------------
-Tango::DbDatum Socket2Class::get_default_device_property(string &prop_name)
+Tango::DbDatum Socket2Class::get_default_device_property(std::string &prop_name)
{
for (unsigned int i=0 ; i<dev_def_prop.size() ; i++)
if (dev_def_prop[i].name == prop_name)
@@ -253,10 +256,10 @@ Tango::DbDatum Socket2Class::get_default_device_property(string &prop_name)
//--------------------------------------------------------
/**
* Method : Socket2Class::get_default_class_property()
- * Description : Return the default value for class property.
+ * Description: Return the default value for class property.
*/
//--------------------------------------------------------
-Tango::DbDatum Socket2Class::get_default_class_property(string &prop_name)
+Tango::DbDatum Socket2Class::get_default_class_property(std::string &prop_name)
{
for (unsigned int i=0 ; i<cl_def_prop.size() ; i++)
if (cl_def_prop[i].name == prop_name)
@@ -269,7 +272,7 @@ Tango::DbDatum Socket2Class::get_default_class_property(string &prop_name)
//--------------------------------------------------------
/**
* Method : Socket2Class::set_default_property()
- * Description : Set default property (class and device) for wizard.
+ * Description: Set default property (class and device) for wizard.
* For each property, add to wizard property name and description.
* If default value has been set, add it to wizard property and
* store it in a DbDatum.
@@ -277,10 +280,10 @@ Tango::DbDatum Socket2Class::get_default_class_property(string &prop_name)
//--------------------------------------------------------
void Socket2Class::set_default_property()
{
- string prop_name;
- string prop_desc;
- string prop_def;
- vector<string> vect_data;
+ std::string prop_name;
+ std::string prop_desc;
+ std::string prop_def;
+ std::vector<std::string> vect_data;
// Set Default Class Properties
@@ -356,140 +359,41 @@ void Socket2Class::set_default_property()
//--------------------------------------------------------
/**
* Method : Socket2Class::write_class_property()
- * Description : Set class description fields as property in database
+ * Description: Set class description fields as property in database
*/
//--------------------------------------------------------
void Socket2Class::write_class_property()
{
- // First time, check if database used
- if (Tango::Util::_UseDb == false)
- return;
-
- Tango::DbData data;
- string classname = get_name();
- string header;
- string::size_type start, end;
-
- // Put title
- Tango::DbDatum title("ProjectTitle");
- string str_title("");
- title << str_title;
- data.push_back(title);
-
- // Put Description
- Tango::DbDatum description("Description");
- vector<string> str_desc;
- str_desc.push_back("");
- description << str_desc;
- data.push_back(description);
-
- // put cvs or svn location
- string filename("Socket2");
- filename += "Class.cpp";
-
- // check for cvs information
- string src_path(CvsPath);
- start = src_path.find("/");
- if (start!=string::npos)
- {
- end = src_path.find(filename);
- if (end>start)
- {
- string strloc = src_path.substr(start, end-start);
- // Check if specific repository
- start = strloc.find("/cvsroot/");
- if (start!=string::npos && start>0)
- {
- string repository = strloc.substr(0, start);
- if (repository.find("/segfs/")!=string::npos)
- strloc = "ESRF:" + strloc.substr(start, strloc.length()-start);
- }
- Tango::DbDatum cvs_loc("cvs_location");
- cvs_loc << strloc;
- data.push_back(cvs_loc);
- }
- }
-
- // check for svn information
- else
- {
- string src_path(SvnPath);
- start = src_path.find("://");
- if (start!=string::npos)
- {
- end = src_path.find(filename);
- if (end>start)
- {
- header = "$HeadURL: ";
- start = header.length();
- string strloc = src_path.substr(start, (end-start));
-
- Tango::DbDatum svn_loc("svn_location");
- svn_loc << strloc;
- data.push_back(svn_loc);
- }
- }
- }
-
- // Get CVS or SVN revision tag
-
- // CVS tag
- string tagname(TagName);
- header = "$Name: ";
- start = header.length();
- string endstr(" $");
-
- end = tagname.find(endstr);
- if (end!=string::npos && end>start)
- {
- string strtag = tagname.substr(start, end-start);
- Tango::DbDatum cvs_tag("cvs_tag");
- cvs_tag << strtag;
- data.push_back(cvs_tag);
- }
-
- // SVN tag
- string svnpath(SvnPath);
- header = "$HeadURL: ";
- start = header.length();
-
- end = svnpath.find(endstr);
- if (end!=string::npos && end>start)
- {
- string strloc = svnpath.substr(start, end-start);
-
- string tagstr ("/tags/");
- start = strloc.find(tagstr);
- if ( start!=string::npos )
- {
- start = start + tagstr.length();
- end = strloc.find(filename);
- string strtag = strloc.substr(start, end-start-1);
-
- Tango::DbDatum svn_tag("svn_tag");
- svn_tag << strtag;
- data.push_back(svn_tag);
- }
- }
-
- // Get URL location
- string httpServ(HttpServer);
- if (httpServ.length()>0)
- {
- Tango::DbDatum db_doc_url("doc_url");
- db_doc_url << httpServ;
- data.push_back(db_doc_url);
- }
-
- // Put inheritance
- Tango::DbDatum inher_datum("InheritedFrom");
- vector<string> inheritance;
- inheritance.push_back("TANGO_BASE_CLASS");
- inher_datum << inheritance;
- data.push_back(inher_datum);
-
- // Call database and and values
- get_db_class()->put_property(data);
+// First time, check if database used
+if (Tango::Util::_UseDb == false)
+ return;
+
+Tango::DbData data;
+std::string classname = get_name();
+std::string header;
+
+// Put title
+Tango::DbDatum title("ProjectTitle");
+std::string str_title("");
+title << str_title;
+data.push_back(title);
+
+// Put Description
+Tango::DbDatum description("Description");
+std::vector<std::string> str_desc;
+str_desc.push_back("");
+description << str_desc;
+data.push_back(description);
+
+// Put inheritance
+Tango::DbDatum inher_datum("InheritedFrom");
+std::vector<std::string> inheritance;
+inheritance.push_back("TANGO_BASE_CLASS");
+inher_datum << inheritance;
+data.push_back(inher_datum);
+
+// Call database and and values
+get_db_class()->put_property(data);
}
//===================================================================
@@ -499,43 +403,43 @@ void Socket2Class::write_class_property()
//--------------------------------------------------------
/**
* Method : Socket2Class::device_factory()
- * Description : Create the device object(s)
+ * Description: Create the device object(s)
* and store them in the device list
*/
//--------------------------------------------------------
void Socket2Class::device_factory(const Tango::DevVarStringArray *devlist_ptr)
{
- /*----- PROTECTED REGION ID(Socket2Class::device_factory_before) ENABLED START -----*/
+/*----- PROTECTED REGION ID(Socket2Class::device_factory_before) ENABLED START -----*/
// Add your own code
/*----- PROTECTED REGION END -----*/ // Socket2Class::device_factory_before
- // Create devices and add it into the device list
- for (unsigned long i=0 ; i<devlist_ptr->length() ; i++)
- {
- cout4 << "Device name : " << (*devlist_ptr)[i].in() << endl;
- device_list.push_back(new Socket2(this, (*devlist_ptr)[i]));
- }
+// Create devices and add it into the device list
+for (unsigned long i=0 ; i<devlist_ptr->length() ; i++)
+{
+ TANGO_LOG_DEBUG << "Device name : " << (*devlist_ptr)[i].in() << std::endl;
+ device_list.push_back(new Socket2(this, (*devlist_ptr)[i]));
+}
- // Manage dynamic attributes if any
- erase_dynamic_attributes(devlist_ptr, get_class_attr()->get_attr_list());
+// Manage dynamic attributes if any
+erase_dynamic_attributes(devlist_ptr, get_class_attr()->get_attr_list());
- // Export devices to the outside world
- for (unsigned long i=1 ; i<=devlist_ptr->length() ; i++)
- {
- // Add dynamic attributes if any
- Socket2 *dev = static_cast<Socket2 *>(device_list[device_list.size()-i]);
- dev->add_dynamic_attributes();
-
- // Check before if database used.
- if ((Tango::Util::_UseDb == true) && (Tango::Util::_FileDb == false))
- export_device(dev);
- else
- export_device(dev, dev->get_name().c_str());
- }
+// Export devices to the outside world
+for (unsigned long i=1 ; i<=devlist_ptr->length() ; i++)
+{
+ // Add dynamic attributes if any
+ Socket2 *dev = static_cast<Socket2 *>(device_list[device_list.size()-i]);
+ dev->add_dynamic_attributes();
- /*----- PROTECTED REGION ID(Socket2Class::device_factory_after) ENABLED START -----*/
+ // Check before if database used.
+ if ((Tango::Util::_UseDb == true) && (Tango::Util::_FileDb == false))
+ export_device(dev);
+ else
+ export_device(dev, dev->get_name().c_str());
+}
+
+/*----- PROTECTED REGION ID(Socket2Class::device_factory_after) ENABLED START -----*/
// Add your own code
@@ -544,11 +448,11 @@ void Socket2Class::device_factory(const Tango::DevVarStringArray *devlist_ptr)
//--------------------------------------------------------
/**
* Method : Socket2Class::attribute_factory()
- * Description : Create the attribute object(s)
+ * Description: Create the attribute object(s)
* and store them in the attribute list
*/
//--------------------------------------------------------
-void Socket2Class::attribute_factory(vector<Tango::Attr *> &att_list)
+void Socket2Class::attribute_factory(std::vector<Tango::Attr *> &att_list)
{
/*----- PROTECTED REGION ID(Socket2Class::attribute_factory_before) ENABLED START -----*/
@@ -572,7 +476,6 @@ void Socket2Class::attribute_factory(vector<Tango::Attr *> &att_list)
// min_warning not set for InputLength
// delta_t not set for InputLength
// delta_val not set for InputLength
-
inputlength->set_default_properties(inputlength_prop);
// Not Polled
inputlength->set_disp_level(Tango::OPERATOR);
@@ -596,7 +499,6 @@ void Socket2Class::attribute_factory(vector<Tango::Attr *> &att_list)
// min_warning not set for OutputLength
// delta_t not set for OutputLength
// delta_val not set for OutputLength
-
outputlength->set_default_properties(outputlength_prop);
// Not Polled
outputlength->set_disp_level(Tango::OPERATOR);
@@ -620,7 +522,6 @@ void Socket2Class::attribute_factory(vector<Tango::Attr *> &att_list)
// min_warning not set for Reconnections
// delta_t not set for Reconnections
// delta_val not set for Reconnections
-
reconnections->set_default_properties(reconnections_prop);
// Not Polled
reconnections->set_disp_level(Tango::OPERATOR);
@@ -639,7 +540,7 @@ void Socket2Class::attribute_factory(vector<Tango::Attr *> &att_list)
//--------------------------------------------------------
/**
* Method : Socket2Class::pipe_factory()
- * Description : Create the pipe object(s)
+ * Description: Create the pipe object(s)
* and store them in the pipe list
*/
//--------------------------------------------------------
@@ -659,7 +560,7 @@ void Socket2Class::pipe_factory()
//--------------------------------------------------------
/**
* Method : Socket2Class::command_factory()
- * Description : Create the command object(s)
+ * Description: Create the command object(s)
* and store them in the command list
*/
//--------------------------------------------------------
@@ -713,19 +614,19 @@ void Socket2Class::command_factory()
* method : Socket2Class::create_static_attribute_list
* description : Create the a list of static attributes
*
- * @param att_list the ceated attribute list
+ * @param att_list the created attribute list
*/
//--------------------------------------------------------
-void Socket2Class::create_static_attribute_list(vector<Tango::Attr *> &att_list)
+void Socket2Class::create_static_attribute_list(std::vector<Tango::Attr *> &att_list)
{
for (unsigned long i=0 ; i<att_list.size() ; i++)
{
- string att_name(att_list[i]->get_name());
+ std::string att_name(att_list[i]->get_name());
transform(att_name.begin(), att_name.end(), att_name.begin(), ::tolower);
defaultAttList.push_back(att_name);
}
- cout2 << defaultAttList.size() << " attributes in default list" << endl;
+ TANGO_LOG_INFO << defaultAttList.size() << " attributes in default list" << std::endl;
/*----- PROTECTED REGION ID(Socket2Class::create_static_att_list) ENABLED START -----*/
@@ -742,26 +643,26 @@ void Socket2Class::create_static_attribute_list(vector<Tango::Attr *> &att_list)
* @param list of all attributes
*/
//--------------------------------------------------------
-void Socket2Class::erase_dynamic_attributes(const Tango::DevVarStringArray *devlist_ptr, vector<Tango::Attr *> &att_list)
+void Socket2Class::erase_dynamic_attributes(const Tango::DevVarStringArray *devlist_ptr, std::vector<Tango::Attr *> &att_list)
{
Tango::Util *tg = Tango::Util::instance();
for (unsigned long i=0 ; i<devlist_ptr->length() ; i++)
{
- Tango::DeviceImpl *dev_impl = tg->get_device_by_name(((string)(*devlist_ptr)[i]).c_str());
+ Tango::DeviceImpl *dev_impl = tg->get_device_by_name(((std::string)(*devlist_ptr)[i]).c_str());
Socket2 *dev = static_cast<Socket2 *> (dev_impl);
- vector<Tango::Attribute *> &dev_att_list = dev->get_device_attr()->get_attribute_list();
- vector<Tango::Attribute *>::iterator ite_att;
+ std::vector<Tango::Attribute *> &dev_att_list = dev->get_device_attr()->get_attribute_list();
+ std::vector<Tango::Attribute *>::iterator ite_att;
for (ite_att=dev_att_list.begin() ; ite_att != dev_att_list.end() ; ++ite_att)
{
- string att_name((*ite_att)->get_name_lower());
+ std::string att_name((*ite_att)->get_name_lower());
if ((att_name == "state") || (att_name == "status"))
continue;
- vector<string>::iterator ite_str = find(defaultAttList.begin(), defaultAttList.end(), att_name);
+ std::vector<std::string>::iterator ite_str = find(defaultAttList.begin(), defaultAttList.end(), att_name);
if (ite_str == defaultAttList.end())
{
- cout2 << att_name << " is a UNWANTED dynamic attribute for device " << (*devlist_ptr)[i] << endl;
+ TANGO_LOG_INFO << att_name << " is a UNWANTED dynamic attribute for device " << (*devlist_ptr)[i] << std::endl;
Tango::Attribute &att = dev->get_device_attr()->get_attr_by_name(att_name.c_str());
dev->remove_attribute(att_list[att.get_attr_idx()], true, false);
--ite_att;
@@ -775,13 +676,13 @@ void Socket2Class::erase_dynamic_attributes(const Tango::DevVarStringArray *devl
//--------------------------------------------------------
/**
- * Method : Socket2Class::get_attr_by_name()
- * Description : returns Tango::Attr * object found by name
+ * Method : Socket2Class::get_attr_object_by_name()
+ * Description: returns Tango::Attr * object found by name
*/
//--------------------------------------------------------
-Tango::Attr *Socket2Class::get_attr_object_by_name(vector<Tango::Attr *> &att_list, string attname)
+Tango::Attr *Socket2Class::get_attr_object_by_name(std::vector<Tango::Attr *> &att_list, std::string attname)
{
- vector<Tango::Attr *>::iterator it;
+ std::vector<Tango::Attr *>::iterator it;
for (it=att_list.begin() ; it<att_list.end() ; ++it)
if ((*it)->get_name()==attname)
return (*it);
diff --git a/src/Socket2Class.h b/src/Socket2Class.h
index 690ecca..1396e5e 100644
--- a/src/Socket2Class.h
+++ b/src/Socket2Class.h
@@ -106,20 +106,20 @@ public:
class WriteClass : public Tango::Command
{
public:
- WriteClass(const char *name,
+ WriteClass(const char *cmd_name,
Tango::CmdArgType in,
Tango::CmdArgType out,
const char *in_desc,
const char *out_desc,
Tango::DispLevel level)
- :Command(name,in,out,in_desc,out_desc, level) {};
+ :Command(cmd_name,in,out,in_desc,out_desc, level) {};
- WriteClass(const char *name,
+ WriteClass(const char *cmd_name,
Tango::CmdArgType in,
Tango::CmdArgType out)
- :Command(name,in,out) {};
+ :Command(cmd_name,in,out) {};
~WriteClass() {};
-
+
virtual CORBA::Any *execute (Tango::DeviceImpl *dev, const CORBA::Any &any);
virtual bool is_allowed (Tango::DeviceImpl *dev, const CORBA::Any &any)
{return (static_cast<Socket2 *>(dev))->is_Write_allowed(any);}
@@ -129,20 +129,20 @@ public:
class ReadClass : public Tango::Command
{
public:
- ReadClass(const char *name,
+ ReadClass(const char *cmd_name,
Tango::CmdArgType in,
Tango::CmdArgType out,
const char *in_desc,
const char *out_desc,
Tango::DispLevel level)
- :Command(name,in,out,in_desc,out_desc, level) {};
+ :Command(cmd_name,in,out,in_desc,out_desc, level) {};
- ReadClass(const char *name,
+ ReadClass(const char *cmd_name,
Tango::CmdArgType in,
Tango::CmdArgType out)
- :Command(name,in,out) {};
+ :Command(cmd_name,in,out) {};
~ReadClass() {};
-
+
virtual CORBA::Any *execute (Tango::DeviceImpl *dev, const CORBA::Any &any);
virtual bool is_allowed (Tango::DeviceImpl *dev, const CORBA::Any &any)
{return (static_cast<Socket2 *>(dev))->is_Read_allowed(any);}
@@ -152,20 +152,20 @@ public:
class ReadUntilClass : public Tango::Command
{
public:
- ReadUntilClass(const char *name,
+ ReadUntilClass(const char *cmd_name,
Tango::CmdArgType in,
Tango::CmdArgType out,
const char *in_desc,
const char *out_desc,
Tango::DispLevel level)
- :Command(name,in,out,in_desc,out_desc, level) {};
+ :Command(cmd_name,in,out,in_desc,out_desc, level) {};
- ReadUntilClass(const char *name,
+ ReadUntilClass(const char *cmd_name,
Tango::CmdArgType in,
Tango::CmdArgType out)
- :Command(name,in,out) {};
+ :Command(cmd_name,in,out) {};
~ReadUntilClass() {};
-
+
virtual CORBA::Any *execute (Tango::DeviceImpl *dev, const CORBA::Any &any);
virtual bool is_allowed (Tango::DeviceImpl *dev, const CORBA::Any &any)
{return (static_cast<Socket2 *>(dev))->is_ReadUntil_allowed(any);}
@@ -182,43 +182,43 @@ class __declspec(dllexport) Socket2Class : public Tango::DeviceClass
class Socket2Class : public Tango::DeviceClass
#endif
{
- /*----- PROTECTED REGION ID(Socket2Class::Additionnal DServer data members) ENABLED START -----*/
-
-
- /*----- PROTECTED REGION END -----*/ // Socket2Class::Additionnal DServer data members
+ /*----- PROTECTED REGION ID(Socket2Class::Additional DServer data members) ENABLED START -----*/
+ /* clang-format on */
+ // Add your own code
+ /* clang-format off */
+ /*----- PROTECTED REGION END -----*/ // Socket2Class::Additional DServer data members
public:
// write class properties data members
Tango::DbData cl_prop;
Tango::DbData cl_def_prop;
Tango::DbData dev_def_prop;
-
// Method prototypes
static Socket2Class *init(const char *);
static Socket2Class *instance();
~Socket2Class();
- Tango::DbDatum get_class_property(string &);
- Tango::DbDatum get_default_device_property(string &);
- Tango::DbDatum get_default_class_property(string &);
-
+ Tango::DbDatum get_class_property(std::string &);
+ Tango::DbDatum get_default_device_property(std::string &);
+ Tango::DbDatum get_default_class_property(std::string &);
+
protected:
- Socket2Class(string &);
+ Socket2Class(std::string &);
static Socket2Class *_instance;
void command_factory();
- void attribute_factory(vector<Tango::Attr *> &);
+ void attribute_factory(std::vector<Tango::Attr *> &);
void pipe_factory();
void write_class_property();
void set_default_property();
void get_class_property();
- string get_cvstag();
- string get_cvsroot();
-
+ std::string get_cvstag();
+ std::string get_cvsroot();
+
private:
- void device_factory(const Tango::DevVarStringArray *);
- void create_static_attribute_list(vector<Tango::Attr *> &);
- void erase_dynamic_attributes(const Tango::DevVarStringArray *,vector<Tango::Attr *> &);
- vector<string> defaultAttList;
- Tango::Attr *get_attr_object_by_name(vector<Tango::Attr *> &att_list, string attname);
+ void device_factory(TANGO_UNUSED(const Tango::DevVarStringArray *));
+ void create_static_attribute_list(std::vector<Tango::Attr *> &);
+ void erase_dynamic_attributes(const Tango::DevVarStringArray *,std::vector<Tango::Attr *> &);
+ std::vector<std::string> defaultAttList;
+ Tango::Attr *get_attr_object_by_name(std::vector<Tango::Attr *> &att_list, std::string attname);
};
} // End of namespace
diff --git a/src/Socket2StateMachine.cpp b/src/Socket2StateMachine.cpp
index 803f432..96578f8 100644
--- a/src/Socket2StateMachine.cpp
+++ b/src/Socket2StateMachine.cpp
@@ -56,7 +56,7 @@ namespace Socket2_ns
//--------------------------------------------------------
/**
* Method : Socket2::is_InputLength_allowed()
- * Description : Execution allowed for InputLength attribute
+ * Description: Execution allowed for InputLength attribute
*/
//--------------------------------------------------------
bool Socket2::is_InputLength_allowed(TANGO_UNUSED(Tango::AttReqType type))
@@ -72,7 +72,7 @@ bool Socket2::is_InputLength_allowed(TANGO_UNUSED(Tango::AttReqType type))
//--------------------------------------------------------
/**
* Method : Socket2::is_OutputLength_allowed()
- * Description : Execution allowed for OutputLength attribute
+ * Description: Execution allowed for OutputLength attribute
*/
//--------------------------------------------------------
bool Socket2::is_OutputLength_allowed(TANGO_UNUSED(Tango::AttReqType type))
@@ -88,7 +88,7 @@ bool Socket2::is_OutputLength_allowed(TANGO_UNUSED(Tango::AttReqType type))
//--------------------------------------------------------
/**
* Method : Socket2::is_Reconnections_allowed()
- * Description : Execution allowed for Reconnections attribute
+ * Description: Execution allowed for Reconnections attribute
*/
//--------------------------------------------------------
bool Socket2::is_Reconnections_allowed(TANGO_UNUSED(Tango::AttReqType type))
@@ -109,7 +109,7 @@ bool Socket2::is_Reconnections_allowed(TANGO_UNUSED(Tango::AttReqType type))
//--------------------------------------------------------
/**
* Method : Socket2::is_Write_allowed()
- * Description : Execution allowed for Write attribute
+ * Description: Execution allowed for Write attribute
*/
//--------------------------------------------------------
bool Socket2::is_Write_allowed(TANGO_UNUSED(const CORBA::Any &any))
@@ -129,7 +129,7 @@ bool Socket2::is_Write_allowed(TANGO_UNUSED(const CORBA::Any &any))
//--------------------------------------------------------
/**
* Method : Socket2::is_Read_allowed()
- * Description : Execution allowed for Read attribute
+ * Description: Execution allowed for Read attribute
*/
//--------------------------------------------------------
bool Socket2::is_Read_allowed(TANGO_UNUSED(const CORBA::Any &any))
@@ -149,7 +149,7 @@ bool Socket2::is_Read_allowed(TANGO_UNUSED(const CORBA::Any &any))
//--------------------------------------------------------
/**
* Method : Socket2::is_ReadUntil_allowed()
- * Description : Execution allowed for ReadUntil attribute
+ * Description: Execution allowed for ReadUntil attribute
*/
//--------------------------------------------------------
bool Socket2::is_ReadUntil_allowed(TANGO_UNUSED(const CORBA::Any &any))
diff --git a/src/main.cpp b/src/main.cpp
index 68aeda5..7b09363 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -65,20 +65,20 @@ int main(int argc,char *argv[])
// Run the endless loop
//----------------------------------------
- cout << "Ready to accept request" << endl;
+ std::cout << "Ready to accept request" << std::endl;
tg->server_run();
}
- catch (bad_alloc &)
+ catch (std::bad_alloc &)
{
- cout << "Can't allocate memory to store device object !!!" << endl;
- cout << "Exiting" << endl;
+ std::cout << "Can't allocate memory to store device object !!!" << std::endl;
+ std::cout << "Exiting" << std::endl;
}
catch (CORBA::Exception &e)
{
Tango::Except::print_exception(e);
- cout << "Received a CORBA_Exception" << endl;
- cout << "Exiting" << endl;
+ std::cout << "Received a CORBA_Exception" << std::endl;
+ std::cout << "Exiting" << std::endl;
}
Tango::Util::instance()->server_cleanup();
return(0);
--
GitLab