diff options
| author | Micael Karlberg <[email protected]> | 2018-10-18 17:24:19 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2018-10-18 17:24:19 +0200 |
| commit | a9de37dd6d2d15aa5d569e952f90c16b5e6a3ff5 (patch) | |
| tree | 7702b7a519fc8bdf6e3ce17c7e2bdd19e8743e2f /erts/emulator/nifs/common/socket_int.h | |
| parent | ff3d31f7d102d68a585f8ce636753bf48b9553ab (diff) | |
| parent | 3c4c36587df5a847dd6f03011a4ecb76d0b70b40 (diff) | |
| download | otp-a9de37dd6d2d15aa5d569e952f90c16b5e6a3ff5.tar.gz otp-a9de37dd6d2d15aa5d569e952f90c16b5e6a3ff5.tar.bz2 otp-a9de37dd6d2d15aa5d569e952f90c16b5e6a3ff5.zip | |
Merge branch 'bmk/20181004/nififying_inet_rework_test_suite/OTP-14831' into bmk/20180918/nififying_inet/OTP-14831
Diffstat (limited to 'erts/emulator/nifs/common/socket_int.h')
| -rw-r--r-- | erts/emulator/nifs/common/socket_int.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/erts/emulator/nifs/common/socket_int.h b/erts/emulator/nifs/common/socket_int.h index 06f677482c..7d223b8259 100644 --- a/erts/emulator/nifs/common/socket_int.h +++ b/erts/emulator/nifs/common/socket_int.h @@ -339,8 +339,12 @@ extern ERL_NIF_TERM esock_atom_einval; #define MLOCK(M) enif_mutex_lock((M)) #define MUNLOCK(M) enif_mutex_unlock((M)) -#define MONP(E,D,P,M) enif_monitor_process((E), (D), (P), (M)) -#define DEMONP(E,D,M) enif_demonitor_process((E), (D), (M)) +// #define MONP(S,E,D,P,M) enif_monitor_process((E), (D), (P), (M)) +// #define DEMONP(S,E,D,M) enif_demonitor_process((E), (D), (M)) +#define MONP(S,E,D,P,M) esock_monitor((S), (E), (D), (P), (M)) +#define DEMONP(S,E,D,M) esock_demonitor((S), (E), (D), (M)) +#define MON_INIT(M) esock_monitor_init((M)) +// #define MON_COMP(M1, M2) esock_monitor_compare((M1), (M2)) #define SELECT(E,FD,M,O,P,R) \ if (enif_select((E), (FD), (M), (O), (P), (R)) < 0) \ |