WIP: Add full compatibility to Fiber.scheduler of Ruby-3.0

.appveyor.yml

@@ -24,13 +24,13 @@ install:
 build_script:
   - bundle exec rake -rdevkit compile --trace
 test_script:
-  - bundle exec rake test
+  - bundle exec rake test PG_DEBUG=1
 environment:
   matrix:
     - ruby_version: "head"
       RUBYDOWNLOAD: x86
       PGVERSION: 10.16-1-windows
       PGVER: 10
-    - ruby_version: "24"
+    - ruby_version: "25"
       PGVERSION: 9.3.25-1-windows
       PGVER: 9.3

.github/workflows/binary-gems.yml

@@ -40,7 +40,7 @@ jobs:
           - ruby: "3.0"
             PGVERSION: 13.2-1-windows-x64
             PGVER: "13"
-          - ruby: "2.4"
+          - ruby: "2.5"
             PGVERSION: 10.16-1-windows
             PGVER: "10"
 

.github/workflows/source-gem.yml

@@ -34,14 +34,17 @@ jobs:
             PGVERSION: 13.2-1-windows-x64
             PGVER: "13"
           - os: windows
-            ruby: "2.4"
+            ruby: "2.5"
             PGVERSION: 9.3.25-1-windows-x64
             PGVER: "9.3"
           - os: ubuntu
             ruby: "head"
             PGVER: "13"
           - os: ubuntu
-            ruby: "2.4"
+            ruby: "3.0"
+            PGVER: "12"
+          - os: ubuntu
+            ruby: "2.5"
             PGVER: "9.3"
           - os: ubuntu
             ruby: "truffleruby"
@@ -110,8 +113,12 @@ jobs:
       - run: bundle install
 
       - run: gem install --local *.gem --verbose
+
       - name: Run specs
-        run: ruby -rpg -S rspec spec/**/*_spec.rb
+        continue-on-error: ${{ matrix.ruby == 'truffleruby' }}
+        env:
+          PG_DEBUG: 1
+        run: ruby -rpg -S rspec spec/**/*_spec.rb -cfdoc
 
       - name: Print logs if job failed
         if: ${{ failure() && matrix.os == 'windows' }}

.travis.yml

@@ -1,5 +1,5 @@
 sudo: required
-dist: xenial
+dist: focal
 services:
   - docker
 language: ruby
@@ -17,12 +17,17 @@ matrix:
       script: |
         docker run --rm -t --network=host ruby-pg
 
-    - rvm: "2.4"
+    - rvm: "2.5"
       env:
         - "PGVERSION=9.3"
+      # Use Ubuntu-16.04 since postgresql-9.3 depends on openssl-1.0.0, which isn't available in 20.04
+      dist: xenial
     - rvm: ruby-head
       env:
         - "PGVERSION=13"
+    - rvm: truffleruby
+      env:
+        - "PGVERSION=13"
 
   allow_failures:
     - rvm: ruby-head
@@ -38,7 +43,7 @@ before_install:
   - export PATH=/usr/lib/postgresql/$PGVERSION/bin:$PATH
 
 script:
-  - bundle exec rake compile test
+  - bundle exec rake compile test PG_DEBUG=1
 
 after_failure:
   - "find tmp -name mkmf.log | xargs cat"

Rakefile

@@ -68,7 +68,7 @@ Rake::ExtensionTask.new do |ext|
 	end
 end
 
-RSpec::Core::RakeTask.new(:spec).rspec_opts = "--profile"
+RSpec::Core::RakeTask.new(:spec).rspec_opts = "--profile -cfdoc"
 task :test => :spec
 
 # Use the fivefish formatter for docs generated from development checkout

Rakefile.cross

@@ -291,7 +291,7 @@ CrossLibraries.each do |xlib|
 		RakeCompilerDock.sh <<-EOT, platform: platform
 			(cp build/gem/gem-*.pem ~/.gem/ || true) &&
 			bundle install --local &&
-			rake native:#{platform} pkg/#{$gem_spec.full_name}-#{platform}.gem MAKE="make -j`nproc`"
+			rake native:#{platform} pkg/#{$gem_spec.full_name}-#{platform}.gem MAKE="make -j`nproc`" RUBY_CC_VERSION=3.0.0:2.7.0:2.6.0:2.5.0
 		EOT
 	end
 	desc "Build the windows binary gems"

