From 3a4e897d14a20325dec6f9d46de10ddf16c8e019 Mon Sep 17 00:00:00 2001
From: Alessio Igor Bogani <alessio.bogani@elettra.eu>
Date: Wed, 7 Feb 2024 12:54:53 +0100
Subject: [PATCH] Add a sleep if write() fails immediately
---
src/Serial2.cpp | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/Serial2.cpp b/src/Serial2.cpp
index 4c6c4da..e1de68a 100644
--- a/src/Serial2.cpp
+++ b/src/Serial2.cpp
@@ -535,7 +535,7 @@ void Serial2::write(const Tango::DevVarCharArray *argin)
DEBUG_STREAM << "Serial2::Write() - " << device_name << std::endl;
/*----- PROTECTED REGION ID(Serial2::write) ENABLED START -----*/
check_init();
-
+
char *argin_data = new char[ argin->length() ];
for( unsigned int i=0; i<argin->length(); ++i )
{
@@ -559,14 +559,19 @@ void Serial2::write(const Tango::DevVarCharArray *argin)
{
delete argin_data;
- string error_mesg = "Connection refused";
-
close();
open();
+
+ string error_mesg = "Connection refused";
DEBUG_STREAM << error_mesg << endl;
+
set_state( Tango::FAULT );
set_status( error_mesg );
+ sleep( tout.tv_sec );
+ usleep( tout.tv_usec );
+ timerclear( &tout );
+
Tango::Except::throw_exception( "",
error_mesg,
"Serial2::write()");
@@ -613,11 +618,12 @@ void Serial2::write(const Tango::DevVarCharArray *argin)
if( (bytes_total - output_queue_length()) != bytes_to_write )
{
- string error_mesg = "Unable to send request to device";
-
close();
open();
+
+ string error_mesg = "Unable to send request to device";
DEBUG_STREAM << error_mesg << endl;
+
set_state( Tango::FAULT );
set_status( error_mesg );
@@ -986,9 +992,11 @@ bool Serial2::read(timeval *tv)
close();
open();
- DEBUG_STREAM << "Server shutting down" << endl;
+ string error_mesg = "Server shutting down";
+ DEBUG_STREAM << error_mesg << endl;
+
set_state(Tango::FAULT);
- set_status("Server shutting down");
+ set_status(error_mesg);
sleep( tv->tv_sec );
usleep( tv->tv_usec );
--
GitLab