File 0244-Fix-configure-test-enable-esock-socket-reg... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0244-Fix-configure-test-enable-esock-socket-registry.patch of Package erlang (Revision 0eb87917a75aae8f396ec39332087beb)

Currently displaying revision 0eb87917a75aae8f396ec39332087beb , Show latest

From caad6216b00e889b84383e91c5e01dc5d754f676 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Wed, 4 Aug 2021 18:28:08 +0200
Subject: [PATCH] Fix configure test --enable-esock-socket-registry

---
 erts/configure                              | 21 ++++++---------
 erts/configure.in                           | 29 +++++++++------------
 erts/emulator/nifs/common/prim_socket_nif.c |  4 +--
 3 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/erts/configure b/erts/configure
index 9404ae3558..85a3e20a05 100755
--- a/erts/configure
+++ b/erts/configure
@@ -830,7 +830,7 @@ enable_builtin_zlib
 enable_esock
 enable_esock_use_rcvsndtimeo
 with_esock_counter_size
-enable_esock_use_socket_registry
+enable_esock_socket_registry
 with_clock_resolution
 with_clock_gettime_realtime_id
 with_clock_gettime_monotonic_id
@@ -1572,7 +1572,7 @@ Optional Features:
   --enable-esock-socket-registry
                           enable use of the socket registry by default
                           (default)
-  --disable-esock-socket-registry
+      --disable-esock-socket-registry
                           disable use of the socket registry by default
   --enable-prefer-elapsed-monotonic-time-during-suspend
                           Prefer an OS monotonic time source with elapsed time
@@ -14083,27 +14083,22 @@ fi
 
 
 
-# Check whether --enable-esock_use_socket_registry was given.
-if test "${enable_esock_use_socket_registry+set}" = set; then :
-  enableval=$enable_esock_use_socket_registry;
+# Check whether --enable-esock-socket-registry was given.
+if test "${enable_esock_socket_registry+set}" = set; then :
+  enableval=$enable_esock_socket_registry;
 fi
 
 
-if test "x$enable_esock_socket_registry" = "xyes"; then
+if test "x$enable_esock_socket_registry" = "xno"; then :
 
-$as_echo "#define ESOCK_USE_SOCKET_REGISTRY 1" >>confdefs.h
-
-else
-    if test "x$disable_esock_socket_registry" = "xyes"; then
 
 $as_echo "#define ESOCK_USE_SOCKET_REGISTRY 0" >>confdefs.h
 
-    else
-        # TEMPORARY default (enabled)
+else
+
 
 $as_echo "#define ESOCK_USE_SOCKET_REGISTRY 1" >>confdefs.h
 
-    fi
 fi
 
 
diff --git a/erts/configure.in b/erts/configure.in
index fd3190f0f1..d8ad6ff552 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -*-m4-*-
 
 dnl %CopyrightBegin%
 dnl
-dnl Copyright Ericsson AB 1997-2020. All Rights Reserved.
+dnl Copyright Ericsson AB 1997-2021. All Rights Reserved.
 dnl
 dnl Licensed under the Apache License, Version 2.0 (the "License");
 dnl you may not use this file except in compliance with the License.
@@ -1459,23 +1459,20 @@ AC_CHECK_FUNC([gethostname],
 
 
 dnl *** ESOCK_USE_SOCKET_REGISTRY ***
-dnl At this time we *enable* use of the socket regstry by default
+dnl At this time we *enable* use of the socket registry by default
 dnl since we want to be able to have as much debug info as possible.
 
-AC_ARG_ENABLE(esock_use_socket_registry,
-AS_HELP_STRING([--enable-esock-socket-registry], [enable use of the socket registry by default (default)])
-AS_HELP_STRING([--disable-esock-socket-registry], [disable use of the socket registry by default]))
-
-if test "x$enable_esock_socket_registry" = "xyes"; then
-    AC_DEFINE(ESOCK_USE_SOCKET_REGISTRY, [1], [Use socket registry by default])
-else
-    if test "x$disable_esock_socket_registry" = "xyes"; then
-        AC_DEFINE(ESOCK_USE_SOCKET_REGISTRY, [0], [Don't use socket registry by default])
-    else
-        # TEMPORARY default (enabled)
-        AC_DEFINE(ESOCK_USE_SOCKET_REGISTRY, [1], [Use socket registry by default])
-    fi
-fi
+AC_ARG_ENABLE(esock-socket-registry,
+    AS_HELP_STRING([--enable-esock-socket-registry],
+        [enable use of the socket registry by default (default)])
+    AS_HELP_STRING([--disable-esock-socket-registry],
+        [disable use of the socket registry by default]))
+
+AS_IF([test "x$enable_esock_socket_registry" = "xno"], [
+    AC_DEFINE(ESOCK_USE_SOCKET_REGISTRY, [0],
+        [Don't use socket registry by default])], [
+    AC_DEFINE(ESOCK_USE_SOCKET_REGISTRY, [1],
+        [Use socket registry by default])])
 
 
 
diff --git a/erts/emulator/nifs/common/prim_socket_nif.c b/erts/emulator/nifs/common/prim_socket_nif.c
index 524b21a9f9..bf9d9a783f 100644
--- a/erts/emulator/nifs/common/prim_socket_nif.c
+++ b/erts/emulator/nifs/common/prim_socket_nif.c
@@ -16259,7 +16259,7 @@ ESockDescriptor* alloc_descriptor(SOCKET sock, ErlNifEvent event)
     descP->wCtrlSz          = ESOCK_SEND_CTRL_BUFFER_SIZE_DEFAULT;
     descP->iow              = FALSE;
     descP->dbg              = ESOCK_DEBUG_DEFAULT; // Overwritten by caller
-    descP->useReg           = ESOCK_CMD_USE_SOCKET_REGISTRY; // Overwritten by caller
+    descP->useReg           = ESOCK_USE_SOCKET_REGISTRY; // Overwritten by caller
     descP->meta.env         = esock_alloc_env("alloc_descriptor - "
                                               "meta-env");
     descP->meta.ref         = esock_atom_undefined;
@@ -18365,7 +18365,7 @@ int on_load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
     data.useReg =
         esock_get_bool_from_map(env, load_info,
                                 atom_use_registry,
-                                ESOCK_CMD_USE_SOCKET_REGISTRY);
+                                ESOCK_USE_SOCKET_REGISTRY);
 
     data.iow =
         esock_get_bool_from_map(env, load_info,
-- 
2.31.1

Places

File 0244-Fix-configure-test-enable-esock-socket-registry.patch of Package erlang (Revision 0eb87917a75aae8f396ec39332087beb)

Places