Changeset 294

Timestamp:

Nov 15, 2011, 8:39:23 AM (13 years ago)

Author:

george

Message:

• Modified: CommProtocol remote buffer now have own class for handling filling of communication buffer in remote device.
• Fixed: Do not try to retransmit data for not prepared or finished session.

Location:

PinConnection

Files:

• Languages/UCommProtocol.cs.po (modified) (1 diff)
• Languages/UCommProtocol.po (modified) (1 diff)
• UCommProtocol.pas (modified) (23 diffs)

PinConnection/Languages/UCommProtocol.cs.po

@@ -20 +20 @@
 #: ucommprotocol.sprotocolnotactive
 msgid "Device protocol not active"
-msgstr ""
+msgstr "Protokol zařízení není aktivní"
+
+#: ucommprotocol.sremotebufferinconsistency
+msgid "Remote buffer inconsistency"
+msgstr "Nekonzistentnost vzdálené vyrovnávací paměti"
 
 #: ucommprotocol.sresponseerror

PinConnection/Languages/UCommProtocol.po

@@ -14 +14 @@
 msgstr ""
 
+#: ucommprotocol.sremotebufferinconsistency
+msgid "Remote buffer inconsistency"
+msgstr ""
+
 #: ucommprotocol.sresponseerror
 msgid "Command %0:s response error %1:s"

PinConnection/UCommProtocol.pas

@@ -33 +33 @@
   public
     Lock: TCriticalSection;
+    Enabled: Boolean;
     SequenceNumber: Integer;
     ResponseCode: Integer;
@@ -51 +52 @@
   public
     SequenceNumber: integer;
+    MaxSequenceNumber: integer;
+    MaxSessionCount: integer;
     Parent: TCommProtocol;
     Lock: TCriticalSection;
@@ -58 +61 @@
     constructor Create;
     destructor Destroy; override;
+    procedure Assign(Source: TListObject);
   end;
 
@@ -66 +70 @@
   { TRetransmitCheckThread }
 
-  TRetransmitCheckThread = class(TListedThread)
+  TRetransmitCheckThread = class(TTermThread)
   public
     Parent: TCommProtocol;
     CheckPeriod: Integer;
     procedure Execute; override;
+  end;
+
+  { TRemoteBuffer }
+
+  TRemoteBuffer = class
+    Lock: TCriticalSection;
+    Size: Integer;
+    Used: Integer;
+    procedure Allocate(AValue: Integer);
+    procedure Release(AValue: Integer);
+    procedure Assign(Source: TRemoteBuffer);
+    constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -89 +106 @@
     RetransmitRepeatCount: integer;
     RetransmitTotalCount: integer;
-    MaxSequenceNumber: integer;
-    MaxSessionCount: integer;
-    RemoteBufferSize: Integer;
-    RemoteBufferUsed: Integer;
+    RemoteBuffer: TRemoteBuffer;
     WrongSequenceCount: integer;
     Sessions: TDeviceProtocolSessionList;
@@ -98 +112 @@
     LastCommandResponseTime: TDateTime;
     LastLatency: TDateTime;
