Changeset 582a0b8 in mainline for uspace/lib/c

Timestamp:

2017-05-08T19:20:39Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d2c8533

Parents:

73db198

Message:

Remove unistd.h

• Rename usleep() and sleep() to thread_usleep() and thread_sleep() and move to thread.[hc].
• Include stddef.h in order to provide NULL.
• Move getpagesize() to libposix.
• Sync uspace/dist/src/c/demos with originals.

Location:

uspace/lib/c

Files:

• arch/abs32le/include/libarch/tls.h (modified) (1 diff)
• arch/abs32le/src/entry.c (modified) (1 diff)
• arch/abs32le/src/stacktrace.c (modified) (1 diff)
• arch/abs32le/src/thread_entry.c (modified) (1 diff)
• arch/abs32le/src/tls.c (modified) (1 diff)
• arch/riscv64/include/libarch/tls.h (modified) (1 diff)
• arch/riscv64/src/entry.c (modified) (1 diff)
• arch/riscv64/src/stacktrace.c (modified) (1 diff)
• arch/riscv64/src/thread_entry.c (modified) (1 diff)
• arch/riscv64/src/tls.c (modified) (1 diff)
• generic/adt/hash_table.c (modified) (1 diff)
• generic/as.c (modified) (1 diff)
• generic/config.c (modified) (1 diff)
• generic/ddi.c (modified) (1 diff)
• generic/dlfcn.c (modified) (1 diff)
• generic/double_to_str.c (modified) (1 diff)
• generic/fibril.c (modified) (1 diff)
• generic/getopt.c (modified) (1 diff)
• generic/inet/addr.c (modified) (1 diff)
• generic/inet/hostname.c (modified) (1 diff)
• generic/io/asprintf.c (modified) (1 diff)
• generic/io/chargrid.c (modified) (1 diff)
• generic/io/io.c (modified) (1 diff)
• generic/io/kio.c (modified) (1 diff)
• generic/io/klog.c (modified) (1 diff)
• generic/io/logctl.c (modified) (1 diff)
• generic/io/printf_core.c (modified) (1 diff)
• generic/io/vprintf.c (modified) (1 diff)
• generic/irq.c (modified) (1 diff)
• generic/malloc.c (modified) (1 diff)
• generic/rcu.c (modified) (3 diffs)
• generic/rtld/module.c (modified) (1 diff)
• generic/stacktrace.c (modified) (1 diff)
• generic/stats.c (modified) (1 diff)
• generic/str.c (modified) (1 diff)
• generic/sysinfo.c (modified) (1 diff)
• generic/task.c (modified) (1 diff)
• generic/thread.c (modified) (1 diff)
• generic/time.c (modified) (2 diffs)
• generic/tls.c (modified) (1 diff)
• generic/uuid.c (modified) (1 diff)
• generic/vfs/canonify.c (modified) (1 diff)
• include/adt/hash_table.h (modified) (1 diff)
• include/double_to_str.h (modified) (1 diff)
• include/getopt.h (modified) (1 diff)
• include/io/pixelmap.h (modified) (1 diff)
• include/ipc/dev_iface.h (modified) (1 diff)
• include/stdlib.h (modified) (1 diff)
• include/thread.h (modified) (2 diffs)
• include/unistd.h (deleted)

uspace/lib/c/arch/abs32le/include/libarch/tls.h

@@ -39 +39 @@
 
 #include <libc.h>
