diff options
Diffstat (limited to 'litmus/rsm_lock.c')
-rw-r--r-- | litmus/rsm_lock.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/litmus/rsm_lock.c b/litmus/rsm_lock.c index dcf44a848cbb..beb2aa1a4f54 100644 --- a/litmus/rsm_lock.c +++ b/litmus/rsm_lock.c | |||
@@ -679,8 +679,8 @@ void rsm_mutex_propagate_decrease_inheritance(struct litmus_lock* l, | |||
679 | //if(__edf_higher_prio(new_max_eff_prio, BASE, owner, BASE)) { | 679 | //if(__edf_higher_prio(new_max_eff_prio, BASE, owner, BASE)) { |
680 | if(litmus->__compare(new_max_eff_prio, BASE, owner, BASE)) { | 680 | if(litmus->__compare(new_max_eff_prio, BASE, owner, BASE)) { |
681 | TRACE_CUR("%s/%d has greater base priority than base priority of owner (%s/%d) of lock %d.\n", | 681 | TRACE_CUR("%s/%d has greater base priority than base priority of owner (%s/%d) of lock %d.\n", |
682 | (new_max_eff_prio) ? new_max_eff_prio->comm : "nil", | 682 | (new_max_eff_prio) ? new_max_eff_prio->comm : "null", |
683 | (new_max_eff_prio) ? new_max_eff_prio->pid : -1, | 683 | (new_max_eff_prio) ? new_max_eff_prio->pid : 0, |
684 | owner->comm, | 684 | owner->comm, |
685 | owner->pid, | 685 | owner->pid, |
686 | l->ident); | 686 | l->ident); |
@@ -689,8 +689,8 @@ void rsm_mutex_propagate_decrease_inheritance(struct litmus_lock* l, | |||
689 | } | 689 | } |
690 | else { | 690 | else { |
691 | TRACE_CUR("%s/%d has lesser base priority than base priority of owner (%s/%d) of lock %d.\n", | 691 | TRACE_CUR("%s/%d has lesser base priority than base priority of owner (%s/%d) of lock %d.\n", |
692 | (new_max_eff_prio) ? new_max_eff_prio->comm : "nil", | 692 | (new_max_eff_prio) ? new_max_eff_prio->comm : "null", |
693 | (new_max_eff_prio) ? new_max_eff_prio->pid : -1, | 693 | (new_max_eff_prio) ? new_max_eff_prio->pid : 0, |
694 | owner->comm, | 694 | owner->comm, |
695 | owner->pid, | 695 | owner->pid, |
696 | l->ident); | 696 | l->ident); |
@@ -812,26 +812,26 @@ static int rsm_proc_print(char *page, char **start, off_t off, int count, int *e | |||
812 | w = scnprintf(next, size, | 812 | w = scnprintf(next, size, |
813 | "owner: %s/%d (inh: %s/%d)\n", | 813 | "owner: %s/%d (inh: %s/%d)\n", |
814 | (mutex->owner) ? | 814 | (mutex->owner) ? |
815 | mutex->owner->comm : "nil", | 815 | mutex->owner->comm : "null", |
816 | (mutex->owner) ? | 816 | (mutex->owner) ? |
817 | mutex->owner->pid : -1, | 817 | mutex->owner->pid : 0, |
818 | (mutex->owner && tsk_rt(mutex->owner)->inh_task) ? | 818 | (mutex->owner && tsk_rt(mutex->owner)->inh_task) ? |
819 | tsk_rt(mutex->owner)->inh_task->comm : "nil", | 819 | tsk_rt(mutex->owner)->inh_task->comm : "null", |
820 | (mutex->owner && tsk_rt(mutex->owner)->inh_task) ? | 820 | (mutex->owner && tsk_rt(mutex->owner)->inh_task) ? |
821 | tsk_rt(mutex->owner)->inh_task->pid : -1); | 821 | tsk_rt(mutex->owner)->inh_task->pid : 0); |
822 | size -= w; | 822 | size -= w; |
823 | next += w; | 823 | next += w; |
824 | 824 | ||
825 | w = scnprintf(next, size, | 825 | w = scnprintf(next, size, |
826 | "hp waiter: %s/%d (inh: %s/%d)\n", | 826 | "hp waiter: %s/%d (inh: %s/%d)\n", |
827 | (mutex->hp_waiter) ? | 827 | (mutex->hp_waiter) ? |
828 | mutex->hp_waiter->comm : "nil", | 828 | mutex->hp_waiter->comm : "null", |
829 | (mutex->hp_waiter) ? | 829 | (mutex->hp_waiter) ? |
830 | mutex->hp_waiter->pid : -1, | 830 | mutex->hp_waiter->pid : 0, |
831 | (mutex->hp_waiter && tsk_rt(mutex->hp_waiter)->inh_task) ? | 831 | (mutex->hp_waiter && tsk_rt(mutex->hp_waiter)->inh_task) ? |
832 | tsk_rt(mutex->hp_waiter)->inh_task->comm : "nil", | 832 | tsk_rt(mutex->hp_waiter)->inh_task->comm : "null", |
833 | (mutex->hp_waiter && tsk_rt(mutex->hp_waiter)->inh_task) ? | 833 | (mutex->hp_waiter && tsk_rt(mutex->hp_waiter)->inh_task) ? |
834 | tsk_rt(mutex->hp_waiter)->inh_task->pid : -1); | 834 | tsk_rt(mutex->hp_waiter)->inh_task->pid : 0); |
835 | size -= w; | 835 | size -= w; |
836 | next += w; | 836 | next += w; |
837 | 837 | ||
@@ -875,9 +875,9 @@ static int rsm_proc_print(char *page, char **start, off_t off, int count, int *e | |||
875 | "\n", | 875 | "\n", |
876 | blocked_task->comm, blocked_task->pid, | 876 | blocked_task->comm, blocked_task->pid, |
877 | (tsk_rt(blocked_task)->inh_task) ? | 877 | (tsk_rt(blocked_task)->inh_task) ? |
878 | tsk_rt(blocked_task)->inh_task->comm : "nil", | 878 | tsk_rt(blocked_task)->inh_task->comm : "null", |
879 | (tsk_rt(blocked_task)->inh_task) ? | 879 | (tsk_rt(blocked_task)->inh_task) ? |
880 | tsk_rt(blocked_task)->inh_task->pid : -1 | 880 | tsk_rt(blocked_task)->inh_task->pid : 0 |
881 | #ifdef CONFIG_LITMUS_DGL_SUPPORT | 881 | #ifdef CONFIG_LITMUS_DGL_SUPPORT |
882 | , enabled | 882 | , enabled |
883 | #endif | 883 | #endif |