X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/4782a5c5afee47721cc617daa40dd29828342c2b..976ec95a74549719adef1a27df9a1a04f45a0ec7:/lcore.pas
diff --git a/lcore.pas b/lcore.pas
index 900bc96..69da11e 100755
--- a/lcore.pas
+++ b/lcore.pas
@@ -35,7 +35,17 @@ interface
const
- receivebufsize=1460;
+ {how this number is made up:
+ - ethernet: MTU 1500
+ - be safe for either "ethernet v1" or "PPPoE", both take 8 bytes
+ - IPv6 header: 40 bytes (IPv4 is 20)
+ - TCP/UDP header: 20 bytes
+ }
+ packetbasesize = 1432;
+ receivebufsize=packetbasesize*8;
+
+ var
+ absoloutemaxs:integer=0;
type
{$ifdef ver1_0}
@@ -63,8 +73,9 @@ interface
TSendData = procedure (Sender: TObject; BytesSent: Integer) of object;
tlcomponent = class(tcomponent)
+ private
+ procedure releasetaskhandler(wparam,lparam:longint);
public
- released:boolean;
procedure release; virtual;
destructor destroy; override;
end;
@@ -84,8 +95,6 @@ interface
onsenddata : tsenddata ;
ondatasent : tsocketevent ;
//connected : boolean ;
- nextasin : tlasio ;
- prevasin : tlasio ;
recvq : tfifo;
OnBgException : TBgExceptionEvent ;
@@ -96,6 +105,7 @@ interface
onfdwrite : procedure (Sender: TObject; Error: word) of object; //added for bewarehttpd
lasterror:integer;
destroying:boolean;
+ recvbufsize:integer;
function receivestr:string; virtual;
procedure close;
procedure abort;
@@ -117,7 +127,7 @@ interface
//procedure messageloop;
function Receive(Buf:Pointer;BufSize:integer):integer; virtual;
- procedure flush;virtual;{$ifdef win32} abstract;{$endif}
+ procedure flush;virtual;
procedure dodatasent(wparam,lparam:longint);
procedure doreceiveloop(wparam,lparam:longint);
procedure sinkdata(sender:tobject;error:word);
@@ -216,7 +226,6 @@ procedure messageloop;
procedure exitmessageloop;
var
- firstasin : tlasio ;
firsttimer : tltimer ;
firsttask , lasttask , currenttask : tltask ;
@@ -274,12 +283,15 @@ begin
inherited destroy;
end;
-
+procedure tlcomponent.releasetaskhandler(wparam,lparam:longint);
+begin
+ free;
+end;
procedure tlcomponent.release;
begin
- released := true;
+ addtask(releasetaskhandler,self,0,0);
end;
procedure tlasio.release;
@@ -326,33 +338,20 @@ end;
constructor tlasio.create;
begin
inherited create(AOwner);
+ if not assigned(eventcore) then raise exception.create('no event core');
sendq := tfifo.create;
recvq := tfifo.create;
state := wsclosed;
fdhandlein := -1;
fdhandleout := -1;
- nextasin := firstasin;
- prevasin := nil;
- if assigned(nextasin) then nextasin.prevasin := self;
- firstasin := self;
-
- released := false;
end;
destructor tlasio.destroy;
begin
destroying := true;
if state <> wsclosed then close;
- if prevasin <> nil then begin
- prevasin.nextasin := nextasin;
- end else begin
- firstasin := nextasin;
- end;
- if nextasin <> nil then begin
- nextasin.prevasin := prevasin;
- end;
- recvq.destroy;
- sendq.destroy;
+ recvq.free;
+ sendq.free;
inherited destroy;
end;
@@ -392,7 +391,10 @@ end;
procedure tlasio.internalclose(error:word);
begin
- if state<>wsclosed then begin
+ if (state<>wsclosed) and (state<>wsinvalidstate) then begin
+ // -2 is a special indication that we should just exist silently
+ // (used for connect failure handling when socket creation fails)
+ if (fdhandlein = -2) and (fdhandleout = -2) then exit;
if (fdhandlein < 0) or (fdhandleout < 0) then raise exception.create('internalclose called with invalid fd handles');
eventcore.rmasterclr(fdhandlein);//fd_clr(fdhandlein,fdsrmaster);
eventcore.wmasterclr(fdhandleout);//fd_clr(fdhandleout,fdswmaster);
@@ -419,7 +421,7 @@ begin
if assigned(onsessionclosed) then if not destroying then onsessionclosed(self,error);
end;
- sendq.del(maxlongint);
+ if assigned(sendq) then sendq.del(maxlongint);
end;
@@ -483,9 +485,12 @@ var
// fdstestr : fdset;
// fdstestw : fdset;
begin
- if state <> wsconnected then exit;
+ if state <> wsconnected then begin
+ result := -1;
+ exit;
+ end;
- lensent := sendq.get(data,2920);
+ lensent := sendq.get(data,packetbasesize*2);
if assigned(data) then result := myfdwrite(fdhandleout,data^,lensent) else result := 0;
if result = -1 then lensent := 0 else lensent := result;
@@ -548,6 +553,7 @@ procedure tlasio.handlefdtrigger(readtrigger,writetrigger:boolean);
var
sendflushresult : integer;
tempbuf:array[0..receivebufsize-1] of byte;
+ a:integer;
begin
if (state=wsconnected) and writetrigger then begin
//writeln('write trigger');
@@ -560,7 +566,16 @@ begin
internalclose(0);
end else begin
- internalclose({$ifdef win32}getlasterror{$else}linuxerror{$endif});
+ {$ifdef win32}
+ if getlasterror=WSAEWOULDBLOCK then begin
+ //the asynchronous nature of windows messages means we sometimes
+ //get here with the buffer full
+ //so do nothing in that case
+ end else
+ {$endif}
+ begin
+ internalclose({$ifdef win32}getlasterror{$else}linuxerror{$endif});
+ end
end;
end;
@@ -574,7 +589,9 @@ begin
writtenthiscycle := false;
if (state =wsconnected) and readtrigger then begin
if recvq.size=0 then begin
- numread := myfdread(fdhandlein,tempbuf,sizeof(tempbuf));
+ a := recvbufsize;
+ if (a <= 0) or (a > sizeof(tempbuf)) then a := sizeof(tempbuf);
+ numread := myfdread(fdhandlein,tempbuf,a);
if (numread=0) and (not mustrefreshfds) then begin
{if i remember correctly numread=0 is caused by eof
if this isn't dealt with then you get a cpu eating infinite loop
@@ -609,19 +626,20 @@ begin
end;
end;
-{$ifndef win32}
- procedure tlasio.flush;
- var
- fds : fdset;
- begin
- fd_zero(fds);
- fd_set(fdhandleout,fds);
- while sendq.size>0 do begin
- select(fdhandleout+1,nil,@fds,nil,nil);
- if sendflush <= 0 then exit;
- end;
- end;
+procedure tlasio.flush;
+{$ifdef win32}
+type fdset = tfdset;
{$endif}
+var
+ fds : fdset;
+begin
+ fd_zero(fds);
+ fd_set(fdhandleout,fds);
+ while sendq.size>0 do begin
+ select(fdhandleout+1,nil,@fds,nil,nil);
+ if sendflush <= 0 then exit;
+ end;
+end;
procedure tlasio.dodatasent(wparam,lparam:longint);
begin
@@ -724,8 +742,6 @@ begin
end;
interval := 1000;
enabled := true;
- released := false;
-
end;
destructor tltimer.destroy;
@@ -876,7 +892,6 @@ end;
begin
- firstasin := nil;
firsttask := nil;