eliminated a lot of hints and warnings

[lcore.git] / lcoreselect.pas

diff --git a/lcoreselect.pas b/lcoreselect.pas
index 16134ee6a73fc3a323ca19521f14de5326c9d617..38da6ba29a2384ea3d56f8f0b9e4f37a2509af83 100755 (executable)
--- a/lcoreselect.pas
+++ b/lcoreselect.pas
@@ -21,7 +21,7 @@ uses
   {$ifdef VER1_0}\r
     linux,\r
   {$else}\r
-    baseunix,unix,unixutil,\r
+    baseunix,unix,unixutil,sockets,\r
   {$endif}\r
   fd_utils;\r
 var\r
@@ -38,11 +38,11 @@ uses
   lcore,sysutils,\r
   classes,pgtypes,bfifo,\r
   {$ifndef nosignal}\r
-    lsignal;\r
+    lsignal,\r
   {$endif}\r
+  ltimevalstuff;\r
 \r
 {$include unixstuff.inc}\r
-{$include ltimevalstuff.inc}\r
 \r
 const\r
   absoloutemaxs_select = (sizeof(fdset)*8)-1;\r
@@ -64,7 +64,7 @@ type
 \r
 procedure processtimers;inline;\r
 var\r
-  tv           ,tvnow     : ttimeval ;\r
+  tvnow     : ttimeval ;\r
   currenttimer            : tltimer   ;\r
   temptimer               : tltimer  ;\r
 \r
@@ -84,17 +84,18 @@ begin
     end;\r
     temptimer := currenttimer;\r
     currenttimer := currenttimer.nexttimer;\r
-    if temptimer.released then temptimer.free;\r
   end;\r
 end;\r
 \r
 procedure processasios(var fdsr,fdsw:fdset);//inline;\r
 var\r
   currentsocket : tlasio  ;\r
-  tempsocket    : tlasio  ;\r
   socketcount   : integer ; // for debugging perposes :)\r
   dw,bt:integer;\r
+  currentfdword:fdword;\r
+  fd : integer;\r
 begin\r
+  //writeln('entering processasios');\r
 {  inc(lcoretestcount);}\r
 \r
     //the message loop will exit if all lasio's and ltimer's and lsignal's are destroyed\r
@@ -103,23 +104,26 @@ begin
 \r
   {------- test optimised loop}\r
   socketcount := 0;\r
-  for dw := (maxs shr 5) downto 0 do if (fdsr[dw] or fdsw[dw]) <> 0 then begin\r
-    for bt := 0 to 31 do if (fdsr[dw] or fdsw[dw]) and (1 shl bt) <> 0 then begin\r
+  for dw := (maxs shr fdwordshift) downto 0 do if (fdsr[dw] or fdsw[dw]) <> 0 then begin\r
+    currentfdword := (fdsr[dw] or fdsw[dw]);\r
+    for bt := fdwordmaxbit downto 0 do if currentfdword and (1 shl bt) <> 0 then begin\r
       inc(socketcount);\r
