Changeset 582a0b8 in mainline for uspace/app

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

Files:

• barber/barber.c (modified) (1 diff)
• bdsh/cmds/builtin_cmds.c (modified) (1 diff)
• bdsh/cmds/builtins/batch/batch.c (modified) (1 diff)
• bdsh/cmds/mod_cmds.c (modified) (1 diff)
• bdsh/cmds/modules/cat/cat.c (modified) (1 diff)
• bdsh/cmds/modules/cmp/cmp.c (modified) (1 diff)
• bdsh/cmds/modules/cp/cp.c (modified) (1 diff)
• bdsh/cmds/modules/echo/echo.c (modified) (1 diff)
• bdsh/cmds/modules/help/help.c (modified) (1 diff)
• bdsh/cmds/modules/printf/printf.c (modified) (1 diff)
• bdsh/cmds/modules/sleep/sleep.c (modified) (2 diffs)
• bdsh/cmds/modules/touch/touch.c (modified) (1 diff)
• bdsh/errors.c (modified) (1 diff)
• bdsh/exec.c (modified) (1 diff)
• bdsh/scli.c (modified) (1 diff)
• bdsh/tok.c (modified) (1 diff)
• bithenge/test.c (modified) (1 diff)
• df/df.c (modified) (1 diff)
• edit/search.c (modified) (1 diff)
• getterm/getterm.c (modified) (1 diff)
• getterm/version.c (modified) (1 diff)
• init/init.c (modified) (1 diff)
• killall/killall.c (modified) (1 diff)
• mkmfs/mkmfs.c (modified) (1 diff)
• redir/redir.c (modified) (1 diff)
• sbi/src/mytypes.h (modified) (1 diff)
• sysinfo/sysinfo.c (modified) (1 diff)
• taskdump/elf_core.c (modified) (1 diff)
• taskdump/taskdump.c (modified) (1 diff)
• tester/float/float1.c (modified) (2 diffs)
• tester/float/float2.c (modified) (1 diff)
• tester/float/softfloat1.c (modified) (2 diffs)
• tester/hw/misc/virtchar1.c (modified) (1 diff)
• tester/hw/serial/serial1.c (modified) (2 diffs)
• tester/mm/malloc1.c (modified) (1 diff)
• tester/mm/malloc2.c (modified) (1 diff)
• tester/mm/malloc3.c (modified) (1 diff)
• tester/mm/mapping1.c (modified) (1 diff)
• tester/print/print1.c (modified) (1 diff)
• tester/print/print2.c (modified) (1 diff)
• tester/print/print3.c (modified) (1 diff)
• tester/print/print4.c (modified) (1 diff)
• tester/print/print5.c (modified) (1 diff)
• tester/print/print6.c (modified) (1 diff)
• tester/stdio/logger1.c (modified) (1 diff)
• tester/stdio/stdio1.c (modified) (1 diff)
• tester/stdio/stdio2.c (modified) (1 diff)
• tester/tester.c (modified) (1 diff)
• tester/thread/setjmp1.c (modified) (1 diff)
• tester/thread/thread1.c (modified) (4 diffs)
• tester/vfs/vfs1.c (modified) (1 diff)
• testwrit/testwrit.c (modified) (1 diff)
• tetris/screen.c (modified) (1 diff)
• tetris/shapes.c (modified) (1 diff)
• tetris/tetris.c (modified) (1 diff)
• tetris/tetris.h (modified) (1 diff)
• top/top.c (modified) (1 diff)
• trace/syscalls.h (modified) (1 diff)
• trace/trace.c (modified) (1 diff)
• untar/tar.c (modified) (1 diff)
• usbinfo/dump.c (modified) (1 diff)
• vuhid/main.c (modified) (1 diff)

uspace/app/barber/barber.c

@@ -33 +33 @@
  */
 
-#include <unistd.h>
 #include <stdbool.h>
 #include <errno.h>

uspace/app/bdsh/cmds/builtin_cmds.c

@@ -32 +32 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <str.h>
 #include "errors.h"

uspace/app/bdsh/cmds/builtins/batch/batch.c

@@ -30 +30 @@
 #include <stdlib.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <errno.h>
 #include "config.h"

uspace/app/bdsh/cmds/mod_cmds.c

@@ -45 +45 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <str.h>
 #include "errors.h"

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -30 +30 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <getopt.h>
 #include <str.h>

uspace/app/bdsh/cmds/modules/cmp/cmp.c

@@ -32 +32 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <vfs/vfs.h>
 

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -30 +30 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <io/console.h>
 #include <io/keycode.h>

uspace/app/bdsh/cmds/modules/echo/echo.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include "config.h"
 #include "util.h"