+    Lock: TCriticalSection;
     procedure DataReceive(Sender: TCommPin; Stream: TStream); virtual;
     procedure SendCommand(Command: array of integer;
@@ -112 +127 @@
 
 resourcestring
+  SRemoteBufferInconsistency = 'Remote buffer inconsistency';
   SResponseError = 'Command %0:s response error %1:s';
   SResponseTimeout = 'Response timeout';
@@ -120 +136 @@
 
 implementation
+
+{ TRemoteBuffer }
+
+procedure TRemoteBuffer.Allocate(AValue: Integer);
+begin
+  try
+    Lock.Acquire;
+
+    // Wait for free remote buffer
+    while (Used + AValue) > Size do
+    try
+      Lock.Release;
+      Sleep(1);
+    finally
+      Lock.Acquire;
+    end;
+    Used := Used + AValue;
+  finally
+    Lock.Release;
+  end;
+end;
+
+procedure TRemoteBuffer.Release(AValue: Integer);
+begin
+  try
+    Lock.Acquire;
+    Used := Used - AValue;
+    if Used < 0 then
+      raise Exception.Create(SRemoteBufferInconsistency);
+  finally
+    Lock.Release;
+  end;
+end;
+
+procedure TRemoteBuffer.Assign(Source: TRemoteBuffer);
+begin
+  Used := Source.Used;
+  Size := Source.Size;
+end;
+
+constructor TRemoteBuffer.Create;
+begin
+  Lock := TCriticalSection.Create;
+  Size := 127;
+  Used := 0;
+end;
+
+destructor TRemoteBuffer.Destroy;
+begin
+  Lock.Free;
+  inherited Destroy;
+end;
 
 
@@ -159 +227 @@
                   else CommandError := 0;
                 Latency := Now - TransmitTime;
+                Enabled := False;
                 ReceiveEvent.SetEvent;
               finally
@@ -253 +322 @@
 
 procedure TCommProtocol.SetActive(const AValue: Boolean);
-var
-  SessionCount: Integer;
 begin
   if FActive = AValue then Exit;
@@ -269 +336 @@
   end else begin
     // Wait for empty session list
-    repeat
+    try
+      Sessions.Lock.Acquire;
+      while Sessions.Count > 0 do
       try
+        Sessions.Lock.Release;
+        Sleep(1);
+      finally
         Sessions.Lock.Acquire;
-        SessionCount := Sessions.Count;
-      finally
-        Sessions.Lock.Release;
       end;
-      Sleep(1);
-    until SessionCount = 0;
-
+    finally
+      Sessions.Lock.Release;
+    end;
     FreeAndNil(RetransmitThread);
   end;
@@ -292 +361 @@
   if FActive then begin
   try
+    //Lock.Acquire;
     Session := TDeviceProtocolSession.Create;
     Sessions.Add(Session);
@@ -313 +383 @@
         NewRequest.WriteToStream(Request);
 
-        // Wait for free remote buffer
-        while (RemoteBufferUsed + Request.Size) > RemoteBufferSize do
-          Sleep(1);
+        RemoteBuffer.Allocate(Request.Size);
 
         //StopWatch.Start;
         TransmitTime := Now;
         Pin.Send(Request);
+        Enabled := True;
       finally
         Lock.Release;
       end;
       try
-        try
-          Sessions.Lock.Acquire;
-          RemoteBufferUsed := RemoteBufferUsed + Request.Size;
-        finally
-          Sessions.Lock.Release;
-        end;
-        while ReceiveEvent.WaitFor(10) = wrTimeout do begin
+        while ReceiveEvent.WaitFor(1) = wrTimeout do begin
           if Timeouted then
             raise ECommTimeout.Create(SResponseTimeout);
@@ -342 +405 @@
         LastLatency := Latency;
       finally
-        try
-          Sessions.Lock.Acquire;
-          RemoteBufferUsed := RemoteBufferUsed - Session.Request.Size;
-          if RemoteBufferUsed < 0 then RemoteBufferUsed := 0;
-        finally
-          Sessions.Lock.Release;
-        end;
+        RemoteBuffer.Release(Session.Request.Size);
         Sessions.Remove(Session);
       end;
@@ -354 +411 @@
   finally
     NewRequest.Free;
+    //Lock.Free;
   end;
   end else raise ENotActive.Create(SProtocolNotActive);
@@ -360 +418 @@
 constructor TCommProtocol.Create;
 begin
+  RemoteBuffer := TRemoteBuffer.Create;
+  Lock := TCriticalSection.Create;
   Pin := TCommPin.Create;
   Pin.OnReceive := DataReceive;
   Sessions := TDeviceProtocolSessionList.Create;
   Sessions.Parent := Self;
-  MaxSessionCount := 10;
-  MaxSequenceNumber := 127;
-  RetransmitTimeout := 2 * OneSecond;
+  RetransmitTimeout := 3 * OneSecond;
   RetransmitRepeatCount := 3;
   RetransmitTotalCount := 0;
-  RemoteBufferSize := 127;
 end;
 
@@ -377 +434 @@
   Sessions.Free;
   Pin.Free;
-  inherited Destroy;
+  Lock.Free;
+  RemoteBuffer.Free;
+  inherited;
 end;
 
@@ -384 +443 @@
   LastCommandResponseTime := Source.LastCommandResponseTime;
   LastLatency := Source.LastLatency;
-  MaxSequenceNumber := Source.MaxSequenceNumber;
-  MaxSessionCount := Source.MaxSessionCount;
-  RemoteBufferSize := Source.RemoteBufferSize;
-  RemoteBufferUsed := Source.RemoteBufferUsed;
+  RemoteBuffer.Assign(Source.RemoteBuffer);
   WrongSequenceCount := Source.WrongSequenceCount;
   RetransmitTimeout := Source.RetransmitTimeout;
@@ -396 +452 @@
   OnAfterRequest := Source.OnAfterRequest;
   OnDebugLog := Source.OnDebugLog;
+  Sessions.Assign(Source.Sessions);
   Active := Source.Active;
 end;
@@ -431 +488 @@
     Lock.Acquire;
     Session.SequenceNumber := GetSequenceNumber;
-    while Count >= Parent.MaxSessionCount do
+    while Count >= MaxSessionCount do
     begin
       try
@@ -474 +531 @@
   inherited Create;
   Lock := TCriticalSection.Create;
+  MaxSessionCount := 100;
+  MaxSequenceNumber := 127;
 end;
 
@@ -491 +550 @@
 end;
 
+procedure TDeviceProtocolSessionList.Assign(Source: TListObject);
+begin
+  MaxSequenceNumber := TDeviceProtocolSessionList(Source).MaxSequenceNumber;
+  MaxSessionCount := TDeviceProtocolSessionList(Source).MaxSessionCount;
+  SequenceNumber := TDeviceProtocolSessionList(Source).SequenceNumber;
+
+  inherited;
+end;
+
 function TDeviceProtocolSessionList.GetSequenceNumber: Integer;
 begin
-  Inc(SequenceNumber);
-  if SequenceNumber > Parent.MaxSequenceNumber then
-    SequenceNumber := 0;
-  Result := SequenceNumber;
+  try
+    //Lock.Acquire;
+    Inc(SequenceNumber);
+    if SequenceNumber > MaxSequenceNumber then
+      SequenceNumber := 0;
+    Result := SequenceNumber;
+  finally
+    //Lock.Release;
+  end;
 end;
 
@@ -514 +587 @@
       while I < Sessions.Count do begin
         Session := TDeviceProtocolSession(Sessions[I]);
-        with TDeviceProtocolSession(Sessions[I]) do begin
+        with Session do
+        if Enabled then begin
           try
             Session.Lock.Acquire;