Skip to content

Made Process Exit and Kill return a bool #75

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 2 commits into from
Mar 5, 2017
Merged

Made Process Exit and Kill return a bool #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3bfa77
Initial implementation
dkrutsko Mar 5, 2017
00a7bbe
Updated test cases
dkrutsko Mar 5, 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
26 changes: 13 additions & 13 deletions Source/Process.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,53 +573,53 @@ string Process::GetPath (void) const

////////////////////////////////////////////////////////////////////////////////

void Process::Exit (void)
bool Process::Exit (void)
{
// Check process validity
if (!IsValid()) return;

#ifdef ROBOT_OS_LINUX

kill (mData->ProcID, SIGTERM);
return kill (mData->ProcID, SIGTERM) == 0;

#endif
#ifdef ROBOT_OS_MAC

kill (mData->ProcID, SIGTERM);
return kill (mData->ProcID, SIGTERM) == 0;

#endif
#ifdef ROBOT_OS_WIN

// Check the process validity
if (!IsValid()) return false;

// Get every process window
auto list = Window::GetList
(nullptr, mData->ProcID);

// Close every open window in the process
for (auto& window : list) window.Close();

// True if not empty
return !list.empty();

#endif
}

////////////////////////////////////////////////////////////////////////////////

void Process::Kill (void)
bool Process::Kill (void)
{
// Check process validity
if (!IsValid()) return;

#ifdef ROBOT_OS_LINUX

kill (mData->ProcID, SIGKILL);
return kill (mData->ProcID, SIGKILL) == 0;

#endif
#ifdef ROBOT_OS_MAC

kill (mData->ProcID, SIGKILL);
return kill (mData->ProcID, SIGKILL) == 0;

#endif
#ifdef ROBOT_OS_WIN

TerminateProcess (mData->Handle, -1);
return TerminateProcess (mData->Handle, -1) != FALSE;

#endif
}
Expand Down
4 changes: 2 additions & 2 deletions Source/Process.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ class ROBOT_EXPORT Process
std::string GetName (void) const;
std::string GetPath (void) const;

void Exit (void);
void Kill (void);
bool Exit (void);
bool Kill (void);
bool HasExited (void) const;

ModuleList GetModules (const char* name = nullptr) const;
Expand Down
17 changes: 11 additions & 6 deletions Test/Process.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,15 @@ static bool TestInvalid (void)
Process p3; VERIFY (!p3.Open (-1));
Process p4 (8888);

VERIFY (!p1.IsValid()); VERIFY (!p1.Is64Bit()); VERIFY (p1.HasExited());
VERIFY (!p2.IsValid()); VERIFY (!p2.Is64Bit()); VERIFY (p2.HasExited());
VERIFY (!p3.IsValid()); VERIFY (!p3.Is64Bit()); VERIFY (p3.HasExited());
VERIFY (!p4.IsValid()); VERIFY (!p4.Is64Bit()); VERIFY (p4.HasExited());
VERIFY (!p1.IsValid()); VERIFY (!p1.Is64Bit());
VERIFY (!p2.IsValid()); VERIFY (!p2.Is64Bit());
VERIFY (!p3.IsValid()); VERIFY (!p3.Is64Bit());
VERIFY (!p4.IsValid()); VERIFY (!p4.Is64Bit());

VERIFY (!p1.Exit()); VERIFY (!p1.Kill()); VERIFY (p1.HasExited());
VERIFY (!p2.Exit()); VERIFY (!p2.Kill()); VERIFY (p2.HasExited());
VERIFY (!p3.Exit()); VERIFY (!p3.Kill()); VERIFY (p3.HasExited());
VERIFY (!p4.Exit()); VERIFY (!p4.Kill()); VERIFY (p4.HasExited());

VERIFY (p1.GetPID() == 0); VERIFY (p1.GetHandle() == 0);
VERIFY (p2.GetPID() == 0); VERIFY (p2.GetHandle() == 0);
Expand Down Expand Up @@ -162,8 +167,8 @@ static bool TestSelect (void)

cout << "Type something in both apps then press enter";
getchar();
p1.Exit();
p2.Kill();
VERIFY (p1.Exit());
VERIFY (p2.Kill());
cout << "Close both applications and then press enter";
getchar();

Expand Down