uspace/app/bdsh/cmds/modules/help/help.c

@@ -30 +30 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <str.h>
 #include <fmtutil.h>

uspace/app/bdsh/cmds/modules/printf/printf.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include "config.h"
 #include "util.h"

uspace/app/bdsh/cmds/modules/sleep/sleep.c

@@ -30 +30 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <thread.h>
 #include "config.h"
 #include "util.h"
@@ -131 +131 @@
         }
 
-        (void) usleep(duration);
+        (void) thread_usleep(duration);
 
         return CMD_SUCCESS;

uspace/app/bdsh/cmds/modules/touch/touch.c

@@ -34 +34 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <dirent.h>
 #include <sys/types.h>

uspace/app/bdsh/errors.c

@@ -28 +28 @@
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stddef.h>
 #include <str.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdarg.h>
 
 #include "config.h"

uspace/app/bdsh/exec.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <str.h>
 #include <str_error.h>

uspace/app/bdsh/scli.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <str.h>
-#include <unistd.h>
 #include "config.h"
 #include "scli.h"

uspace/app/bdsh/tok.c

@@ -31 +31 @@
 #include <malloc.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <errno.h>
 

uspace/app/bithenge/test.c

@@ -38 +38 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <sys/types.h>
 #include <bithenge/blob.h>

uspace/app/df/df.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <stdint.h>
 #include <getopt.h>

uspace/app/edit/search.c

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

uspace/app/getterm/getterm.c

@@ -36 +36 @@
 
 #include <sys/types.h>
-#include <unistd.h>
 #include <stdio.h>
 #include <task.h>

uspace/app/getterm/version.c

@@ -34 +34 @@
  */
 
-#include <unistd.h>
 #include <stdio.h>
 #include <macros.h>

uspace/app/init/init.c

@@ -36 +36 @@
 
 #include <stdio.h>
-#include <unistd.h>
 #include <stdarg.h>
 #include <vfs/vfs.h>

uspace/app/killall/killall.c

@@ -36 +36 @@
 #include <errno.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <task.h>
 #include <stats.h>

uspace/app/mkmfs/mkmfs.c

@@ -40 +40 @@
 #include <stdlib.h>
 #include <block.h>
-#include <unistd.h>
 #include <errno.h>
 #include <sys/typefmt.h>

uspace/app/redir/redir.c

@@ -37 +37 @@
 #include <sys/types.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <str.h>
 #include <stdio.h>

uspace/app/sbi/src/mytypes.h

@@ -52 +52 @@
 #include <errno.h>
 /** We need NULL defined. */
-#include <unistd.h>
+#include <stddef.h>
 #define EOK 0
 

uspace/app/sysinfo/sysinfo.c

@@ -36 +36 @@
 #include <errno.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <stddef.h>
 #include <sysinfo.h>
 #include <malloc.h>

uspace/app/taskdump/elf_core.c

@@ -54 +54 @@
 #include <errno.h>
 #include <sys/types.h>
-#include <unistd.h>
 #include <mem.h>
 #include <stdint.h>

uspace/app/taskdump/taskdump.c

@@ -38 +38 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <errno.h>
 #include <udebug.h>

uspace/app/tester/float/float1.c

@@ -30 +30 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <atomic.h>
 #include <thread.h>
@@ -88 +89 @@
                 TPRINTF("Threads left: %" PRIua "\n",
                     total - atomic_get(&threads_finished));
-                sleep(1);
+                thread_sleep(1);
         }
         

uspace/app/tester/float/float2.c

@@ -31 +31 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <math.h>
 #include "../tester.h"

uspace/app/tester/float/softfloat1.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
+#include <stddef.h>
 #include <mathtypes.h>
 #include <add.h>
@@ -36 +38 @@
 #include <comparison.h>
 #include <conversion.h>
-#include <stdbool.h>
 #include "../tester.h"
 

uspace/app/tester/hw/misc/virtchar1.c

@@ -40 +40 @@
 #include <sys/types.h>
 #include <async.h>
-#include <unistd.h>
 #include <char_dev_iface.h>
 #include <str.h>

uspace/app/tester/hw/serial/serial1.c

@@ -39 +39 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <sys/types.h>
 #include <async.h>
+#include <thread.h>
 #include <ipc/services.h>
 #include <loc.h>
@@ -146 +148 @@
                 
                 if (read == 0)
