Changeset a35b458 in mainline for kernel/generic/src/syscall

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.

Location:

kernel/generic/src/syscall

Files:

• copy.c (modified) (5 diffs)
• syscall.c (modified) (12 diffs)

kernel/generic/src/syscall/copy.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-    
+
 /** @addtogroup generic
  * @{
@@ -63 +63 @@
         ipl_t ipl;
         errno_t rc;
-        
+
         assert(THREAD);
         assert(!THREAD->in_copy_from_uspace);
-        
+
         if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
                 if (overlaps((uintptr_t) uspace_src, size,
@@ -86 +86 @@
                 return EPERM;
 #endif
-        
+
         ipl = interrupts_disable();
         THREAD->in_copy_from_uspace = true;
-        
+
         rc = memcpy_from_uspace(dst, uspace_src, size);
 
@@ -114 +114 @@
         ipl_t ipl;
         errno_t rc;
-        
+
         assert(THREAD);
         assert(!THREAD->in_copy_to_uspace);
-        
+
         if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
                 if (overlaps((uintptr_t) uspace_dst, size,
@@ -137 +137 @@
                 return EPERM;
 #endif
-        
+
         ipl = interrupts_disable();
         THREAD->in_copy_to_uspace = true;
-        
+
         rc = memcpy_to_uspace(uspace_dst, src, size);
 

kernel/generic/src/syscall/syscall.c

@@ -66 +66 @@
         thread_update_accounting(true);
         irq_spinlock_unlock(&THREAD->lock, true);
-        
+
 #ifdef CONFIG_UDEBUG
         /*
@@ -82 +82 @@
                 udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, 0, false);
 #endif
-        
+
         sysarg_t rc;
         if (id < SYSCALL_END) {
@@ -91 +91 @@
                 task_kill_self(true);
         }
-        
+
         if (THREAD->interrupted)
                 thread_exit();
-        
+
 #ifdef CONFIG_UDEBUG
         if (THREAD->udebug.active) {
                 udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, rc, true);
-                
+
                 /*
                  * Stopping point needed for tasks that only invoke
@@ -111 +111 @@
         THREAD->udebug.uspace_state = NULL;
 #endif
-        
+
         /* Do kernel accounting */
         irq_spinlock_lock(&THREAD->lock, true);
         thread_update_accounting(false);
         irq_spinlock_unlock(&THREAD->lock, true);
-        
+
         return rc;
 }
@@ -123 +123 @@
         /* System management syscalls. */
         [SYS_KIO] = (syshandler_t) sys_kio,
-        
+
         /* Thread and task related syscalls. */
         [SYS_THREAD_CREATE] = (syshandler_t) sys_thread_create,
@@ -130 +130 @@
         [SYS_THREAD_USLEEP] = (syshandler_t) sys_thread_usleep,
         [SYS_THREAD_UDELAY] = (syshandler_t) sys_thread_udelay,
-        
+
         [SYS_TASK_GET_ID] = (syshandler_t) sys_task_get_id,
         [SYS_TASK_SET_NAME] = (syshandler_t) sys_task_set_name,
@@ -136 +136 @@
         [SYS_TASK_EXIT] = (syshandler_t) sys_task_exit,
         [SYS_PROGRAM_SPAWN_LOADER] = (syshandler_t) sys_program_spawn_loader,
-        
+
         /* Synchronization related syscalls. */
         [SYS_FUTEX_SLEEP] = (syshandler_t) sys_futex_sleep,
@@ -142 +142 @@
         [SYS_SMC_COHERENCE] = (syshandler_t) sys_smc_coherence,
         [SYS_SMP_MEMORY_BARRIER] = (syshandler_t) sys_smp_memory_barrier,
-        
+
         /* Address space related syscalls. */
         [SYS_AS_AREA_CREATE] = (syshandler_t) sys_as_area_create,
@@ -148 +148 @@
         [SYS_AS_AREA_CHANGE_FLAGS] = (syshandler_t) sys_as_area_change_flags,
         [SYS_AS_AREA_DESTROY] = (syshandler_t) sys_as_area_destroy,
-        
+
         /* Page mapping related syscalls. */
         [SYS_PAGE_FIND_MAPPING] = (syshandler_t) sys_page_find_mapping,
-        
+
         /* IPC related syscalls. */
         [SYS_IPC_CALL_ASYNC_FAST] = (syshandler_t) sys_ipc_call_async_fast,
@@ -163 +163 @@
         [SYS_IPC_HANGUP] = (syshandler_t) sys_ipc_hangup,
         [SYS_IPC_CONNECT_KBOX] = (syshandler_t) sys_ipc_connect_kbox,
-        
+
         /* Event notification syscalls. */
         [SYS_IPC_EVENT_SUBSCRIBE] = (syshandler_t) sys_ipc_event_subscribe,
         [SYS_IPC_EVENT_UNSUBSCRIBE] = (syshandler_t) sys_ipc_event_unsubscribe,
         [SYS_IPC_EVENT_UNMASK] = (syshandler_t) sys_ipc_event_unmask,
-        
+
         /* Permission related syscalls. */
         [SYS_PERM_GRANT] = (syshandler_t) sys_perm_grant,
         [SYS_PERM_REVOKE] = (syshandler_t) sys_perm_revoke,
-        
+
         /* DDI related syscalls. */
         [SYS_PHYSMEM_MAP] = (syshandler_t) sys_physmem_map,
@@ -180 +180 @@
         [SYS_IOSPACE_ENABLE] = (syshandler_t) sys_iospace_enable,
         [SYS_IOSPACE_DISABLE] = (syshandler_t) sys_iospace_disable,
-        
+
         [SYS_IPC_IRQ_SUBSCRIBE] = (syshandler_t) sys_ipc_irq_subscribe,
         [SYS_IPC_IRQ_UNSUBSCRIBE] = (syshandler_t) sys_ipc_irq_unsubscribe,
-        
+
         /* Sysinfo syscalls. */
         [SYS_SYSINFO_GET_KEYS_SIZE] = (syshandler_t) sys_sysinfo_get_keys_size,
@@ -191 +191 @@
         [SYS_SYSINFO_GET_DATA_SIZE] = (syshandler_t) sys_sysinfo_get_data_size,
         [SYS_SYSINFO_GET_DATA] = (syshandler_t) sys_sysinfo_get_data,
-        
+
         /* Kernel console syscalls. */
         [SYS_DEBUG_CONSOLE] = (syshandler_t) sys_debug_console,
-        
+
         [SYS_KLOG] = (syshandler_t) sys_klog,
 };