Changeset 231b3fd in mainline for uspace/lib/cpp

Timestamp:

2018-08-25T21:35:26Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

e2625b1a (diff), 3c45353 (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.

git-author:

Jakub Jermář <jakub@…> (2018-08-25 21:35:26)

git-committer:

GitHub <noreply@…> (2018-08-25 21:35:26)

Message:

Merge 3c453534a2b093c8039d8e8059b923c71f3492a3 into e2625b1a1e5a2895b86f0e39c2d70a39e49e042a

Location:

uspace/lib/cpp/include/__bits

Files:

• chrono.hpp (modified) (2 diffs)
• thread/threading.hpp (modified) (1 diff)

uspace/lib/cpp/include/__bits/chrono.hpp

@@ -611 +611 @@
             static time_point now()
             {
-                hel::timeval tv{};
-                hel::gettimeofday(&tv, nullptr);
-
-                rep time = tv.tv_usec;
-                time += (tv.tv_sec * 1'000'000ul);
+                hel::timespec ts{};
+                hel::getrealtime(&ts);
+
+                rep time = NSEC2USEC(ts.tv_nsec);
+                time += (ts.tv_sec * 1'000'000ul);
 
                 return time_point{duration{time - epoch_usecs}};
@@ -654 +654 @@
             static time_point now()
             {
-                hel::timeval tv{};
-                hel::getuptime(&tv);
-
-                rep time = tv.tv_usec;
-                time += (tv.tv_sec * 1'000'000ul);
+                hel::timespec ts{};
+                hel::getuptime(&ts);
+
+                rep time = NSEC2USEC(ts.tv_nsec);
+                time += (ts.tv_sec * 1'000'000ul);
 
                 return time_point{duration{time}};

uspace/lib/cpp/include/__bits/thread/threading.hpp

@@ -58 +58 @@
         using thread_type       = hel::fid_t;
         using condvar_type      = hel::fibril_condvar_t;
-        using time_unit         = hel::suseconds_t;
+        using time_unit         = hel::usec_t;
         using shared_mutex_type = hel::fibril_rwlock_t;