*
*/
-#include <config.h>
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <cstdlib>
}
}
- int status= 0;
- if (waitpid(pid_arg, &status, 0) == -1)
{
- switch (errno)
+ uint32_t this_wait= 0;
+ uint32_t timeout= 20; // This number should be high enough for valgrind startup (which is slow)
+ uint32_t waited;
+ uint32_t retry;
+
+ for (waited= 0, retry= 1; ; retry++, waited+= this_wait)
{
- // Just means that the server has already gone away
- case ECHILD:
+ int status= 0;
+ if (waitpid(pid_arg, &status, WNOHANG) == 0)
{
- return true;
+ break;
+ }
+ else if (errno == ECHILD)
+ {
+ // Server has already gone away
+ break;
+ }
+ else if (waited >= timeout)
+ {
+ // Timeout failed
+ kill(pid_arg, SIGKILL);
+ break;
}
- }
-
- Error << "Error occured while waitpid(" << strerror(errno) << ") on pid " << int(pid_arg);
- return false;
+ this_wait= retry * retry / 3 + 1;
+ libtest::dream(this_wait, 0);
+ }
}
return true;
FILE *fp;
if ((fp= fopen(filename.c_str(), "r")))
{
- char pid_buffer[1024];
+ libtest::vchar_t pid_buffer;
+ pid_buffer.resize(1024);
- char *ptr= fgets(pid_buffer, sizeof(pid_buffer), fp);
+ char *ptr= fgets(&pid_buffer[0], int(pid_buffer.size()), fp);
fclose(fp);
if (ptr)
{
- pid_t pid= (pid_t)atoi(pid_buffer);
+ pid_t pid= (pid_t)atoi(&pid_buffer[0]);
if (pid > 0)
{
return (::kill(pid, 0) == 0);
FILE *fp;
if ((fp= fopen(filename.c_str(), "r")))
{
- char pid_buffer[1024];
+ libtest::vchar_t pid_buffer;
+ pid_buffer.resize(1024);
- char *ptr= fgets(pid_buffer, sizeof(pid_buffer), fp);
+ char *ptr= fgets(&pid_buffer[0], int(pid_buffer.size()), fp);
fclose(fp);
if (ptr)
{
- pid_t pid= (pid_t)atoi(pid_buffer);
+ pid_t pid= (pid_t)atoi(&pid_buffer[0]);
if (pid != 0)
{
bool ret= kill_pid(pid);
pid_t get_pid_from_file(const std::string &filename, std::stringstream& error_message)
{
pid_t ret= -1;
- FILE *fp;
if (filename.empty())
{
return ret;
}
+ FILE *fp;
if ((fp= fopen(filename.c_str(), "r")))
{
- char pid_buffer[1024];
-
- char *ptr= fgets(pid_buffer, sizeof(pid_buffer), fp);
- fclose(fp);
+ libtest::vchar_t pid_buffer;
+ pid_buffer.resize(1024);
+ char *ptr= fgets(&pid_buffer[0], int(pid_buffer.size()), fp);
if (ptr)
{
- ret= (pid_t)atoi(pid_buffer);
+ ret= (pid_t)atoi(&pid_buffer[0]);
if (ret < 1)
{
error_message << LIBTEST_AT << " Invalid pid was read from file " << filename;
error_message << LIBTEST_AT << " File " << filename << " was empty ";
}
+ fclose(fp);
+
return ret;
}
else
{
- char buffer[1024];
- char *current_directory= getcwd(buffer, sizeof(buffer));
+ libtest::vchar_t buffer;
+ buffer.resize(1024);
+ char *current_directory= getcwd(&buffer[0], buffer.size());
error_message << "Error while opening " << current_directory << "/" << filename << " " << strerror(errno);
}