Changeset 88 for branches/DirectWeb/UHTTPServer.pas

Timestamp:

Dec 18, 2009, 12:21:39 PM (15 years ago)

Author:

george

Message:

• Upraveno: Nedokončené přepracování správy vláken. Použit systém přidělování ze společné sady o dané velikosti namísto přidělování vláken ke každému požadavku samostatně. Vlákna jsou inicializována při spuštění aplikace, jsou opakovaně používána a uvolněna až při ukončení běhu aplikace.
• Přidáno: Třída pro práci s opakovaně spustitelnými vlákny.
• Přidáno: Třída přidělování objektů ze zásoby o dané velikosti.
• Přidáno: Třída pro zobrazování stránkování seznamů položek.

File:

• branches/DirectWeb/UHTTPServer.pas (modified) (13 diffs)

branches/DirectWeb/UHTTPServer.pas

@@ -10 +10 @@
 
 type
+  THTTPServer = class;
 
   TQueryParameterList = class(TStringList)
@@ -28 +29 @@
     Query: TQueryParameterList;
     Path: string;
-    Host: string;
     Method: string;
     Headers: TStringList;
@@ -47 +47 @@
   end;
 
-  TRequestEvent = procedure(Request: THTTPRequest; Response: THTTPResponse) of object;
+  { THTTPHandlerData }
+
+  THTTPHandlerData = class
+    Server: THTTPServer;
+    Request: THTTPRequest;
+    Response: THTTPResponse;
+    SessionId: string;
+    Session: TStringList;
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
+  TRequestEvent = procedure(HandlerData: THTTPHandlerData) of object;
 
   TRequestHandler = class
@@ -63 +75 @@
   { THTTPSession }
 
-  THTTPSession = class
-    Variables: TStringList;
-    procedure Load(Request: THTTPRequest); virtual;
-    procedure Save(Response: THTTPResponse); virtual;
+  { THTTPSessionStorage }
+
+  THTTPSessionStorage = class
+    procedure Load(HandlerData: THTTPHandlerData); virtual;
+    procedure Save(HandlerData: THTTPHandlerData); virtual;
     constructor Create; virtual;
     destructor Destroy; override;
@@ -76 +89 @@
   private
     procedure HandleClient(Sender: TObject);
-    procedure ErrorResponse(Request: THTTPRequest; Response: THTTPResponse);
+    procedure ErrorResponse(HandlerData: THTTPHandlerData);
   public
     Name: string;
@@ -83 +96 @@
     MaxConnection: Integer;
     RequestHandlerList: TRequestHandlerList;
-    SessionHandler: THTTPSession;
-    procedure FileResponse(Request: THTTPRequest;
-      Response: THTTPResponse);
+    SessionStorage: THTTPSessionStorage;
+    procedure FileResponse(HandlerData: THTTPHandlerData);
     constructor Create;
     destructor Destroy; override;
@@ -100 +112 @@
   LineIndex: Integer;
   LineParts: array of string;
-  Request: THTTPRequest;
-  Response: THTTPResponse;
+  HandlerData: THTTPHandlerData;
   I: Integer;
   QueryString: string;
 begin
   with TTCPClientThread(Sender), Socket do begin
-    WriteLn('Client ' + IntToStr(Parent.IndexOf(Sender)) + ' connected from ' + GetRemoteSinIP);
+    WriteLn('Used thrads ' + IntToStr(Parent.ThreadPool.UsedCount) + '. Client connected from ' + GetRemoteSinIP);
+
+    HandlerData := THTTPHandlerData.Create;
+    with HandlerData do begin
+      Server := Self;
 
     Response := THTTPResponse.Create;
@@ -128 +143 @@
           LineParts[0] := Copy(LineParts[0], 1, Length(LineParts[0]) - 1);
           Request.Headers.Values[LineParts[0]] := LineParts[1];
-          WriteLn(Line);
+          //WriteLn(Line);
         end;
       end;
@@ -138 +153 @@
       Request.Cookies.Parse(Request.Headers.Values['Cookie']);
 
-    // Process session
-    if Assigned(SessionHandler) then
-      SessionHandler.Load(Request);
+    // Load session variables
+    if Assigned(SessionStorage) then
+      SessionStorage.Load(HandlerData);
 
     Response.Stream.Clear;
@@ -148 +163 @@
     RequestHandler := RequestHandlerList.IndexOfName(Request.Path);
 
