diff options
| author | Sverker Eriksson <[email protected]> | 2018-09-11 20:30:50 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-09-11 20:30:50 +0200 |
| commit | e257aef202d282d37101fc0feaf1c211b055b4c0 (patch) | |
| tree | 197b265d2f8ddf19bbdf4c1993fe1454c45476c4 /erts/emulator/beam | |
| parent | a33920ef4e0669006b1c07ac7eda599ebd9583fb (diff) | |
| parent | 31d26cfc44e0b0bb84879e7043db4dcf4e0e66cc (diff) | |
| download | otp-e257aef202d282d37101fc0feaf1c211b055b4c0.tar.gz otp-e257aef202d282d37101fc0feaf1c211b055b4c0.tar.bz2 otp-e257aef202d282d37101fc0feaf1c211b055b4c0.zip | |
Merge branch 'sverker/enif-cancel-select/OTP-15095'
* sverker/enif-cancel-select/OTP-15095:
erts: Add ERL_NIF_SELECT_CANCEL flag for enif_select
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_drv_nif.h | 3 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_nif.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_drv_nif.h b/erts/emulator/beam/erl_drv_nif.h index 31b4817fb1..9ef7c39d41 100644 --- a/erts/emulator/beam/erl_drv_nif.h +++ b/erts/emulator/beam/erl_drv_nif.h @@ -53,7 +53,8 @@ typedef enum { enum ErlNifSelectFlags { ERL_NIF_SELECT_READ = (1 << 0), ERL_NIF_SELECT_WRITE = (1 << 1), - ERL_NIF_SELECT_STOP = (1 << 2) + ERL_NIF_SELECT_STOP = (1 << 2), + ERL_NIF_SELECT_CANCEL = (1 << 3) }; /* diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h index 4c09496ef1..c5227a0c23 100644 --- a/erts/emulator/beam/erl_nif.h +++ b/erts/emulator/beam/erl_nif.h @@ -160,6 +160,8 @@ typedef int ErlNifEvent; #define ERL_NIF_SELECT_STOP_SCHEDULED (1 << 1) #define ERL_NIF_SELECT_INVALID_EVENT (1 << 2) #define ERL_NIF_SELECT_FAILED (1 << 3) +#define ERL_NIF_SELECT_READ_CANCELLED (1 << 4) +#define ERL_NIF_SELECT_WRITE_CANCELLED (1 << 5) typedef enum { |