Changeset 296 for PinConnection/UCommThread.pas

Timestamp:

Nov 16, 2011, 7:24:09 AM (13 years ago)

Author:

george

Message:

• Added: New TCommDelay interconnection block for creating time delay in route.
• Fixed: In TCommThread do not obtain lock during sending data in thread.
• Modified: TCommFrame have ability to change special control symbols.

File:

• PinConnection/UCommThread.pas (modified) (3 diffs)

PinConnection/UCommThread.pas

@@ -16 +16 @@
   { TCommThreadReceiveThread }
 
-  TCommThreadReceiveThread = class(TListedThread)
+  TCommThreadReceiveThread = class(TTermThread)
   public
     Parent: TCommThread;
@@ -103 +103 @@
     FReceiveThread.Start;
   end else begin
-    FReceiveThread.Terminate;
-    FReceiveThread.WaitFor;
     FreeAndNil(FReceiveThread);
   end;
@@ -139 +137 @@
 
 procedure TCommThreadReceiveThread.Execute;
+var
+  TempStatus: Integer;
 begin
-  try
-    with Parent do
-    repeat
-      // Check if new data arrived
-      if FDataAvailable.WaitFor(1) = wrSignaled then
+  with Parent do
+  repeat
+    // Check if new data arrived
+    if FDataAvailable.WaitFor(1) = wrSignaled then begin
       try
         FInputBufferLock.Acquire;
         Stream.Size := 0;
         Stream.WriteStream(FInputBuffer, FInputBuffer.Size);
-        Pin.Send(Stream);
-      finally
         FDataAvailable.ResetEvent;
         FInputBuffer.Clear;
+      finally
         FInputBufferLock.Release;
       end; // else Yield;
+      Pin.Send(Stream);
+    end;
 
-      // Check if state changed
-      if FStatusEvent.WaitFor(0) = wrSignaled then
+    // Check if state changed
+    if FStatusEvent.WaitFor(0) = wrSignaled then begin
       try
         FInputBufferLock.Acquire;
-        Pin.Status := FStatusValue;
+        TempStatus := FStatusValue;
       finally
         FStatusEvent.ResetEvent;
         FInputBufferLock.Release;
       end;
-    until Terminated;
-  finally
-  end;
+      Pin.Status := TempStatus;
+    end;
+  until Terminated;
 end;