projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Have just one debug test, and don't use timers during gdb operations.
[m6w6/libmemcached]
/
libtest
/
alarm.cc
diff --git
a/libtest/alarm.cc
b/libtest/alarm.cc
index 2d662622c4bae6bf8607a26b9852ad3db4c4df8e..93c8ccf74e14b307fb198041e9ababaca60e0420 100644
(file)
--- a/
libtest/alarm.cc
+++ b/
libtest/alarm.cc
@@
-51,33
+51,42
@@
static const struct itimerval cancel_timer= { default_it_interval, default_it_in
void set_alarm()
{
void set_alarm()
{
- if (
setitimer(ITIMER_VIRTUAL, &defualt_timer, NULL) == -1
)
+ if (
gdb_is_caller() == false
)
{
{
- Error << "setitimer() failed";
+ if (setitimer(ITIMER_VIRTUAL, &defualt_timer, NULL) == -1)
+ {
+ Error << "setitimer() failed";
+ }
}
}
void set_alarm(long tv_sec, long tv_usec)
{
}
}
void set_alarm(long tv_sec, long tv_usec)
{
+ if (gdb_is_caller() == false)
+ {
#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
- struct timeval it_value= { time_t(tv_sec), suseconds_t(tv_usec) };
+
struct timeval it_value= { time_t(tv_sec), suseconds_t(tv_usec) };
#else
#else
- struct timeval it_value= { tv_sec, tv_usec };
+
struct timeval it_value= { tv_sec, tv_usec };
#endif
#endif
- struct itimerval timer= { default_it_interval, it_value };
+
struct itimerval timer= { default_it_interval, it_value };
- if (setitimer(ITIMER_VIRTUAL, &timer, NULL) == -1)
- {
- Error << "setitimer() failed";
+ if (setitimer(ITIMER_VIRTUAL, &timer, NULL) == -1)
+ {
+ Error << "setitimer() failed";
+ }
}
}
void cancel_alarm()
{
}
}
void cancel_alarm()
{
- if (
setitimer(ITIMER_VIRTUAL, &cancel_timer, NULL) == -1
)
+ if (
gdb_is_caller() == false
)
{
{
- Error << "setitimer() failed";
+ if (setitimer(ITIMER_VIRTUAL, &cancel_timer, NULL) == -1)
+ {
+ Error << "setitimer() failed";
+ }
}
}
}
}