Changeset 582a0b8 in mainline for uspace/app/tester

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

Files:

• float/float1.c (modified) (2 diffs)
• float/float2.c (modified) (1 diff)
• float/softfloat1.c (modified) (2 diffs)
• hw/misc/virtchar1.c (modified) (1 diff)
• hw/serial/serial1.c (modified) (2 diffs)
• mm/malloc1.c (modified) (1 diff)
• mm/malloc2.c (modified) (1 diff)
• mm/malloc3.c (modified) (1 diff)
• mm/mapping1.c (modified) (1 diff)
• print/print1.c (modified) (1 diff)
• print/print2.c (modified) (1 diff)
• print/print3.c (modified) (1 diff)
• print/print4.c (modified) (1 diff)
• print/print5.c (modified) (1 diff)
• print/print6.c (modified) (1 diff)
• stdio/logger1.c (modified) (1 diff)
• stdio/stdio1.c (modified) (1 diff)
• stdio/stdio2.c (modified) (1 diff)
• tester.c (modified) (1 diff)
• thread/setjmp1.c (modified) (1 diff)
• thread/thread1.c (modified) (4 diffs)
• vfs/vfs1.c (modified) (1 diff)

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>