Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove remaints of libev. (#3372)

This commit is contained in:
Wilfried Goesgens 2017-10-10 15:01:59 +02:00 committed by Frank Celler
parent 066e91e1ed
commit 2c1e4dae98
3 changed files with 0 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdParty/CMakeLists.txt vendored
View File

@ -49,7 +49,6 @@ if (USE_PRECOMPILED_V8)
set(ICU_LIBS
"${ICU_BIN_DIR}/libicui18n.a;${ICU_BIN_DIR}/libicuuc.a"
${libev_BINARY_DIR}/libev.a
CACHE INTERNAL
"ICU: Libraries"
FORCE
@ -64,7 +63,6 @@ if (USE_PRECOMPILED_V8)
set(V8_LIBS
"${V8_BIN_DIR}/libv8_base.a;${V8_BIN_DIR}/libv8_libbase.a;${V8_BIN_DIR}/libv8_libplatform.a;${V8_BIN_DIR}/libv8_nosnapshot.a"
${libev_BINARY_DIR}/libev.a
CACHE INTERNAL
"${PROJECT_NAME}: Libraries"
FORCE

50
lib/Basics/win-utils.cpp
View File

@ -139,51 +139,6 @@ static void InvalidParameterHandler(
LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "Invalid handle parameter passed";
}
////////////////////////////////////////////////////////////////////////////////
// Called from the 'main' and performs any initialization requirements which
// are specific to windows.
//
// If this function returns 0, then no errors encountered. If < 0, then the
// calling function should terminate the application. If > 0, then the
// calling function should decide what to do.
////////////////////////////////////////////////////////////////////////////////
int finalizeWindows(const TRI_win_finalize_e finalizeWhat, char const* data) {
// ............................................................................
// The data is used to transport information from the calling function to here
// it may be NULL (and will be in most cases)
// ............................................................................
switch (finalizeWhat) {
case TRI_WIN_FINAL_WSASTARTUP_FUNCTION_CALL: {
/*
TODO: we can't always determine when to call this properly.
if we have closed libev, its ok, if we have active socket operations
these will fail with errors.
int result =
WSACleanup(); // could this cause error on server termination?
if (result != 0) {
// can not use LOG_ etc here since the logging may have terminated
printf(
"ERROR: Could not perform a valid Winsock2 cleanup. WSACleanup "
"returned error %d.",
result);
return -1;
}
*/
return 0;
}
default: {
// can not use LOG_ etc here since the logging may have terminated
printf("ERROR: Invalid windows finalization called");
return -1;
}
}
return -1;
}
int initializeWindows(const TRI_win_initialize_e initializeWhat,
char const* data) {
// ............................................................................
@ -598,11 +553,6 @@ void ADB_WindowsExitFunction(int exitCode, void* data) {
if (serviceAbort != nullptr) {
serviceAbort();
}
int res = finalizeWindows(TRI_WIN_FINAL_WSASTARTUP_FUNCTION_CALL, 0);
if (res != 0) {
exit(EXIT_FAILURE);
}
exit(exitCode);
}

6
lib/Basics/win-utils.h
View File

@ -32,11 +32,6 @@
// initialized.
// .............................................................................
typedef enum {
TRI_WIN_FINAL_SET_INVALID_HANLE_HANDLER,
TRI_WIN_FINAL_WSASTARTUP_FUNCTION_CALL
} TRI_win_finalize_e;
typedef enum {
TRI_WIN_INITIAL_SET_DEBUG_FLAG,
TRI_WIN_INITIAL_SET_INVALID_HANLE_HANDLER,
@ -44,7 +39,6 @@ typedef enum {
TRI_WIN_INITIAL_WSASTARTUP_FUNCTION_CALL
} TRI_win_initialize_e;
int finalizeWindows(const TRI_win_finalize_e, char const*);
int initializeWindows(const TRI_win_initialize_e, char const*);
void ADB_WindowsEntryFunction();