Fix windows pollset initialization

pull/5419/head
Craig Tiller 9 years ago
parent 8479c972e4
commit 4c33dba55e
  1. 3
      src/core/lib/iomgr/iomgr_windows.c
  2. 4
      src/core/lib/iomgr/pollset_windows.c
  3. 3
      src/core/lib/iomgr/pollset_windows.h

@ -41,6 +41,7 @@
#include "src/core/lib/iomgr/iocp_windows.h"
#include "src/core/lib/iomgr/iomgr.h"
#include "src/core/lib/iomgr/pollset_windows.h"
#include "src/core/lib/iomgr/socket_windows.h"
/* Windows' io manager is going to be fully designed using IO completion
@ -61,11 +62,13 @@ static void winsock_shutdown(void) {
void grpc_iomgr_platform_init(void) {
winsock_init();
grpc_iocp_init();
grpc_pollset_global_init();
}
void grpc_iomgr_platform_flush(void) { grpc_iocp_flush(); }
void grpc_iomgr_platform_shutdown(void) {
grpc_pollset_global_shutdown();
grpc_iocp_shutdown();
winsock_shutdown();
}

@ -47,7 +47,7 @@ gpr_mu grpc_polling_mu;
static grpc_pollset_worker *g_active_poller;
static grpc_pollset_worker g_global_root_worker;
void grpc_pollset_global_init() {
void grpc_pollset_global_init(void) {
gpr_mu_init(&grpc_polling_mu);
g_active_poller = NULL;
g_global_root_worker.links[GRPC_POLLSET_WORKER_LINK_GLOBAL].next =
@ -55,7 +55,7 @@ void grpc_pollset_global_init() {
&g_global_root_worker;
}
void grpc_pollset_global_shutdown() { gpr_mu_destroy(&grpc_polling_mu); }
void grpc_pollset_global_shutdown(void) { gpr_mu_destroy(&grpc_polling_mu); }
static void remove_worker(grpc_pollset_worker *worker,
grpc_pollset_worker_link_type type) {

@ -72,4 +72,7 @@ struct grpc_pollset {
grpc_closure *on_shutdown;
};
void grpc_pollset_global_init(void);
void grpc_pollset_global_shutdown(void);
#endif /* GRPC_CORE_LIB_IOMGR_POLLSET_WINDOWS_H */

Loading…
Cancel
Save