RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-18 17:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

librados: separate callbacks for aio ack/complete and safe

Browse Source
This commit is contained in:
Sage Weil 2010-05-05 14:40:59 -07:00
parent 66350d2b2b
commit e9cc4a37ae
3 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/librados.h
View File

@ -79,8 +79,8 @@ int rados_exec(rados_pool_t pool, const char *oid, const char *cls, const char *
typedef void *rados_completion_t;
typedef void (*rados_callback_t)(rados_completion_t cb, void *arg);
int rados_aio_create_completion(rados_callback_t, void *arg, rados_completion_t *pc);
int rados_aio_set_callback(rados_completion_t c, rados_callback_t, void *arg);
int rados_aio_create_completion(void *cb_arg, rados_callback_t cb_complete, rados_callback_t cb_safe,
rados_completion_t *pc);
int rados_aio_wait_for_complete(rados_completion_t c);
int rados_aio_wait_for_safe(rados_completion_t c);
int rados_aio_is_complete(rados_completion_t c);

5
src/include/librados.hpp
View File

@ -100,7 +100,8 @@ public:
struct AioCompletion {
void *pc;
AioCompletion(void *_pc) : pc(_pc) {}
int set_callback(callback_t cb, void *cba);
int set_complete_callback(void *cb_arg, callback_t cb);
int set_safe_callback(void *cb_arg, callback_t cb);
int wait_for_complete();
int wait_for_safe();
bool is_complete();
@ -114,7 +115,7 @@ public:
int aio_write(pool_t pool, const std::string& oid, off_t off, const bufferlist& bl, size_t len,
AioCompletion *c);
AioCompletion *aio_create_completion();
AioCompletion *aio_create_completion(callback_t cb, void *cba);
AioCompletion *aio_create_completion(void *cb_arg, callback_t cb_complete, callback_t cb_safe);
};
}

58
src/librados.cc
View File

@ -147,7 +147,7 @@ public:
bool released;
bool ack, safe;
rados_callback_t callback;
rados_callback_t callback_complete, callback_safe;
void *callback_arg;
// for read
@ -157,13 +157,20 @@ public:
AioCompletion() : lock("RadosClient::AioCompletion::lock"),
ref(1), rval(0), released(false), ack(false), safe(false),
callback(0), callback_arg(0),
callback_complete(0), callback_safe(0), callback_arg(0),
pbl(0), buf(0), maxlen(0) { }
int set_callback(rados_callback_t cb, void *cba) {
int set_complete_callback(void *cb_arg, rados_callback_t cb) {
lock.Lock();
callback = cb;
callback_arg = cba;
callback_complete = cb;
callback_arg = cb_arg;
lock.Unlock();
return 0;
}
int set_safe_callback(void *cb_arg, rados_callback_t cb) {
lock.Lock();
callback_safe = cb;
callback_arg = cb_arg;
lock.Unlock();
return 0;
}
@ -242,11 +249,11 @@ public:
*c->pbl = c->bl;
}
if (c->callback) {
rados_callback_t cb = c->callback;
void *cba = c->callback_arg;
if (c->callback_complete) {
rados_callback_t cb = c->callback_complete;
void *cb_arg = c->callback_arg;
c->lock.Unlock();
cb(c, cba);
cb(c, cb_arg);
c->lock.Lock();
}
@ -268,11 +275,11 @@ public:
c->safe = true;
c->cond.Signal();
if (c->callback) {
rados_callback_t cb = c->callback;
void *cba = c->callback_arg;
if (c->callback_safe) {
rados_callback_t cb = c->callback_safe;
void *cb_arg = c->callback_arg;
c->lock.Unlock();
cb(c, cba);
cb(c, cb_arg);
c->lock.Lock();
}
@ -294,9 +301,12 @@ public:
AioCompletion *aio_create_completion() {
return new AioCompletion;
}
AioCompletion *aio_create_completion(rados_callback_t cb, void *cba) {
AioCompletion *aio_create_completion(void *cb_arg, rados_callback_t cb_complete, rados_callback_t cb_safe) {
AioCompletion *c = new AioCompletion;
c->set_callback(cb, cba);
if (cb_complete)
c->set_complete_callback(cb_arg, cb_complete);
if (cb_safe)
c->set_safe_callback(cb_arg, cb_safe);
return c;
}
};
@ -1454,16 +1464,21 @@ Rados::AioCompletion *Rados::aio_create_completion()
return new AioCompletion(c);
}
Rados::AioCompletion *Rados::aio_create_completion(callback_t cb, void *cba)
Rados::AioCompletion *Rados::aio_create_completion(void *cb_arg, callback_t cb_complete, callback_t cb_safe)
{
RadosClient::AioCompletion *c = ((RadosClient *)client)->aio_create_completion(cb, cba);
RadosClient::AioCompletion *c = ((RadosClient *)client)->aio_create_completion(cb_arg, cb_complete, cb_safe);
return new AioCompletion(c);
}
int Rados::AioCompletion::set_callback(rados_callback_t cb, void *cba)
int Rados::AioCompletion::set_complete_callback(void *cb_arg, rados_callback_t cb)
{
RadosClient::AioCompletion *c = (RadosClient::AioCompletion *)pc;
return c->set_callback(cb, cba);
return c->set_complete_callback(cb_arg, cb);
}
int Rados::AioCompletion::set_safe_callback(void *cb_arg, rados_callback_t cb)
{
RadosClient::AioCompletion *c = (RadosClient::AioCompletion *)pc;
return c->set_safe_callback(cb_arg, cb);
}
int Rados::AioCompletion::wait_for_complete()
{
@ -1805,9 +1820,10 @@ extern "C" int rados_list_objects_next(rados_list_ctx_t listctx, const char **en
// -------------------------
// aio
extern "C" int rados_aio_create_completion(rados_callback_t cb, void *cba, rados_completion_t *pc)
extern "C" int rados_aio_create_completion(void *cb_arg, rados_callback_t cb_complete, rados_callback_t cb_safe,
rados_completion_t *pc)
{
*pc = radosp->aio_create_completion(cb, cba);
*pc = radosp->aio_create_completion(cb_arg, cb_complete, cb_safe);
return 0;
}