Changeset 23 for trunk/kernel/syscalls/sys_clock.c

Timestamp:

Jun 18, 2017, 10:06:41 PM (7 years ago)

Author:

alain

Message:

Introduce syscalls.

File:

• trunk/kernel/syscalls/sys_clock.c (modified) (2 diffs)

trunk/kernel/syscalls/sys_clock.c

@@ -1 +1 @@
 /*
- * sys_clock: get system current time
+ * sys_clock: get calling core cycles count
  * 
- * Copyright (c) 2008,2009,2010,2011,2012 Ghassan Almaless
- * Copyright (c) 2011,2012 UPMC Sorbonne Universites
+ * Author    Alain Greiner (2016,2017)
+ *  
+ * Copyright (c) UPMC Sorbonne Universites
  *
- * This file is part of ALMOS-kernel.
+ * This file is part of ALMOS-MKH.
  *
- * ALMOS-kernel is free software; you can redistribute it and/or modify it
+ * ALMOS-MKH is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2.0 of the License.
  *
- * ALMOS-kernel is distributed in the hope that it will be useful, but
+ * ALMOS-MKH is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -17 +18 @@
  *
  * You should have received a copy of the GNU General Public License
- * along with ALMOS-kernel; if not, write to the Free Software Foundation,
+ * along with ALMOS-MKH; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <hal_types.h>
+#include <hal_uspace.h>
 #include <errno.h>
-#include <config.h>
-#include <cpu.h>
+#include <core.h>
 #include <thread.h>
+#include <process.h>
+#include <vmm.h>
+#include <printk.h>
 
-int sys_clock(uint64_t *val)
+//////////////////////////////////
+int sys_clock (uint64_t * cycles )
 {
-        error_t err;
-        uint64_t cycles;
+        error_t   error;
+    paddr_t   paddr;
+        uint64_t  k_cycles;
 
-        if((val == NULL) || NOT_IN_USPACE((uint_t)val))
+    thread_t  * this    = CURRENT_THREAD;
+    process_t * process = this->process;
+
+    // check buffer in user space
+    error = vmm_v2p_translate( false , cycles , &paddr );
+
+        if( error )
         {
-                err = EINVAL;
-                goto fail_inval;
+        printk("\n[ERROR] in %s : user buffer unmapped for thread %x in process %x\n",
+               __FUNCTION__ , this->trdid , process->pid );
+        this->errno = EFAULT;
+                return -1;
         }
 
-        cycles = cpu_get_cycles(current_cpu);
-        err    = cpu_copy_to_uspace(val, &cycles, sizeof(cycles));
+    // call relevant core function
+        k_cycles = core_get_cycles( this->core );
 
-fail_inval:
-        current_thread->info.errno = err;
-        return err; 
-}
+    // copy to user space
+        hal_copy_to_uspace( cycles , &k_cycles , sizeof(uint64_t) );
+
+        return 0; 
+
+}  // end sys_clock()