The Samba-Bugzilla – Attachment 10133 Details for
Bug 10731
sys_poll_intr(): wrong unit for timeout value
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch in git-format patch format for master
look (text/plain), 1.34 KB, created by
Volker Lendecke
on 2014-07-21 13:59:22 UTC
(
hide
)
Description:
Patch in git-format patch format for master
Filename:
MIME Type:
Creator:
Volker Lendecke
Created:
2014-07-21 13:59:22 UTC
Size:
1.34 KB
patch
obsolete
>From 18948619a26460e1f99003fc3ec1ff6f5bb71494 Mon Sep 17 00:00:00 2001 >From: Daniel Kobras <d.kobras@science-computing.de> >Date: Mon, 21 Jul 2014 10:47:53 +0200 >Subject: [PATCH] sys_poll_intr: fix timeout arithmetic > >Callers of sys_poll_intr() assume timeout to be in milliseconds like >poll(2) expects, but implementation used nanosecond units. Also make >sure timeout doesn't become infinite by mistake during time arithmetic. > >Signed-off-by: Daniel Kobras <d.kobras@science-computing.de> >Reviewed-by: Volker Lendecke <vl@samba.org> >--- > lib/util/select.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > >diff --git a/lib/util/select.c b/lib/util/select.c >index 5e66344..99cd772 100644 >--- a/lib/util/select.c >+++ b/lib/util/select.c >@@ -42,9 +42,19 @@ int sys_poll_intr(struct pollfd *fds, int num_fds, int timeout) > if (errno != EINTR) { > break; > } >+ /* Infinite timeout, no need to adjust. */ >+ if (timeout < 0) { >+ continue; >+ } > clock_gettime_mono(&now); >- elapsed = nsec_time_diff(&now, &start); >- timeout = (orig_timeout - elapsed) / 1000000; >+ elapsed = nsec_time_diff(&now, &start) / 1000000; >+ timeout = orig_timeout - elapsed; >+ /* Unlikely, but might happen eg. when getting traced. >+ * Make sure we're not hanging in this case. >+ */ >+ if (timeout < 0) { >+ timeout = 0; >+ } > }; > return ret; > } >-- >1.8.1.2 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
metze
:
review+
Actions:
View
Attachments on
bug 10731
:
10130
|
10133
|
10142