RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-26 21:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

C_Gather: Set debug #ifdefs to remove set.

Browse Source 
This way when we're confident it works right, we can
remove the set<Context*> and just rely on ref counting.

Further optimizations would include using a spinlock
rather than a mutex, or possibly even just switching
sub_[created|existing]_count to be atomics.

Signed-off-by: Greg Farnum <gregf@hq.newdream.net>
This commit is contained in:
Greg Farnum 2011-01-14 16:12:32 -08:00
parent 55cf6bad2f
commit a93b970ab1
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -42,6 +42,8 @@ AC_ARG_WITH([debug],
[with_debug=no])
AM_CONDITIONAL(WITH_DEBUG, test "$with_debug" = "yes")
AC_DEFINE([DEBUG_GATHER], [1], [Define if you want C_Gather debugging])
# radosgw?
AC_ARG_WITH([radosgw],
[AS_HELP_STRING([--with-radosgw], [build RADOS gateway])],

10
src/include/Context.h
View File

@ -114,7 +114,9 @@ class C_Gather : public Context {
private:
int result;
Context *onfinish;
#ifdef DEBUG_GATHER
std::set<Context*> waitfor;
#endif
int sub_created_count;
int sub_existing_count;
Mutex lock;
@ -123,8 +125,10 @@ private:
bool sub_finish(Context* sub, int r) {
Mutex::Locker l(lock);
#ifdef DEBUG_GATHER
assert(waitfor.count(sub));
waitfor.erase(sub);
#endif
--sub_existing_count;
//generic_dout(0) << "C_Gather " << this << ".sub_finish(r=" << r << ") " << sub << " " << dendl;
@ -183,7 +187,9 @@ public:
~C_Gather() {
//generic_dout(0) << "C_Gather " << this << ".delete" << dendl;
assert(sub_existing_count == 0);
#ifdef DEBUG_GATHER
assert(waitfor.empty());
#endif
assert(!onfinish);
}
@ -198,14 +204,18 @@ public:
sub_created_count++;
sub_existing_count++;
Context *s = new C_GatherSub(this);
#ifdef DEBUG_GATHER
waitfor.insert(s);
#endif
//generic_dout(0) << "C_Gather " << this << ".new_sub is " << sub_created_count << " " << s << dendl;
return s;
}
void rm_sub(Context *s) {
Mutex::Locker l(lock);
#ifdef DEBUG_GATHER
assert(waitfor.count(s));
waitfor.erase(s);
#endif
sub_existing_count--;
}