Changeset c621f4aa in mainline for kernel/generic/src/syscall/syscall.c

Timestamp:

2010-07-25T10:11:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline.

File:

• kernel/generic/src/syscall/syscall.c (modified) (5 diffs)

kernel/generic/src/syscall/syscall.c

@@ -59 +59 @@
     unative_t a4, unative_t a5, unative_t a6, unative_t id)
 {
-        unative_t rc;
-
+        /* Do userpace accounting */
+        irq_spinlock_lock(&THREAD->lock, true);
+        thread_update_accounting(true);
+        irq_spinlock_unlock(&THREAD->lock, true);
+        
 #ifdef CONFIG_UDEBUG
         /*
          * Early check for undebugged tasks. We do not lock anything as this
          * test need not be precise in either direction.
+         *
          */
-        if (THREAD->udebug.active) {
+        if (THREAD->udebug.active)
                 udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, 0, false);
-        }
 #endif
         
+        unative_t rc;
         if (id < SYSCALL_END) {
                 rc = syscall_table[id](a1, a2, a3, a4, a5, a6);
@@ -85 +89 @@
         if (THREAD->udebug.active) {
                 udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, rc, true);
-        
+                
                 /*
                  * Stopping point needed for tasks that only invoke
@@ -95 +99 @@
         }
 #endif
+        
+        /* Do kernel accounting */
+        irq_spinlock_lock(&THREAD->lock, true);
+        thread_update_accounting(false);
+        irq_spinlock_unlock(&THREAD->lock, true);
         
         return rc;
@@ -138 +147 @@
         (syshandler_t) sys_ipc_register_irq,
         (syshandler_t) sys_ipc_unregister_irq,
-
+        
         /* Event notification syscalls. */
         (syshandler_t) sys_event_subscribe,
@@ -153 +162 @@
         
         /* Sysinfo syscalls */
-        (syshandler_t) sys_sysinfo_valid,
-        (syshandler_t) sys_sysinfo_value,
+        (syshandler_t) sys_sysinfo_get_tag,
+        (syshandler_t) sys_sysinfo_get_value,
+        (syshandler_t) sys_sysinfo_get_data_size,
+        (syshandler_t) sys_sysinfo_get_data,
         
         /* Debug calls */