Commit 65834685 authored by Dmitriy Vyukov's avatar Dmitriy Vyukov

runtime: use GetQueuedCompletionStatusEx on windows if available

GetQueuedCompletionStatusEx allows to dequeue a batch of completion
notifications, which is more efficient than dequeueing one by one.

benchmark                           old ns/op    new ns/op    delta
BenchmarkClientServerParallel4         100605        90945   -9.60%
BenchmarkClientServerParallel4-2        90225        74504  -17.42%

R=golang-dev, alex.brainman
CC=golang-dev
https://golang.org/cl/12436044
parent ed8c5501
...@@ -206,6 +206,12 @@ func runtime_pollUnblock(pd *PollDesc) { ...@@ -206,6 +206,12 @@ func runtime_pollUnblock(pd *PollDesc) {
runtime·ready(wg); runtime·ready(wg);
} }
uintptr
runtime·netpollfd(PollDesc *pd)
{
return pd->fd;
}
// make pd ready, newly runnable goroutines (if any) are enqueued info gpp list // make pd ready, newly runnable goroutines (if any) are enqueued info gpp list
void void
runtime·netpollready(G **gpp, PollDesc *pd, int32 mode) runtime·netpollready(G **gpp, PollDesc *pd, int32 mode)
......
...@@ -10,9 +10,11 @@ ...@@ -10,9 +10,11 @@
#pragma dynimport runtime·CreateIoCompletionPort CreateIoCompletionPort "kernel32.dll" #pragma dynimport runtime·CreateIoCompletionPort CreateIoCompletionPort "kernel32.dll"
#pragma dynimport runtime·GetQueuedCompletionStatus GetQueuedCompletionStatus "kernel32.dll" #pragma dynimport runtime·GetQueuedCompletionStatus GetQueuedCompletionStatus "kernel32.dll"
#pragma dynimport runtime·WSAGetOverlappedResult WSAGetOverlappedResult "ws2_32.dll"
extern void *runtime·CreateIoCompletionPort; extern void *runtime·CreateIoCompletionPort;
extern void *runtime·GetQueuedCompletionStatus; extern void *runtime·GetQueuedCompletionStatus;
extern void *runtime·WSAGetOverlappedResult;
#define INVALID_HANDLE_VALUE ((uintptr)-1) #define INVALID_HANDLE_VALUE ((uintptr)-1)
...@@ -23,12 +25,23 @@ struct net_op ...@@ -23,12 +25,23 @@ struct net_op
// used by windows // used by windows
Overlapped o; Overlapped o;
// used by netpoll // used by netpoll
uintptr runtimeCtx; PollDesc* pd;
int32 mode; int32 mode;
int32 errno; int32 errno;
uint32 qty; uint32 qty;
}; };
typedef struct OverlappedEntry OverlappedEntry;
struct OverlappedEntry
{
uintptr key;
net_op* op; // In reality it's Overlapped*, but we cast it to net_op* anyway.
uintptr internal;
uint32 qty;
};
static void handlecompletion(G **gpp, net_op *o, int32 errno, uint32 qty);
static uintptr iocphandle = INVALID_HANDLE_VALUE; // completion port io handle static uintptr iocphandle = INVALID_HANDLE_VALUE; // completion port io handle
void void
...@@ -64,49 +77,72 @@ runtime·netpollclose(uintptr fd) ...@@ -64,49 +77,72 @@ runtime·netpollclose(uintptr fd)
G* G*
runtime·netpoll(bool block) runtime·netpoll(bool block)
{ {
uint32 wait, qty, key; OverlappedEntry entries[64];
int32 mode, errno; uint32 wait, qty, key, flags, n, i;
net_op *o; int32 errno;
net_op *op;
G *gp; G *gp;
if(iocphandle == INVALID_HANDLE_VALUE) if(iocphandle == INVALID_HANDLE_VALUE)
return nil; return nil;
gp = nil; gp = nil;
wait = 0;
if(block)
wait = INFINITE;
retry: retry:
o = nil; if(runtime·GetQueuedCompletionStatusEx != nil) {
errno = 0; n = nelem(entries) / runtime·gomaxprocs;
qty = 0; if(n < 8)
wait = INFINITE; n = 8;
if(!block) if(runtime·stdcall(runtime·GetQueuedCompletionStatusEx, 6, iocphandle, entries, (uintptr)n, &n, (uintptr)wait, (uintptr)0) == 0) {
wait = 0; errno = runtime·getlasterror();
// TODO(brainman): Need a loop here to fetch all pending notifications if(!block && errno == WAIT_TIMEOUT)
// (or at least a batch). Scheduler will behave better if is given
// a batch of newly runnable goroutines.
// TODO(brainman): Call GetQueuedCompletionStatusEx() here when possible.
if(runtime·stdcall(runtime·GetQueuedCompletionStatus, 5, iocphandle, &qty, &key, &o, (uintptr)wait) == 0) {
errno = runtime·getlasterror();
if(o == nil && errno == WAIT_TIMEOUT) {
if(!block)
return nil; return nil;
runtime·throw("netpoll: GetQueuedCompletionStatus timed out"); runtime·printf("netpoll: GetQueuedCompletionStatusEx failed (errno=%d)\n", errno);
runtime·throw("netpoll: GetQueuedCompletionStatusEx failed");
} }
if(o == nil) { for(i = 0; i < n; i++) {
runtime·printf("netpoll: GetQueuedCompletionStatus failed (errno=%d)\n", errno); op = entries[i].op;
runtime·throw("netpoll: GetQueuedCompletionStatus failed"); errno = 0;
qty = 0;
if(runtime·stdcall(runtime·WSAGetOverlappedResult, 5, runtime·netpollfd(op->pd), op, &qty, (uintptr)0, (uintptr)&flags) == 0)
errno = runtime·getlasterror();
handlecompletion(&gp, op, errno, qty);
} }
// dequeued failed IO packet, so report that } else {
op = nil;
errno = 0;
qty = 0;
if(runtime·stdcall(runtime·GetQueuedCompletionStatus, 5, iocphandle, &qty, &key, &op, (uintptr)wait) == 0) {
errno = runtime·getlasterror();
if(!block && errno == WAIT_TIMEOUT)
return nil;
if(op == nil) {
runtime·printf("netpoll: GetQueuedCompletionStatus failed (errno=%d)\n", errno);
runtime·throw("netpoll: GetQueuedCompletionStatus failed");
}
// dequeued failed IO packet, so report that
}
handlecompletion(&gp, op, errno, qty);
} }
if(o == nil) if(block && gp == nil)
runtime·throw("netpoll: GetQueuedCompletionStatus returned o == nil"); goto retry;
mode = o->mode; return gp;
}
static void
handlecompletion(G **gpp, net_op *op, int32 errno, uint32 qty)
{
int32 mode;
if(op == nil)
runtime·throw("netpoll: GetQueuedCompletionStatus returned op == nil");
mode = op->mode;
if(mode != 'r' && mode != 'w') { if(mode != 'r' && mode != 'w') {
runtime·printf("netpoll: GetQueuedCompletionStatus returned invalid mode=%d\n", mode); runtime·printf("netpoll: GetQueuedCompletionStatus returned invalid mode=%d\n", mode);
runtime·throw("netpoll: GetQueuedCompletionStatus returned invalid mode"); runtime·throw("netpoll: GetQueuedCompletionStatus returned invalid mode");
} }
o->errno = errno; op->errno = errno;
o->qty = qty; op->qty = qty;
runtime·netpollready(&gp, (void*)o->runtimeCtx, mode); runtime·netpollready(gpp, op->pd, mode);
if(block && gp == nil)
goto retry;
return gp;
} }
...@@ -68,6 +68,8 @@ extern void *runtime·timeBeginPeriod; ...@@ -68,6 +68,8 @@ extern void *runtime·timeBeginPeriod;
extern void *runtime·WaitForSingleObject; extern void *runtime·WaitForSingleObject;
extern void *runtime·WriteFile; extern void *runtime·WriteFile;
void *runtime·GetQueuedCompletionStatusEx;
static int32 static int32
getproccount(void) getproccount(void)
{ {
...@@ -100,6 +102,7 @@ runtime·osinit(void) ...@@ -100,6 +102,7 @@ runtime·osinit(void)
SetProcessPriorityBoost = runtime·stdcall(runtime·GetProcAddress, 2, kernel32, "SetProcessPriorityBoost"); SetProcessPriorityBoost = runtime·stdcall(runtime·GetProcAddress, 2, kernel32, "SetProcessPriorityBoost");
if(SetProcessPriorityBoost != nil) // supported since Windows XP if(SetProcessPriorityBoost != nil) // supported since Windows XP
runtime·stdcall(SetProcessPriorityBoost, 2, (uintptr)-1, (uintptr)1); runtime·stdcall(SetProcessPriorityBoost, 2, (uintptr)-1, (uintptr)1);
runtime·GetQueuedCompletionStatusEx = runtime·stdcall(runtime·GetProcAddress, 2, kernel32, "GetQueuedCompletionStatusEx");
} }
} }
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
extern void *runtime·LoadLibrary; extern void *runtime·LoadLibrary;
extern void *runtime·GetProcAddress; extern void *runtime·GetProcAddress;
extern void *runtime·GetQueuedCompletionStatusEx;
// Call a Windows function with stdcall conventions, // Call a Windows function with stdcall conventions,
// and switch to os stack during the call. // and switch to os stack during the call.
......
...@@ -853,6 +853,7 @@ void runtime·netpollinit(void); ...@@ -853,6 +853,7 @@ void runtime·netpollinit(void);
int32 runtime·netpollopen(uintptr, PollDesc*); int32 runtime·netpollopen(uintptr, PollDesc*);
int32 runtime·netpollclose(uintptr); int32 runtime·netpollclose(uintptr);
void runtime·netpollready(G**, PollDesc*, int32); void runtime·netpollready(G**, PollDesc*, int32);
uintptr runtime·netpollfd(PollDesc*);
void runtime·crash(void); void runtime·crash(void);
void runtime·parsedebugvars(void); void runtime·parsedebugvars(void);
void _rt0_go(void); void _rt0_go(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment