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

import mars-36.tgz

This commit is contained in:
Thomas Schoebel-Theuer 2010-08-12 22:15:04 +01:00
parent 08643a0940
commit 390262b6c1
2 changed files with 24 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
mars_trans_logger.c
View File

@ -21,8 +21,8 @@
#define CODE_UNKNOWN 0 #define CODE_UNKNOWN 0
#define CODE_WRITE_NEW 1 #define CODE_WRITE_NEW 1
#define START_MAGIC 0xa8f7e908d9177957 #define START_MAGIC 0xa8f7e908d9177957ll
#define END_MAGIC 0x74941fb74ab5726d #define END_MAGIC 0x74941fb74ab5726dll
#define OVERHEAD \ #define OVERHEAD \
( \ ( \
@ -357,8 +357,9 @@ static int _read_ref_get(struct trans_logger_output *output, struct trans_logger
if (mref->ref_len > restlen) if (mref->ref_len > restlen)
mref->ref_len = restlen; mref->ref_len = restlen;
mref->ref_data = shadow->ref_data - diff; mref->ref_data = shadow->ref_data - diff;
mref_a->orig_data = shadow->ref_data;
mref->ref_flags = shadow->ref_flags; mref->ref_flags = shadow->ref_flags;
mref_a->sub_a = shadow_a; mref_a->is_shadow = true;
return mref->ref_len; return mref->ref_len;
} }
@ -369,35 +370,18 @@ call_through:
static int _write_ref_get(struct trans_logger_output *output, struct trans_logger_mars_ref_aspect *mref_a) static int _write_ref_get(struct trans_logger_output *output, struct trans_logger_mars_ref_aspect *mref_a)
{ {
struct mars_ref_object *mref = mref_a->object; struct mars_ref_object *mref = mref_a->object;
struct trans_logger_input *input = output->brick->inputs[0];
struct mars_ref_object *shadow;
struct trans_logger_mars_ref_aspect *shadow_a;
// unconditionally create a new shadow buffer // unconditionally create a new shadow buffer
shadow = trans_logger_alloc_mars_ref(&input->hidden_output, &input->ref_object_layout); mref->ref_data = kmalloc(mref->ref_len, GFP_MARS);
shadow_a = trans_logger_mars_ref_get_aspect(output, shadow); if (unlikely(!mref->ref_data)) {
if (unlikely(!shadow_a)) {
MARS_FAT("cannot get my own aspect\n");
trans_logger_free_mars_ref(shadow);
return -ENOSYS;
}
shadow->ref_data = kmalloc(mref->ref_len, GFP_MARS);
if (unlikely(!shadow->ref_data)) {
trans_logger_free_mars_ref(shadow);
return -ENOMEM; return -ENOMEM;
} }
shadow->ref_pos = mref->ref_pos; mref_a->orig_data = mref->ref_data;
shadow->ref_len = mref->ref_len; mref_a->output = output;
shadow->ref_may_write = WRITE; mref_a->stamp = CURRENT_TIME;
shadow->ref_flags = 0;
hash_insert(output->hash_table, shadow_a);
mref->ref_data = shadow->ref_data;
mref->ref_flags = 0; mref->ref_flags = 0;
mref_a->sub_a = shadow_a; mref_a->is_shadow = true;
return mref->ref_len; return mref->ref_len;
} }
@ -425,7 +409,6 @@ static void trans_logger_ref_put(struct trans_logger_output *output, struct mars
{ {
struct trans_logger_mars_ref_aspect *mref_a; struct trans_logger_mars_ref_aspect *mref_a;
struct trans_logger_input *input = output->brick->inputs[0]; struct trans_logger_input *input = output->brick->inputs[0];
struct trans_logger_mars_ref_aspect *shadow_a;
mref_a = trans_logger_mars_ref_get_aspect(output, mref); mref_a = trans_logger_mars_ref_get_aspect(output, mref);
if (unlikely(!mref_a)) { if (unlikely(!mref_a)) {
@ -433,9 +416,8 @@ static void trans_logger_ref_put(struct trans_logger_output *output, struct mars
return; return;
} }
shadow_a = mref_a->sub_a; if (mref_a->is_shadow) {
if (shadow_a) { hash_put(output->hash_table, mref_a);
hash_put(output->hash_table, shadow_a);
CHECK_ATOMIC(&mref->ref_count, 1); CHECK_ATOMIC(&mref->ref_count, 1);
if (!atomic_dec_and_test(&mref->ref_count)) if (!atomic_dec_and_test(&mref->ref_count))
@ -460,10 +442,16 @@ static void trans_logger_ref_io(struct trans_logger_output *output, struct mars_
} }
// is this a shadow buffer? // is this a shadow buffer?
if (mref_a->sub_a) { if (mref_a->is_shadow) {
mref_a->output = output; if (rw == READ) {
mref_a->stamp = CURRENT_TIME; struct generic_callback *cb = mref->ref_cb;
q_insert(&output->q_phase1, mref_a); cb->cb_error = 0;
cb->cb_fn(cb);
trans_logger_ref_put(output, mref);
} else {
hash_insert(output->hash_table, mref_a);
q_insert(&output->q_phase1, mref_a);
}
return; return;
} }

3
mars_trans_logger.h
View File

@ -34,7 +34,8 @@ struct trans_logger_mars_ref_aspect {
struct list_head hash_head; struct list_head hash_head;
struct list_head q_head; struct list_head q_head;
atomic_t hash_count; atomic_t hash_count;
struct trans_logger_mars_ref_aspect *sub_a; bool is_shadow;
void *orig_data;
struct trans_logger_output *output; struct trans_logger_output *output;
struct timespec stamp; struct timespec stamp;
struct generic_callback cb; struct generic_callback cb;