change "nil/-1" to "null/0" to match prop. m-line

1 files changed, 31 insertions, 31 deletions

diff --git a/litmus/ikglp_lock.c b/litmus/ikglp_lock.c
index fe242c789318..59d7ee4f9fd1 100644
--- a/litmus/ikglp_lock.c
+++ b/litmus/ikglp_lock.c
@@ -192,8 +192,8 @@ static void print_donees(struct ikglp_semaphore *sem, struct binheap_node *n, in
                           padding,
                           donee_node->task->comm,
                           donee_node->task->pid,
-                          (donor) ? donor->comm : "nil",
-                          (donor) ? donor->pid : -1,
+                          (donor) ? donor->comm : "null",
+                          (donor) ? donor->pid : 0,
                           ikglp_get_idx(sem, donee_node->fq));
 
     if(n->left) print_donees(sem, n->left, depth+1);
@@ -493,8 +493,8 @@ static void ikglp_refresh_owners_prio_decrease(struct fifo_queue *fq,
 
                 if(litmus->__compare(new_max_eff_prio, BASE, owner, BASE)) {
                         TRACE_CUR("%s/%d has greater base priority than base priority of owner (%s/%d) of fq %d.\n",
-                                          (new_max_eff_prio) ? new_max_eff_prio->comm : "nil",
-                                          (new_max_eff_prio) ? new_max_eff_prio->pid : -1,
+                                          (new_max_eff_prio) ? new_max_eff_prio->comm : "null",
+                                          (new_max_eff_prio) ? new_max_eff_prio->pid : 0,
                                           owner->comm,
                                           owner->pid,
                                           ikglp_get_idx(sem, fq));
@@ -503,8 +503,8 @@ static void ikglp_refresh_owners_prio_decrease(struct fifo_queue *fq,
                 }
                 else {
                         TRACE_CUR("%s/%d has lesser base priority than base priority of owner (%s/%d) of fq %d.\n",
-                                          (new_max_eff_prio) ? new_max_eff_prio->comm : "nil",
-                                          (new_max_eff_prio) ? new_max_eff_prio->pid : -1,
+                                          (new_max_eff_prio) ? new_max_eff_prio->comm : "null",
+                                          (new_max_eff_prio) ? new_max_eff_prio->pid : 0,
                                           owner->comm,
                                           owner->pid,
                                           ikglp_get_idx(sem, fq));
@@ -889,8 +889,8 @@ static void ikglp_enqueue_on_donor(struct ikglp_semaphore *sem,
         }
         else {
                 TRACE_TASK(t, "No change in effective priority (it is %s/%d).\n",
-                                   (new_max_eff_prio) ? new_max_eff_prio->comm : "nil",
-                                   (new_max_eff_prio) ? new_max_eff_prio->pid : -1);
+                                   (new_max_eff_prio) ? new_max_eff_prio->comm : "null",
+                                   (new_max_eff_prio) ? new_max_eff_prio->pid : 0);
                 raw_spin_unlock(&tsk_rt(donee)->hp_blocked_tasks_lock);
                 unlock_fine_irqrestore(&sem->lock, flags);
         }
@@ -1078,9 +1078,9 @@ static ikglp_wait_state_t* ikglp_find_hp_waiter_to_steal(
                                           ikglp_get_idx(sem, &sem->fifo_queues[i]),
                                           sem->fifo_queues[i].hp_waiter->comm,
                                           sem->fifo_queues[i].hp_waiter->pid,
-                                          (fq) ? ikglp_get_idx(sem, fq) : -1,
-                                          (fq) ? ((fq->hp_waiter) ? fq->hp_waiter->comm : "nil") : "nilXX",
-                                          (fq) ? ((fq->hp_waiter) ? fq->hp_waiter->pid : -1) : -2);
+                                          (fq) ? ikglp_get_idx(sem, fq) : 0,
+                                          (fq) ? ((fq->hp_waiter) ? fq->hp_waiter->comm : "null") : "nullXX",
+                                          (fq) ? ((fq->hp_waiter) ? fq->hp_waiter->pid : 0) : -2);
 
                         fq = &sem->fifo_queues[i];
 
@@ -1151,8 +1151,8 @@ static void ikglp_steal_to_fq(struct ikglp_semaphore *sem,
                 fq_steal->hp_waiter = ikglp_find_hp_waiter(fq_steal, NULL);
                 TRACE_TASK(t, "New hp_waiter for fq %d is %s/%d!\n",
                                    ikglp_get_idx(sem, fq_steal),
-                                   (fq_steal->hp_waiter) ? fq_steal->hp_waiter->comm : "nil",
-                                   (fq_steal->hp_waiter) ? fq_steal->hp_waiter->pid : -1);
+                                   (fq_steal->hp_waiter) ? fq_steal->hp_waiter->comm : "null",
+                                   (fq_steal->hp_waiter) ? fq_steal->hp_waiter->pid : 0);
         }
 
 
@@ -1450,8 +1450,8 @@ int ikglp_unlock(struct litmus_lock* l)
                                 other_fq->hp_waiter = ikglp_find_hp_waiter(other_fq, NULL);
                                 TRACE_TASK(t, "New hp_waiter for fq %d is %s/%d!\n",
                                                    ikglp_get_idx(sem, other_fq),
-                                                   (other_fq->hp_waiter) ? other_fq->hp_waiter->comm : "nil",
-                                                   (other_fq->hp_waiter) ? other_fq->hp_waiter->pid : -1);
+                                                   (other_fq->hp_waiter) ? other_fq->hp_waiter->comm : "null",
+                                                   (other_fq->hp_waiter) ? other_fq->hp_waiter->pid : 0);
 
                                 ikglp_refresh_owners_prio_decrease(other_fq, sem, flags); // unlocks sem->lock.  reacquire it.
                                 lock_fine_irqsave(&sem->lock, flags);  // there should be no contention!!!!
