Merge pull request WebAssembly#1 from waynr/cpython-compatibility-fixes

CPython compatibility updates

Author: john-sharratt

.gitignore

@@ -1,3 +1,4 @@
+.ccls*
 sysroot
 sysroot32
 sysroot64

Makefile

@@ -99,6 +99,29 @@ LIBC_TOP_HALF_MUSL_SOURCES = \
         misc/nftw.c \
         misc/syslog.c \
         errno/strerror.c \
+        \
+        network/services.c \
+        network/getaddrinfo.c \
+        network/getnameinfo.c \
+        network/gethostbyname.c \
+        network/gethostbyname2.c \
+        network/gethostbyname2_r.c \
+        network/getservbyname.c \
+        network/getservbyname_r.c \
+        network/gethostbyaddr.c \
+        network/gethostbyaddr_r.c \
+        network/lookup_ipliteral.c \
+        network/lookup_name.c \
+        network/lookup_serv.c \
+        network/freeaddrinfo.c \
+        network/resolvconf.c \
+        \
+        network/gethostbyaddr.c \
+        network/gethostbyname.c \
+        network/getservbyname.c \
+        network/getservbyport.c \
+        network/h_errno.c \
+        network/hstrerror.c \
         network/htonl.c \
         network/htons.c \
         network/ntohl.c \
@@ -108,6 +131,7 @@ LIBC_TOP_HALF_MUSL_SOURCES = \
         network/inet_aton.c \
         network/in6addr_any.c \
         network/in6addr_loopback.c \
+        network/proto.c \
         fenv/fenv.c \
         fenv/fesetround.c \
         fenv/feupdateenv.c \
@@ -169,6 +193,7 @@ LIBC_TOP_HALF_MUSL_SOURCES = \
         linux/wait3.c \
         linux/wait4.c \
         linux/eventfd.c \
+        linux/setgroups.c \
         stat/futimesat.c \
         legacy/getpagesize.c \
         thread/thrd_sleep.c \
@@ -445,7 +470,7 @@ MUSL_OMIT_HEADERS += \
     "sys/acct.h" \
     "sys/cachectl.h" \
     "sys/epoll.h" "sys/reboot.h" "sys/swap.h" \
-    "sys/sendfile.h" "sys/inotify.h" \
+    "sys/inotify.h" \
     "sys/quota.h" \
     "sys/klog.h" \
     "sys/fsuid.h" \
@@ -468,7 +493,6 @@ MUSL_OMIT_HEADERS += \
     "sys/membarrier.h" \
     "sys/signalfd.h" \
     "sys/termios.h" \
-    "net/if.h" \
     "net/if_arp.h" \
     "net/ethernet.h" \
     "net/route.h" \
@@ -483,7 +507,16 @@ ifeq ($(THREAD_MODEL), single)
 MUSL_OMIT_HEADERS += "pthread.h"
 endif
 
-default: finish
+default: finish post-finish
+
+wasix-headers:
+	git submodule init
+	git submodule update
+	cargo run --manifest-path tools/wasix-headers/Cargo.toml generate-libc
+
+post-finish: finish
+	rm -f sysroot/lib/wasm32-wasi/libc-printscan-log-double.a
+	rsync -rtvu --delete ./sysroot/ ./sysroot32/
 
 $(SYSROOT_LIB)/libc.a: $(LIBC_OBJS)
 

examples/Makefile

@@ -1,9 +1,10 @@
-CC=clang
+CC ?= "clang"
+SYSROOT ?= "../sysroot32"
 LLD_PATH=/prog/rust/build/x86_64-unknown-linux-gnu/lld/bin
 
 CFLAGS = --target=wasm32-wasmer-wasi \
          -O2 \
-         --sysroot ../../wasix-libc/sysroot32 \
+         --sysroot ${SYSROOT} \
          -matomics \
          -mbulk-memory \
          -mmutable-globals \
@@ -54,7 +55,7 @@ SRC=$(wildcard *.c)
 
 export PATH := $(LLD_PATH):$(PATH)
 
-all: longjmp file-copy signal fork vfork fork-longjmp execve spawn pipe epoll
+all: longjmp file-copy signal fork vfork fork-longjmp execve spawn pipe epoll getrandom readdir_tree
 	cp -f ../dist/wasix/longjmp.wasm ../../wasmer/tests/integration/cli/tests/wasm/example-longjmp.wasm
 	cp -f ../dist/wasix/fork.wasm ../../wasmer/tests/integration/cli/tests/wasm/example-fork.wasm
 	cp -f ../dist/wasix/fork.wasm ../../packages/fork-test/test.wasm
@@ -69,9 +70,9 @@ all: longjmp file-copy signal fork vfork fork-longjmp execve spawn pipe epoll
 
 %: %.c
 	mkdir -p ../dist/host
-	clang $@.c -o ../dist/host/$@
+	${CC} $(CFLAGS) $@.c -o ../dist/host/$@
 	mkdir -p ../dist/wasix
-	clang $(CFLAGS) $(CLFLAGS) \
+	${CC} $(CFLAGS) $(CLFLAGS) \
               [email protected] \
               -o ../dist/wasix/[email protected]
 	wasm-opt -O2 --asyncify ../dist/wasix/[email protected] -o ../dist/wasix/[email protected]

examples/getrandom.c

