Skip to content
This repository has been archived by the owner on Feb 20, 2021. It is now read-only.

Commit

Permalink
Remove useless qfork synchronization event
Browse files Browse the repository at this point in the history
There is no apparent reason for the child to wait for the
startOperation event to be signaled.
  • Loading branch information
orangemocha committed Feb 6, 2015
1 parent 5677f53 commit b713fda
Showing 1 changed file with 0 additions and 32 deletions.
32 changes: 0 additions & 32 deletions src/Win32_Interop/Win32_QFork.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ struct QForkControl {

OperationType typeOfOperation;
HANDLE forkedProcessReady;
HANDLE startOperation;
HANDLE operationComplete;
HANDLE operationFailed;
HANDLE terminateForkedProcess;
Expand Down Expand Up @@ -264,8 +263,6 @@ BOOL QForkSlaveInit(HANDLE QForkConrolMemoryMapHandle, DWORD ParentProcessID) {
g_pQForkControl->heapMemoryMapFile = dupHeapFileHandle;
SmartHandle dupForkedProcessReady(shParent,sfvMasterQForkControl->forkedProcessReady);
g_pQForkControl->forkedProcessReady = dupForkedProcessReady;
SmartHandle dupStartOperation(shParent,sfvMasterQForkControl->startOperation);
g_pQForkControl->startOperation = dupStartOperation;
SmartHandle dupOperationComplete(shParent,sfvMasterQForkControl->operationComplete);
g_pQForkControl->operationComplete = dupOperationComplete;
SmartHandle dupOperationFailed(shParent,sfvMasterQForkControl->operationFailed);
Expand Down Expand Up @@ -305,9 +302,6 @@ BOOL QForkSlaveInit(HANDLE QForkConrolMemoryMapHandle, DWORD ParentProcessID) {
// signal parent that we are ready
SetEvent(g_pQForkControl->forkedProcessReady);

// wait for parent to signal operation start
WaitForSingleObject(g_pQForkControl->startOperation, INFINITE);

// copy redis globals into fork process
SetupGlobals(g_pQForkControl->globalData.globalData, g_pQForkControl->globalData.globalDataSize, g_pQForkControl->globalData.dictHashSeed);

Expand Down Expand Up @@ -575,13 +569,6 @@ BOOL QForkMasterInit( __int64 maxheapBytes ) {
system_category(),
"CreateEvent failed.");
}
g_pQForkControl->startOperation = CreateEvent(NULL,TRUE,FALSE,NULL);
if (g_pQForkControl->startOperation == NULL) {
throw std::system_error(
GetLastError(),
system_category(),
"CreateEvent failed.");
}
g_pQForkControl->operationComplete = CreateEvent(NULL,TRUE,FALSE,NULL);
if (g_pQForkControl->operationComplete == NULL) {
throw std::system_error(
Expand Down Expand Up @@ -780,10 +767,6 @@ BOOL QForkShutdown() {
CloseHandle(g_pQForkControl->forkedProcessReady);
g_pQForkControl->forkedProcessReady = NULL;
}
if (g_pQForkControl->startOperation != NULL) {
CloseHandle(g_pQForkControl->startOperation);
g_pQForkControl->startOperation = NULL;
}
if (g_pQForkControl->operationComplete != NULL) {
CloseHandle(g_pQForkControl->operationComplete);
g_pQForkControl->operationComplete = NULL;
Expand Down Expand Up @@ -874,12 +857,6 @@ void CreateChildProcess(PROCESS_INFORMATION *pi, char* logfile, DWORD dwCreation
system_category(),
"BeginForkOperation: ResetEvent() failed.");
}
if (ResetEvent(g_pQForkControl->startOperation) == FALSE ) {
throw std::system_error(
GetLastError(),
system_category(),
"BeginForkOperation: ResetEvent() failed.");
}
if (ResetEvent(g_pQForkControl->forkedProcessReady) == FALSE) {
throw std::system_error(
GetLastError(),
Expand Down Expand Up @@ -944,9 +921,6 @@ BOOL BeginForkOperation(OperationType type, LPVOID globalData, int sizeOfGlobalD
"Forked Process did not respond in a timely manner.");
}

// signal the 2nd process that we want to do some work
SetEvent(g_pQForkControl->startOperation);

return TRUE;
}
catch(std::system_error syserr) {
Expand Down Expand Up @@ -1144,12 +1118,6 @@ BOOL EndForkOperation(int * pExitCode) {
system_category(),
"EndForkOperation: ResetEvent() failed.");
}
if (ResetEvent(g_pQForkControl->startOperation) == FALSE ) {
throw std::system_error(
GetLastError(),
system_category(),
"EndForkOperation: ResetEvent() failed.");
}
if (ResetEvent(g_pQForkControl->forkedProcessReady) == FALSE) {
throw std::system_error(
GetLastError(),
Expand Down

0 comments on commit b713fda

Please sign in to comment.