Index: uspace/lib/c/generic/ipc/ns.c =================================================================== --- uspace/lib/c/generic/ipc/ns.c (revision 9c81703396899b0f387e719f5279bbd14aa89698) +++ uspace/lib/c/generic/ipc/ns.c (revision 2c577e0ba0c3d4da6f9430cbe193b8411923aad2) @@ -79,4 +79,20 @@ } +void *service_realtime_share_in(void) +{ + void *rtime = as_get_mappable_page(PAGE_SIZE); + if (rtime == NULL) + return NULL; + + int res = async_share_in_start_1_0(PHONE_NS, rtime, PAGE_SIZE, + SERVICE_MEM_REALTIME); + if (res != EOK) { + as_area_destroy((void *) rtime); + return NULL; + } + + return rtime; +} + /** @} */ Index: uspace/lib/c/generic/time.c =================================================================== --- uspace/lib/c/generic/time.c (revision 9c81703396899b0f387e719f5279bbd14aa89698) +++ uspace/lib/c/generic/time.c (revision 2c577e0ba0c3d4da6f9430cbe193b8411923aad2) @@ -35,20 +35,12 @@ #include #include -#include -#include +#include +#include #include -#include -#include -#include -#include +#include #include - -#include -#include -#include - #include -/* Pointers to public variables with time */ +/** Pointer to kernel shared variables with time */ struct { volatile sysarg_t seconds1; @@ -59,6 +51,7 @@ /** Add microseconds to given timeval. * - * @param tv Destination timeval. - * @param usecs Number of microseconds to add. + * @param tv Destination timeval. + * @param usecs Number of microseconds to add. + * */ void tv_add(struct timeval *tv, suseconds_t usecs) @@ -66,4 +59,5 @@ tv->tv_sec += usecs / 1000000; tv->tv_usec += usecs % 1000000; + if (tv->tv_usec > 1000000) { tv->tv_sec++; @@ -74,104 +68,98 @@ /** Subtract two timevals. * - * @param tv1 First timeval. - * @param tv2 Second timeval. - * - * @return Return difference between tv1 and tv2 (tv1 - tv2) in - * microseconds. + * @param tv1 First timeval. + * @param tv2 Second timeval. + * + * @return Difference between tv1 and tv2 (tv1 - tv2) in + * microseconds. + * */ suseconds_t tv_sub(struct timeval *tv1, struct timeval *tv2) { - suseconds_t result; - - result = tv1->tv_usec - tv2->tv_usec; - result += (tv1->tv_sec - tv2->tv_sec) * 1000000; - - return result; + return (tv1->tv_usec - tv2->tv_usec) + + ((tv1->tv_sec - tv2->tv_sec) * 1000000); } /** Decide if one timeval is greater than the other. * - * @param t1 First timeval. - * @param t2 Second timeval. - * - * @return Return true tv1 is greater than tv2. Otherwise return - * false. + * @param t1 First timeval. + * @param t2 Second timeval. + * + * @return True if tv1 is greater than tv2. + * @return False otherwise. + * */ int tv_gt(struct timeval *tv1, struct timeval *tv2) { if (tv1->tv_sec > tv2->tv_sec) - return 1; - if (tv1->tv_sec == tv2->tv_sec && tv1->tv_usec > tv2->tv_usec) - return 1; - return 0; + return true; + + if ((tv1->tv_sec == tv2->tv_sec) && (tv1->tv_usec > tv2->tv_usec)) + return true; + + return false; } /** Decide if one timeval is greater than or equal to the other. * - * @param tv1 First timeval. - * @param tv2 Second timeval. - * - * @return Return true if tv1 is greater than or equal to tv2. - * Otherwise return false. + * @param tv1 First timeval. + * @param tv2 Second timeval. + * + * @return True if tv1 is greater than or equal to tv2. + * @return False otherwise. + * */ int tv_gteq(struct timeval *tv1, struct timeval *tv2) { if (tv1->tv_sec > tv2->tv_sec) - return 1; - if (tv1->tv_sec == tv2->tv_sec && tv1->tv_usec >= tv2->tv_usec) - return 1; - return 0; -} - - -/** POSIX gettimeofday - * - * The time variables are memory mapped(RO) from kernel, which updates - * them periodically. As it is impossible to read 2 values atomically, we - * use a trick: First read a seconds, then read microseconds, then - * read seconds again. If a second elapsed in the meantime, set it to zero. - * This provides assurance, that at least the - * sequence of subsequent gettimeofday calls is ordered. + return true; + + if ((tv1->tv_sec == tv2->tv_sec) && (tv1->tv_usec >= tv2->tv_usec)) + return true; + + return false; +} + +/** Get time of day + * + * The time variables are memory mapped (read-only) from kernel which + * updates them periodically. + * + * As it is impossible to read 2 values atomically, we use a trick: + * First we read the seconds, then we read the microseconds, then we + * read the seconds again. If a second elapsed in the meantime, set + * the microseconds to zero. + * + * This assures that the values returned by two subsequent calls + * to gettimeofday() are monotonous. + * */ int gettimeofday(struct timeval *tv, struct timezone *tz) { - void *mapping; - sysarg_t s1, s2; - int rights; - int res; - if (!ktime) { - mapping = as_get_mappable_page(PAGE_SIZE); - /* Get the mapping of kernel clock */ - res = ipc_share_in_start_1_1(PHONE_NS, mapping, PAGE_SIZE, - SERVICE_MEM_REALTIME, &rights); - if (res) { - printf("Failed to initialize timeofday memarea\n"); - _exit(1); - } - if (!(rights & AS_AREA_READ)) { - printf("Received bad rights on time area: %X\n", - rights); - as_area_destroy(mapping); - _exit(1); - } - ktime = mapping; - } + ktime = service_realtime_share_in(); + if (!ktime) + return -1; + } + if (tz) { tz->tz_minuteswest = 0; tz->tz_dsttime = DST_NONE; } - - s2 = ktime->seconds2; + + sysarg_t s2 = ktime->seconds2; + read_barrier(); tv->tv_usec = ktime->useconds; + read_barrier(); - s1 = ktime->seconds1; + sysarg_t s1 = ktime->seconds1; + if (s1 != s2) { + tv->tv_sec = max(s1, s2); tv->tv_usec = 0; - tv->tv_sec = s1 > s2 ? s1 : s2; } else tv->tv_sec = s1; - + return 0; } @@ -180,13 +168,16 @@ { struct timeval tv; - if (gettimeofday(&tv, NULL)) return (time_t) -1; + if (tloc) *tloc = tv.tv_sec; + return tv.tv_sec; } -/** Wait unconditionally for specified number of microseconds */ +/** Wait unconditionally for specified number of microseconds + * + */ int usleep(useconds_t usec) { @@ -195,15 +186,21 @@ } -/** Wait unconditionally for specified number of seconds */ +/** Wait unconditionally for specified number of seconds + * + */ unsigned int sleep(unsigned int sec) { - /* Sleep in 1000 second steps to support - full argument range */ + /* + * Sleep in 1000 second steps to support + * full argument range + */ + while (sec > 0) { unsigned int period = (sec > 1000) ? 1000 : sec; - + usleep(period * 1000000); sec -= period; } + return 0; } Index: uspace/lib/c/include/ipc/ns.h =================================================================== --- uspace/lib/c/include/ipc/ns.h (revision 9c81703396899b0f387e719f5279bbd14aa89698) +++ uspace/lib/c/include/ipc/ns.h (revision 2c577e0ba0c3d4da6f9430cbe193b8411923aad2) @@ -37,5 +37,5 @@ #include -#include +#include typedef enum { @@ -51,4 +51,5 @@ extern wchar_t *service_klog_share_in(size_t *); +extern void *service_realtime_share_in(void); #endif Index: uspace/lib/c/include/ipc/services.h =================================================================== --- uspace/lib/c/include/ipc/services.h (revision 9c81703396899b0f387e719f5279bbd14aa89698) +++ uspace/lib/c/include/ipc/services.h (revision 2c577e0ba0c3d4da6f9430cbe193b8411923aad2) @@ -66,7 +66,9 @@ } services_t; -/* Memory area to be received from NS */ -#define SERVICE_MEM_REALTIME 1 -#define SERVICE_MEM_KLOG 2 +/* Memory areas to be received from NS */ +typedef enum { + SERVICE_MEM_REALTIME = 1, + SERVICE_MEM_KLOG = 2 +} mem_services_t; #endif