X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/6cb6b7ede2d178e03fa817bc28474c175f5a93b9..0ac6b47e810e6efaebcdbf3075b633e9b4109341:/lcoreselect.pas

diff --git a/lcoreselect.pas b/lcoreselect.pas
index bae8fe4..3cee9bf 100755
--- a/lcoreselect.pas
+++ b/lcoreselect.pas
@@ -6,11 +6,11 @@
   For conditions of distribution and use, see copyright notice in zlib_license.txt
   which is included in the package
   ----------------------------------------------------------------------------- }
-
-{$ifdef fpc}
-  {$ifndef ver1_0}
-    {$define useinline}
-  {$endif}
+
+{$ifdef fpc}
+  {$ifndef ver1_0}
+    {$define useinline}
+  {$endif}
 {$endif}
 
 unit lcoreselect;
@@ -31,16 +31,18 @@ var
 function getfdsrmaster : fdset; {$ifdef useinline}inline;{$endif}
 function getfdswmaster : fdset; {$ifdef useinline}inline;{$endif}
 
+procedure lcoreinit;
+
 implementation
 uses
   lcore,sysutils,
   classes,pgtypes,bfifo,
   {$ifndef nosignal}
-    lsignal;
+    lsignal,
   {$endif}
+  ltimevalstuff;
 
 {$include unixstuff.inc}
-{$include ltimevalstuff.inc}
 
 const
   absoloutemaxs_select = (sizeof(fdset)*8)-1;
@@ -82,7 +84,6 @@ begin
     end;
     temptimer := currenttimer;
     currenttimer := currenttimer.nexttimer;
-    if temptimer.released then temptimer.free;
   end;
 end;
 
@@ -133,17 +134,6 @@ begin
     end;
   end;
 
-  if asinreleaseflag then begin
-    asinreleaseflag := false;
-    currentsocket := firstasin;
-    while assigned(currentsocket) do begin
-      tempsocket := currentsocket;
-      currentsocket := currentsocket.nextasin;
-      if tempsocket.released then begin
-        tempsocket.free;
-      end;
-    end;
-  end;
   {
   !!! issues:
   - sockets which are released may not be freed because theyre never processed by the loop
@@ -213,7 +203,7 @@ var
 
 var
   fdsrmaster , fdswmaster               : fdset      ;
-
+
 function getfdsrmaster : fdset; {$ifdef fpc}inline;{$endif}
 begin
   result := fdsrmaster;
@@ -222,8 +212,8 @@ function getfdswmaster : fdset; {$ifdef fpc}inline;{$endif}
 begin
   result := fdswmaster;
 end;
-
-
+
+
 Function  doSelect(timeOut:PTimeVal):longint;//inline;
 var
   localtimeval : ttimeval;
@@ -293,25 +283,6 @@ begin
   repeat
 
     //the message loop will exit if all lasio's and ltimer's and lsignal's are destroyed
-    if (not assigned(firstasin)) and (not assigned(firsttimer)) {$ifndef nosignal} and (not assigned(firstsignal)){$endif} then exit;
-    {fd_zero(FDSR);
-    fd_zero(FDSW);
-    currentsocket := firstasin;
-    if not assigned(currentsocket) then exit; //the message loop will exit if all lsockets are destroyed
-
-    repeat
-      if (not currentsocket.released) and (currentsocket.state<>wsclosed) then fd_set(currentsocket.fdhandlein,fdsr);
-      if (not currentsocket.released) and (currentsocket.state=wsconnecting) then fd_set(currentsocket.fdhandleout,fdsw);
-      if currentsocket is tlsocket then begin
-         if (not currentsocket.released) and (currentsocket.state=wsconnected) and(tlsocket(currentsocket).sendq <> '') then fd_set(currentsocket.fdhandleout,fdsw);
-      end;
-      tempsocket := currentsocket;
-      currentsocket := currentsocket.nextasin;
-      if tempsocket.released then begin
-        tempsocket.free;
-      end;
-    until not assigned(currentsocket);
-    }
     processtasks;
     //currenttask := nil;
     {beware}
@@ -392,9 +363,13 @@ begin
   fdreverse[fd] := reverseto;
 end;
 
+var
+  inited:boolean;
 
-
+procedure lcoreinit;
 begin
+  if inited then exit;
+  inited := true;
   eventcore := tselecteventcore.create;
 
   absoloutemaxs := absoloutemaxs_select;
@@ -402,4 +377,6 @@ begin
   maxs := 0;
   fd_zero(fdsrmaster);
   fd_zero(fdswmaster);
+end;
+
 end.