Fix struct timeval units in DCE poll

YellowDog3629 · tomhenderson · commit 843e8568fba9 · 2019-10-21T17:23:58.000-07:00
diff --git a/model/dce-poll.cc b/model/dce-poll.cc
@@ -36,7 +36,7 @@ int dce_poll (struct pollfd *fds, nfds_t nfds, int timeout)
     }
   else if (timeout > 0)
     {
-      endtime = Now () + MilliSeconds (timeout);
+      endtime = Now () + MicroSeconds (timeout);
     }
 
   for (uint32_t i = 0; i < nfds; ++i)
@@ -208,7 +208,7 @@ int dce_select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
 
   if (timeout)
     {
-      pollTo = timeout->tv_sec * 1000 + timeout->tv_usec / 1000;
+      pollTo = timeout->tv_sec * 1000000 + timeout->tv_usec / 1000;
     }
 
   int pollRet = dce_poll (pollFd, nfds, pollTo);

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ int dce_poll (struct pollfd *fds, nfds_t nfds, int timeout)`
`36`	`36`	`}`
`37`	`37`	`else if (timeout > 0)`
`38`	`38`	`{`
`39`		`- endtime = Now () + MilliSeconds (timeout);`
	`39`	`+ endtime = Now () + MicroSeconds (timeout);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`for (uint32_t i = 0; i < nfds; ++i)`
`@@ -208,7 +208,7 @@ int dce_select (int nfds, fd_set readfds, fd_set writefds, fd_set *exceptfds,`
`208`	`208`
`209`	`209`	`if (timeout)`
`210`	`210`	`{`
`211`		`- pollTo = timeout->tv_sec * 1000 + timeout->tv_usec / 1000;`
	`211`	`+ pollTo = timeout->tv_sec * 1000000 + timeout->tv_usec / 1000;`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`int pollRet = dce_poll (pollFd, nfds, pollTo);`