-      currentsocket := fdreverse[dw shl 5 or bt];\r
+      fd := dw shl fdwordshift or bt;\r
+      //writeln('reversing fd ',fd);\r
+      currentsocket := fdreverse[fd];\r
       {if not assigned(currentsocket) then raise exception.create('currentsocket not assigned');\r
       if currentsocket.fdhandlein < 0 then raise exception.create('currentsocket.fdhandlein out of range');}\r
       {i've seen the out of range case actually happening, so it can happen. test: just close the fd - beware}\r
       if not assigned(currentsocket) then begin\r
-        fdclose(dw shl 5 or bt);\r
+        fdclose(fd);\r
         continue\r
       end;\r
       if currentsocket.fdhandlein < 0 then begin\r
-        fdclose(dw shl 5 or bt);\r
+        fdclose(fd);\r
         continue\r
       end;\r
       try\r
-        currentsocket.handlefdtrigger(fd_isset(currentsocket.fdhandlein,fdsr),fd_isset(currentsocket.fdhandleout,fdsw));\r
+        currentsocket.handlefdtrigger(fd_isset(fd,fdsr),fd_isset(fd,fdsw));\r
       except\r
         on E: exception do begin\r
           currentsocket.HandleBackGroundException(e);\r
@@ -135,17 +139,6 @@ begin
     end;\r
   end;\r
 \r
-  if asinreleaseflag then begin\r
-    asinreleaseflag := false;\r
-    currentsocket := firstasin;\r
-    while assigned(currentsocket) do begin\r
-      tempsocket := currentsocket;\r
-      currentsocket := currentsocket.nextasin;\r
-      if tempsocket.released then begin\r
-        tempsocket.free;\r
-      end;\r
-    end;\r
-  end;\r
   {\r
   !!! issues:\r
   - sockets which are released may not be freed because theyre never processed by the loop\r
@@ -184,6 +177,7 @@ begin
     end;\r
   end; *)\r
 {  debugout('socketcount='+inttostr(socketcount));}\r
+  //writeln('leaving processasios');\r
 end;\r
 \r
 procedure tselecteventcore.processmessages;\r
@@ -295,25 +289,6 @@ begin
   repeat\r
 \r
     //the message loop will exit if all lasio's and ltimer's and lsignal's are destroyed\r
-    if (not assigned(firstasin)) and (not assigned(firsttimer)) {$ifndef nosignal} and (not assigned(firstsignal)){$endif} then exit;\r
-    {fd_zero(FDSR);\r
-    fd_zero(FDSW);\r
-    currentsocket := firstasin;\r
-    if not assigned(currentsocket) then exit; //the message loop will exit if all lsockets are destroyed\r
-\r
-    repeat\r
-      if (not currentsocket.released) and (currentsocket.state<>wsclosed) then fd_set(currentsocket.fdhandlein,fdsr);\r
-      if (not currentsocket.released) and (currentsocket.state=wsconnecting) then fd_set(currentsocket.fdhandleout,fdsw);\r
-      if currentsocket is tlsocket then begin\r
-         if (not currentsocket.released) and (currentsocket.state=wsconnected) and(tlsocket(currentsocket).sendq <> '') then fd_set(currentsocket.fdhandleout,fdsw);\r
-      end;\r
-      tempsocket := currentsocket;\r
-      currentsocket := currentsocket.nextasin;\r
-      if tempsocket.released then begin\r
-        tempsocket.free;\r
-      end;\r
-    until not assigned(currentsocket);\r
-    }\r
     processtasks;\r
     //currenttask := nil;\r
     {beware}\r
@@ -358,6 +333,7 @@ end;
 \r
 procedure tselecteventcore.rmasterset(fd : integer;islistensocket : boolean);\r
 begin\r
+  //writeln('rmasterset called with fd ',fd);\r
   if fd > absoloutemaxs then raise esocketexception.create('file discriptor out of range');\r
   if fd > maxs then maxs := fd;\r
   if fd_isset(fd,fdsrmaster) then exit;\r
@@ -367,6 +343,7 @@ end;
 \r
 procedure tselecteventcore.rmasterclr(fd: integer);\r
 begin\r
+  //writeln('rmasterclr called with fd ',fd);\r
   if not fd_isset(fd,fdsrmaster) then exit;\r
   fd_clr(fd,fdsrmaster);\r
 \r
@@ -375,6 +352,7 @@ end;
 \r
 procedure tselecteventcore.wmasterset(fd : integer);\r
 begin\r
+  //writeln('wmasterset called with fd ',fd);\r
   if fd > absoloutemaxs then raise esocketexception.create('file discriptor out of range');\r
   if fd > maxs then maxs := fd;\r
 \r
@@ -385,6 +363,7 @@ end;
 \r
 procedure tselecteventcore.wmasterclr(fd: integer);\r
 begin\r
+  //writeln('wmasterclr called with fd ',fd);\r
   if not fd_isset(fd,fdswmaster) then exit;\r
   fd_clr(fd,fdswmaster);\r
 end;\r