Skip to content
Snippets Groups Projects
Commit 9db88dde authored by Alessio Igor Bogani's avatar Alessio Igor Bogani
Browse files

Synchronize with Socket2

parent 3a4e897d
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
src/Serial2.cpp
+ 292
− 415
View file @ 9db88dde
This diff is collapsed.
src/Serial2.h
+ 13
− 24
View file @ 9db88dde
......@@ -40,8 +40,6 @@
#include <tango.h>
#define BUFFER_SIZE 1000
/*----- PROTECTED REGION END -----*/ // Serial2.h
#ifdef TANGO_LOG
......@@ -77,22 +75,17 @@ class Serial2 : public TANGO_BASE_CLASS
string init_error;
int fd;
fd_set readfds;
fd_set writefds;
fd_set errorfds;
enum event_type { READ, WRITE };
int conn_state;
unsigned char buffer[ BUFFER_SIZE ];
vector< unsigned char > data;
enum event_type {READ, WRITE};
bool connecting;
long long reconnections;
vector<unsigned char> data;
enum { SLEEP, SELECT } multiplexing;
int reconnections;
timeval tout;
enum {SLEEP, SELECT} multiplexing;
timeval timeout_timeval, tout;
/*----- PROTECTED REGION END -----*/ // Serial2::Data Members
// Device property data members
......@@ -267,20 +260,16 @@ public:
/*----- PROTECTED REGION ID(Serial2::Additional Method prototypes) ENABLED START -----*/
// Additional Method prototypes
void check_init();
bool sleep(timeval);
void open();
void close();
void check_connection( );
bool wait_for( event_type et, timeval *tv );
bool wait_for_with_sleep( event_type et, timeval *tv );
bool wait_for_with_select( event_type et, timeval *tv );
int input_queue_length();
int output_queue_length();
bool read( struct timeval *tv );
void close();
ssize_t _write(int, const void*, size_t);
void _read(size_t);
void check_state(bool);
bool wait_for(event_type);
void resolve();
/*----- PROTECTED REGION END -----*/ // Serial2::Additional Method prototypes
};
......
src/Serial2.xmi
+ 10
− 6
View file @ 9db88dde
<?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="Serial2" pogoRevision="9.7">
<description description="" title="" sourcePath="/home/alessio/Sources/git-trees/serial2/src" language="Cpp" filestogenerate="XMI file,Code files,Protected Regions" license="GPL" hasMandatoryProperty="true" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
<description description="" title="" sourcePath="/home/alessio/Sources/git-trees/4uhv/deps/serial2/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 &lt;alessio.bogani" author="Alessio Igor Bogani &lt;alessio.bogani" emailDomain="elettra.eu>" classFamily="Communication" siteSpecific="" platform="Unix Like" bus="Serial Line" manufacturer="none" reference=""/>
</description>
......@@ -36,6 +36,7 @@
<deviceProperties name="IOMultiplexing" description="Use `sleep` for fixed sleep and `select` for ths syscall of the same name">
<type xsi:type="pogoDsl:StringType"/>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<DefaultPropValue>SELECT</DefaultPropValue>
</deviceProperties>
<commands name="Write" description="" execMethod="write" displayLevel="OPERATOR" polledPeriod="0">
<argin description="">
......@@ -45,7 +46,6 @@
<type xsi:type="pogoDsl:VoidType"/>
</argout>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<excludedStates>INIT</excludedStates>
</commands>
<commands name="Read" description="" execMethod="read" displayLevel="OPERATOR" polledPeriod="0">
<argin description="">
......@@ -55,7 +55,6 @@
<type xsi:type="pogoDsl:CharArrayType"/>
</argout>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<excludedStates>INIT</excludedStates>
</commands>
<commands name="ReadUntil" description="" execMethod="read_until" displayLevel="OPERATOR" polledPeriod="0">
<argin description="">
......@@ -65,7 +64,6 @@
<type xsi:type="pogoDsl:CharArrayType"/>
</argout>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
<excludedStates>INIT</excludedStates>
</commands>
<attributes name="InputLength" attType="Scalar" rwType="READ" displayLevel="OPERATOR" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
<dataType xsi:type="pogoDsl:IntType"/>
......@@ -94,10 +92,16 @@
<states name="ON" description="Connected">
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</states>
<states name="FAULT" description="Connection failed">
<states name="INIT" description="">
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</states>
<states name="INIT" description="">
<states name="UNKNOWN" description="">
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</states>
<states name="ALARM" description="">
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</states>
<states name="FAULT" description="">
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</states>
<preferences docHome="./doc_html" makefileHome="$(TANGO_HOME)"/>
......
src/Serial2Class.cpp
+ 2
− 1
View file @ 9db88dde
......@@ -376,8 +376,9 @@ void Serial2Class::set_default_property()
add_wiz_dev_prop(prop_name, prop_desc);
prop_name = "IOMultiplexing";
prop_desc = "Use `sleep` for fixed sleep and `select` for ths syscall of the same name";
prop_def = "";
prop_def = "SELECT";
vect_data.clear();
vect_data.push_back("SELECT");
if (prop_def.length()>0)
{
Tango::DbDatum data(prop_name);
......
src/Serial2StateMachine.cpp
+ 9
− 19
View file @ 9db88dde
......@@ -39,11 +39,13 @@
/*----- PROTECTED REGION END -----*/ // Serial2::Serial2StateMachine.cpp
//================================================================
// States | Description
// States | Description
//================================================================
// ON | Connected
// FAULT | Connection failed
// INIT |
// ON | Connected
// INIT |
// UNKNOWN |
// ALARM |
// FAULT |
namespace Serial2_ns
......@@ -113,14 +115,10 @@ bool Serial2::is_Reconnections_allowed(TANGO_UNUSED(Tango::AttReqType type))
//--------------------------------------------------------
bool Serial2::is_Write_allowed(TANGO_UNUSED(const CORBA::Any &any))
{
// Compare device state with not allowed states.
if (get_state()==Tango::INIT)
{
// Not any excluded states for Write command.
/*----- PROTECTED REGION ID(Serial2::WriteStateAllowed) ENABLED START -----*/
/*----- PROTECTED REGION END -----*/ // Serial2::WriteStateAllowed
return false;
}
return true;
}
......@@ -132,14 +130,10 @@ bool Serial2::is_Write_allowed(TANGO_UNUSED(const CORBA::Any &any))
//--------------------------------------------------------
bool Serial2::is_Read_allowed(TANGO_UNUSED(const CORBA::Any &any))
{
// Compare device state with not allowed states.
if (get_state()==Tango::INIT)
{
// Not any excluded states for Read command.
/*----- PROTECTED REGION ID(Serial2::ReadStateAllowed) ENABLED START -----*/
/*----- PROTECTED REGION END -----*/ // Serial2::ReadStateAllowed
return false;
}
return true;
}
......@@ -151,14 +145,10 @@ bool Serial2::is_Read_allowed(TANGO_UNUSED(const CORBA::Any &any))
//--------------------------------------------------------
bool Serial2::is_ReadUntil_allowed(TANGO_UNUSED(const CORBA::Any &any))
{
// Compare device state with not allowed states.
if (get_state()==Tango::INIT)
{
// Not any excluded states for ReadUntil command.
/*----- PROTECTED REGION ID(Serial2::ReadUntilStateAllowed) ENABLED START -----*/
/*----- PROTECTED REGION END -----*/ // Serial2::ReadUntilStateAllowed
return false;
}
return true;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment