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

logger: fix LOGICAL_CONTINUATIONS

This commit is contained in:
Thomas Schoebel-Theuer 2015-09-30 15:12:42 +02:00 committed by Thomas Schoebel-Theuer
parent bc2f3d146f
commit 454420d849
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/mars_trans_logger.c
View File

@ -564,14 +564,14 @@ void _inf_callback(struct trans_logger_input *input, bool force)
static inline
int _congested(struct trans_logger_brick *brick)
{
return atomic_read(&brick->q_phase[0].q_queued)
|| atomic_read(&brick->q_phase[0].q_flying)
|| atomic_read(&brick->q_phase[1].q_queued)
|| atomic_read(&brick->q_phase[1].q_flying)
|| atomic_read(&brick->q_phase[2].q_queued)
|| atomic_read(&brick->q_phase[2].q_flying)
|| atomic_read(&brick->q_phase[3].q_queued)
|| atomic_read(&brick->q_phase[3].q_flying);
return atomic_read(&brick->q_phase[0].q_queued) ||
atomic_read(&brick->q_phase[0].q_flying) ||
atomic_read(&brick->q_phase[1].q_queued) ||
atomic_read(&brick->q_phase[1].q_flying) ||
atomic_read(&brick->q_phase[2].q_queued) ||
atomic_read(&brick->q_phase[2].q_flying) ||
atomic_read(&brick->q_phase[3].q_queued) ||
atomic_read(&brick->q_phase[3].q_flying);
}
////////////////// own brick / input / output operations //////////////////
@ -696,7 +696,8 @@ int _write_ref_get(struct trans_logger_output *output, struct trans_logger_mref_
// delay in case of too many master shadows / memory shortage
wait_event_interruptible_timeout(brick->caller_event,
!brick->delay_callers &&
(brick_global_memlimit < 1024 || atomic64_read(&global_mshadow_used) / 1024 < brick_global_memlimit),
(brick_global_memlimit < 1024 ||
atomic64_read(&global_mshadow_used) / 1024 < brick_global_memlimit),
HZ / 2);
#endif