RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2024-12-14 10:45:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

try to fix resource deadlock

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2012-02-07 10:00:12 +01:00 committed by Thomas Schoebel-Theuer
parent c0dcc32df4
commit e7d7ee206c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mars_trans_logger.c
View File

@ -1903,6 +1903,7 @@ bool logst_is_ready(struct trans_logger_brick *brick)
* use the captured status during processing. * use the captured status during processing.
*/ */
struct condition_status { struct condition_status {
bool log_ready;
bool q1_ready; bool q1_ready;
bool q2_ready; bool q2_ready;
bool q3_ready; bool q3_ready;
@ -1914,13 +1915,19 @@ struct condition_status {
static noinline static noinline
bool _condition(struct condition_status *st, struct trans_logger_brick *brick) bool _condition(struct condition_status *st, struct trans_logger_brick *brick)
{ {
st->log_ready = logst_is_ready(brick);
st->q1_ready = atomic_read(&brick->q_phase1.q_queued) > 0 && st->q1_ready = atomic_read(&brick->q_phase1.q_queued) > 0 &&
logst_is_ready(brick); st->log_ready;
st->q2_ready = qq_is_ready(&brick->q_phase2); st->q2_ready = qq_is_ready(&brick->q_phase2);
st->q3_ready = qq_is_ready(&brick->q_phase3); st->q3_ready = qq_is_ready(&brick->q_phase3);
st->q4_ready = qq_is_ready(&brick->q_phase4); st->q4_ready = qq_is_ready(&brick->q_phase4);
st->extra_ready = (kthread_should_stop() && !_congested(brick)); st->extra_ready = (kthread_should_stop() && !_congested(brick));
return (st->some_ready = st->q1_ready | st->q2_ready | st->q3_ready | st->q4_ready | st->extra_ready); st->some_ready = st->q1_ready | st->q2_ready | st->q3_ready | st->q4_ready | st->extra_ready;
#if 0
if (!st->some_ready)
st->q1_ready = atomic_read(&brick->q_phase1.q_queued) > 0;
#endif
return st->some_ready;
} }
static static
@ -2061,7 +2068,7 @@ void trans_logger_log(struct trans_logger_brick *brick)
last_jiffies = jiffies; last_jiffies = jiffies;
txt = brick->ops->brick_statistics(brick, 0); txt = brick->ops->brick_statistics(brick, 0);
if (txt) { if (txt) {
MARS_INF("q1_ready = %d q2_ready = %d q3_ready = %d q4_ready = %d extra_ready = %d some_ready = %d || %s", st.q1_ready, st.q2_ready, st.q3_ready, st.q4_ready, st.extra_ready, st.some_ready, txt); MARS_INF("log_ready = %d q1_ready = %d q2_ready = %d q3_ready = %d q4_ready = %d extra_ready = %d some_ready = %d || %s", st.q1_ready, st.log_ready, st.q2_ready, st.q3_ready, st.q4_ready, st.extra_ready, st.some_ready, txt);
brick_string_free(txt); brick_string_free(txt);
} }
} }

2
sy_old/mars_light.c
View File

@ -84,7 +84,7 @@ struct light_class {
#define CONF_TRANS_BATCHLEN 1024 #define CONF_TRANS_BATCHLEN 1024
//#define CONF_LOGST_FLYING 0 //#define CONF_LOGST_FLYING 0
#define CONF_LOGST_FLYING 16 #define CONF_LOGST_FLYING 64 // CHECK: could too small values lead to resource deadlocks?
//#define CONF_TRANS_FLYING 16 //#define CONF_TRANS_FLYING 16
#define CONF_TRANS_FLYING 0 #define CONF_TRANS_FLYING 0
#define CONF_TRANS_PRIO MARS_PRIO_HIGH #define CONF_TRANS_PRIO MARS_PRIO_HIGH