mirror of https://github.com/grpc/grpc.git
Merge pull request #16163 from apolcyn/revert_revert_windows_breakage
Revert "Revert "Merge pull request #15797 from apolcyn/windows_compile_and_sort""pull/16184/head
apolcyn
6 years ago
committed by
GitHub
commit
8fc60d3f30
31 changed files with 577 additions and 73 deletions
@ -0,0 +1,59 @@ |
||||
/*
|
||||
* |
||||
* Copyright 2016 gRPC authors. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
* |
||||
*/ |
||||
#include <grpc/support/port_platform.h> |
||||
|
||||
#include "src/core/lib/iomgr/port.h" |
||||
#if GRPC_ARES == 1 && defined(GPR_WINDOWS) |
||||
|
||||
#include <ares.h> |
||||
#include <string.h> |
||||
#include "src/core/lib/gprpp/memory.h" |
||||
|
||||
#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h" |
||||
|
||||
namespace grpc_core { |
||||
|
||||
/* TODO: fill in the body of GrpcPolledFdWindows to enable c-ares on Windows.
|
||||
This dummy implementation only allows grpc to compile on windows with |
||||
GRPC_ARES=1. */ |
||||
class GrpcPolledFdWindows : public GrpcPolledFd { |
||||
public: |
||||
GrpcPolledFdWindows() { abort(); } |
||||
~GrpcPolledFdWindows() { abort(); } |
||||
void RegisterForOnReadableLocked(grpc_closure* read_closure) override { |
||||
abort(); |
||||
} |
||||
void RegisterForOnWriteableLocked(grpc_closure* write_closure) override { |
||||
abort(); |
||||
} |
||||
bool IsFdStillReadableLocked() override { abort(); } |
||||
void ShutdownLocked(grpc_error* error) override { abort(); } |
||||
ares_socket_t GetWrappedAresSocketLocked() override { abort(); } |
||||
const char* GetName() override { abort(); } |
||||
}; |
||||
|
||||
GrpcPolledFd* NewGrpcPolledFdLocked(ares_socket_t as, |
||||
grpc_pollset_set* driver_pollset_set) { |
||||
return nullptr; |
||||
} |
||||
|
||||
void ConfigureAresChannelLocked(ares_channel* channel) { abort(); } |
||||
|
||||
} // namespace grpc_core
|
||||
|
||||
#endif /* GRPC_ARES == 1 && defined(GPR_WINDOWS) */ |
||||
@ -0,0 +1,29 @@ |
||||
/*
|
||||
* |
||||
* Copyright 2016 gRPC authors. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
* |
||||
*/ |
||||
|
||||
#include <grpc/support/port_platform.h> |
||||
|
||||
#include "src/core/lib/iomgr/port.h" |
||||
#if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) |
||||
|
||||
#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" |
||||
#include "src/core/lib/iomgr/socket_utils_posix.h" |
||||
|
||||
bool grpc_ares_query_ipv6() { return grpc_ipv6_loopback_available(); } |
||||
|
||||
#endif /* GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) */ |
||||
@ -0,0 +1,29 @@ |
||||
/*
|
||||
* |
||||
* Copyright 2016 gRPC authors. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
* |
||||
*/ |
||||
|
||||
#include <grpc/support/port_platform.h> |
||||
|
||||
#include "src/core/lib/iomgr/port.h" |
||||
#if GRPC_ARES == 1 && defined(GPR_WINDOWS) |
||||
|
||||
#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" |
||||
#include "src/core/lib/iomgr/socket_windows.h" |
||||
|
||||
bool grpc_ares_query_ipv6() { return grpc_ipv6_loopback_available(); } |
||||
|
||||
#endif /* GRPC_ARES == 1 && defined(GPR_WINDOWS) */ |
||||
@ -0,0 +1,48 @@ |
||||
/*
|
||||
* |
||||
* Copyright 2015 gRPC authors. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
* |
||||
*/ |
||||
|
||||
#include "src/core/lib/iomgr/port.h" |
||||
|
||||
// grpc_ipv6_loopback_available isn't currently available on UV.
|
||||
#ifndef GRPC_UV |
||||
|
||||
#include <grpc/grpc.h> |
||||
#include <grpc/support/log.h> |
||||
#include "test/core/util/test_config.h" |
||||
|
||||
#ifdef GPR_WINDOWS |
||||
#include "src/core/lib/iomgr/socket_windows.h" |
||||
#else |
||||
#include "src/core/lib/iomgr/socket_utils_posix.h" |
||||
#endif |
||||
|
||||
int main(int argc, char** argv) { |
||||
grpc_test_init(argc, argv); |
||||
grpc_init(); |
||||
// This test assumes that the ipv6 loopback is available
|
||||
// in all environments in which grpc tests run in.
|
||||
GPR_ASSERT(grpc_ipv6_loopback_available()); |
||||
grpc_shutdown(); |
||||
return 0; |
||||
} |
||||
|
||||
#else |
||||
|
||||
int main(int argc, char** argv) { return 0; } |
||||
|
||||
#endif /* GRPC_UV */ |
||||
Loading…
Reference in new issue