#include <cstdlib>
#include <cstring>
#include <iostream>
+#include <sstream>
#include <signal.h>
#include <sys/types.h>
#include <sys/types.h>
return true;
}
-
-pid_t kill_file(const std::string &filename)
+bool check_pid(const std::string &filename)
{
- pid_t ret= -1;
+ if (filename.empty())
+ {
+ return false;
+ }
+
FILE *fp;
+ if ((fp= fopen(filename.c_str(), "r")))
+ {
+ char pid_buffer[1024];
+
+ char *ptr= fgets(pid_buffer, sizeof(pid_buffer), fp);
+ fclose(fp);
+
+ if (ptr)
+ {
+ pid_t pid= (pid_t)atoi(pid_buffer);
+ if (pid > 0)
+ {
+ return (::kill(pid, 0) == 0);
+ }
+ }
+ }
+
+ return false;
+}
+
+bool kill_file(const std::string &filename)
+{
if (filename.empty())
- return ret;
+ {
+ return true;
+ }
+ FILE *fp;
if ((fp= fopen(filename.c_str(), "r")))
{
char pid_buffer[1024];
pid_t pid= (pid_t)atoi(pid_buffer);
if (pid != 0)
{
- kill_pid(pid);
+ bool ret= kill_pid(pid);
unlink(filename.c_str()); // If this happens we may be dealing with a dead server that left its pid file.
+
+ return ret;
}
}
}
- return ret;
+ return false;
}
-pid_t get_pid_from_file(const std::string &filename)
+#define STRINGIFY(x) #x
+#define TOSTRING(x) STRINGIFY(x)
+#define LIBTEST_AT __FILE__ ":" TOSTRING(__LINE__)
+
+pid_t get_pid_from_file(const std::string &filename, std::stringstream& error_message)
{
pid_t ret= -1;
FILE *fp;
if (filename.empty())
{
- Error << "empty pid file";
+ error_message << LIBTEST_AT << " empty pid file";
return ret;
}
if (ptr)
{
ret= (pid_t)atoi(pid_buffer);
- if (ret <= 0)
+ if (ret < 1)
{
- return ret;
+ error_message << LIBTEST_AT << " Invalid pid was read from file " << filename;
}
}
+ else
+ {
+ error_message << LIBTEST_AT << " File " << filename << " was empty ";
+ }
+
+ return ret;
+ }
+ else
+ {
+ char buffer[1024];
+ char *current_directory= getcwd(buffer, sizeof(buffer));
+ error_message << "Error while opening " << current_directory << "/" << filename << " " << strerror(errno);
}
return ret;