projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
dump: memcached returns the right error by now
[awesomized/libmemcached]
/
libtest
/
killpid.cc
diff --git
a/libtest/killpid.cc
b/libtest/killpid.cc
index aae43bb391bc12729bf82648653ecf4892708627..2cefff2c60642170b414b86a5ebf344dcecb0507 100644
(file)
--- a/
libtest/killpid.cc
+++ b/
libtest/killpid.cc
@@
-34,7
+34,7
@@
*
*/
*
*/
-#include
<config.h>
+#include
"libtest/yatlcon.h"
#include <libtest/common.h>
#include <cstdlib>
#include <libtest/common.h>
#include <cstdlib>
@@
-80,21
+80,34
@@
bool kill_pid(pid_t pid_arg)
}
}
}
}
- 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;
}
return true;
@@
-110,14
+123,15
@@
bool check_pid(const std::string &filename)
FILE *fp;
if ((fp= fopen(filename.c_str(), "r")))
{
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)
{
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);
if (pid > 0)
{
return (::kill(pid, 0) == 0);
@@
-139,14
+153,15
@@
bool kill_file(const std::string &filename)
FILE *fp;
if ((fp= fopen(filename.c_str(), "r")))
{
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)
{
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);
if (pid != 0)
{
bool ret= kill_pid(pid);
@@
-167,7
+182,6
@@
bool kill_file(const std::string &filename)
pid_t get_pid_from_file(const std::string &filename, std::stringstream& error_message)
{
pid_t ret= -1;
pid_t get_pid_from_file(const std::string &filename, std::stringstream& error_message)
{
pid_t ret= -1;
- FILE *fp;
if (filename.empty())
{
if (filename.empty())
{
@@
-175,16
+189,16
@@
pid_t get_pid_from_file(const std::string &filename, std::stringstream& error_me
return ret;
}
return ret;
}
+ FILE *fp;
if ((fp= fopen(filename.c_str(), "r")))
{
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)
{
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;
if (ret < 1)
{
error_message << LIBTEST_AT << " Invalid pid was read from file " << filename;
@@
-195,12
+209,15
@@
pid_t get_pid_from_file(const std::string &filename, std::stringstream& error_me
error_message << LIBTEST_AT << " File " << filename << " was empty ";
}
error_message << LIBTEST_AT << " File " << filename << " was empty ";
}
+ fclose(fp);
+
return ret;
}
else
{
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);
}
error_message << "Error while opening " << current_directory << "/" << filename << " " << strerror(errno);
}