Changeset bd41ac52 in mainline for uspace/lib/nic/src

Timestamp:

2018-08-25T22:21:25Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cca80a2

Parents:

e2625b1a

Message:

Get rid of sys/time.h

This commit moves the POSIX-like time functionality from libc's
sys/time.h to libposix and introduces C11-like or HelenOS-specific
interfaces to libc.

Specifically, use of sys/time.h, struct timeval, suseconds_t and
gettimeofday is replaced by time.h (C11), struct timespec (C11), usec_t
(HelenOS) and getuptime / getrealtime (HelenOS).

Also attempt to fix the implementation of clock() to return microseconds
(clocks) rather than processor cycles and move it to libc.

Location:

uspace/lib/nic/src

Files:

• nic_driver.c (modified) (7 diffs)
• nic_impl.c (modified) (4 diffs)

uspace/lib/nic/src/nic_driver.c

@@ -384 +384 @@
  *  @return Current polling mode of the controller
  */
-nic_poll_mode_t nic_query_poll_mode(nic_t *nic_data, struct timeval *period)
+nic_poll_mode_t nic_query_poll_mode(nic_t *nic_data, struct timespec *period)
 {
         if (period)
@@ -400 +400 @@
  */
 errno_t nic_report_poll_mode(nic_t *nic_data, nic_poll_mode_t mode,
-    struct timeval *period)
+    struct timespec *period)
 {
         errno_t rc = EOK;
@@ -408 +408 @@
         if (mode == NIC_POLL_PERIODIC) {
                 if (period) {
-                        memcpy(&nic_data->default_poll_period, period, sizeof(struct timeval));
-                        memcpy(&nic_data->poll_period, period, sizeof(struct timeval));
+                        memcpy(&nic_data->default_poll_period, period, sizeof(struct timespec));
+                        memcpy(&nic_data->poll_period, period, sizeof(struct timespec));
                 } else {
                         rc = EINVAL;
@@ -1030 +1030 @@
  *  @returns Nonzero if t is zero interval
  */
-static int timeval_nonpositive(struct timeval t)
-{
-        return (t.tv_sec <= 0) && (t.tv_usec <= 0);
+static int timespec_nonpositive(struct timespec t)
+{
+        return (t.tv_sec <= 0) && (t.tv_nsec <= 0);
 }
 
@@ -1051 +1051 @@
                 int run = info->run;
                 int running = info->running;
-                struct timeval remaining = nic->poll_period;
+                struct timespec remaining = nic->poll_period;
                 fibril_rwlock_read_unlock(&nic->main_lock);
 
                 if (!running) {
                         remaining.tv_sec = 5;
-                        remaining.tv_usec = 0;
+                        remaining.tv_nsec = 0;
                 }
 
                 /* Wait the period (keep attention to overflows) */
-                while (!timeval_nonpositive(remaining)) {
-                        suseconds_t wait = 0;
+                while (!timespec_nonpositive(remaining)) {
+                        usec_t wait = 0;
                         if (remaining.tv_sec > 0) {
                                 time_t wait_sec = remaining.tv_sec;
@@ -1071 +1071 @@
                                         wait_sec = 5;
 
-                                wait = (suseconds_t) wait_sec * 1000000;
+                                wait = SEC2USEC(wait_sec);
 
                                 remaining.tv_sec -= wait_sec;
                         } else {
-                                wait = remaining.tv_usec;
+                                wait = NSEC2USEC(remaining.tv_nsec);
 
                                 if (wait > 5 * 1000000) {
@@ -1081 +1081 @@
                                 }
 
-                                remaining.tv_usec -= wait;
+                                remaining.tv_nsec -= USEC2NSEC(wait);
                         }
                         fibril_usleep(wait);

uspace/lib/nic/src/nic_impl.c

@@ -121 +121 @@
                 nic_data->poll_mode = nic_data->default_poll_mode;
                 memcpy(&nic_data->poll_period, &nic_data->default_poll_period,
-                    sizeof(struct timeval));
+                    sizeof(struct timespec));
                 if (rc != EOK) {
                         /*
@@ -714 +714 @@
  */
 errno_t nic_poll_get_mode_impl(ddf_fun_t *fun,
-    nic_poll_mode_t *mode, struct timeval *period)
+    nic_poll_mode_t *mode, struct timespec *period)
 {
         nic_t *nic_data = nic_get_from_ddf_fun(fun);
         fibril_rwlock_read_lock(&nic_data->main_lock);
         *mode = nic_data->poll_mode;
-        memcpy(period, &nic_data->poll_period, sizeof(struct timeval));
+        memcpy(period, &nic_data->poll_period, sizeof(struct timespec));
         fibril_rwlock_read_unlock(&nic_data->main_lock);
         return EOK;
@@ -737 +737 @@
  */
 errno_t nic_poll_set_mode_impl(ddf_fun_t *fun,
-    nic_poll_mode_t mode, const struct timeval *period)
+    nic_poll_mode_t mode, const struct timespec *period)
 {
         nic_t *nic_data = nic_get_from_ddf_fun(fun);
@@ -753 +753 @@
                 if (period == NULL)
                         return EINVAL;
-                if (period->tv_sec == 0 && period->tv_usec == 0)
+                if (period->tv_sec == 0 && period->tv_nsec == 0)
                         return EINVAL;
-                if (period->tv_sec < 0 || period->tv_usec < 0)
+                if (period->tv_sec < 0 || period->tv_nsec < 0)
                         return EINVAL;
         }