Skip to content

Commit

Permalink
reverted to using Thread instead of Task
Browse files Browse the repository at this point in the history
  • Loading branch information
@genemars
genemars committed Nov 4, 2015
1 parent c9b0b76 commit 8d2900a
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 67 deletions.
3 changes: 2 additions & 1 deletion XTenLib/Drivers/CM15.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ public bool Open()
/// </summary>
public void Close()
{
this.Dispose();
if (myUsbDevice != null)
{
if (myUsbDevice.DriverMode == UsbDevice.DriverModeType.MonoLibUsb)
Expand All @@ -144,6 +143,8 @@ public void Close()
}
}
myUsbDevice = null;
UsbDevice.Exit();
this.Dispose();
}
}

Expand Down
134 changes: 68 additions & 66 deletions XTenLib/XTenManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,13 @@ public class XTenManager
private bool gotReadWriteError = true;

// X10 interface reader Task
private Task readerTask;
private CancellationTokenSource readerTokenSource;
private Thread reader;

// X10 interface connection watcher
private Task connectionWatcher;
private CancellationTokenSource watcherTokenSource;
private Thread connectionWatcher;

private object accessLock = new object();
private bool disconnectRequested = false;

// This is used on Linux/Mono for detecting when the link gets disconnected
private int zeroChecksumCount = 0;
Expand Down Expand Up @@ -195,36 +196,37 @@ public XTenManager()
/// </summary>
public bool Connect()
{
Disconnect();
bool returnValue = Open();
gotReadWriteError = !returnValue;
watcherTokenSource = new CancellationTokenSource();
connectionWatcher = Task.Factory.StartNew(() => ConnectionWatcherTask(watcherTokenSource.Token), watcherTokenSource.Token);
return returnValue;
if (disconnectRequested)
return false;
lock (accessLock)
{
Disconnect();
Open();
connectionWatcher = new Thread(ConnectionWatcherTask);
connectionWatcher.Start();
}
return IsConnected;
}

/// <summary>
/// Connect from the X10 hardware.
/// </summary>
public void Disconnect()
{
if (connectionWatcher != null)
if (disconnectRequested)
return;
disconnectRequested = true;
Close();
lock (accessLock)
{
watcherTokenSource.Cancel();
try
{
connectionWatcher.Wait(5000);
}
catch (AggregateException e)
if (connectionWatcher != null)
{
logger.Error(e);
if (!connectionWatcher.Join(5000))
connectionWatcher.Abort();
connectionWatcher = null;
}
if (connectionWatcher != null)
connectionWatcher.Dispose();
connectionWatcher = null;
watcherTokenSource = null;
disconnectRequested = false;
}
Close();
}

/// <summary>
Expand All @@ -233,7 +235,7 @@ public void Disconnect()
/// <value><c>true</c> if connected; otherwise, <c>false</c>.</value>
public bool IsConnected
{
get { return isInterfaceReady || (!gotReadWriteError && x10interface.GetType().Equals(typeof(CM15))); }
get { return (x10interface != null && !disconnectRequested && (isInterfaceReady || (!gotReadWriteError && x10interface.GetType().Equals(typeof(CM15))))); }
}

/// <summary>
Expand All @@ -248,8 +250,10 @@ public string PortName
{
if (portName != value)
{
// set to erro so that the connection watcher will reconnect
// using the new port
Close();

// instantiate the requested interface
if (value.ToUpper() == "USB")
{
x10interface = new CM15();
Expand All @@ -258,8 +262,6 @@ public string PortName
{
x10interface = new CM11(value);
}

gotReadWriteError = true;
}
portName = value;
}
Expand Down Expand Up @@ -724,52 +726,54 @@ private void Module_PropertyChanged(object sender, PropertyChangedEventArgs args

private bool Open()
{
Close();
bool success = (x10interface != null && x10interface.Open());
if (success)
bool success = false;
lock (accessLock)
{
if (x10interface.GetType().Equals(typeof(CM15)))
Close();
success = (x10interface != null && x10interface.Open());
if (success)
{
// Set transceived house codes for CM15 X10 RF-->PLC
InitializeCm15();
OnConnectionStatusChanged(new ConnectionStatusChangedEventArgs(true));
if (x10interface.GetType().Equals(typeof(CM15)))
{
// Set transceived house codes for CM15 X10 RF-->PLC
InitializeCm15();
// For CM15 we do not need to receive ACK message to claim status as connected
OnConnectionStatusChanged(new ConnectionStatusChangedEventArgs(true));
}
// Start the Reader task
gotReadWriteError = false;
// Start the Reader task
reader = new Thread(ReaderTask);
reader.Start();
}
// Start the Reader task
readerTokenSource = new CancellationTokenSource();
readerTask = Task.Factory.StartNew(() => ReaderTask(readerTokenSource.Token), readerTokenSource.Token);
}
return success;
}

private void Close()
{
// Stop the Reader task
if (readerTask != null)
UnselectModules();
lock (accessLock)
{
readerTokenSource.Cancel();
// Dispose the X10 interface
try
{
readerTask.Wait(5000);
x10interface.Close();
}
catch (AggregateException e)
catch (Exception e)
{
logger.Error(e);
}
if (readerTask != null)
readerTask.Dispose();
readerTask = null;
readerTokenSource = null;
}
// Dispose the X10 interface
try
{
x10interface.Close();
}
catch (Exception e)
{
logger.Error(e);
gotReadWriteError = true;
// Stop the Reader task
if (reader != null)
{
if (!reader.Join(5000))
reader.Abort();
reader = null;
}
OnConnectionStatusChanged(new ConnectionStatusChangedEventArgs(false));
}
OnConnectionStatusChanged(new ConnectionStatusChangedEventArgs(false));
}

private void SendMessage(byte[] message)
Expand Down Expand Up @@ -846,9 +850,9 @@ private void SendMessage(byte[] message)
}
}

private void ReaderTask(CancellationToken readerToken)
private void ReaderTask()
{
while (!readerToken.IsCancellationRequested)
while (IsConnected)
{
try
{
Expand Down Expand Up @@ -1133,7 +1137,6 @@ private void ReaderTask(CancellationToken readerToken)
{
zeroChecksumCount = 0;
gotReadWriteError = true;
Close();
}
else
{
Expand All @@ -1156,26 +1159,24 @@ private void ReaderTask(CancellationToken readerToken)
}
}

private void ConnectionWatcherTask(CancellationToken watcherToken)
private void ConnectionWatcherTask()
{
// This task takes care of automatically reconnecting the interface
// when the connection is drop or if an I/O error occurs
while (!watcherToken.IsCancellationRequested)
while (!disconnectRequested)
{
if (gotReadWriteError)
{
OnConnectionStatusChanged(new ConnectionStatusChangedEventArgs(false));
try
{
UnselectModules();
Close();
// wait 3 secs before reconnecting
Thread.Sleep(3000);
if (!watcherToken.IsCancellationRequested)
if (!disconnectRequested)
{
try
{
gotReadWriteError = !Open();
Open();
}
catch (Exception e)
{
Expand All @@ -1188,7 +1189,8 @@ private void ConnectionWatcherTask(CancellationToken watcherToken)
logger.Error(e);
}
}
Thread.Sleep(1000);
if (!disconnectRequested)
Thread.Sleep(1000);
}
}

Expand Down

0 comments on commit 8d2900a

Please sign in to comment.