net: Add timestamps to the netlog

[akaros.git] / kern / src / ucq.c

diff --git a/kern/src/ucq.c b/kern/src/ucq.c
index b0e64ec..cabf077 100644 (file)
--- a/kern/src/ucq.c
+++ b/kern/src/ucq.c
@@ -21,8 +21,8 @@ void send_ucq_msg(struct ucq *ucq, struct proc *p, struct event_msg *msg)
        assert(is_user_rwaddr(ucq, sizeof(struct ucq)));
        /* So we can try to send ucqs to _Ss before they initialize */
        if (!ucq->ucq_ready) {
-               if (p->state & (PROC_RUNNING_M | PROC_RUNNABLE_M))
-                       warn("proc %d is _M with an uninitialized ucq %08p\n", p->pid, ucq);
+               if (__proc_is_mcp(p))
+                       warn("proc %d is _M with an uninitialized ucq %p\n", p->pid, ucq);
                return;
        }
        /* Bypass fetching/incrementing the counter if we're overflowing, helps
@@ -62,7 +62,8 @@ grab_lock:
        if (!new_page) {
                /* Warn if we have a ridiculous amount of pages in the ucq */
                if (atomic_fetch_and_add(&ucq->nr_extra_pgs, 1) > UCQ_WARN_THRESH)
-                       warn("Over %d pages in ucq %08p!\n", UCQ_WARN_THRESH, ucq);
+                       warn("Over %d pages in ucq %p for pid %d!\n", UCQ_WARN_THRESH,
+                            ucq, p->pid);
                /* Giant warning: don't ask for anything other than anonymous memory at
                 * a non-fixed location.  o/w, it may cause a TLB shootdown, which grabs
                 * the proc_lock, and potentially deadlock the system. */
@@ -132,18 +133,29 @@ error_addr:
 /* Prints the status and up to 25 of the previous messages for the UCQ. */
 void print_ucq(struct proc *p, struct ucq *ucq)
 {
-       struct proc *old_proc = switch_to(p);
+       struct ucq_page *ucq_pg;
+       uintptr_t old_proc = switch_to(p);
 
-       printk("UCQ %08p\n", ucq);
-       printk("prod_idx: %08p, cons_idx: %08p\n", atomic_read(&ucq->prod_idx),
+       printk("UCQ %p\n", ucq);
+       printk("prod_idx: %p, cons_idx: %p\n", atomic_read(&ucq->prod_idx),
               atomic_read(&ucq->cons_idx));
-       printk("spare_pg: %08p, nr_extra_pgs: %d\n", atomic_read(&ucq->spare_pg),
+       printk("spare_pg: %p, nr_extra_pgs: %d\n", atomic_read(&ucq->spare_pg),
               atomic_read(&ucq->nr_extra_pgs));
        printk("prod_overflow: %d\n", ucq->prod_overflow);
        /* Try to see our previous ucqs */
-       for (int i = atomic_read(&ucq->prod_idx), count = 0;
-            slot_is_good(i), count < 25;  i--, count++) {
-               printk("Prod idx %08p message ready is %08p\n", i, slot2msg(i)->ready);
+       for (uintptr_t i = atomic_read(&ucq->prod_idx), count = 0;
+            slot_is_good(i) && count < 25;  i--, count++) {
+               /* only attempt to print messages on the same page */
+               if (PTE_ADDR(i) != PTE_ADDR(atomic_read(&ucq->prod_idx)))
+                       break;
+               printk("Prod idx %p message ready is %p\n", i, slot2msg(i)->ready);
+       }
+       /* look at the chain, starting from cons_idx */
+       ucq_pg = (struct ucq_page*)PTE_ADDR(atomic_read(&ucq->cons_idx));
+       for (int i = 0; i < 10 && ucq_pg; i++) {
+               printk("#%02d: Cons page: %p, nr_cons: %d, next page: %p\n", i,
+                      ucq_pg, ucq_pg->header.nr_cons, ucq_pg->header.cons_next_pg);
+               ucq_pg = (struct ucq_page*)(ucq_pg->header.cons_next_pg);
        }
        switch_back(p, old_proc);
 }