urbit · joemfb · Dec 17, 2022 · Nov 18, 2022 · Nov 2, 2022 · Nov 3, 2022
diff --git a/.github/workflows/tarballs.yml b/.github/workflows/tarballs.yml
@@ -23,12 +23,13 @@ jobs:
           name: ${{ secrets.CACHIX_NAME }}
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
-      - uses: google-github-actions/[email protected]
+      - uses: google-github-actions/auth@v1
+        with:
+          credentials_json: ${{ secrets.GCP_CREDENTIALS }}
+
+      - uses: google-github-actions/setup-gcloud@v1
         with:
-          version: '290.0.1'
-          service_account_key: ${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}
           project_id: ${{ secrets.GCS_PROJECT }}
-          export_default_credentials: true
 
       - run: nix-build -A tarball --arg enableStatic true
 

diff --git a/.github/workflows/vere.yml b/.github/workflows/vere.yml
@@ -125,13 +125,14 @@ jobs:
           echo -n "$version" > ./version-string
 
       - name: upload version string artifact
-        if: matrix.type == 'linux'
+        if: inputs.upload && matrix.type == 'linux'
         uses: actions/upload-artifact@v3
         with:
           name: version-string
           path: version-string
 
       - uses: google-github-actions/auth@v1
+        if: inputs.upload
         with:
           credentials_json: ${{ secrets.GCP_CREDENTIALS }}
 
@@ -244,12 +245,13 @@ jobs:
     needs: [urbit, mingw]
     if: inputs.upload
     steps:
-      - uses: google-github-actions/[email protected]
+      - uses: google-github-actions/auth@v1
+        with:
+          credentials_json: ${{ secrets.GCP_CREDENTIALS }}
+
+      - uses: google-github-actions/setup-gcloud@v1
         with:
-          version: '290.0.1'
-          service_account_key: ${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}
           project_id: ${{ secrets.GCS_PROJECT }}
-          export_default_credentials: true
 
       - name: download version-string
         uses: actions/download-artifact@v3

