introduce time managment in xtf

80 lines not on this page · raw message

new file mode 100644
index 0000000..7d46d3a
@@ -0,0 +1,31 @@
+/**
+ * @file include/xtf/time.h
+ *
+ * Time management
+ */
+#ifndef XTF_TIME_H
+# define XTF_TIME_H
+
+#include <xtf/types.h>
+
+#define rdtscp(tsc) {\
+    uint32_t lo, hi;\
+    __asm__ volatile("rdtsc": "=a"(lo), "=d"(hi));\
+    tsc = ((uint64_t)hi << 32) | lo;\
+}
+
+
+/* Time from boot in nanoseconds */
+uint64_t since_boot_time(void);
+
+#endif /* XTF_TIME_H */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

index a0f53bf..3e8e8ce 100644
@@ -3,6 +3,7 @@
 #include <xtf/time.h>
 
 #include <arch/barrier.h>
+#include <arch/div.h>
 
 /* This function was taken from mini-os source code */
 /* It returns ((delta << shift) * mul_frac) >> 32 */

@@ -69,6 +70,23 @@ uint64_t since_boot_time(void)
     return system_time;
 }
 
+/* This function return the epoch time (number of seconds elapsed
+ * since Juanary 1, 1970) */
+uint64_t current_time(void)
+{
+    uint64_t seconds;
+    uint64_t boot_time = since_boot_time();
+#if defined(__i386__)
+    seconds = (uint64_t)ACCESS_ONCE(shared_info.wc_sec);
+    divmod64(&boot_time, 1000000000);
+#else
+    seconds = ((uint64_t)ACCESS_ONCE(shared_info.wc_sec_hi) << 32)
+              | ACCESS_ONCE(shared_info.wc_sec);
+    boot_time /= 1000000000;
+#endif
+    return seconds + boot_time;
+}
+
 /*
  * Local variables:
  * mode: C

index 7d46d3a..6195b24 100644
@@ -18,6 +18,8 @@
 /* Time from boot in nanoseconds */
 uint64_t since_boot_time(void);
 
+uint64_t current_time(void);
+
 #endif /* XTF_TIME_H */
 
 /*

index 3e8e8ce..1f0f289 100644
@@ -87,6 +87,29 @@ uint64_t current_time(void)
     return seconds + boot_time;
 }
 
+/* The POSIX gettimeofday syscall normally takes a second argument, which is
+ * the timezone (struct timezone). However, it sould be NULL because linux
+ * doesn't use it anymore. So we need for us to add it in this function
+ */
+int gettimeofday(struct timeval *tp)
+{
+    uint64_t boot_time = since_boot_time();
+    uint32_t mod;
+
+#if defined(__i386__)
+    mod = divmod64(&boot_time, 1000000000);
+#else
+    mod = boot_time % 1000000000;
+#endif
+
+    if (!tp)
+        return -1;
+
+    tp->sec = current_time();
+    tp->nsec = ACCESS_ONCE(shared_info.wc_nsec) + mod;
+    return 0;
+}
+
 /*
  * Local variables:
  * mode: C

index 6195b24..2ff8f42 100644
@@ -8,6 +8,11 @@
 
 #include <xtf/types.h>
 
+struct timeval {
+    uint64_t sec;
+    uint64_t nsec;
+};
+
 #define rdtscp(tsc) {\
     uint32_t lo, hi;\
     __asm__ volatile("rdtsc": "=a"(lo), "=d"(hi));\

@@ -20,6 +25,8 @@ uint64_t since_boot_time(void);
 
 uint64_t current_time(void);
 
+int gettimeofday(struct timeval *tp);
+
 #endif /* XTF_TIME_H */
 
 /*

index 1f0f289..1d7fef5 100644
@@ -110,6 +110,15 @@ int gettimeofday(struct timeval *tp)
     return 0;
 }
 
+static inline void nspin_sleep(uint64_t t)
+{
+    uint64_t curr = since_boot_time();
+    uint64_t end = curr + t;
+
+    while ( curr < end )
+        curr = since_boot_time();
+}
+
 /*
  * Local variables:
  * mode: C

index 1d7fef5..67fe049 100644
@@ -119,6 +119,12 @@ static inline void nspin_sleep(uint64_t t)
         curr = since_boot_time();
 }
 
+static inline void spin_sleep(uint64_t t)
+{
+    uint64_t nsec = t * 1000000000ul;
+    nspin_sleep(nsec);
+}
+
 /*
  * Local variables:
  * mode: C

index 67fe049..f75979a 100644
@@ -125,6 +125,12 @@ static inline void spin_sleep(uint64_t t)
     nspin_sleep(nsec);
 }
 
+static inline void mspin_sleep(uint64_t t)
+{
+    uint64_t nsec = t * 1000000ul;
+    nspin_sleep(nsec);
+}
+
 /*
  * Local variables:
  * mode: C

index f75979a..246a2dd 100644
@@ -131,6 +131,16 @@ static inline void mspin_sleep(uint64_t t)
     nspin_sleep(nsec);
 }
 
+void sleep(uint64_t t)
+{
+    spin_sleep(t);
+}
+
+void msleep(uint64_t t)
+{
+    mspin_sleep(t);
+}
+
 /*
  * Local variables:
  * mode: C

index 2ff8f42..97f3b5b 100644
@@ -25,8 +25,20 @@ uint64_t since_boot_time(void);
 
 uint64_t current_time(void);
 
+/* This function takes seconds in parameter */
+void sleep(uint64_t f);
+
+/* Be careful, this function takes milliseconds in parameter,
+ * not microseconds !
+ */
+void msleep(uint64_t f);
+
 int gettimeofday(struct timeval *tp);
 
+
+/* This returns the current epoch time */
+#define NOW() current_time()
+
 #endif /* XTF_TIME_H */
 
 /*

81 lines not on this page · raw message

new file mode 100644
index 0000000..7d46d3a
@@ -0,0 +1,31 @@
+/**
+ * @file include/xtf/time.h
+ *
+ * Time management
+ */
+#ifndef XTF_TIME_H
+# define XTF_TIME_H
+
+#include <xtf/types.h>
+
+#define rdtscp(tsc) {\
+    uint32_t lo, hi;\
+    __asm__ volatile("rdtsc": "=a"(lo), "=d"(hi));\
+    tsc = ((uint64_t)hi << 32) | lo;\
+}
+
+
+/* Time from boot in nanoseconds */
+uint64_t since_boot_time(void);
+
+#endif /* XTF_TIME_H */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */