# | Line 21 | Line 21 | |
---|---|---|
21 | jcofflan@users.sourceforge.net | |
22 | ||
23 | \*******************************************************************/ | |
24 | < | #include <protomol/debug/Process.h> |
24 | > | #include "debug/Process.hpp" |
25 | ||
26 | < | #include <protomol/base/Exception.h> |
27 | < | #include <protomol/debug/Debugger.h> |
28 | < | #include <protomol/debug/Pipe.h> |
29 | < | #include <protomol/type/String.h> |
30 | < | #include <protomol/base/Zap.h> |
26 | > | #include "utils/Exception.hpp" |
27 | > | #include "debug/Debugger.hpp" |
28 | > | #include "debug/Pipe.hpp" |
29 | > | #include "utils/StringUtils.hpp" |
30 | > | #include "utils/Zap.hpp" |
31 | ||
32 | #include <stdio.h> | |
33 | #include <unistd.h> | |
# | Line 39 | Line 39 | using namespace std; | |
39 | #include <string> | |
40 | ||
41 | using namespace std; | |
42 | < | using namespace ProtoMol; |
42 | > | using namespace OpenMD; |
43 | ||
44 | void PipeProcessFunctor::child() { | |
45 | if (direction == Process::TO_CHILD) { | |
# | Line 228 | Line 228 | void Process::kill(int sig) { | |
228 | ASSERT_OR_THROW("Process not running!", running); | |
229 | ||
230 | if (::kill(pid, sig) != 0) | |
231 | < | THROW(string("Failed to kill process ") + String(pid) + ":" + |
231 | > | THROW(string("Failed to kill process ") + string(toString(pid)) + ":" + |
232 | strerror(errno)); | |
233 | } | |
234 | ||
# | Line 240 | Line 240 | int Process::wait(int options) { | |
240 | ||
241 | if (retVal == -1) { | |
242 | running = false; | |
243 | < | THROW(string("Failed to wait on process ") + String(pid) + ":" + |
243 | > | THROW(string("Failed to wait on process ") + string(toString(pid)) + ":" + |
244 | strerror(errno)); | |
245 | } | |
246 |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |