Changeset a35b458 in mainline for kernel/generic/src/ipc/kbox.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

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

kernel/generic/src/ipc/kbox.c

@@ -63 +63 @@
         TASK->kb.finished = true;
         mutex_unlock(&TASK->kb.cleanup_lock);
-        
+
         bool have_kb_thread = (TASK->kb.thread != NULL);
-        
+
         /*
          * From now on nobody will try to connect phones or attach
          * kbox threads
          */
-        
+
         /*
          * Disconnect all phones connected to our kbox. Passing true for
@@ -78 +78 @@
          */
         ipc_answerbox_slam_phones(&TASK->kb.box, have_kb_thread);
-        
+
         /*
          * If the task was being debugged, clean up debugging session.
@@ -87 +87 @@
         udebug_task_cleanup(TASK);
         mutex_unlock(&TASK->udebug.lock);
-        
+
         if (have_kb_thread) {
                 LOG("Join kb.thread.");
@@ -95 +95 @@
                 TASK->kb.thread = NULL;
         }
-        
+
         /* Answer all messages in 'calls' and 'dispatched_calls' queues. */
         ipc_cleanup_call_list(&TASK->kb.box, &TASK->kb.box.calls);
@@ -120 +120 @@
                 LOG("Was not debugger.");
         }
-        
+
         LOG("Continue with hangup message.");
         IPC_SET_RETVAL(call->data, 0);
         ipc_answer(&TASK->kb.box, call);
-        
+
         mutex_lock(&TASK->kb.cleanup_lock);
-        
+
         irq_spinlock_lock(&TASK->lock, true);
         irq_spinlock_lock(&TASK->kb.box.lock, false);
@@ -134 +134 @@
                  * gets freed and signal to the caller.
                  */
-                
+
                 /* Only detach kbox thread unless already terminating. */
                 if (TASK->kb.finished == false) {
@@ -141 +141 @@
                         TASK->kb.thread = NULL;
                 }
-                
+
                 LOG("Phone list is empty.");
                 *last = true;
         } else
                 *last = false;
-        
+
         irq_spinlock_unlock(&TASK->kb.box.lock, false);
         irq_spinlock_unlock(&TASK->lock, true);
-        
+
         mutex_unlock(&TASK->kb.cleanup_lock);
 }
@@ -166 +166 @@
         LOG("Starting.");
         bool done = false;
-        
+
         while (!done) {
                 call_t *call = ipc_wait_for_call(&TASK->kb.box, SYNCH_NO_TIMEOUT,
                     SYNCH_FLAGS_NONE);
-                
+
                 if (call == NULL)
                         continue;  /* Try again. */
-                
+
                 switch (IPC_GET_IMETHOD(call->data)) {
-                
+
                 case IPC_M_DEBUG:
                         /* Handle debug call. */
                         udebug_call_receive(call);
                         break;
-                
+
                 case IPC_M_PHONE_HUNGUP:
                         /*
@@ -189 +189 @@
                         kbox_proc_phone_hungup(call, &done);
                         break;
-                
+
                 default:
                         /* Ignore */
@@ -195 +195 @@
                 }
         }
-        
+
         LOG("Exiting.");
 }
@@ -213 +213 @@
 {
         irq_spinlock_lock(&tasks_lock, true);
-        
+
         task_t *task = task_find_by_id(taskid);
         if (task == NULL) {
@@ -219 +219 @@
                 return ENOENT;
         }
-        
+
         atomic_inc(&task->refcount);
-        
+
         irq_spinlock_unlock(&tasks_lock, true);
-        
+
         mutex_lock(&task->kb.cleanup_lock);
-        
+
         if (atomic_predec(&task->refcount) == 0) {
                 mutex_unlock(&task->kb.cleanup_lock);
@@ -231 +231 @@
                 return ENOENT;
         }
-        
+
         if (task->kb.finished) {
                 mutex_unlock(&task->kb.cleanup_lock);
                 return EINVAL;
         }
-        
+
         /* Create a kbox thread if necessary. */
         if (task->kb.thread == NULL) {
                 thread_t *kb_thread = thread_create(kbox_thread_proc, NULL, task,
                     THREAD_FLAG_NONE, "kbox");
-                
+
                 if (!kb_thread) {
                         mutex_unlock(&task->kb.cleanup_lock);
                         return ENOMEM;
                 }
-                
+
                 task->kb.thread = kb_thread;
                 thread_ready(kb_thread);
         }
-        
+
         /* Allocate a new phone. */
         cap_handle_t phone_handle;
@@ -258 +258 @@
                 return rc;
         }
-        
+
         kobject_t *phone_obj = kobject_get(TASK, phone_handle,
             KOBJECT_TYPE_PHONE);
@@ -264 +264 @@
         /* Hand over phone_obj's reference to ipc_phone_connect() */
         (void) ipc_phone_connect(phone_obj->phone, &task->kb.box);
-        
+
         mutex_unlock(&task->kb.cleanup_lock);
         *out_phone = phone_handle;