X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/03b75b4c964d8b3ac97d4007f0e033549b01c92f..2e969e5e75fb8f544ff468584fb4e33d891e2954:/lcoreselect.pas?ds=sidebyside

diff --git a/lcoreselect.pas b/lcoreselect.pas
index 38da6ba..d3685ae 100644
--- a/lcoreselect.pas
+++ b/lcoreselect.pas
@@ -45,10 +45,10 @@ uses
 {$include unixstuff.inc}
 
 const
-  absoloutemaxs_select = (sizeof(fdset)*8)-1;
+  absolutemaxs_select = (sizeof(fdset)*8)-1;
 
 var
-  fdreverse:array[0..absoloutemaxs_select] of tlasio;
+  fdreverse:array[0..absolutemaxs_select] of tlasio;
 type
   tselecteventcore=class(teventcore)
     public
@@ -69,7 +69,7 @@ var
   temptimer               : tltimer  ;
 
 begin
-  gettimeofday(tvnow);
+  gettimemonotonic(tvnow);
   currenttimer := firsttimer;
   while assigned(currenttimer) do begin
     //writeln(currenttimer.enabled);
@@ -90,7 +90,7 @@ end;
 procedure processasios(var fdsr,fdsw:fdset);//inline;
 var
   currentsocket : tlasio  ;
-  socketcount   : integer ; // for debugging perposes :)
+  socketcount   : integer ; // for debugging purposes :)
   dw,bt:integer;
   currentfdword:fdword;
   fd : integer;
@@ -98,7 +98,7 @@ begin
   //writeln('entering processasios');
 {  inc(lcoretestcount);}
 
-    //the message loop will exit if all lasio's and ltimer's and lsignal's are destroyed
+    //the message loop will exit if all lasios and ltimers and lsignals are destroyed
     //if (not assigned(firstasin)) and (not assigned(firsttimer)) and (not assigned(firstsignal)) then exit;
 
 
@@ -144,7 +144,7 @@ begin
   - sockets which are released may not be freed because theyre never processed by the loop
   made new code for handling this, using asinreleaseflag
 
-  - when/why does the mustrefreshfds select apply, sheck if i did it correctly?
+  - when/why does the mustrefreshfds select apply, check if i did it correctly?
 
   - what happens if calling handlefdtrigger for a socket which does not have an event
   }
@@ -190,7 +190,7 @@ begin
     prepsigpipe;
   {$endif}
   selectresult := select(maxs+1,@fdsr,@fdsw,nil,0);
-  while (selectresult>0) or assigned(firsttask) or assigned(currenttask) do begin;
+  while (selectresult>0) or assigned(firsttask) do begin;
 
     processtasks;
     processtimers;
@@ -220,10 +220,22 @@ begin
 end;
 
 
+{
+select in linux/sysV subtracts from timeout for time spent in it, but in BSD it doesn't
+enabling select_no_autotv here makes doSelect mimic the decrement behavior, in case the caller needs it
+the caller here in lcoreselect does not need it, and enabling it would have a slight perf hit.
+it is safe for this to be enabled even if the OS does it too (it will not subtract twice)
+it is currently disabled but can be enabled if needed
+}
+{$ifndef linux}{-$define select_no_autotv}{$endif}
+
 Function  doSelect(timeOut:PTimeVal):longint;//inline;
 var
   localtimeval : ttimeval;
   maxslocal    : integer;
+  {$ifdef select_no_autotv}
+  timeoutcopy,tvstart,tvend : ttimeval;
+  {$endif}
 begin
   //unblock signals
   //zeromemory(@sset,sizeof(sset));
@@ -243,18 +255,46 @@ begin
   {$ifndef nosignal}
     sigprocmask(SIG_UNBLOCK,@blockset,nil);
   {$endif}
+
+  {$ifdef select_no_autotv}
+  if assigned(timeout) then begin
+    timeoutcopy.tv_sec := timeOut.tv_sec;
+    timeoutcopy.tv_usec := timeOut.tv_usec;
+    gettimemonotonic(tvstart);
+  end;
+  {$endif}
+
   result := select(maxslocal+1,@FDSR,@FDSW,nil,timeout);
   if result <= 0 then begin
     fd_zero(FDSR);
     fd_zero(FDSW);
     if result=-1 then begin
       if linuxerror = SYS_EINTR then begin
-        // we received a signal it's not a problem
+        // we received a signal it is not a problem
       end else begin
         raise esocketexception.create('select returned error '+inttostr(linuxerror));
       end;
+    end
+  {$ifdef select_no_autotv}
+    else if (result = 0) and assigned(timeout) then begin
+      //timeout reached: zero the timeval
+      timeout.tv_sec := 0;
+      timeout.tv_usec := 0;
     end;
+  end else if assigned(timeout) then begin
+    //successful result: subtract elapsed time
+    gettimemonotonic(tvend);
+    tv_subtract(tvend,tvstart);
+    tv_subtract(timeoutcopy,tvend);
+    timeout.tv_sec := timeoutcopy.tv_sec;
+    timeout.tv_usec := timeoutcopy.tv_usec;
+    if (timeout.tv_sec < 0) then begin
+      timeout.tv_sec := 0;
+      timeout.tv_usec := 0;
+    end;
+  {$endif} //select_no_autotv
   end;
+
   {$ifndef nosignal}
     sigprocmask(SIG_BLOCK,@blockset,nil);
   {$endif}
@@ -288,7 +328,7 @@ begin
 
   repeat
 
-    //the message loop will exit if all lasio's and ltimer's and lsignal's are destroyed
+    //the message loop will exit if all lasios and ltimers and lsignals are destroyed
     processtasks;
     //currenttask := nil;
     {beware}
@@ -309,8 +349,8 @@ begin
       selectresult := doselect(nil);
 
     end else begin
-      gettimeofday(tvnow);
-      tv_substract(tv,tvnow);
+      gettimemonotonic(tvnow);
+      tv_subtract(tv,tvnow);
 
       //writeln('timers active');
       if tv.tv_sec < 0 then begin
@@ -334,7 +374,7 @@ end;
 procedure tselecteventcore.rmasterset(fd : integer;islistensocket : boolean);
 begin
   //writeln('rmasterset called with fd ',fd);
-  if fd > absoloutemaxs then raise esocketexception.create('file discriptor out of range');
+  if fd > absolutemaxs then raise esocketexception.create('file descriptor out of range');
   if fd > maxs then maxs := fd;
   if fd_isset(fd,fdsrmaster) then exit;
   fd_set(fd,fdsrmaster);
@@ -353,7 +393,7 @@ end;
 procedure tselecteventcore.wmasterset(fd : integer);
 begin
   //writeln('wmasterset called with fd ',fd);
-  if fd > absoloutemaxs then raise esocketexception.create('file discriptor out of range');
+  if fd > absolutemaxs then raise esocketexception.create('file descriptor out of range');
   if fd > maxs then maxs := fd;
 
   if fd_isset(fd,fdswmaster) then exit;
@@ -382,7 +422,7 @@ begin
   inited := true;
   eventcore := tselecteventcore.create;
 
-  absoloutemaxs := absoloutemaxs_select;
+  absolutemaxs := absolutemaxs_select;
 
   maxs := 0;
   fd_zero(fdsrmaster);