Changeset 171 for PinConnection

Timestamp:

Feb 21, 2011, 2:02:53 PM (13 years ago)

Author:

george

Message:

• Fixed: Wrong locking inside CommProtocol SendCommand method.

Location:

PinConnection

Files:

• UCommProtocol.pas (modified) (9 diffs)
• UCommSerialPort.pas (modified) (1 diff)
• UCommThread.pas (modified) (1 diff)
• UPacketBurst.pas (modified) (1 diff)

PinConnection/UCommProtocol.pas

@@ -46 +46 @@
 
   TDeviceProtocolSessionList = class(TListObject)
+  private
+    function GetSequenceNumber: Integer;
+  public
     SequenceNumber: integer;
     Parent: TCommProtocol;
@@ -54 +57 @@
     constructor Create;
     destructor Destroy; override;
-    function GetSequenceNumber: Integer;
   end;
 
@@ -124 +126 @@
   TempStream: TMemoryStream;
 begin
-  TempStream := TMemoryStream.Create;
-  Request := TVarBlockIndexed.Create;
-  Request.Enclose := False;
-  with Request do try
+  try
+    TempStream := TMemoryStream.Create;
+    Request := TVarBlockIndexed.Create;
+    Request.Enclose := False;
+    with Request do
     try
       ReadFromStream(Stream);
@@ -174 +177 @@
   finally
     TempStream.Free;
-    Free;
+    Request.Free;
   end;
 end;
@@ -277 +280 @@
     with Session do begin
       try
-        Session.Lock.Acquire;
-        Session.SequenceNumber := Sessions.GetSequenceNumber;
+        Lock.Acquire;
         CommandIndex.Clear;
         CommandIndex.AddArray(Command);
@@ -309 +311 @@
           Sessions.Lock.Release;
         end;
-        while MTWaitForEvent(ReceiveEvent, 10 * OneMillisecond) = wrTimeout do begin
+        while ReceiveEvent.WaitFor(10 * OneMillisecond) = wrTimeout do begin
           if Timeouted then
             raise ECommTimeout.Create(SResponseTimeout);
@@ -389 +391 @@
   try
     Lock.Acquire;
+    Session.SequenceNumber := GetSequenceNumber;
     while Count >= Parent.MaxSessionCount do
     begin
@@ -439 +442 @@
   // instead of freeing in inherited Destroy in TListObject
   try
-    Lock.Acquire;
+//    Lock.Acquire;
     Clear;
   finally
-    Lock.Release;
+//    Lock.Release;
   end;
 
@@ -451 +454 @@
 function TDeviceProtocolSessionList.GetSequenceNumber: Integer;
 begin
-  try
-    Lock.Acquire;
-    Inc(SequenceNumber);
-    if SequenceNumber > Parent.MaxSequenceNumber then
-      SequenceNumber := 0;
-    Result := SequenceNumber;
-  finally
-    Lock.Release;
-  end;
+  Inc(SequenceNumber);
+  if SequenceNumber > Parent.MaxSequenceNumber then
+    SequenceNumber := 0;
+  Result := SequenceNumber;
 end;
 

PinConnection/UCommSerialPort.pas

@@ -59 +59 @@
       Lock.Release;
     end;
-    MTSleep(1 * OneMillisecond);
+    if Stream.Position <> Stream.Size then
+      MTSleep(1 * OneMillisecond);
   until Stream.Position = Stream.Size;
 end;

PinConnection/UCommThread.pas

@@ -80 +80 @@
     FReceiveThread.FreeOnTerminate := False;
     FReceiveThread.Parent := Self;
+    FReceiveThread.Name := 'CommThread';
     FReceiveThread.Start;
   end else begin

PinConnection/UPacketBurst.pas

@@ -50 +50 @@
   PacketBurstPin := TCommPin.Create;
   PacketBurstPin.OnReceive := PacketBurstReceive;
-  SendThread := TMicroThreadEvent.Create;
+  SendThreadEvent := TMicroThreadEvent.Create;
   SendPeriod := OneMillisecond;
 end;