Changeset 2b3dd78 in mainline for uspace/lib/posix/src/time.c

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/lib/posix/src/time.c (moved) (moved from uspace/lib/posix/source/time.c ) (16 diffs)

uspace/lib/posix/src/time.c

@@ -34 +34 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "internal/common.h"
 #include "posix/time.h"
@@ -70 +67 @@
  * Set timezone conversion information.
  */
-void posix_tzset(void)
+void tzset(void)
 {
         // TODO: read environment
@@ -80 +77 @@
 
 /**
- * Get the time in seconds
- *
- * @param t If t is non-NULL, the return value is also stored in the memory
- *          pointed to by t.
- * @return  On success, the value of time in seconds since the Epoch
- *          is returned. On error, (time_t)-1 is returned.
- */
-time_t posix_time(time_t *t)
-{
-        return time(t);
-}
-
-/**
  * Converts a time value to a broken-down UTC time.
  * 
@@ -99 +83 @@
  * @return Value of result on success, NULL on overflow.
  */
-struct tm *posix_gmtime_r(const time_t *restrict timer,
+struct tm *gmtime_r(const time_t *restrict timer,
     struct tm *restrict result)
 {
@@ -117 +101 @@
  *               the result, NULL in case of error.
  */
-struct tm *posix_gmtime(const time_t *restrict timep)
+struct tm *gmtime(const time_t *restrict timep)
 {
         static struct tm result;
 
-        return posix_gmtime_r(timep, &result);
+        return gmtime_r(timep, &result);
 }
 
@@ -131 +115 @@
  * @return Value of result on success, NULL on overflow.
  */
-struct tm *posix_localtime_r(const time_t *restrict timer,
+struct tm *localtime_r(const time_t *restrict timer,
     struct tm *restrict result)
 {
         // TODO: deal with timezone
         // currently assumes system and all times are in GMT
-        return posix_gmtime_r(timer, result);
+        return gmtime_r(timer, result);
 }
 
@@ -147 +131 @@
  *                 the result, NULL in case of error.
  */
-struct tm *posix_localtime(const time_t *restrict timep)
+struct tm *localtime(const time_t *restrict timep)
 {
         static struct tm result;
 
-        return posix_localtime_r(timep, &result);
+        return localtime_r(timep, &result);
 }
 
@@ -163 +147 @@
  * @return Value of buf.
  */
-char *posix_asctime_r(const struct tm *restrict timeptr,
+char *asctime_r(const struct tm *restrict timeptr,
     char *restrict buf)
 {
@@ -179 +163 @@
  *                   the result, NULL in case of error.
  */
-char *posix_asctime(const struct tm *restrict timeptr)
+char *asctime(const struct tm *restrict timeptr)
 {
         static char buf[ASCTIME_BUF_LEN];
 
-        return posix_asctime_r(timeptr, buf);
+        return asctime_r(timeptr, buf);
 }
 
@@ -195 +179 @@
  * @return Pointer to buf on success, NULL on failure.
  */
-char *posix_ctime_r(const time_t *timer, char *buf)
+char *ctime_r(const time_t *timer, char *buf)
 {
         if (failed(time_local2str(*timer, buf))) {
@@ -213 +197 @@
  *                 the result, NULL in case of error.
  */
-char *posix_ctime(const time_t *timep)
+char *ctime(const time_t *timep)
 {
         static char buf[ASCTIME_BUF_LEN];
 
-        return posix_ctime_r(timep, buf);
+        return ctime_r(timep, buf);
 }
 
@@ -227 +211 @@
  * @return 0 on success, -1 with errno set on failure.
  */
-int posix_clock_getres(posix_clockid_t clock_id, struct posix_timespec *res)
+int clock_getres(clockid_t clock_id, struct timespec *res)
 {
         assert(res != NULL);
@@ -249 +233 @@
  * @return 0 on success, -1 with errno on failure.
  */
-int posix_clock_gettime(posix_clockid_t clock_id, struct posix_timespec *tp)
+int clock_gettime(clockid_t clock_id, struct timespec *tp)
 {
         assert(tp != NULL);
@@ -275 +259 @@
  * @return 0 on success, -1 with errno on failure.
  */
-int posix_clock_settime(posix_clockid_t clock_id,
-    const struct posix_timespec *tp)
+int clock_settime(clockid_t clock_id,
+    const struct timespec *tp)
 {
         assert(tp != NULL);
@@ -302 +286 @@
  * @return 0 on success, -1 with errno set on failure.
  */
-int posix_clock_nanosleep(posix_clockid_t clock_id, int flags,
-    const struct posix_timespec *rqtp, struct posix_timespec *rmtp)
+int clock_nanosleep(clockid_t clock_id, int flags,
+    const struct timespec *rqtp, struct timespec *rmtp)
 {
         assert(rqtp != NULL);
@@ -329 +313 @@
  * @return Consumed CPU cycles by this process or -1 if not available.
  */
-posix_clock_t posix_clock(void)
-{
-        posix_clock_t total_cycles = -1;
+clock_t clock(void)
+{
+        clock_t total_cycles = -1;
         stats_task_t *task_stats = stats_get_task(task_get_id());
         if (task_stats) {
-                total_cycles = (posix_clock_t) (task_stats->kcycles +
+                total_cycles = (clock_t) (task_stats->kcycles +
                     task_stats->ucycles);
                 free(task_stats);