-#include <unistd.h>
 
 typedef struct {

uspace/lib/c/arch/abs32le/src/entry.c

@@ -30 +30 @@
  */
 
-#include <unistd.h>
 #include <libarch/entry.h>
 #include "../../../generic/private/libc.h"

uspace/lib/c/arch/abs32le/src/stacktrace.c

@@ -31 +31 @@
 
 #include <sys/types.h>
-#include <unistd.h>
 #include <stdbool.h>
 #include <stacktrace.h>

uspace/lib/c/arch/abs32le/src/thread_entry.c

@@ -30 +30 @@
  */
 
-#include <unistd.h>
 #include "../../../generic/private/thread.h"
 

uspace/lib/c/arch/abs32le/src/tls.c

@@ -32 +32 @@
 #include <tls.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 tcb_t * tls_alloc_arch(void **data, size_t size)

uspace/lib/c/arch/riscv64/include/libarch/tls.h

@@ -39 +39 @@
 
 #include <libc.h>
-#include <unistd.h>
 
 typedef struct {

uspace/lib/c/arch/riscv64/src/entry.c

@@ -30 +30 @@
  */
 
-#include <unistd.h>
 #include <libarch/entry.h>
 #include "../../../generic/private/libc.h"

uspace/lib/c/arch/riscv64/src/stacktrace.c

@@ -31 +31 @@
 
 #include <sys/types.h>
-#include <unistd.h>
 #include <stdbool.h>
 #include <stacktrace.h>

uspace/lib/c/arch/riscv64/src/thread_entry.c

@@ -30 +30 @@
  */
 
-#include <unistd.h>
 #include "../../../generic/private/thread.h"
 

uspace/lib/c/arch/riscv64/src/tls.c

@@ -32 +32 @@
 #include <tls.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 tcb_t *tls_alloc_arch(void **data, size_t size)

uspace/lib/c/generic/adt/hash_table.c

@@ -51 +51 @@
 #include <adt/hash_table.h>
 #include <adt/list.h>
-#include <unistd.h>
 #include <malloc.h>
 #include <assert.h>

uspace/lib/c/generic/as.c

@@ -36 +36 @@
 #include <libc.h>
 #include <errno.h>
-#include <unistd.h>
 #include <align.h>
 #include <sys/types.h>

uspace/lib/c/generic/config.c

@@ -29 +29 @@
 #include <stdlib.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <config.h>
 #include <sysinfo.h>

uspace/lib/c/generic/ddi.c

@@ -35 +35 @@
 #include <assert.h>
 #include <atomic.h>
-#include <unistd.h>
 #include <stdio.h>
 #include <errno.h>

uspace/lib/c/generic/dlfcn.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <dlfcn.h>
 

uspace/lib/c/generic/double_to_str.c

@@ -33 +33 @@
 
 #include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
 #include <assert.h>
-#include <stdbool.h>
 
 /*

uspace/lib/c/generic/fibril.c

@@ -42 +42 @@
 #include <abi/mm/as.h>
 #include <as.h>
-#include <unistd.h>
 #include <stdio.h>
 #include <libarch/barrier.h>

uspace/lib/c/generic/getopt.c

@@ -34 +34 @@
 #include <assert.h>
 #include <stdarg.h>
+#include <stdlib.h>
+#include <stddef.h>
 #include <err.h>
 #include <errno.h>
 #include <getopt.h>
-#include <stdlib.h>
 #include <str.h>
 

uspace/lib/c/generic/inet/addr.c

@@ -36 +36 @@
 #include <assert.h>
 #include <errno.h>
-#include <unistd.h>
 #include <inet/addr.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <malloc.h>
 #include <bitops.h>

uspace/lib/c/generic/inet/hostname.c

@@ -37 +37 @@
 #include <inet/hostname.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <str.h>
 

uspace/lib/c/generic/io/asprintf.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <str.h>
 #include <io/printf_core.h>

uspace/lib/c/generic/io/chargrid.c

@@ -35 +35 @@
 #include <io/style.h>
 #include <malloc.h>
-#include <unistd.h>
 #include <assert.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <as.h>
 #include <io/chargrid.h>

uspace/lib/c/generic/io/io.c

@@ -34 +34 @@
 
 #include <stdio.h>
-#include <unistd.h>
 #include <assert.h>
 #include <str.h>

uspace/lib/c/generic/io/kio.c

@@ -34 +34 @@
  */
 
+#include <stddef.h>
 #include <libc.h>
 #include <str.h>
 #include <sys/types.h>
-#include <unistd.h>
 #include <errno.h>
 #include <abi/kio.h>

uspace/lib/c/generic/io/klog.c

@@ -36 +36 @@
 #include <str.h>
 #include <sys/types.h>
-#include <unistd.h>
 #include <errno.h>
 #include <abi/klog.h>

uspace/lib/c/generic/io/logctl.c

@@ -32 +32 @@
 
 #include <assert.h>
-#include <unistd.h>
 #include <errno.h>
 #include <io/logctl.h>

uspace/lib/c/generic/io/printf_core.c

@@ -37 +37 @@
  */
 
-#include <unistd.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <io/printf_core.h>
 #include <ctype.h>

uspace/lib/c/generic/io/vprintf.c

@@ -35 +35 @@
 #include <stdarg.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <io/printf_core.h>
 #include <fibril_synch.h>

uspace/lib/c/generic/irq.c

@@ -36 +36 @@
 #include <libc.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <macros.h>
 

uspace/lib/c/generic/malloc.c

@@ -36 +36 @@
 #include <malloc.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <as.h>
 #include <align.h>

uspace/lib/c/generic/rcu.c

@@ -70 +70 @@
 #include <fibril.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <compiler/barrier.h>
 #include <libarch/barrier.h>
@@ -79 +80 @@
 #include <assert.h>
 #include <time.h>
+#include <thread.h>
 
 
@@ -428 +430 @@
                 async_usleep(RCU_SLEEP_MS * 1000);
         } else {
-                usleep(RCU_SLEEP_MS * 1000);
+                thread_usleep(RCU_SLEEP_MS * 1000);
         }
                 

uspace/lib/c/generic/rtld/module.c

@@ -41 +41 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 #include <rtld/rtld.h>

uspace/lib/c/generic/stacktrace.c

@@ -36 +36 @@
 #include <stacktrace.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <sys/types.h>
 #include <errno.h>
-#include <unistd.h>
 
 static int stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data);

uspace/lib/c/generic/stats.c

