r_bridge 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee29073e5090bf0ac44de5a81374aad07050f0518ea7bd0c3942d4d7ce523487
-  data.tar.gz: b93811a27fb58066cd93660009c0a9555cf7e74380727149e9f8a353ccb8893d
+  metadata.gz: 4d7f74da4e1b6be0717eb1aad13197269106b65abd080922cf19e34f7ed58b5d
+  data.tar.gz: e8b58e04c13954ed86ca44070861a7fb59f9b5d6fc66c0aa0268b631ebd56e23
 SHA512:
-  metadata.gz: ce3cbb9fd43d040599d88e3f49512917b9981f268816c5f82ae2e0722d86e33e3934ae5dacf796e0c467bdd6ff08001b33f2c25cb97d594698adbe895a199344
-  data.tar.gz: b850ea4e23d9a5b504c94ca761640a9e3e8f34bb08b79809b6e563d0457ac9b9f31257b1817e3eb4c47cb66ec8862c2acbc928ced2a0c901bb445cad656b613b
+  metadata.gz: 98ef89344e79fd315d8bf05d80a74116747ad6d7e0faaafb38895dbb5b787626d0fc44113cd504d8f3b1537264725177822e6280fa5eeee3d96228a68a6d140a
+  data.tar.gz: d89e882f5f0a3cc345345e0436da5848de0d6d257876debe6df64aae5bc5938162b831a535c97fb8791f844427555c096b2e9841d86cecbe2a7a24414105fc58

data/ext/r_bridge/r_embed.c

@@ -2,25 +2,55 @@
 #include <Rembedded.h>
 #include <Rdefines.h>
 
+#include <stdbool.h>
+
+#include <stdint.h>
+#define CSTACK_DEFNS
+#include <Rinterface.h>
+
 #include "win_compat.h"
 
+#ifdef __FreeBSD__
+#include <ieeefp.h>
+fp_rnd_t fpmask_preset;
+#endif
+
 EXPORT void
-r_embedded_init()
+r_embedded_init( bool unlimited_stack_size )
 {
-    size_t localArgc = 2;
-    char localArgs[][50] = {"R", "--silent"};
+
+    #ifdef __FreeBSD__
+        fpmask_preset = fpsetmask(0);
+    #endif
+
+    size_t localArgc = 3;
+    char localArgs[][50] = {"R", "--silent", "--vanilla"};
 
     char *args[ localArgc ];
     for (size_t i = 0; i < localArgc; ++i){
         args[i] = localArgs[i];
     }
 
-    Rf_initEmbeddedR( localArgc , args );
+    // Rf_initEmbeddedR raises C stack usage limit error on multithreading environment.
+    // Rf_initEmbeddedR( localArgc , args ); is replaced with the following code.
+
+    if( unlimited_stack_size == false ){  // default stack size
+      Rf_initialize_R( localArgc , args );
+      setup_Rmainloop();
+    }else{
+      Rf_initialize_R( localArgc , args );
+      R_CStackLimit = (uintptr_t) -1 ;  // Set -1 for unlimited C stack size.
+      setup_Rmainloop();
+    }
 }
 
 EXPORT void
 r_embedded_end()
 {
     Rf_endEmbeddedR(0);
+
+    #ifdef __FreeBSD__
+        fpsetmask(fpmask_preset);
+    #endif
 }
 

data/lib/r_bridge/r_bridge_ffi.rb

@@ -7,7 +7,7 @@ module RBridge
   lib_name = "librbridge" + "." + RbConfig::CONFIG['DLEXT']
   ffi_lib File.expand_path( lib_name, __dir__ )
 
-  attach_function :r_embedded_init, [], :void
+  attach_function :r_embedded_init, [:bool], :void
   attach_function :r_embedded_end, [], :void
 
   attach_function :r_vec_create_str, [:int], :pointer
@@ -49,8 +49,11 @@ module RBridge
 
   # From here, Ruby interface
 
-  def self.init_embedded_r()
-    r_embedded_init()
+  def self.init_embedded_r( unlimited_cstack: false )
+    if(unlimited_cstack.class != TrueClass && unlimited_cstack.class != FalseClass)
+      raise "init_embedded_r() can take true or false for unlimited C stack size. true: unlimited, false: default." 
+    end
+    r_embedded_init( unlimited_cstack )
   end
 
   def self.end_embedded_r()

data/lib/r_bridge/version.rb

@@ -1,3 +1,3 @@
 module RBridge
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r_bridge
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Toshihiro Umehara
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-31 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -73,7 +73,7 @@ metadata:
   homepage_uri: https://github.com/niceume/r_bridge
   source_code_uri: https://github.com/niceume/r_bridge
   changelog_uri: https://github.com/niceume/r_bridge
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -88,8 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Enables Ruby to construct and evaluate R internal objects
 test_files: []