Merge pull request #4979 from nicolasnoble/win32_subprocess

Adding windows support for gpr subprocesses.
pull/4983/merge
Craig Tiller 9 years ago
commit f09fb7e4b0
  1. 2
      BUILD
  2. 1
      Makefile
  3. 1
      binding.gyp
  4. 1
      build.yaml
  5. 1
      gRPC.podspec
  6. 1
      grpc.gemspec
  7. 2
      include/grpc/impl/codegen/port_platform.h
  8. 1
      package.json
  9. 141
      src/core/support/subprocess_windows.c
  10. 1
      src/python/grpcio/grpc_core_dependencies.py
  11. 1
      tools/doxygen/Doxyfile.core.internal
  12. 1
      tools/run_tests/sources_and_headers.json
  13. 2
      vsprojects/vcxproj/gpr/gpr.vcxproj
  14. 3
      vsprojects/vcxproj/gpr/gpr.vcxproj.filters

@ -84,6 +84,7 @@ cc_library(
"src/core/support/string_posix.c",
"src/core/support/string_win32.c",
"src/core/support/subprocess_posix.c",
"src/core/support/subprocess_windows.c",
"src/core/support/sync.c",
"src/core/support/sync_posix.c",
"src/core/support/sync_win32.c",
@ -1158,6 +1159,7 @@ objc_library(
"src/core/support/string_posix.c",
"src/core/support/string_win32.c",
"src/core/support/subprocess_posix.c",
"src/core/support/subprocess_windows.c",
"src/core/support/sync.c",
"src/core/support/sync_posix.c",
"src/core/support/sync_win32.c",

@ -2235,6 +2235,7 @@ LIBGPR_SRC = \
src/core/support/string_posix.c \
src/core/support/string_win32.c \
src/core/support/subprocess_posix.c \
src/core/support/subprocess_windows.c \
src/core/support/sync.c \
src/core/support/sync_posix.c \
src/core/support/sync_win32.c \

@ -516,6 +516,7 @@
'src/core/support/string_posix.c',
'src/core/support/string_win32.c',
'src/core/support/subprocess_posix.c',
'src/core/support/subprocess_windows.c',
'src/core/support/sync.c',
'src/core/support/sync_posix.c',
'src/core/support/sync_win32.c',

@ -499,6 +499,7 @@ libs:
- src/core/support/string_posix.c
- src/core/support/string_win32.c
- src/core/support/subprocess_posix.c
- src/core/support/subprocess_windows.c
- src/core/support/sync.c
- src/core/support/sync_posix.c
- src/core/support/sync_win32.c

@ -151,6 +151,7 @@ Pod::Spec.new do |s|
'src/core/support/string_posix.c',
'src/core/support/string_win32.c',
'src/core/support/subprocess_posix.c',
'src/core/support/subprocess_windows.c',
'src/core/support/sync.c',
'src/core/support/sync_posix.c',
'src/core/support/sync_win32.c',

@ -134,6 +134,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/support/string_posix.c )
s.files += %w( src/core/support/string_win32.c )
s.files += %w( src/core/support/subprocess_posix.c )
s.files += %w( src/core/support/subprocess_windows.c )
s.files += %w( src/core/support/sync.c )
s.files += %w( src/core/support/sync_posix.c )
s.files += %w( src/core/support/sync_win32.c )

@ -80,6 +80,7 @@
#define GPR_ARCH_64 1
#define GPR_GETPID_IN_PROCESS_H 1
#define GPR_WINSOCK_SOCKET 1
#define GPR_WINDOWS_SUBPROCESS 1
#ifdef __GNUC__
#define GPR_GCC_ATOMIC 1
#define GPR_GCC_TLS 1
@ -94,6 +95,7 @@
#define GPR_WIN32 1
#define GPR_GETPID_IN_PROCESS_H 1
#define GPR_WINSOCK_SOCKET 1
#define GPR_WINDOWS_SUBPROCESS 1
#ifdef __GNUC__
#define GPR_GCC_ATOMIC 1
#define GPR_GCC_TLS 1

@ -491,6 +491,7 @@
"src/core/support/string_posix.c",
"src/core/support/string_win32.c",
"src/core/support/subprocess_posix.c",
"src/core/support/subprocess_windows.c",
"src/core/support/sync.c",
"src/core/support/sync_posix.c",
"src/core/support/sync_win32.c",

@ -0,0 +1,141 @@
/*
*
* Copyright 2016, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include <grpc/support/port_platform.h>
#ifdef GPR_WINDOWS_SUBPROCESS
#include <windows.h>
#include <string.h>
#include <tchar.h>
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/subprocess.h>
#include "src/core/support/string.h"
#include "src/core/support/string_win32.h"
struct gpr_subprocess {
PROCESS_INFORMATION pi;
int joined;
int interrupted;
};
const char *gpr_subprocess_binary_extension() { return ".exe"; }
gpr_subprocess *gpr_subprocess_create(int argc, const char **argv) {
gpr_subprocess *r;
STARTUPINFO si;
PROCESS_INFORMATION pi;
char *args = gpr_strjoin_sep(argv, argc, " ", NULL);
TCHAR *args_tchar;
args_tchar = gpr_char_to_tchar(args);
gpr_free(args);
memset(&si, 0, sizeof(si));
si.cb = sizeof(si);
memset(&pi, 0, sizeof(pi));
if (!CreateProcess(NULL, args_tchar, NULL, NULL, FALSE,
CREATE_NEW_PROCESS_GROUP, NULL, NULL, &si, &pi)) {
gpr_free(args_tchar);
return NULL;
}
gpr_free(args_tchar);
r = gpr_malloc(sizeof(gpr_subprocess));
memset(r, 0, sizeof(*r));
r->pi = pi;
return r;
}
void gpr_subprocess_destroy(gpr_subprocess *p) {
if (p) {
if (!p->joined) {
gpr_subprocess_interrupt(p);
gpr_subprocess_join(p);
}
if (p->pi.hProcess) {
CloseHandle(p->pi.hProcess);
}
if (p->pi.hThread) {
CloseHandle(p->pi.hThread);
}
gpr_free(p);
}
}
int gpr_subprocess_join(gpr_subprocess *p) {
DWORD dwExitCode;
if (GetExitCodeProcess(p->pi.hProcess, &dwExitCode)) {
if (dwExitCode == STILL_ACTIVE) {
if (WaitForSingleObject(p->pi.hProcess, INFINITE) == WAIT_OBJECT_0) {
p->joined = 1;
goto getExitCode;
}
return -1; // failed to join
} else {
goto getExitCode;
}
} else {
return -1; // failed to get exit code
}
getExitCode:
if (p->interrupted) {
return 0;
}
if (GetExitCodeProcess(p->pi.hProcess, &dwExitCode)) {
return dwExitCode;
} else {
return -1; // failed to get exit code
}
}
void gpr_subprocess_interrupt(gpr_subprocess *p) {
DWORD dwExitCode;
if (GetExitCodeProcess(p->pi.hProcess, &dwExitCode)) {
if (dwExitCode == STILL_ACTIVE) {
gpr_log(GPR_INFO, "sending ctrl-break");
GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, p->pi.dwProcessId);
p->joined = 1;
p->interrupted = 1;
}
}
return;
}
#endif /* GPR_WINDOWS_SUBPROCESS */

@ -60,6 +60,7 @@ CORE_SOURCE_FILES = [
'src/core/support/string_posix.c',
'src/core/support/string_win32.c',
'src/core/support/subprocess_posix.c',
'src/core/support/subprocess_windows.c',
'src/core/support/sync.c',
'src/core/support/sync_posix.c',
'src/core/support/sync_win32.c',

@ -1139,6 +1139,7 @@ src/core/support/string.c \
src/core/support/string_posix.c \
src/core/support/string_win32.c \
src/core/support/subprocess_posix.c \
src/core/support/subprocess_windows.c \
src/core/support/sync.c \
src/core/support/sync_posix.c \
src/core/support/sync_win32.c \

@ -2916,6 +2916,7 @@
"src/core/support/string_win32.c",
"src/core/support/string_win32.h",
"src/core/support/subprocess_posix.c",
"src/core/support/subprocess_windows.c",
"src/core/support/sync.c",
"src/core/support/sync_posix.c",
"src/core/support/sync_win32.c",

@ -269,6 +269,8 @@
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\support\subprocess_posix.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\support\subprocess_windows.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\support\sync.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\support\sync_posix.c">

@ -91,6 +91,9 @@
<ClCompile Include="$(SolutionDir)\..\src\core\support\subprocess_posix.c">
<Filter>src\core\support</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\support\subprocess_windows.c">
<Filter>src\core\support</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\support\sync.c">
<Filter>src\core\support</Filter>
</ClCompile>

Loading…
Cancel
Save