Changeset bd41ac52 in mainline for uspace/srv

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/srv

Files:

• audio/hound/audio_device.c (modified) (2 diffs)
• net/ethip/atrans.c (modified) (1 diff)
• net/ethip/atrans.h (modified) (1 diff)
• net/inetsrv/ntrans.c (modified) (1 diff)
• net/inetsrv/ntrans.h (modified) (1 diff)
• net/tcp/tcp_type.h (modified) (1 diff)

uspace/srv/audio/hound/audio_device.c

@@ -266 +266 @@
 static void device_event_callback(ipc_call_t *icall, void *arg)
 {
-        struct timeval time1;
+        struct timespec time1;
         errno_t ret;
 
@@ -286 +286 @@
                             dev->buffer.fragment_size);
                         advance_buffer(dev, dev->buffer.fragment_size);
-                        struct timeval time2;
+                        struct timespec time2;
                         getuptime(&time2);
-                        log_verbose("Time to mix sources: %li\n",
-                            tv_sub_diff(&time2, &time1));
+                        log_verbose("Time to mix sources: %lld\n",
+                            NSEC2USEC(ts_sub_diff(&time2, &time1)));
                         break;
                 case PCM_EVENT_CAPTURE_TERMINATED:

uspace/srv/net/ethip/atrans.c

@@ -134 +134 @@
 }
 
-errno_t atrans_lookup_timeout(addr32_t ip_addr, suseconds_t timeout,
+errno_t atrans_lookup_timeout(addr32_t ip_addr, usec_t timeout,
     addr48_t mac_addr)
 {

uspace/srv/net/ethip/atrans.h

@@ -45 +45 @@
 extern errno_t atrans_remove(addr32_t);
 extern errno_t atrans_lookup(addr32_t, addr48_t);
-extern errno_t atrans_lookup_timeout(addr32_t, suseconds_t, addr48_t);
+extern errno_t atrans_lookup_timeout(addr32_t, usec_t, addr48_t);
 
 #endif

uspace/srv/net/inetsrv/ntrans.c

@@ -156 +156 @@
  *
  */
-errno_t ntrans_wait_timeout(suseconds_t timeout)
+errno_t ntrans_wait_timeout(usec_t timeout)
 {
         fibril_mutex_lock(&ntrans_list_lock);

uspace/srv/net/inetsrv/ntrans.h

@@ -51 +51 @@
 extern errno_t ntrans_remove(addr128_t);
 extern errno_t ntrans_lookup(addr128_t, addr48_t);
-extern errno_t ntrans_wait_timeout(suseconds_t);
+extern errno_t ntrans_wait_timeout(usec_t);
 
 #endif

uspace/srv/net/tcp/tcp_type.h

@@ -192 +192 @@
 typedef struct {
         link_t link;
-        suseconds_t delay;
+        usec_t delay;
         inet_ep2_t epp;
         tcp_segment_t *seg;