Merge pull request #358 from filmor/otp24

Update supported NIF API version to 2.16

Author: filmor

.github/workflows/main.yml

@@ -140,8 +140,11 @@ jobs:
     strategy:
       matrix:
         pair:
-          - erlang: "23.1"
-            elixir: "1.11.1"
+          - erlang: "24.0"
+            elixir: "1.11.4"
+          - erlang: "23.3"
+            elixir: "1.11.4"
+
           - erlang: "23.0.3"
             elixir: "1.10.3"
 

rustler/build.rs

@@ -4,7 +4,7 @@ use std::process::Command;
 
 // keep this sorted by version number
 const NIF_VERSION: &[&str] = &[
-    "2.7", "2.8", "2.9", "2.10", "2.11", "2.12", "2.13", "2.14", "2.15",
+    "2.7", "2.8", "2.9", "2.10", "2.11", "2.12", "2.13", "2.14", "2.15", "2.16",
 ];
 
 fn main() {

rustler_mix/lib/rustler.ex

@@ -131,6 +131,7 @@ defmodule Rustler do
       '2.12',
       '2.13',
       '2.14',
-      '2.15'
+      '2.15',
+      '2.16'
     ]
 end

rustler_sys/gen_api.erl

@@ -36,6 +36,9 @@ version_opts("2.14") -> [{major,2}, {minor,14}, exception, getenv, time,   % erl
 version_opts("2.15") -> [{major,2}, {minor,15}, exception, getenv, time,   % erlang 22.0
                         dirty_scheduler_opt, nif_2_11, nif_2_12, nif_2_13,
                         nif_2_14, nif_2_15];
+version_opts("2.16") -> [{major,2}, {minor,16}, exception, getenv, time,   % erlang 24.0
+                        dirty_scheduler_opt, nif_2_11, nif_2_12, nif_2_13,
+                        nif_2_14, nif_2_15, nif_2_16];
 version_opts(Ver) ->
     io:format(
         "This OTP release uses the unsupported Erlang NIF version ~p.\n\n"
@@ -364,6 +367,13 @@ api_list(Opts) -> [
             {"ERL_NIF_TERM", "enif_make_monitor_term", "env: *mut ErlNifEnv, mon: *const ErlNifMonitor"}
         ];
         false -> []
+    end ++
+    case proplists:get_bool(nif_2_16, Opts) of
+        true -> [
+            {"*const ErlNifResourceType", "enif_init_resource_type", "env: *mut ErlNifEnv, name_str: *const c_uchar, init: *const ErlNifResourceTypeInit, flags: ErlNifResourceFlags, tried: *mut ErlNifResourceFlags"},
+            {"c_int", "enif_dynamic_resource_call", "env: *mut ErlNifEnv, module: ERL_NIF_TERM, name: ERL_NIF_TERM, rsrc: ERL_NIF_TERM, call_data: *const c_void"}
+        ];
+        false -> []
     end.
 
 

rustler_sys/precompiled/nif_api.4.snippet

@@ -1,6 +1,6 @@
 pub const ERL_NIF_ENTRY_OPTIONS: c_uint = ERL_NIF_DIRTY_NIF_OPTION;
 pub const NIF_MAJOR_VERSION: c_int = 2;
-pub const NIF_MINOR_VERSION: c_int = 15;
+pub const NIF_MINOR_VERSION: c_int = 16;
 
 extern "C" {
 /// See [enif_priv_data](http://www.erlang.org/doc/man/erl_nif.html#enif_priv_data) in the Erlang docs.
@@ -245,6 +245,10 @@ pub fn enif_is_pid_undefined(pid: *const ErlNifPid) -> c_int;
 pub fn enif_set_pid_undefined(pid: *mut ErlNifPid);
 /// See [enif_make_monitor_term](http://www.erlang.org/doc/man/erl_nif.html#enif_make_monitor_term) in the Erlang docs.
 pub fn enif_make_monitor_term(env: *mut ErlNifEnv, mon: *const ErlNifMonitor) -> ERL_NIF_TERM;
+/// See [enif_init_resource_type](http://www.erlang.org/doc/man/erl_nif.html#enif_init_resource_type) in the Erlang docs.
+pub fn enif_init_resource_type(env: *mut ErlNifEnv, name_str: *const c_uchar, init: *const ErlNifResourceTypeInit, flags: ErlNifResourceFlags, tried: *mut ErlNifResourceFlags) -> *const ErlNifResourceType;
+/// See [enif_dynamic_resource_call](http://www.erlang.org/doc/man/erl_nif.html#enif_dynamic_resource_call) in the Erlang docs.
+pub fn enif_dynamic_resource_call(env: *mut ErlNifEnv, module: ERL_NIF_TERM, name: ERL_NIF_TERM, rsrc: ERL_NIF_TERM, call_data: *const c_void) -> c_int;
 }
 
 extern "C" {

rustler_sys/precompiled/nif_api.8.snippet

@@ -1,6 +1,6 @@
 pub const ERL_NIF_ENTRY_OPTIONS: c_uint = ERL_NIF_DIRTY_NIF_OPTION;
 pub const NIF_MAJOR_VERSION: c_int = 2;
-pub const NIF_MINOR_VERSION: c_int = 15;
+pub const NIF_MINOR_VERSION: c_int = 16;
 
 extern "C" {
 /// See [enif_priv_data](http://www.erlang.org/doc/man/erl_nif.html#enif_priv_data) in the Erlang docs.
@@ -237,6 +237,10 @@ pub fn enif_is_pid_undefined(pid: *const ErlNifPid) -> c_int;
 pub fn enif_set_pid_undefined(pid: *mut ErlNifPid);
 /// See [enif_make_monitor_term](http://www.erlang.org/doc/man/erl_nif.html#enif_make_monitor_term) in the Erlang docs.
 pub fn enif_make_monitor_term(env: *mut ErlNifEnv, mon: *const ErlNifMonitor) -> ERL_NIF_TERM;
+/// See [enif_init_resource_type](http://www.erlang.org/doc/man/erl_nif.html#enif_init_resource_type) in the Erlang docs.
+pub fn enif_init_resource_type(env: *mut ErlNifEnv, name_str: *const c_uchar, init: *const ErlNifResourceTypeInit, flags: ErlNifResourceFlags, tried: *mut ErlNifResourceFlags) -> *const ErlNifResourceType;
+/// See [enif_dynamic_resource_call](http://www.erlang.org/doc/man/erl_nif.html#enif_dynamic_resource_call) in the Erlang docs.
+pub fn enif_dynamic_resource_call(env: *mut ErlNifEnv, module: ERL_NIF_TERM, name: ERL_NIF_TERM, rsrc: ERL_NIF_TERM, call_data: *const c_void) -> c_int;
 }
 
 extern "C" {

rustler_sys/src/rustler_sys_api.rs

@@ -138,13 +138,19 @@ pub type ErlNifResourceDown = unsafe extern "C" fn(
     mon: *const ErlNifMonitor,
 ) -> ();
 
+/// See [ErlNifResourceDynCall](http://www.erlang.org/doc/man/erl_nif.html#ErlNifResourceDynCall) in the Erlang Docs.
+pub type ErlNifResourceDynCall =
+    unsafe extern "C" fn(env: *mut ErlNifEnv, obj: *mut c_void, call_data: *const c_void) -> ();
+
 /// See [ErlNifResourceTypeInit](http://www.erlang.org/doc/man/erl_nif.html#ErlNifResourceTypeInit) in the Erlang docs.
 #[derive(Debug, Copy, Clone)]
 #[repr(C)]
 pub struct ErlNifResourceTypeInit {
     dtor: *const ErlNifResourceDtor,
     stop: *const ErlNifResourceStop, // at ERL_NIF_SELECT_STOP event
     down: *const ErlNifResourceDown, // enif_monitor_process
+    members: c_int,
+    dyncall: *const ErlNifResourceDynCall,
 }
 
 /// See [ErlNifSelectFlags](http://erlang.org/doc/man/erl_nif.html#ErlNifSelectFlags) in the Erlang docs.
@@ -156,6 +162,8 @@ pub const ERL_NIF_SELECT_STOP: ErlNifSelectFlags = 1 << 2;
 pub const ERL_NIF_SELECT_FAILED: ErlNifSelectFlags = 1 << 3;
 pub const ERL_NIF_SELECT_READ_CANCELLED: ErlNifSelectFlags = 1 << 4;
 pub const ERL_NIF_SELECT_WRITE_CANCELLED: ErlNifSelectFlags = 1 << 5;
+pub const ERL_NIF_SELECT_ERROR_CANCELLED: ErlNifSelectFlags = 1 << 6;
+pub const ERL_NIF_SELECT_NOTSUP: ErlNifSelectFlags = 1 << 7;
 
 /// See [ErlNifMonitor](http://www.erlang.org/doc/man/erl_nif.html#ErlNifMonitor) in the Erlang docs.
 #[derive(Debug, Copy, Clone)]