projects / packages / aMule.git / blame
| Commit | Line | Data |
|---|---|---|
| f0349bce JR |
1 | diff -ur aMule-2.3.1/src/amuled.cpp aMule-2.3.1.wx3/src/amuled.cpp |
| 2 | --- aMule-2.3.1/src/amuled.cpp 2011-07-13 17:00:12.000000000 +0200 | |
| 3 | +++ aMule-2.3.1.wx3/src/amuled.cpp 2014-01-19 13:55:50.904800356 +0100 | |
| 4 | @@ -423,7 +423,9 @@ | |
| 5 | #ifndef __WXMSW__ | |
| 6 | ||
| 7 | ||
| 8 | +/* | |
| 9 | static EndProcessDataMap endProcDataMap; | |
| 10 | +*/ | |
| 11 | ||
| 12 | ||
| 13 | int CDaemonAppTraits::WaitForChild(wxExecuteData &execData) | |
| 14 | @@ -449,6 +451,7 @@ | |
| 15 | wxSleep(1); | |
| 16 | result = AmuleWaitPid(execData.pid, &status, WNOHANG, &msg); | |
| 17 | if (result == 0) { | |
| 18 | + /* | |
| 19 | // Add a WxEndProcessData entry to the map, so that we can | |
| 20 | // support process termination | |
| 21 | wxEndProcessData *endProcData = new wxEndProcessData(); | |
| 22 | @@ -456,6 +459,7 @@ | |
| 23 | endProcData->process = execData.process; | |
| 24 | endProcData->tag = 0; | |
| 25 | endProcDataMap[execData.pid] = endProcData; | |
| 26 | + */ | |
| 27 | ||
| 28 | status = execData.pid; | |
| 29 | } else { | |
| 30 | @@ -480,6 +484,7 @@ | |
| 31 | msg << wxT("OnSignalChildHandler() has been called for child process with pid `") << | |
| 32 | siginfo->si_pid << | |
| 33 | wxT("'. "); | |
| 34 | +/* | |
| 35 | // Make sure we leave no zombies by calling waitpid() | |
| 36 | int status = 0; | |
| 37 | pid_t result = AmuleWaitPid(siginfo->si_pid, &status, WNOHANG, &msg); | |
| 38 | @@ -503,6 +508,7 @@ | |
| 39 | msg << wxT(" Error: the child process pid is not on the pid map."); | |
| 40 | } | |
| 41 | } | |
| 42 | +*/ | |
| 43 | ||
| 44 | // Log our passage here | |
| 45 | AddDebugLogLineN(logGeneral, msg); |