@@ -40 +40 @@
 #include <inttypes.h>
 #include <malloc.h>
-#include <unistd.h>
 
 #define SYSINFO_STATS_MAX_PATH  64

uspace/lib/c/generic/str.c

@@ -38 +38 @@
 #include <str.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <assert.h>
 #include <stdint.h>

uspace/lib/c/generic/sysinfo.c

@@ -39 +39 @@
 #include <malloc.h>
 #include <stdbool.h>
-#include <unistd.h>
+#include <stddef.h>
 
 /** Get sysinfo keys size

uspace/lib/c/generic/task.c

@@ -48 +48 @@
 #include "private/ns.h"
 #include <vfs/vfs.h>
-#include <unistd.h>
 
 task_id_t task_get_id(void)

uspace/lib/c/generic/thread.c

@@ -196 +196 @@
 }
 
+/** Wait unconditionally for specified number of microseconds
+ *
+ */
+int thread_usleep(useconds_t usec)
+{
+        (void) __SYSCALL1(SYS_THREAD_USLEEP, usec);
+        return 0;
+}
+
+/** Wait unconditionally for specified number of seconds
+ *
+ */
+unsigned int thread_sleep(unsigned int sec)
+{
+        /*
+         * Sleep in 1000 second steps to support
+         * full argument range
+         */
+        
+        while (sec > 0) {
+                unsigned int period = (sec > 1000) ? 1000 : sec;
+                
+                thread_usleep(period * 1000000);
+                sec -= period;
+        }
+        
+        return 0;
+}
+
 /** @}
  */

uspace/lib/c/generic/time.c

@@ -49 +49 @@
 #include <ctype.h>
 #include <assert.h>
-#include <unistd.h>
 #include <loc.h>
 #include <device/clock_dev.h>
 #include <malloc.h>
+#include <thread.h>
 
 #define ASCTIME_BUF_LEN  26
@@ -685 +685 @@
 }
 
-/** Wait unconditionally for specified number of microseconds
- *
- */
-int usleep(useconds_t usec)
-{
-        (void) __SYSCALL1(SYS_THREAD_USLEEP, usec);
-        return 0;
-}
-
 void udelay(useconds_t time)
 {
         (void) __SYSCALL1(SYS_THREAD_UDELAY, (sysarg_t) time);
-}
-
-
-/** Wait unconditionally for specified number of seconds
- *
- */
-unsigned int sleep(unsigned int sec)
-{
-        /*
-         * 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;
 }
 

uspace/lib/c/generic/tls.c

@@ -36 +36 @@
  */
 
+#include <stddef.h>
 #include <align.h>
 #include <tls.h>
 #include <malloc.h>
 #include <str.h>
-#include <unistd.h>
 
 #ifdef CONFIG_RTLD

uspace/lib/c/generic/uuid.c

@@ -36 +36 @@
 #include <uuid.h>
 #include <stdlib.h>
+#include <stddef.h>
+#include <time.h>
 #include <str.h>
 

uspace/lib/c/generic/vfs/canonify.c

@@ -37 +37 @@
 
 #include <stdlib.h>
+#include <stddef.h>
 #include <vfs/canonify.h>
 

uspace/lib/c/include/adt/hash_table.h

@@ -39 +39 @@
 
 #include <adt/list.h>
-#include <unistd.h>
 #include <stdbool.h>
 #include <macros.h>

uspace/lib/c/include/double_to_str.h

@@ -30 +30 @@
 #define DOUBLE_TO_STR_H_
 
-#include <unistd.h>
+#include <stddef.h>
 
 /** Maximum number of digits double_to_*_str conversion functions produce. 

uspace/lib/c/include/getopt.h

@@ -35 +35 @@
 #define _GETOPT_H_
 
-#include <unistd.h>
-
 /*
  * Gnu like getopt_long() and BSD4.4 getsubopt()/optreset extensions

uspace/lib/c/include/io/pixelmap.h

@@ -39 +39 @@
 
 #include <sys/types.h>
-#include <unistd.h>
+#include <stddef.h>
 #include <io/pixel.h>
 

uspace/lib/c/include/ipc/dev_iface.h

@@ -31 +31 @@
 
 #include <malloc.h>
-#include <unistd.h>
 #include <libarch/types.h>
 

uspace/lib/c/include/stdlib.h

@@ -36 +36 @@
 #define LIBC_STDLIB_H_
 
-#include <unistd.h>
 #include <malloc.h>
 #include <stacktrace.h>

uspace/lib/c/include/thread.h

@@ -39 +39 @@
 #include <sys/types.h>
 #include <abi/proc/thread.h>
+#include <time.h>
 
 extern int thread_create(void (*)(void *), void *, const char *, thread_id_t *);
@@ -45 +46 @@
 extern int thread_join(thread_id_t);
 extern thread_id_t thread_get_id(void);
+extern int thread_usleep(useconds_t);
+extern unsigned int thread_sleep(unsigned int);
 
 #endif