-                        usleep(DEFAULT_SLEEP);
+                        thread_usleep(DEFAULT_SLEEP);
                 else {
                         buf[read] = 0;

uspace/app/tester/mm/malloc1.c

@@ -31 +31 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include "common.h"
 #include "../tester.h"

uspace/app/tester/mm/malloc2.c

@@ -28 +28 @@
 
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <malloc.h>
 #include "../tester.h"

uspace/app/tester/mm/malloc3.c

@@ -31 +31 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
+#include <libarch/config.h>
 #include "common.h"
 #include "../tester.h"

uspace/app/tester/mm/mapping1.c

@@ -28 +28 @@
 
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <malloc.h>
 #include <as.h>

uspace/app/tester/print/print1.c

@@ -28 +28 @@
 
 #include <stdio.h>
-#include <unistd.h>
+#include <stddef.h>
 #include "../tester.h"
 

uspace/app/tester/print/print2.c

@@ -28 +28 @@
 
 #include <stdio.h>
-#include <unistd.h>
+#include <stddef.h>
 #include "../tester.h"
 

uspace/app/tester/print/print3.c

@@ -28 +28 @@
 
 #include <stdio.h>
-#include <unistd.h>
+#include <stddef.h>
 #include <macros.h>
 #include "../tester.h"

uspace/app/tester/print/print4.c

@@ -28 +28 @@
 
 #include <stdio.h>
-#include <unistd.h>
+#include <stddef.h>
 #include "../tester.h"
 

uspace/app/tester/print/print5.c

@@ -40 +40 @@
 
 #include <stdio.h>
-#include <unistd.h>
+#include <stddef.h>
 #include "../tester.h"
 

uspace/app/tester/print/print6.c

@@ -28 +28 @@
 
 #include <stdio.h>
-#include <unistd.h>
 #include "../tester.h"
 

uspace/app/tester/stdio/logger1.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <errno.h>
 #include <io/log.h>

uspace/app/tester/stdio/stdio1.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <errno.h>
 #include "../tester.h"

uspace/app/tester/stdio/stdio2.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <errno.h>
 #include "../tester.h"

uspace/app/tester/tester.c

@@ -36 +36 @@
  */
 
-#include <unistd.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <str.h>
 #include <io/log.h>

uspace/app/tester/thread/setjmp1.c

@@ -29 +29 @@
 #include <setjmp.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include "../tester.h"
 

uspace/app/tester/thread/thread1.c

@@ -34 +34 @@
 #include <thread.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <stddef.h>
 #include <inttypes.h>
 #include "../tester.h"
@@ -46 +46 @@
         
         while (atomic_get(&finish))
-                usleep(100000);
+                thread_usleep(100000);
         
         atomic_inc(&threads_finished);
@@ -70 +70 @@
         
         TPRINTF("\nRunning threads for %u seconds...", DELAY);
-        sleep(DELAY);
+        thread_sleep(DELAY);
         TPRINTF("\n");
         
@@ -77 +77 @@
                 TPRINTF("Threads left: %" PRIua "\n",
                     total - atomic_get(&threads_finished));
-                sleep(1);
+                thread_sleep(1);
         }
         

uspace/app/tester/vfs/vfs1.c

@@ -32 +32 @@
 #include <str.h>
 #include <vfs/vfs.h>
-#include <unistd.h>
 #include <dirent.h>
 #include <loc.h>

uspace/app/testwrit/testwrit.c

@@ -32 +32 @@
 
 #include <stdio.h>
-#include <unistd.h>
+#include <stddef.h>
 
 #define BUF_SIZE  1024

uspace/app/tetris/screen.c

@@ -58 +58 @@
 #include <stdlib.h>
 #include <str.h>
-#include <unistd.h>
 #include <vfs/vfs.h>
 #include <async.h>

uspace/app/tetris/shapes.c

@@ -56 +56 @@
  */
 
-#include <unistd.h>
 #include "tetris.h"
 

uspace/app/tetris/tetris.c

@@ -61 +61 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <str.h>
-#include <unistd.h>
 #include <getopt.h>
 #include "scores.h"

uspace/app/tetris/tetris.h

@@ -49 +49 @@
 /** @file
  */
+
+#include <stdint.h>
 
 /*

uspace/app/top/top.c

@@ -38 +38 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <task.h>
 #include <thread.h>

uspace/app/trace/syscalls.h

@@ -37 +37 @@
 
 #include <stdbool.h>
-#include <unistd.h>
+#include <stddef.h>
 
 #include "trace.h"

uspace/app/trace/trace.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <fibril.h>
 #include <errno.h>

uspace/app/untar/tar.c

@@ -35 +35 @@
 #include <str.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <errno.h>
 #include <assert.h>

uspace/app/usbinfo/dump.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
+#include <stddef.h>
 #include <errno.h>
 #include <str_error.h>
-#include <stdbool.h>
 
 #include <usb/usb.h>

uspace/app/vuhid/main.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <errno.h>
 #include <str_error.h>