Changes in kernel/generic/src/ipc/ipc.c [1b20da0:a35b458] in mainline

File:

• kernel/generic/src/ipc/ipc.c (modified) (28 diffs)

kernel/generic/src/ipc/ipc.c

@@ -127 +127 @@
         kobject_initialize(kobj, KOBJECT_TYPE_CALL, call, &call_kobject_ops);
         call->kobject = kobj;
-        
+
         return call;
 }
@@ -212 +212 @@
         answerbox_t *mybox = slab_alloc(answerbox_cache, 0);
         ipc_answerbox_init(mybox, TASK);
-        
+
         /* We will receive data in a special box. */
         request->callerbox = mybox;
-        
+
         errno_t rc = ipc_call(phone, request);
         if (rc != EOK) {
@@ -247 +247 @@
                         ipc_forget_call(request);       /* releases locks */
                         rc = EINTR;
-                        
+
                 } else {
                         spinlock_unlock(&TASK->active_calls_lock);
@@ -264 +264 @@
         }
         assert(!answer || request == answer);
-        
+
         slab_free(answerbox_cache, mybox);
         return rc;
@@ -305 +305 @@
             &call->sender->answerbox;
         bool do_lock = ((!selflocked) || (callerbox != &TASK->answerbox));
-        
+
         call->flags |= IPC_CALL_ANSWERED;
-        
+
         call->data.task_id = TASK->taskid;
-        
+
         if (do_lock)
                 irq_spinlock_lock(&callerbox->lock, true);
-        
+
         list_append(&call->ab_link, &callerbox->answers);
-        
+
         if (do_lock)
                 irq_spinlock_unlock(&callerbox->lock, true);
-        
+
         waitq_wakeup(&callerbox->wq, WAKEUP_FIRST);
 }
@@ -333 +333 @@
         list_remove(&call->ab_link);
         irq_spinlock_unlock(&box->lock, true);
-        
+
         /* Send back answer */
         _ipc_answer_free_call(call, false);
@@ -395 +395 @@
         caller->ipc_info.call_sent++;
         irq_spinlock_unlock(&caller->lock, true);
-        
+
         if (!(call->flags & IPC_CALL_FORWARDED))
                 _ipc_call_actions_internal(phone, call, preforget);
-        
+
         irq_spinlock_lock(&box->lock, true);
         list_append(&call->ab_link, &box->calls);
         irq_spinlock_unlock(&box->lock, true);
-        
+
         waitq_wakeup(&box->wq, WAKEUP_FIRST);
 }
@@ -426 +426 @@
                                 ipc_backsend_err(phone, call, ENOENT);
                 }
-                
+
                 return ENOENT;
         }
-        
+
         answerbox_t *box = phone->callee;
         _ipc_call(phone, box, call, false);
-        
+
         mutex_unlock(&phone->lock);
         return 0;
@@ -457 +457 @@
                 return EINVAL;
         }
-        
+
         answerbox_t *box = phone->callee;
         if (phone->state != IPC_PHONE_SLAMMED) {
@@ -467 +467 @@
                 /* Drop the answerbox reference */
                 kobject_put(phone->kobject);
-                
+
                 call_t *call = ipc_call_alloc(0);
                 IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP);
@@ -474 +474 @@
                 _ipc_call(phone, box, call, false);
         }
-        
+
         phone->state = IPC_PHONE_HUNGUP;
         mutex_unlock(&phone->lock);
-        
+
         return EOK;
 }
@@ -504 +504 @@
         list_remove(&call->ab_link);
         irq_spinlock_unlock(&oldbox->lock, true);
-        
+
         if (mode & IPC_FF_ROUTE_FROM_ME) {
                 call->data.phone = newphone;
                 call->data.task_id = TASK->taskid;
         }
-        
+
         return ipc_call(newphone, call);
 }
@@ -536 +536 @@
         uint64_t call_cnt = 0;
         errno_t rc;
-        
+
 restart:
         rc = waitq_sleep_timeout(&box->wq, usec, flags, NULL);
         if (rc != EOK)
                 return NULL;
-        
+
         irq_spinlock_lock(&box->lock, true);
         if (!list_empty(&box->irq_notifs)) {
                 /* Count received IRQ notification */
                 irq_cnt++;
-                
+
                 irq_spinlock_lock(&box->irq_lock, false);
-                
+
                 request = list_get_instance(list_first(&box->irq_notifs),
                     call_t, ab_link);
                 list_remove(&request->ab_link);
-                
+
                 irq_spinlock_unlock(&box->irq_lock, false);
         } else if (!list_empty(&box->answers)) {
                 /* Count received answer */
                 answer_cnt++;
-                
+
                 /* Handle asynchronous answers */
                 request = list_get_instance(list_first(&box->answers),
@@ -566 +566 @@
                 /* Count received call */
                 call_cnt++;
-                
+
                 /* Handle requests */
                 request = list_get_instance(list_first(&box->calls),
                     call_t, ab_link);
                 list_remove(&request->ab_link);
-                
+
                 /* Append request to dispatch queue */
                 list_append(&request->ab_link, &box->dispatched_calls);
@@ -579 +579 @@
                 goto restart;
         }
-        
+
         irq_spinlock_pass(&box->lock, &TASK->lock);
-        
+
         TASK->ipc_info.irq_notif_received += irq_cnt;
         TASK->ipc_info.answer_received += answer_cnt;
         TASK->ipc_info.call_received += call_cnt;
-        
+
         irq_spinlock_unlock(&TASK->lock, true);
-        
+
         return request;
 }
@@ -602 +602 @@
                 call_t *call = list_get_instance(list_first(lst), call_t,
                     ab_link);
-                
+
                 list_remove(&call->ab_link);
 
@@ -631 +631 @@
         phone_t *phone;
         DEADLOCK_PROBE_INIT(p_phonelck);
-        
+
         /* Disconnect all phones connected to our answerbox */
 restart_phones:
@@ -643 +643 @@
                         goto restart_phones;
                 }
-                
+
                 /* Disconnect phone */
                 assert(phone->state == IPC_PHONE_CONNECTED);
-                
+
                 list_remove(&phone->link);
                 phone->state = IPC_PHONE_SLAMMED;
-                
+
                 if (notify_box) {
                         task_hold(phone->caller);
@@ -671 +671 @@
 
                         kobject_put(phone->kobject);
-                        
+
                         /* Must start again */
                         goto restart_phones;
                 }
-                
+
                 mutex_unlock(&phone->lock);
                 kobject_put(phone->kobject);
         }
-        
+
         irq_spinlock_unlock(&box->lock, true);
 }
@@ -727 +727 @@
                 return;
         }
-        
+
         call = list_get_instance(list_first(&TASK->active_calls), call_t,
             ta_link);
@@ -811 +811 @@
         if (restart)
                 goto restart;
-        
+
         call = ipc_wait_for_call(&TASK->answerbox, SYNCH_NO_TIMEOUT,
             SYNCH_FLAGS_NONE);
@@ -872 +872 @@
         caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_PHONE,
             phone_cap_cleanup_cb, NULL);
-        
+
         /* Unsubscribe from any event notifications. */
         event_cleanup_answerbox(&TASK->answerbox);
-        
+
         /* Disconnect all connected IRQs */
         caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_IRQ, irq_cap_cleanup_cb,
             NULL);
-        
+
         /* Disconnect all phones connected to our regular answerbox */
         ipc_answerbox_slam_phones(&TASK->answerbox, false);
-        
+
 #ifdef CONFIG_UDEBUG
         /* Clean up kbox thread and communications */
@@ -891 +891 @@
         caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_CALL, call_cap_cleanup_cb,
             NULL);
-        
+
         /* Answer all messages in 'calls' and 'dispatched_calls' queues */
         ipc_cleanup_call_list(&TASK->answerbox, &TASK->answerbox.calls);
         ipc_cleanup_call_list(&TASK->answerbox,
             &TASK->answerbox.dispatched_calls);
-        
+
         ipc_forget_all_active_calls();
         ipc_wait_for_all_answered_calls();
@@ -921 +921 @@
                 printf("%10p ", call);
 #endif
-                
+
 #ifdef __64_BITS__
                 printf("%18p ", call);
 #endif
-                
+
                 spinlock_lock(&call->forget_lock);
 
@@ -954 +954 @@
                 printf("%-11d %7" PRIun " ", cap->handle,
                     atomic_get(&phone->active_calls));
-                
+
                 switch (phone->state) {
                 case IPC_PHONE_CONNECTING:
@@ -973 +973 @@
                         break;
                 }
-                
+
                 printf("\n");
         }
@@ -996 +996 @@
         task_hold(task);
         irq_spinlock_unlock(&tasks_lock, true);
-        
+
         printf("[phone cap] [calls] [state\n");
-        
+
         caps_apply_to_kobject_type(task, KOBJECT_TYPE_PHONE,
             print_task_phone_cb, NULL);
-        
+
         irq_spinlock_lock(&task->lock, true);
         irq_spinlock_lock(&task->answerbox.lock, false);
-        
+
 #ifdef __32_BITS__
         printf("[call id ] [method] [arg1] [arg2] [arg3] [arg4] [arg5]"
             " [flags] [sender\n");
 #endif
-        
+
 #ifdef __64_BITS__
         printf("[call id         ] [method] [arg1] [arg2] [arg3] [arg4]"
             " [arg5] [flags] [sender\n");
 #endif
-        
+
         printf(" --- incomming calls ---\n");
         ipc_print_call_list(&task->answerbox.calls);
@@ -1021 +1021 @@
         printf(" --- incoming answers ---\n");
         ipc_print_call_list(&task->answerbox.answers);
-        
+
         irq_spinlock_unlock(&task->answerbox.lock, false);
         irq_spinlock_unlock(&task->lock, true);