@@ -0,0 +1,32 @@
+#include <stdio.h>
+#include <sys/random.h>
+#include <unistd.h>
+
+int print_random_int_array() {
+  ssize_t retval;
+  int buf[100];
+  retval = getrandom(buf, sizeof(int) * 100, 0);
+  if (retval == -1) {
+    return retval;
+  }
+  for (int i = 0; i < 100; ++i) {
+    printf("%d ", buf[i]);
+  }
+  printf("\n");
+  return 0;
+}
+
+int main() {
+  int i = 0, retval = 0;
+  while (i < 5) {
+    printf("trial %d:\n     ", i);
+    retval = print_random_int_array();
+    printf("\n");
+    if (retval == -1) {
+      printf("failed!\n");
+      return retval;
+    }
+    i++;
+  }
+  return 0;
+}

examples/readdir_tree.c

@@ -0,0 +1,64 @@
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/random.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <dirent.h>
+
+void print(int lvl, const char *format, ...) {
+  for (int i = 0; i < lvl; i++) {
+    printf("  ");
+  }
+  va_list args;
+  va_start(args, format);
+  vprintf(format, args);
+  va_end(args);
+  fflush(stdout);
+}
+
+int handle_dir(int lvl, DIR *d) {
+  DIR *new;
+  int ret = 0;
+  for (;;) {
+    struct dirent *ent = readdir(d);
+    if (ent == NULL) {
+      return 0;
+    }
+
+    if (strcmp(ent->d_name, "..") == 0 || strcmp(ent->d_name, ".") == 0) {
+      continue;
+    }
+
+    switch (ent->d_type) {
+    case DT_DIR:
+      print(lvl, "%s:\n", ent->d_name);
+      new = opendir(ent->d_name);
+      ret = handle_dir(lvl + 1, new);
+      if (ret < 0) {
+        return ret;
+      }
+      continue;
+    default:
+      print(lvl, "%s\n", ent->d_name);
+    }
+  }
+
+  return ret;
+}
+
+int main(int argc, char *argv[]) {
+  if (argc < 1) {
+    fprintf(stderr, "not enough args!");
+  }
+  for (int i = 1; i < argc; i++) {
+    print(0, "%s\n", argv[i]);
+
+    DIR *d = opendir(argv[i]);
+    int ret = handle_dir(1, d);
+    if (ret < 0) {
+      return ret;
+    }
+  }
+  return 0;
+}

expected/wasm32-wasi/defined-symbols.txt

@@ -103,6 +103,7 @@ __fwritex
 __fwriting
 __get_handler_set
 __get_locale
+__get_resolv_conf
 __getdelim
 __getentropy
 __getgr_a
@@ -113,6 +114,7 @@ __getpwent_a
 __gettext_lockptr
 __gettextdomain
 __gmtime_r
+__h_errno_location
 __hwcap
 __inet_aton
 __inhibit_ptc
@@ -184,6 +186,10 @@ __log2_data
 __log2f_data
 __log_data
 __logf_data
+__lookup_ipliteral
+__lookup_name
+__lookup_serv
+__lookup_serv_wasi
 __lseek
 __main_void
 __malloc_atfork
@@ -560,6 +566,7 @@ acosh
 acoshf
 acoshl
 acosl
+add_entry
 alarm
 aligned_alloc
 alphasort
@@ -742,6 +749,7 @@ duplocale
 ecvt
 encrypt
 endgrent
+endprotoent
 endpwent
 endspent
 environ
@@ -869,6 +877,7 @@ fputws_unlocked
 fread
 fread_unlocked
 free
+freeaddrinfo
 freeif_addrs
 freelocale
 freopen
@@ -901,9 +910,11 @@ fwrite_unlocked
 fwscanf
 gcvt
 get_avphys_pages
+get_entry
 get_nprocs
 get_nprocs_conf
 get_phys_pages
+getaddrinfo
 getc
 getc_unlocked
 getchar
@@ -925,11 +936,17 @@ getgrgid_r
 getgrnam
 getgrnam_r
 getgrouplist
+gethostbyaddr
+gethostbyaddr_r
+gethostbyname
+gethostbyname2
+gethostbyname2_r
 gethostid
 gethostname
 getif_addrs
 getitimer
 getline
+getnameinfo
 getopt
 getopt_long
 getopt_long_only
@@ -939,6 +956,9 @@ getpgid
 getpgrp
 getpid
 getppid
+getprotobyname
+getprotobynumber
+getprotoent
 getpwent
 getpwnam
 getpwnam_r
@@ -948,6 +968,9 @@ getrandom
 getrlimit
 getrlimit64
 getrusage
+getservbyname
+getservbyname_r
+getservbyport
 getsid
 getsockname
 getsockopt
@@ -969,12 +992,14 @@ globfree
 globfree64
 gmtime
 gmtime_r
+h_errno
 hcreate
 hcreate_r
 hdestroy
 hdestroy_r
 hsearch
 hsearch_r
+hstrerror
 htonl
 htons
 hypot
@@ -994,6 +1019,7 @@ index
 inet_aton
 inet_ntop
 inet_pton
+init_services
 initstate
 insque
 ioctl
@@ -1428,13 +1454,15 @@ send
 sendfile
 sendmsg
 sendto
+services
 setbuf
 setbuffer
 setegid
 setenv
 seteuid
 setgid
 setgrent
+setgroups
 setitimer
 setjmp
 setkey
@@ -1443,6 +1471,7 @@ setlocale
 setlogmask
 setpgid
 setpgrp
+setprotoent
 setpwent
 setrlimit
 setrlimit64

expected/wasm32-wasi/include-all.c

@@ -116,6 +116,7 @@
 #include <memory.h>
 #include <monetary.h>
 #include <mqueue.h>
+#include <net/if.h>
 #include <netdb.h>
 #include <netinet/icmp6.h>
 #include <netinet/igmp.h>
@@ -161,6 +162,7 @@
 #include <sys/random.h>
 #include <sys/reg.h>
 #include <sys/select.h>
+#include <sys/sendfile.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/stropts.h>