EVENTLOOP: ensure exclusive Gambit thread exists.

LNCONFIG.h.in

@@ -117,10 +117,19 @@ int  scm_screenheight();
 
 // hook prototype (performs scheme init)
 void ffi_event(int,int,int);
+void ln_gambit_unlock();
+typedef struct {
+  int t;
+  int x;
+  int y;
+  int fd[2];
+} ffi_event_params_t;
+extern ffi_event_params_t ffi_event_params;
 
 // C prototypes
 // these are used by the desktop platforms
 void microgl_hook(int,int,int);
+void microgl_draw_before();
 void microgl_swapbuffers();
 void microgl_close();
 void microgl_init();
@@ -130,6 +139,7 @@ void microgl_pollevents();
 void microgl_refresh();
 int microgl_screenwidth();
 int microgl_screenheight();
+unsigned int microgl_redraw_period(unsigned int);
 
 #endif // STANDALONE
 

languages/scm.c

@@ -42,13 +42,17 @@ void lambdanative_payload_setup()
   setup_params.debug_settings = debug_settings;
   lambdanative_exit_call_count = 0;
   ___setup(&setup_params);
+ /*  Runing from a single thread should fix the race conditions, which
+     lead to the following mitigation.  Should be ready to be removed.
+
   #if defined(ANDROID)
     #if (___VERSION < 409002)
       ___disable_heartbeat_interrupts();
     #else
       ___cleanup_heartbeat_interrupt_handling();
     #endif
   #endif
+ */
 }
 
 void lambdanative_payload_cleanup()

languages/scm.sh

@@ -133,7 +133,7 @@ compile_payload_scm()
         (
           # exported list of "well known" build parameters
           export SYS_PREFIX SYS_ROOT SYS_PATH SYS_ANDROIDAPI SYS_ANDROID_ABI
-          veval "$SYS_GSC -:~~tgt=${SYS_PREFIX} -prelude \"$scm_opts\" -c -o $scm_ctgt $gsc_processing $scm_hdr $scm_src"
+          veval "$SYS_GSC -:~~tgt=${SYS_PREFIX},~~bld=${SYS_HOSTPREFIX} -prelude \"$scm_opts\" -c -o $scm_ctgt $gsc_processing $scm_hdr $scm_src"
         )
         if [ $veval_result != "0" ]; then rmifexists "$scm_ctgt"; fi
         assertfile "$scm_ctgt"

libraries/libgambit/0001-Fix-incorrect-space-allocation-report-by-time-specia.patch

@@ -0,0 +1,50 @@
+From e529b1d6d5b7bae2fcc3e9cd8e7f3e11a1318193 Mon Sep 17 00:00:00 2001
+From: Marc Feeley <[email protected]>
+Date: Sun, 28 Mar 2021 19:29:54 -0400
+Subject: [PATCH] Fix incorrect space allocation report by time special form
+
+---
+ lib/_kernel.scm | 6 ++++--
+ lib/mem.c       | 3 ++-
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/lib/_kernel.scm b/lib/_kernel.scm
+index 59b9e41..2d827dd 100644
+--- lib/_kernel.scm
++++ lib/_kernel.scm
+@@ -4346,7 +4346,9 @@ end-of-code
+
+     if (!___FIXNUMP(result))
+     {
+-      n = ___bytes_allocated (___PSPNC) - n;
++      ___F64 ba = ___bytes_allocated (___PSPNC);
++
++      n = ba - n;
+
+       ___process_times (&user, &sys, &real);
+       ___vm_stats (&minflt, &majflt);
+@@ -4358,7 +4360,7 @@ end-of-code
+       ___F64VECTORSET(result,___FIX(4),___vms->mem.gc_sys_time_)
+       ___F64VECTORSET(result,___FIX(5),___vms->mem.gc_real_time_)
+       ___F64VECTORSET(result,___FIX(6),___vms->mem.nb_gcs_)
+-      ___F64VECTORSET(result,___FIX(7),___bytes_allocated (___PSPNC))
++      ___F64VECTORSET(result,___FIX(7),ba)
+       ___F64VECTORSET(result,___FIX(8),(2*(1+2)<<___LWS))
+       ___F64VECTORSET(result,___FIX(9),n)
+       ___F64VECTORSET(result,___FIX(10),minflt)
+diff --git a/lib/mem.c b/lib/mem.c
+index 2c6cafd..9223da1 100755
+--- lib/mem.c
++++ lib/mem.c
+@@ -7080,7 +7080,8 @@ ___PSDKR)
+   alloc_stack_ptr = ___ps->fp;
+   alloc_heap_ptr  = ___ps->hp;
+
+-  return bytes_allocated_minus_occupied + bytes_occupied(___ps);
++  return bytes_allocated_minus_occupied + bytes_occupied(___ps) +
++         ___CAST(___F64,occupied_words_still) * ___WS;
+ }
+
+
+--
+2.20.1