Index: generic/include/ipc/ipc.h =================================================================== --- generic/include/ipc/ipc.h (revision fe196117136f8e73cbf82c36f721f7a0e27d83a0) +++ generic/include/ipc/ipc.h (revision c4e45073fbe4143fbb4ab29aa6875ecdc374466e) @@ -186,7 +186,8 @@ } ipc_phone_state_t; +/** Structure identifying phone (in TASK structure) */ struct phone_s { SPINLOCK_DECLARE(lock); - link_t list; + link_t link; answerbox_t *callee; ipc_phone_state_t state; @@ -195,5 +196,5 @@ typedef struct { - link_t list; + link_t link; int flags; @@ -227,4 +228,5 @@ extern int ipc_phone_hangup(phone_t *phone, int aggressive); extern void ipc_backsend_err(phone_t *phone, call_t *call, __native err); +extern void ipc_print_task(task_id_t taskid); extern answerbox_t *ipc_phone_0; Index: generic/src/console/cmd.c =================================================================== --- generic/src/console/cmd.c (revision fe196117136f8e73cbf82c36f721f7a0e27d83a0) +++ generic/src/console/cmd.c (revision c4e45073fbe4143fbb4ab29aa6875ecdc374466e) @@ -59,4 +59,5 @@ #include #include +#include /** Data and methods for 'help' command. */ @@ -301,4 +302,17 @@ }; +/** Data and methods for 'ipc_task' command */ +static int cmd_ipc_task(cmd_arg_t *argv); +static cmd_arg_t ipc_task_argv = { + .type = ARG_TYPE_INT, +}; +static cmd_info_t ipc_task_info = { + .name = "ipc_task", + .description = "Show memory zone structure.", + .func = cmd_ipc_task, + .argc = 1, + .argv = &ipc_task_argv +}; + /** Data and methods for 'zone' command */ static int cmd_zone(cmd_arg_t *argv); @@ -348,4 +362,5 @@ &halt_info, &help_info, + &ipc_task_info, &set4_info, &slabs_info, @@ -687,4 +702,16 @@ } +/** Command for printing task ipc details + * + * @param argv Integer argument from cmdline expected + * + * return Always 1 + */ +int cmd_ipc_task(cmd_arg_t * argv) { + ipc_print_task(argv[0].intval); + return 1; +} + + /** Command for listing processors. * Index: generic/src/ipc/ipc.c =================================================================== --- generic/src/ipc/ipc.c (revision fe196117136f8e73cbf82c36f721f7a0e27d83a0) +++ generic/src/ipc/ipc.c (revision c4e45073fbe4143fbb4ab29aa6875ecdc374466e) @@ -111,10 +111,9 @@ spinlock_lock(&phone->lock); - ASSERT(!phone->callee); phone->state = IPC_PHONE_CONNECTED; phone->callee = box; spinlock_lock(&box->lock); - list_append(&phone->list, &box->connected_phones); + list_append(&phone->link, &box->connected_phones); spinlock_unlock(&box->lock); @@ -156,5 +155,5 @@ spinlock_lock(&callerbox->lock); - list_append(&call->list, &callerbox->answers); + list_append(&call->link, &callerbox->answers); spinlock_unlock(&callerbox->lock); waitq_wakeup(&callerbox->wq, 0); @@ -170,5 +169,5 @@ /* Remove from active box */ spinlock_lock(&box->lock); - list_remove(&call->list); + list_remove(&call->link); spinlock_unlock(&box->lock); /* Send back answer */ @@ -198,5 +197,5 @@ spinlock_lock(&box->lock); - list_append(&call->list, &box->calls); + list_append(&call->link, &box->calls); spinlock_unlock(&box->lock); waitq_wakeup(&box->wq, 0); @@ -262,5 +261,5 @@ /* Remove myself from answerbox */ spinlock_lock(&box->lock); - list_remove(&phone->list); + list_remove(&phone->link); spinlock_unlock(&box->lock); @@ -277,6 +276,4 @@ } - phone->callee = 0; - phone->state = IPC_PHONE_HUNGUP; spinlock_unlock(&phone->lock); @@ -298,5 +295,5 @@ { spinlock_lock(&oldbox->lock); - list_remove(&call->list); + list_remove(&call->link); spinlock_unlock(&oldbox->lock); @@ -331,6 +328,6 @@ spinlock_lock(&box->irq_lock); - request = list_get_instance(box->irq_notifs.next, call_t, list); - list_remove(&request->list); + request = list_get_instance(box->irq_notifs.next, call_t, link); + list_remove(&request->link); spinlock_unlock(&box->irq_lock); @@ -338,13 +335,13 @@ } else if (!list_empty(&box->answers)) { /* Handle asynchronous answers */ - request = list_get_instance(box->answers.next, call_t, list); - list_remove(&request->list); + request = list_get_instance(box->answers.next, call_t, link); + list_remove(&request->link); atomic_dec(&request->data.phone->active_calls); } else if (!list_empty(&box->calls)) { /* Handle requests */ - request = list_get_instance(box->calls.next, call_t, list); - list_remove(&request->list); + request = list_get_instance(box->calls.next, call_t, link); + list_remove(&request->link); /* Append request to dispatch queue */ - list_append(&request->list, &box->dispatched_calls); + list_append(&request->link, &box->dispatched_calls); } else { /* This can happen regularly after ipc_cleanup, remove @@ -365,6 +362,6 @@ while (!list_empty(lst)) { - call = list_get_instance(lst->next, call_t, list); - list_remove(&call->list); + call = list_get_instance(lst->next, call_t, link); + list_remove(&call->link); IPC_SET_RETVAL(call->data, EHANGUP); @@ -395,6 +392,5 @@ while (!list_empty(&task->answerbox.connected_phones)) { phone = list_get_instance(task->answerbox.connected_phones.next, - phone_t, - list); + phone_t, link); if (! spinlock_trylock(&phone->lock)) { spinlock_unlock(&task->answerbox.lock); @@ -405,5 +401,5 @@ ASSERT(phone->state == IPC_PHONE_CONNECTED); phone->state = IPC_PHONE_SLAMMED; - list_remove(&phone->list); + list_remove(&phone->link); spinlock_unlock(&phone->lock); @@ -452,2 +448,81 @@ } + +/** Kconsole - list answerbox contents */ +void ipc_print_task(task_id_t taskid) +{ + task_t *task; + int i; + call_t *call; + link_t *tmp; + + spinlock_lock(&tasks_lock); + task = task_find_by_id(taskid); + if (task) + spinlock_lock(&task->lock); + spinlock_unlock(&tasks_lock); + if (!task) + return; + + /* Print opened phones & details */ + printf("PHONE:\n"); + for (i=0; i < IPC_MAX_PHONES;i++) { + spinlock_lock(&task->phones[i].lock); + if (task->phones[i].state != IPC_PHONE_FREE) { + printf("%d: ",i); + switch (task->phones[i].state) { + case IPC_PHONE_CONNECTING: + printf("connecting "); + break; + case IPC_PHONE_CONNECTED: + printf("connected to: %P ", + task->phones[i].callee); + break; + case IPC_PHONE_SLAMMED: + printf("slammed by: %P ", + task->phones[i].callee); + break; + case IPC_PHONE_HUNGUP: + printf("hung up - was: %P ", + task->phones[i].callee); + break; + default: + break; + } + printf("active: %d\n", atomic_get(&task->phones[i].active_calls)); + } + spinlock_unlock(&task->phones[i].lock); + } + + + /* Print answerbox - calls */ + spinlock_lock(&task->answerbox.lock); + printf("ABOX - CALLS:\n"); + for (tmp=task->answerbox.calls.next; tmp != &task->answerbox.calls;tmp = tmp->next) { + call = list_get_instance(tmp, call_t, link); + printf("Callid: %P Srctask:%lld M:%d A1:%d A2:%d A3:%d Flags:%x\n",call, + call->sender->taskid, IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data), + IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data), call->flags); + } + /* Print answerbox - calls */ + printf("ABOX - DISPATCHED CALLS:\n"); + for (tmp=task->answerbox.dispatched_calls.next; + tmp != &task->answerbox.dispatched_calls; + tmp = tmp->next) { + call = list_get_instance(tmp, call_t, link); + printf("Callid: %P Srctask:%lld M:%d A1:%d A2:%d A3:%d Flags:%x\n",call, + call->sender->taskid, IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data), + IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data), call->flags); + } + /* Print answerbox - calls */ + printf("ABOX - ANSWERS:\n"); + for (tmp=task->answerbox.answers.next; tmp != &task->answerbox.answers; tmp = tmp->next) { + call = list_get_instance(tmp, call_t, link); + printf("Callid:%P M:%d A1:%d A2:%d A3:%d Flags:%x\n",call, + IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data), + IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data), call->flags); + } + + spinlock_unlock(&task->answerbox.lock); + spinlock_unlock(&task->lock); +} Index: generic/src/ipc/ipcrsc.c =================================================================== --- generic/src/ipc/ipcrsc.c (revision fe196117136f8e73cbf82c36f721f7a0e27d83a0) +++ generic/src/ipc/ipcrsc.c (revision c4e45073fbe4143fbb4ab29aa6875ecdc374466e) @@ -141,5 +141,5 @@ for (lst = TASK->answerbox.dispatched_calls.next; lst != &TASK->answerbox.dispatched_calls; lst = lst->next) { - call = list_get_instance(lst, call_t, list); + call = list_get_instance(lst, call_t, link); if ((__native)call == callid) { result = call; @@ -178,5 +178,4 @@ { ASSERT(phone->state == IPC_PHONE_CONNECTING); - ASSERT(! phone->callee); /* atomic operation */ Index: generic/src/ipc/irq.c =================================================================== --- generic/src/ipc/irq.c (revision fe196117136f8e73cbf82c36f721f7a0e27d83a0) +++ generic/src/ipc/irq.c (revision c4e45073fbe4143fbb4ab29aa6875ecdc374466e) @@ -225,5 +225,5 @@ spinlock_lock(&irq_conns[irq].box->irq_lock); - list_append(&call->list, &irq_conns[irq].box->irq_notifs); + list_append(&call->link, &irq_conns[irq].box->irq_notifs); spinlock_unlock(&irq_conns[irq].box->irq_lock); Index: generic/src/ipc/sysipc.c =================================================================== --- generic/src/ipc/sysipc.c (revision fe196117136f8e73cbf82c36f721f7a0e27d83a0) +++ generic/src/ipc/sysipc.c (revision c4e45073fbe4143fbb4ab29aa6875ecdc374466e) @@ -107,5 +107,5 @@ spinlock_lock(&TASK->answerbox.lock); if (answer->data.phone->state == IPC_PHONE_CONNECTED) { - list_remove(&answer->data.phone->list); + list_remove(&answer->data.phone->link); answer->data.phone->state = IPC_PHONE_SLAMMED; } Index: generic/src/proc/task.c =================================================================== --- generic/src/proc/task.c (revision fe196117136f8e73cbf82c36f721f7a0e27d83a0) +++ generic/src/proc/task.c (revision c4e45073fbe4143fbb4ab29aa6875ecdc374466e) @@ -230,6 +230,6 @@ spinlock_lock(&t->lock); - printf("%s: address=%#zX, taskid=%#llX, as=%#zX, ActiveCalls: %zd", - t->name, t, t->taskid, t->as, atomic_get(&t->active_calls)); + printf("%s(%lld): address=%#zX, as=%#zX, ActiveCalls: %zd", + t->name, t->taskid, t, t->as, atomic_get(&t->active_calls)); for (j=0; j < IPC_MAX_PHONES; j++) { if (t->phones[j].callee)