Changeset 582a0b8 in mainline for uspace/lib/posix/source

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/posix/source

Files:

• fcntl.c (modified) (1 diff)
• time.c (modified) (2 diffs)
• unistd.c (modified) (4 diffs)

uspace/lib/posix/source/fcntl.c

@@ -39 +39 @@
 #include "posix/fcntl.h"
 
-#include "libc/unistd.h"
 #include "libc/vfs/vfs.h"
 #include "posix/errno.h"

uspace/lib/posix/source/time.c

@@ -49 +49 @@
 #include "libc/stats.h"
 #include "libc/stdbool.h"
+#include "libc/stddef.h"
+#include "libc/thread.h"
 #include "libc/sys/time.h"
 
@@ -313 +315 @@
                         // TODO: interruptible sleep
                         if (rqtp->tv_sec != 0) {
-                                sleep(rqtp->tv_sec);
+                                thread_sleep(rqtp->tv_sec);
                         }
                         if (rqtp->tv_nsec != 0) {
-                                usleep(rqtp->tv_nsec / 1000);
+                                thread_usleep(rqtp->tv_nsec / 1000);
                         }
                         return 0;

uspace/lib/posix/source/unistd.c

@@ -49 +49 @@
 #include "libc/vfs/vfs.h"
 
+#include <libarch/config.h>
+
 aoff64_t posix_pos[MAX_OPEN_FILES];
 
@@ -134 +136 @@
 int posix_getpagesize(void)
 {
-        return getpagesize();
+        return PAGE_SIZE;
 }
 
@@ -384 +386 @@
         stats_physmem_t *mem_stats = stats_get_physmem();
         if (mem_stats) {
-                phys_pages = (long) (mem_stats->total / getpagesize());
-                avphys_pages = (long) (mem_stats->free / getpagesize());
+                phys_pages = (long) (mem_stats->total / posix_getpagesize());
+                avphys_pages = (long) (mem_stats->free / posix_getpagesize());
                 free(mem_stats);
                 mem_stats = 0;
@@ -396 +398 @@
                 return avphys_pages;
         case _SC_PAGESIZE:
-                return getpagesize();
+                return posix_getpagesize();
         case _SC_CLK_TCK:
                 return clk_tck;