8000 rework process handling by dothebart · Pull Request #3322 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

rework process handling #3322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Sep 28, 2017
Merged

rework process handling #3322

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3ed6eb5
the Cookbook deserves a capital C!
dothebart Sep 21, 2017
61fb249
rework kill external to behave similar on windows & linux, plus outpu…
dothebart Sep 21, 2017
fea42de
fix windows compile
dothebart Sep 21, 2017
f7719a2
C++ify process handling, make it work on linux
dothebart Sep 22, 2017
dd77634
fix windows compile
dothebart Sep 22, 2017
c809c0d
fix windows INVALID_HANDLE_VALUE handling all over the place
dothebart Sep 25, 2017
486c64f
fix missing include
dothebart Sep 25, 2017
608694e
Merge branch 'devel' of github.com:arangodb/ArangoDB into bug-fix/rew…
dothebart Sep 25, 2017
af69301
don't ignore signals on spawned processes
dothebart Sep 25, 2017
92ebdcc
DRY.
dothebart Sep 25, 2017
8ec65e0
define signals that aren't present on some platforms
dothebart Sep 26, 2017
981abcb
Merge branch 'devel' of https://github.com/arangodb/arangodb into bug…
fceller Sep 26, 2017
0082377
fix used number on mac.
dothebart Sep 27, 2017
d408fba
Merge branch 'bug-fix/rework_killexternal' of github.com:arangodb/Ara…
dothebart Sep 27, 2017
6d235ef
Merge branch 'devel' of github.com:arangodb/ArangoDB into bug-fix/rew…
dothebart Sep 27, 2017
64633d2
Merge branch 'devel' of github.com:arangodb/ArangoDB into bug-fix/rew…
dothebart Sep 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix windows INVALID_HANDLE_VALUE handling all over the place
  • Loading branch information
@dothebart
dothebart committed Sep 25, 2017
commit c809c0d77eae2b8ff3e06833494a36560eeffb3b
8 changes: 4 additions & 4 deletions lib/Basics/process-utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ ExternalProcess::ExternalProcess():
#else
_pid(0),
_process(nullptr),
_readPipe(nullptr),
_writePipe(nullptr),
_readPipe(INVALID_HANDLE_VALUE),
_writePipe(INVALID_HANDLE_VALUE),
#endif
_status(TRI_EXT_NOT_STARTED),
_exitStatus(0) {}
Expand Down Expand Up @@ -136,10 +136,10 @@ ExternalProcess::~ExternalProcess() {
}
#else
CloseHandle(_process);
if (_readPipe != nullptr) {
if (_readPipe != INVALID_HANDLE_VALUE) {
CloseHandle(_readPipe);
}
if (_writePipe != nullptr) {
if (_writePipe != INVALID_HANDLE_VALUE) {
CloseHandle(_writePipe);
}
#endif
Expand Down
13 changes: 13 additions & 0 deletions lib/Basics/win-utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,3 +721,16 @@ bool terminalKnowsANSIColors()
// Windows 8 onwards the CMD window understands ANSI-Colorcodes.
return IsWindows8OrGreater();
}

std::string getFileNameFromHandle(HANDLE fileHandle) {
char buff[sizeof(FILE_NAME_INFO) + sizeof(WCHAR)*MAX_PATH];
FILE_NAME_INFO *FileInformation = (FILE_NAME_INFO*) buff;

if (!GetFileInformationByHandleEx(fileHandle,
FileNameInfo,
FileInformation, sizeof(buff)
)) {
return std::string();
}
return std::string((LPCTSTR)CString(FileInformation->FileName));
}
4 changes: 4 additions & 0 deletions lib/Basics/win-utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,5 +151,9 @@ int _is_cyg_tty(int fd);
////////////////////////////////////////////////////////////////////////////////
bool terminalKnowsANSIColors();

////////////////////////////////////////////////////////////////////////////////
// returns returns the filename in conjunction with a handle
////////////////////////////////////////////////////////////////////////////////
std::string getFileNameFromHandle(HANDLE fileHandle);

#endif
42 changes: 16 additions & 26 deletions lib/V8/v8-utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3481,23 +3481,18 @@ static void JS_ExecuteExternal(
v8::Number::New(isolate, external._writePipe));
}
#else
size_t readPipe_len, writePipe_len;
if (0 != external._readPipe) {
char* readPipe = TRI_EncodeHexString((char const*)external._readPipe,
sizeof(HANDLE), &readPipe_len);
if (readPipe != nullptr) {
if (external._readPipe != INVALID_HANDLE_VALUE) {
auto fn = getFileNameFromHandle(external._readPipe);
if (fn.length() > 0) {
result->Set(TRI_V8_ASCII_STRING(isolate, "readPipe"),
TRI_V8_PAIR_STRING(isolate, readPipe, (int)readPipe_len));
TRI_FreeString(readPipe);
TRI_V8_STD_STRING(isolate, fn));
}
}
if (0 != external._writePipe) {
char* writePipe = TRI_EncodeHexString((char const*)external._writePipe,
sizeof(HANDLE), &writePipe_len);
if (writePipe != nullptr) {
if (external._writePipe != INVALID_HANDLE_VALUE) {
auto fn = getFileNameFromHandle(external._writePipe);
if (fn.length() > 0) {
result->Set(TRI_V8_ASCII_STRING(isolate, "writePipe"),
TRI_V8_PAIR_STRING(isolate, writePipe, (int)writePipe_len));
TRI_FreeString(writePipe);
TRI_V8_STD_STRING(isolate, fn));
}
}
#endif
Expand Down Expand Up @@ -3602,23 +3597,18 @@ static void JS_StatusExternal(v8::FunctionCallbackInfo<v8::Value> const& args) {
v8::Number::New(isolate, external._writePipe));
}
#else
size_t readPipe_len, writePipe_len;
if (0 != external._readPipe) {
char* readPipe = TRI_EncodeHexString((char const*)external._readPipe,
sizeof(HANDLE), &readPipe_len);
if (readPipe != nullptr) {
if (external._readPipe != INVALID_HANDLE_VALUE) {
auto fn = getFileNameFromHandle(external._readPipe);
if (fn.length() > 0) {
result->Set(TRI_V8_ASCII_STRING(isolate, "readPipe"),
TRI_V8_PAIR_STRING(isolate, readPipe, (int)readPipe_len));
TRI_FreeString(readPipe);
TRI_V8_STD_STRING(isolate, fn));
}
}
if (0 != external._writePipe) {
char* writePipe = TRI_EncodeHexString((char const*)external._writePipe,
sizeof(HANDLE), &writePipe_len);
if (writePipe != nullptr) {
if (external._writePipe != INVALID_HANDLE_VALUE) {
auto fn = getFileNameFromHandle(external._writePipe);
if (fn.length() > 0) {
result->Set(TRI_V8_ASCII_STRING(isolate, "writePipe"),
TRI_V8_PAIR_STRING(isolate, writePipe, (int)writePipe_len));
TRI_FreeString(writePipe);
TRI_V8_STD_STRING(isolate, fn));
}
}
#endif
Expand Down
0