ext/extconf.rb

@@ -15,6 +15,13 @@
 	ENV['PATH'] = "#{pgdir}/bin" + File::PATH_SEPARATOR + ENV['PATH']
 end
 
+if enable_config("gvl-unlock", true)
+	$defs.push( "-DENABLE_GVL_UNLOCK" )
+	$stderr.puts "Calling libpq with GVL unlocked"
+else
+	$stderr.puts "Calling libpq with GVL locked"
+end
+
 if enable_config("windows-cross")
 	# Avoid dependency to external libgcc.dll on x86-mingw32
 	$LDFLAGS << " -static-libgcc"
@@ -142,6 +149,7 @@ module PG
 have_func 'timegm'
 have_func 'rb_gc_adjust_memory_usage' # since ruby-2.4
 have_func 'rb_gc_mark_movable' # since ruby-2.7
+have_func 'rb_io_wait' # since ruby-3.0
 
 # unistd.h confilicts with ruby/win32.h when cross compiling for win32 and ruby 1.9.1
 have_header 'unistd.h'

ext/gvl_wrappers.c

@@ -9,9 +9,13 @@
 char *PQencryptPasswordConn(PGconn *conn, const char *passwd, const char *user, const char *algorithm){return NULL;}
 #endif
 
+#ifdef ENABLE_GVL_UNLOCK
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_WRAPPER_STRUCT );
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_SKELETON );
+#endif
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB );
+#ifdef ENABLE_GVL_UNLOCK
 FOR_EACH_CALLBACK_FUNCTION( DEFINE_GVL_WRAPPER_STRUCT );
 FOR_EACH_CALLBACK_FUNCTION( DEFINE_GVLCB_SKELETON );
+#endif
 FOR_EACH_CALLBACK_FUNCTION( DEFINE_GVLCB_STUB );

ext/gvl_wrappers.h

@@ -17,6 +17,10 @@
 
 #include <ruby/thread.h>
 
+#ifdef RUBY_EXTCONF_H
+#	include RUBY_EXTCONF_H
+#endif
+
 #define DEFINE_PARAM_LIST1(type, name) \
 	name,
 
@@ -46,6 +50,7 @@
 		return NULL; \
 	}
 
+#ifdef ENABLE_GVL_UNLOCK
 #define DEFINE_GVL_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
 	rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
 		struct gvl_wrapper_##name##_params params = { \
@@ -54,6 +59,13 @@
 		rb_thread_call_without_gvl(gvl_##name##_skeleton, &params, RUBY_UBF_IO, 0); \
 		when_non_void( return params.retval; ) \
 	}
+#else
+#define DEFINE_GVL_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
+	rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
+		when_non_void( return ) \
+			name( FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname ); \
+	}
+#endif
 
 #define DEFINE_GVL_STUB_DECL(name, when_non_void, rettype, lastparamtype, lastparamname) \
 	rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname);
@@ -66,6 +78,7 @@
 		return NULL; \
 	}
 
+#ifdef ENABLE_GVL_UNLOCK
 #define DEFINE_GVLCB_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
 	rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
 		struct gvl_wrapper_##name##_params params = { \
@@ -74,6 +87,13 @@
 		rb_thread_call_with_gvl(gvl_##name##_skeleton, &params); \
 		when_non_void( return params.retval; ) \
 	}
+#else
+#define DEFINE_GVLCB_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
+	rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
+		when_non_void( return ) \
+			name( FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname ); \
+	}
+#endif
 
 #define GVL_TYPE_VOID(string)
 #define GVL_TYPE_NONVOID(string) string

ext/pg.h

@@ -11,6 +11,7 @@
 #include <sys/types.h>
 #if !defined(_WIN32)
 #	include <sys/time.h>
+#	include <sys/socket.h>
 #endif
 #if defined(HAVE_UNISTD_H) && !defined(_WIN32)
 #	include <unistd.h>
@@ -113,6 +114,8 @@ typedef struct {
 	int enc_idx : PG_ENC_IDX_BITS;
 	/* flags controlling Symbol/String field names */
 	unsigned int flags : 2;
+	/* enable automatic flushing of send data at the end of send_query calls */
+	unsigned int flush_data : 1;
 
 #if defined(_WIN32)
 	/* File descriptor to be used for rb_w32_unwrap_io_handle() */