-    if Assigned(RequestHandler) then RequestHandler.Handler(Request, Response)
-      else ErrorResponse(Request, Response);
-
-    if Assigned(SessionHandler) then
-      SessionHandler.Save(Response);
+    if Assigned(RequestHandler) then RequestHandler.Handler(HandlerData)
+      else ErrorResponse(HandlerData);
+
+    // Store session variables
+    if Assigned(SessionStorage) then
+      SessionStorage.Save(HandlerData);
 
     with Response do begin
@@ -167 +183 @@
       // Send headers
       for I := 0 to Headers.Count - 1 do begin
-        WriteLn(Headers.Names[I] + ': ' + Headers.ValueFromIndex[I] + #13#10);
+        //WriteLn(Headers.Names[I] + ': ' + Headers.ValueFromIndex[I] + #13#10);
         SendString(Headers.Names[I] + ': ' + Headers.ValueFromIndex[I] + #13#10);
       end;
@@ -175 +191 @@
     end;
 
-    Request.Destroy;
-    Response.Destroy;
-  end;
-end;
-
-procedure THTTPServer.ErrorResponse(Request: THTTPRequest;
-  Response: THTTPResponse);
-begin
-  with Response.Stream do begin
+      Destroy;
+    end;
+  end;
+end;
+
+procedure THTTPServer.ErrorResponse(HandlerData: THTTPHandlerData);
+begin
+  with HandlerData, Response.Stream do begin
     WriteString('<html><body>Page ' + Request.Path + ' not found.</body></html>');
   end;
 end;
 
-procedure THTTPServer.FileResponse(Request: THTTPRequest;
-  Response: THTTPResponse);
+procedure THTTPServer.FileResponse(HandlerData: THTTPHandlerData);
 var
   BinaryFile: TFileStream;
   FileName: string;
 begin
-  FileName := DocumentRoot + Request.Path;
-  if FileExists(FileName) then begin
-    Response.Headers.Values['Content-Type'] := GetMIMEType(Copy(ExtractFileExt(FileName), 2, 255));
-    BinaryFile := TFileStream.Create(FileName, fmOpenRead);
-    Response.Stream.WriteStream(BinaryFile);
-    BinaryFile.Destroy;
-  end else
-  with Response.Stream do begin
-    WriteLn('File ' + Request.Path + ' not found.');
-    WriteString('<html><body>File ' + Request.Path + ' not found.</body></html>');
+  with HandlerData do begin
+    FileName := DocumentRoot + Request.Path;
+    if FileExists(FileName) then begin
+      Response.Headers.Values['Content-Type'] := GetMIMEType(Copy(ExtractFileExt(FileName), 2, 255));
+      BinaryFile := TFileStream.Create(FileName, fmOpenRead);
+      Response.Stream.WriteStream(BinaryFile);
+      BinaryFile.Destroy;
+    end else
+    with Response.Stream do begin
+      WriteLn('File ' + Request.Path + ' not found.');
+      WriteString('<html><body>File ' + Request.Path + ' not found.</body></html>');
+    end;
   end;
 end;
@@ -329 +345 @@
 end;
 
-{ THTTPSession }
-
-procedure THTTPSession.Load(Request: THTTPRequest);
-begin
-
-end;
-
-procedure THTTPSession.Save(Response: THTTPResponse);
-begin
-
-end;
-
-constructor THTTPSession.Create;
-begin
-  Variables := TStringList.Create;
-end;
-
-destructor THTTPSession.Destroy;
-begin
-  Variables.Destroy;
+{ THTTPSessionStorage }
+
+procedure THTTPSessionStorage.Load(HandlerData: THTTPHandlerData);
+begin
+
+end;
+
+procedure THTTPSessionStorage.Save(HandlerData: THTTPHandlerData);
+begin
+
+end;
+
+constructor THTTPSessionStorage.Create;
+begin
+
+end;
+
+destructor THTTPSessionStorage.Destroy;
+begin
+  inherited Destroy;
+end;
+
+{ THTTPHandlerData }
+
+constructor THTTPHandlerData.Create;
+begin
+  Request := THTTPRequest.Create;
+  Response := THTTPResponse.Create;
+  Session := TStringList.Create;
+end;
+
+destructor THTTPHandlerData.Destroy;
+begin
+  Request.Destroy;
+  Response.Destroy;
+  Session.Destroy;
   inherited Destroy;
 end;