RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trans_logger: do preio() much earlier

This commit is contained in:
Thomas Schoebel-Theuer 2013-01-03 10:12:20 +01:00
parent 106579ac32
commit 47c8f6ae57
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib_log.c
View File

@ -58,7 +58,6 @@ struct log_cb_info {
struct semaphore mutex;
atomic_t refcount;
int nr_cb;
void (*preios[MARS_LOG_CB_MAX])(void *private);
void (*endios[MARS_LOG_CB_MAX])(void *private, int error);
void *privates[MARS_LOG_CB_MAX];
};
@ -72,20 +71,12 @@ void put_log_cb_info(struct log_cb_info *cb_info)
}
static
void _do_callbacks(struct log_cb_info *cb_info, int error, bool both)
void _do_callbacks(struct log_cb_info *cb_info, int error)
{
int i;
down(&cb_info->mutex);
for (i = 0; i < cb_info->nr_cb; i++) {
void (*pre_fn)(void *private);
void (*end_fn)(void *private, int error);
pre_fn = cb_info->preios[i];
cb_info->preios[i] = NULL;
if (pre_fn) {
pre_fn(cb_info->privates[i]);
}
if (!both)
continue;
end_fn = cb_info->endios[i];
cb_info->endios[i] = NULL;
if (end_fn) {
@ -113,7 +104,7 @@ void log_write_endio(struct generic_callback *cb)
MARS_IO("nr_cb = %d\n", cb_info->nr_cb);
_do_callbacks(cb_info, cb->cb_error, true);
_do_callbacks(cb_info, cb->cb_error);
done:
put_log_cb_info(cb_info);
@ -170,8 +161,6 @@ void log_flush(struct log_status *logst)
atomic_inc(&logst->mref_flying);
atomic_inc(&global_mref_flying);
_do_callbacks(cb_info, 0, false);
GENERIC_INPUT_CALL(logst->input, mref_io, mref);
GENERIC_INPUT_CALL(logst->input, mref_put, mref);
@ -297,7 +286,7 @@ err:
}
EXPORT_SYMBOL_GPL(log_reserve);
bool log_finalize(struct log_status *logst, int len, void (*preio)(void *private), void (*endio)(void *private, int error), void *private)
bool log_finalize(struct log_status *logst, int len, void (*endio)(void *private, int error), void *private)
{
struct mref_object *mref = logst->log_mref;
struct log_cb_info *cb_info = logst->private;
@ -367,7 +356,6 @@ bool log_finalize(struct log_status *logst, int len, void (*preio)(void *private
DATA_PUT(data, offset, (char)1);
nr_cb = cb_info->nr_cb++;
cb_info->preios[nr_cb] = preio;
cb_info->endios[nr_cb] = endio;
cb_info->privates[nr_cb] = private;

2
lib_log.h
View File

@ -128,7 +128,7 @@ void log_flush(struct log_status *logst);
void *log_reserve(struct log_status *logst, struct log_header *lh);
bool log_finalize(struct log_status *logst, int len, void (*preio)(void *private), void (*endio)(void *private, int error), void *private);
bool log_finalize(struct log_status *logst, int len, void (*endio)(void *private, int error), void *private);
int log_read(struct log_status *logst, struct log_header *lh, void **payload, int *payload_len);

7
mars_trans_logger.c
View File

@ -1534,7 +1534,7 @@ bool phase0_startio(struct trans_logger_mref_aspect *orig_mref_a)
atomic_inc(&brick->log_fly_count);
ok = log_finalize(logst, orig_mref->ref_len, phase0_preio, phase0_endio, orig_mref_a);
ok = log_finalize(logst, orig_mref->ref_len, phase0_endio, orig_mref_a);
if (unlikely(!ok)) {
atomic_dec(&brick->log_fly_count);
goto err;
@ -1562,6 +1562,9 @@ bool phase0_startio(struct trans_logger_mref_aspect *orig_mref_a)
up(&input->inf_mutex);
qq_inc_flying(&brick->q_phase[0]);
phase0_preio(orig_mref_a);
return true;
err:
@ -1847,7 +1850,7 @@ bool _phase2_startio(struct trans_logger_mref_aspect *sub_mref_a)
memcpy(data, sub_mref->ref_data, sub_mref->ref_len);
ok = log_finalize(logst, sub_mref->ref_len, NULL, phase2_endio, sub_mref_a);
ok = log_finalize(logst, sub_mref->ref_len, phase2_endio, sub_mref_a);
if (unlikely(!ok)) {
goto err;
}