projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Disable silent rules so that we can view more in Jenkins.
[m6w6/libmemcached]
/
libtest
/
thread.hpp
diff --git
a/libtest/thread.hpp
b/libtest/thread.hpp
index 05f7fad4522220c4734d56c9fd43568c398b86b6..b09da7fcef266821e83eed7b5798368dc1b0b570 100644
(file)
--- a/
libtest/thread.hpp
+++ b/
libtest/thread.hpp
@@
-46,30
+46,32
@@
namespace thread
class Mutex
{
public:
class Mutex
{
public:
- Mutex()
+ Mutex() :
+ _err(0)
{
{
- int err;
- if ((err= pthread_mutex_init(&_mutex, NULL)))
- {
- throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "pthread_mutex_init: %s", strerror(err));
- }
+ _err= pthread_mutex_init(&_mutex, NULL);
}
~Mutex()
{
}
~Mutex()
{
- int err;
- if ((err= pthread_mutex_destroy(&_mutex)))
+ if ((_err= pthread_mutex_destroy(&_mutex)))
{
{
- throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "pthread_cond_destroy: %s", strerror(err));
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "pthread_cond_destroy: %s", strerror(
_
err));
}
}
pthread_mutex_t* handle()
{
}
}
pthread_mutex_t* handle()
{
+ if (_err != 0)
+ {
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "pthread_mutex_init: %s", strerror(_err));
+ }
+
return &_mutex;
}
private:
return &_mutex;
}
private:
+ int _err;
pthread_mutex_t _mutex;
};
pthread_mutex_t _mutex;
};
@@
-165,7
+167,7
@@
private:
class Barrier
{
public:
class Barrier
{
public:
- Barrier(uint32_t count):
+
explicit
Barrier(uint32_t count):
_threshold(count),
_count(count),
_generation(0)
_threshold(count),
_count(count),
_generation(0)