@@ -1489,8 +1489,8 @@ int ikglp_unlock(struct litmus_lock* l)
 
                                 TRACE_TASK(t, "New hp_waiter for fq %d is %s/%d!\n",
                                                    ikglp_get_idx(sem, fq),
-                                                   (fq->hp_waiter) ? fq->hp_waiter->comm : "nil",
-                                                   (fq->hp_waiter) ? fq->hp_waiter->pid : -1);
+                                                   (fq->hp_waiter) ? fq->hp_waiter->comm : "null",
+                                                   (fq->hp_waiter) ? fq->hp_waiter->pid : 0);
                         }
                 }
                 else {
@@ -1536,8 +1536,8 @@ wake_kludge:
                         fq->hp_waiter = ikglp_find_hp_waiter(fq, NULL);
                         TRACE_TASK(next, "New hp_waiter for fq %d is %s/%d!\n",
                                            ikglp_get_idx(sem, fq),
-                                           (fq->hp_waiter) ? fq->hp_waiter->comm : "nil",
-                                           (fq->hp_waiter) ? fq->hp_waiter->pid : -1);
+                                           (fq->hp_waiter) ? fq->hp_waiter->comm : "null",
+                                           (fq->hp_waiter) ? fq->hp_waiter->pid : 0);
 
                         fq->nest.hp_waiter_eff_prio = (fq->hp_waiter) ?
                                                                 effective_priority(fq->hp_waiter) : NULL;
@@ -1568,8 +1568,8 @@ wake_kludge:
                          * waiter's priority. */
                         TRACE_TASK(next, "is not hp_waiter of replica %d. hp_waiter is %s/%d\n",
                                            ikglp_get_idx(sem, fq),
-                                           (fq->hp_waiter) ? fq->hp_waiter->comm : "nil",
-                                           (fq->hp_waiter) ? fq->hp_waiter->pid : -1);
+                                           (fq->hp_waiter) ? fq->hp_waiter->comm : "null",
+                                           (fq->hp_waiter) ? fq->hp_waiter->pid : 0);
 
                         raw_spin_lock(&tsk_rt(next)->hp_blocked_tasks_lock);
 
@@ -2166,8 +2166,8 @@ out:
 
         TRACE_CUR("Candidate victim from fq %d is %s/%d.  aff improvement = %d.\n",
                           replica,
-                          (wait) ? wait->task->comm : "nil",
-                          (wait) ? wait->task->pid  : -1,
+                          (wait) ? wait->task->comm : "null",
+                          (wait) ? wait->task->pid  : 0,
                           max_improvement);
 
         return wait;
@@ -2284,11 +2284,11 @@ static ikglp_donee_heap_node_t* pick_donee(struct ikglp_affinity* aff,
 //                                "(mth_highest != fq->owner) = %d "
 //                                "(mth_highest > fq->owner) = %d\n",
 //                                ikglp_get_idx(sem, fq),
-//                                (fq->owner) ? fq->owner->comm : "nil",
-//                                (fq->owner) ? fq->owner->pid : -1,
+//                                (fq->owner) ? fq->owner->comm : "null",
+//                                (fq->owner) ? fq->owner->pid : 0,
 //                                (fq->owner) ? (int)get_deadline(fq->owner) - now : -999,
-//                                (fq->donee_heap_node.donor_info) ? fq->donee_heap_node.donor_info->task->comm : "nil",
-//                                (fq->donee_heap_node.donor_info) ? fq->donee_heap_node.donor_info->task->pid : -1,
+//                                (fq->donee_heap_node.donor_info) ? fq->donee_heap_node.donor_info->task->comm : "null",
+//                                (fq->donee_heap_node.donor_info) ? fq->donee_heap_node.donor_info->task->pid : 0,
 //                                (mth_highest != fq->owner),
 //                                (litmus->__compare(mth_highest, BASE, fq->owner, BASE)));
 
@@ -2308,8 +2308,8 @@ static ikglp_donee_heap_node_t* pick_donee(struct ikglp_affinity* aff,
 //                                        dist_from_head,
 //                                        wait->task->comm, wait->task->pid,
 //                                        (int)get_deadline(wait->task) - now,
-//                                        (wait->donee_heap_node.donor_info) ? wait->donee_heap_node.donor_info->task->comm : "nil",
-//                                        (wait->donee_heap_node.donor_info) ? wait->donee_heap_node.donor_info->task->pid : -1,
+//                                        (wait->donee_heap_node.donor_info) ? wait->donee_heap_node.donor_info->task->comm : "null",
+//                                        (wait->donee_heap_node.donor_info) ? wait->donee_heap_node.donor_info->task->pid : 0,
 //                                        (mth_highest != wait->task),
 //                                        (litmus->__compare(mth_highest, BASE, wait->task, BASE)));
 
@@ -2342,8 +2342,8 @@ out:
 
         TRACE_CUR("Candidate donee for fq %d is %s/%d (dist_from_head = %d)\n",
                           ikglp_get_idx(sem, fq),
-                          (donee) ? (donee)->comm : "nil",
-                          (donee) ? (donee)->pid  : -1,
+                          (donee) ? (donee)->comm : "null",
+                          (donee) ? (donee)->pid  : 0,
                           *dist_from_head);
 
         return donee_node;