diff --git a/pkg/urbit/Makefile b/pkg/urbit/Makefile
@@ -2,6 +2,7 @@ include config.mk
 compat_mks := $(foreach dir,$(compat),$(wildcard compat/$(dir)/*.mk))
 include $(compat_mks)
 
+c    = $(wildcard c/*.c)
 jets = jets/tree.c $(wildcard jets/*/*.c)
 noun = $(wildcard noun/*.c)
 ur   = $(wildcard ur/*.c)
@@ -13,7 +14,7 @@ bench  = $(wildcard bench/*.c)
 
 compat := $(foreach dir,$(compat),$(wildcard compat/$(dir)/*.c))
 
-common  = $(jets) $(noun) $(ur) $(vere) $(compat)
+common  = $(c) $(jets) $(noun) $(ur) $(vere) $(compat)
 headers = $(shell find include -type f)
 
 common_objs = $(shell echo $(common) | sed 's/\.c/.o/g')

diff --git a/pkg/urbit/bench/ur_bench.c b/pkg/urbit/bench/ur_bench.c
@@ -7,9 +7,7 @@
 static void
 _setup(void)
 {
-  u3m_init(1 << 24);
-  u3m_pave(c3y);
-  u3e_init();
+  u3m_boot_lite(1 << 24);
 }
 
 /* _ames_writ_ex(): |hi packet from fake ~zod to fake ~nec

diff --git a/pkg/urbit/c/defs.c b/pkg/urbit/c/defs.c
@@ -0,0 +1,96 @@
+/// @file defs.c
+
+#include "c/defs.h"
+
+/* c3_pread(): full positioned read(), up to eof, retrying errors.
+*/
+ssize_t
+c3_pread(c3_i fid_i, void* buf_v, size_t len_i, off_t off_i)
+{
+  c3_w    max_w = 128;
+  c3_w    try_w = 0;
+  size_t  rem_i = len_i;
+  ssize_t ret_i;
+
+  do {
+    if (  (0 > (ret_i = pread(fid_i, buf_v, rem_i, off_i)))
+       && (  (++try_w == max_w)
+          || (  (EINTR       != errno)
+             && (EAGAIN      != errno)
+             && (EWOULDBLOCK != errno) )))
+    {
+      return -1;
+    }
+    else if ( 0 == ret_i ) {
+      break;
+    }
+    else {
+      buf_v  = (void*)((c3_c*)buf_v + ret_i);
+      rem_i -= ret_i;
+      off_i += ret_i;
+    }
+
+  }
+  while ( rem_i );
+
+  return len_i - rem_i;
+}
+
+/* c3_pwrite(): full positioned write(), retrying errors.
+*/
+ssize_t
+c3_pwrite(c3_i fid_i, const void* buf_v, size_t len_i, off_t off_i)
+{
+  c3_w    max_w = 128;
+  c3_w    try_w = 0;
+  size_t  rem_i = len_i;
+  ssize_t ret_i;
+
+  do {
+    if (  (0 > (ret_i = pwrite(fid_i, buf_v, rem_i, off_i)))
+       && (  (++try_w == max_w)
+          || (  (EINTR       != errno)
+             && (EAGAIN      != errno)
+             && (EWOULDBLOCK != errno) )))
+    {
+      return -1;
+    }
+    else {
+      buf_v  = (void*)((c3_c*)buf_v + ret_i);
+      rem_i -= ret_i;
+      off_i += ret_i;
+    }
+  }
+  while ( rem_i );
+
+  return len_i;
+}
+
+/* c3_write(): full write(), retrying errors.
+*/
+ssize_t
+c3_write(c3_i fid_i, const void* buf_v, size_t len_i)
+{
+  c3_w    max_w = 128;
+  c3_w    try_w = 0;
+  size_t  rem_i = len_i;
+  ssize_t ret_i;
+
+  do {
+    if (  (0 > (ret_i = write(fid_i, buf_v, rem_i)))
+       && (  (++try_w == max_w)
+          || (  (EINTR       != errno)
+             && (EAGAIN      != errno)
+             && (EWOULDBLOCK != errno) )))
+    {
+      return -1;
+    }
+    else {
+      buf_v  = (void*)((c3_c*)buf_v + ret_i);
+      rem_i -= ret_i;
+    }
+  }
+  while ( rem_i );
+
+  return len_i;
+}
diff --git a/pkg/urbit/compat/mingw/compat.c b/pkg/urbit/compat/mingw/compat.c
@@ -144,6 +144,63 @@ int link(const char *path1, const char *path2)
   return -1;
 }
 
+ssize_t pread(int fd, void *buf, size_t count, off_t offset)
+{
+  DWORD len = 0;
+
+  OVERLAPPED overlapped = {0};
+
+  overlapped.OffsetHigh = (sizeof(off_t) <= sizeof(DWORD)) ?
+                          (DWORD)0 : (DWORD)((offset >> 32) & 0xFFFFFFFFL);
+  overlapped.Offset     = (sizeof(off_t) <= sizeof(DWORD)) ?
+                          (DWORD)offset : (DWORD)(offset & 0xFFFFFFFFL);
+
+  HANDLE h = (HANDLE)_get_osfhandle(fd);
+
+  if ( INVALID_HANDLE_VALUE == h ) {
+    errno = EBADF;
+    return -1;
+  }
+
+  if ( !ReadFile(h, buf, count, &len, &overlapped) ) {
+    DWORD err = GetLastError();
+
+    if ( ERROR_HANDLE_EOF != err ) {
+      errno = err_win_to_posix(err);
+      return -1;
+    }
+  }
+
+  return (ssize_t)len;
+}
+
+ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset)
+{
+  DWORD len = 0;
+
+  OVERLAPPED overlapped = {0};
+
+  overlapped.OffsetHigh = (sizeof(off_t) <= sizeof(DWORD)) ?
+                          (DWORD)0 : (DWORD)((offset >> 32) & 0xFFFFFFFFL);
+  overlapped.Offset     = (sizeof(off_t) <= sizeof(DWORD)) ?
+                          (DWORD)offset : (DWORD)(offset & 0xFFFFFFFFL);
+
+  HANDLE h = (HANDLE)_get_osfhandle(fd);
+
+  if ( INVALID_HANDLE_VALUE == h ) {
+    errno = EBADF;
+    return -1;
+  }
+
+  if ( !WriteFile(h, buf, count, &len, &overlapped) ) {
+    errno = err_win_to_posix(GetLastError());
+    return -1;
+  }
+
+  return (ssize_t)len;
+}
+
+
 // from msys2 mingw-packages-dev patches
 // -----------------------------------------------------------------------
 

diff --git a/pkg/urbit/compat/mingw/compat.h b/pkg/urbit/compat/mingw/compat.h
@@ -4,6 +4,8 @@
 #define mkdir(A, B) mkdir(A)
 
 int link(const char *path1, const char *path2);
+ssize_t pread(int fd, void *buf, size_t count, off_t offset);
+ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset);
 char *realpath(const char *path, char *resolved_path);
 int fdatasync(int fd);
 int utimes(const char *path, const struct timeval times[2]);

diff --git a/pkg/urbit/compat/mingw/seh_handler.c b/pkg/urbit/compat/mingw/seh_handler.c
@@ -12,7 +12,7 @@ EXCEPTION_DISPOSITION _mingw_exception_filter(
 {
     if (ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION &&
         ExceptionRecord->ExceptionInformation[0] == 1 &&
-        u3e_fault((void*)ExceptionRecord->ExceptionInformation[1], 1))
+        u3m_fault((void*)ExceptionRecord->ExceptionInformation[1], 1))
     {
         return ExceptionContinueExecution;
     }