ChangeLogTag:Mon Apr 17 16:33:17 2000 Ossama Othman <ossama@uci.edu>

7 files changed, 197 insertions, 61 deletions

diff --git a/acconfig.h b/acconfig.h
index 39eaa0b896b..36c0c2c18df 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -225,7 +225,10 @@
 #undef ACE_UINT64_TYPEDEF
 #if defined(ACE_UINT64_TYPEDEF)
    typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF && !ACE_DISABLE_AUTOCONF_UINT64 */
+#endif /* ACE_UINT64_TYPEDEF */
+
+/* typedef for ACE_LOFF_T */
+#undef ACE_LOFF_T_TYPEDEF
 
 /* Enable ACE inlining */
 #undef __ACE_INLINE__
@@ -1039,6 +1042,16 @@
    necessarily mean that the platform does not support iostreams. */
 #undef ACE_LACKS_ACE_IOSTREAM
 
+/* Do not compile support for the "other" ACE features, such as CORBA
+   handling, name services, and QOS. */
+#undef ACE_LACKS_ACE_OTHER
+
+/* Do not compile support for the ACE Service Configurator. */
+#undef ACE_LACKS_ACE_SVCCONF
+
+/* Do not compile support for the ACE Token feature. */
+#undef ACE_LACKS_ACE_TOKEN
+
 /* Platform lacks condition variables (e.g., Win32 and VxWorks) */
 #undef ACE_LACKS_COND_T
 
diff --git a/ace/Makefile.am b/ace/Makefile.am
index e77053e5a70..d278cb592ae 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -273,7 +273,13 @@ libACE_IPC_la_SOURCES = \
   UPIPE_Acceptor.cpp \
   UPIPE_Connector.cpp \
   UPIPE_Stream.cpp \
-  XTI_ATM_Mcast.cpp
+  XTI_ATM_Mcast.cpp \
+  MEM_Acceptor.cpp \
+  MEM_Addr.cpp \
+  MEM_Connector.cpp \
+  MEM_IO.cpp \
+  MEM_SAP.cpp \
+  MEM_Stream.cpp
 
 libACE_Svcconf_la_SOURCES = \
   DLL.cpp \
@@ -324,7 +330,8 @@ libACE_Other_la_SOURCES = \
   Registry_Name_Space.cpp \
   Remote_Name_Space.cpp \
   QoS_Session_Impl.cpp \
-  QoS_Session_Factory.cpp
+  QoS_Session_Factory.cpp \
+  QoS_Manager.cpp
 
 libACE_la_SOURCES = \
   $(libACE_OS_la_SOURCES) \
@@ -541,6 +548,12 @@ HEADER_FILES = \
   Log_Msg.h \
   Log_Priority.h \
   Log_Record.h \
+  MEM_Acceptor.h \
+  MEM_Addr.h \
+  MEM_Connector.h \
+  MEM_IO.h \
+  MEM_SAP.h \
+  MEM_Stream.h \
   Malloc.h \
   Malloc_Base.h \
   Malloc_T.h \
@@ -580,6 +593,7 @@ HEADER_FILES = \
   Process.h \
   Process_Manager.h \
   Profile_Timer.h \
+  QoS_Manager.h \
   QoS_Session.h \
   QoS_Session_Factory.h \
   QoS_Session_Impl.h \
@@ -687,6 +701,8 @@ HEADER_FILES = \
   config.h \
   inc_user_config.h \
   iosfwd.h \
+  post.h \
+  pre.h \
   streams.h \
   ws2tcpip.h
 ## Make sure config.h is in the above header list!
@@ -772,6 +788,12 @@ INLINE_FILES = \
   Local_Tokens.i \
   Log_Msg.i \
   Log_Record.i \
+  MEM_Acceptor.i \
+  MEM_Addr.i \
+  MEM_Connector.i \
+  MEM_IO.i \
+  MEM_SAP.i \
+  MEM_Stream.i \
   Malloc.i \
   Malloc_T.i \
   Managed_Object.i \
@@ -879,6 +901,7 @@ INLINE_FILES = \
   WIN32_Proactor.i \
   XTI_ATM_Mcast.i
 
+
 ## It would be good to remove pkgincludedir.  However, we want to install
 ## headers in "$(prefix)/ace" not "$(prefix)/ACE" because the source files
 ## include files in the directory "ace."  By default pkgincludedir would
diff --git a/configure.in b/configure.in
index ed726870b91..688cb54a169 100644
--- a/configure.in
+++ b/configure.in
@@ -142,6 +142,12 @@ if test -n "$AWK"; then
   ACE_MINOR=`echo "$ACE_VERSION" | sed 's/\./ /g' | $AWK '{ print \[$]2 }'`
   ACE_BETA=`echo "$ACE_VERSION" | sed 's/\./ /g' | $AWK '{ print \[$]3 }'`
 
+dnl Make sure all of the versions have a legitimate value, i.e. not an
+dnl empty string.
+  test -z $ACE_MAJOR && ACE_MAJOR=0
+  test -z $ACE_MINOR && ACE_MINOR=0
+  test -z $ACE_BETA && ACE_BETA=0
+
 dnl This is a terrible kludge to fool libtool into making it produce a shared
 dnl library with the "right" version information.
 dnl We really should switch to a version scheme that is compatible with
@@ -623,6 +629,10 @@ if test "$ac_cv_header_xti_h" = yes ||
     [
      AC_EGREP_CPP([ACE_BROKEN_XTI_MACROS],
        [
+#ifndef ACE_LACKS_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
 #if defined (ACE_HAS_TIUSER_H) || defined (ACE_HAS_XTI)
 #  if defined (ACE_HAS_TIUSER_H)
 #    include /**/ <tiuser.h>
@@ -678,6 +688,10 @@ if test "$ace_has_tli" = yes; then
 dnl We only check for t_accept.  This should hopefully be enough.
    AC_EGREP_CPP(t_accept,
      [
+#ifndef ACE_LACKS_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
 #if defined (ACE_HAS_TIMOD_H)
 # include <sys/timod.h>
 #endif
@@ -721,6 +735,10 @@ dnl Check for t_errno type in TLI headers
    dnl Check if t_errno is declared in the TLI headers
    AC_EGREP_CPP(t_errno,
      [
+#ifndef ACE_LACKS_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
 #if defined (ACE_HAS_TIMOD_H)
 # include <sys/timod.h>
 #endif
@@ -764,6 +782,10 @@ dnl Check if t_error incorrectly accepts char *
    dnl Check if t_errno is declared in the TLI headers
    AC_TRY_COMPILE(
      [
+#ifndef ACE_LACKS_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
 #if defined (ACE_HAS_TIMOD_H)
 # include <sys/timod.h>
 #endif
@@ -794,7 +816,7 @@ dnl Check if t_error incorrectly accepts char *
      ],
      [
       const char *ace_errmsg = "FOO";
-      t_error (errmsg);
+      t_error (ace_errmsg);
      ],
      [
       ace_cv_lib_has_broken_t_error=no
@@ -3504,53 +3526,8 @@ AC_CHECK_FUNC(difftime, dnl
   ,
   AC_DEFINE(ACE_LACKS_DIFFTIME))
 
-AC_CHECK_FUNC(lseek64, dnl
-  [
-   AC_DEFINE(ACE_HAS_LSEEK64)
-   dnl Check if _LARGEFILE64_SOURCE macro is needed to make the
-   dnl lseek64() prototype visible, or if the prototype itself is missing.
-   ACE_CACHE_CHECK(for lseek64 prototype,
-     ace_cv_lib_has_lseek64_prototype,
-     [
-      ace_save_CPPFLAGS="$CPPFLAGS"
-      ace_no_largefile64="-U_LARGEFILE64_SOURCE"
-      CPPFLAGS="$CPPFLAGS $ace_no_largefile64"
-      AC_EGREP_HEADER([[^_]+lseek64], unistd.h,
-        [
-         ace_cv_lib_has_lseek64_prototype=yes
-        ],
-        [
-         ace_cv_lib_has_lseek64_prototype=no
-        ])
-      dnl Reset the compiler flags
-      CPPFLAGS="$ace_save_CPPFLAGS"
-     ],, AC_DEFINE(ACE_LACKS_LSEEK64_PROTOTYPE))
-  ],
-  [
-   AC_CHECK_FUNC(llseek,
-     [
-      AC_DEFINE(ACE_HAS_LLSEEK)
-      dnl Check if _LARGEFILE64_SOURCE macro is needed to make the
-      dnl llseek() prototype visible, or if the prototype itself is
-      dnl missing.
-      ACE_CACHE_CHECK(for llseek prototype,
-        ace_cv_lib_has_llseek_prototype,
-        [
-         ace_save_CPPFLAGS="$CPPFLAGS"
-         ace_no_largefile64="-U_LARGEFILE64_SOURCE"
-         CPPFLAGS="$CPPFLAGS $ace_no_largefile64"
-         AC_EGREP_HEADER([[^_]+llseek], unistd.h,
-           [
-            ace_cv_lib_has_llseek_prototype=no
-           ],
-           [
-            ace_cv_lib_has_llseek_prototype=yes
-           ],)
-         dnl Reset the compiler flags
-         CPPFLAGS="$ace_save_CPPFLAGS"
-        ],, AC_DEFINE(ACE_LACKS_LLSEEK_PROTOTYPE))
-     ],)
-  ])
+dnl Check for 64 bit llseek() or lseek64()
+ACE_CHECK_LSEEK64
 
 AC_CHECK_FUNC(bind, dnl
   [
diff --git a/m4/ace.m4 b/m4/ace.m4
index da71197aff3..a1a497699c8 100644
--- a/m4/ace.m4
+++ b/m4/ace.m4
@@ -361,19 +361,11 @@ AC_DEFUN(ACE_COMPILATION_OPTIONS, dnl
       if test -n "$GXX"; then
 dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
 changequote(, )dnl
-        if g++ --version | egrep -v '^2\.[0-7]' > /dev/null; then
+        if $CXX --version | egrep -v '^2\.[0-7]' > /dev/null; then
 changequote([, ])dnl
           ACE_CXXFLAGS="$ACE_CXXFLAGS -fno-exceptions"
         fi
       fi
-      if test -n "$GCC"; then
-dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
-changequote(, )dnl
-        if gcc --version | egrep -v '^2\.[0-7]' > /dev/null; then
-changequote([, ])dnl
-          ACE_CFLAGS="$ACE_CFLAGS -fno-exceptions" 
-        fi
-      fi
       ;;
     *)
       AC_MSG_ERROR(bad value ${enableval} for --enable-exceptions)
@@ -382,6 +374,14 @@ changequote([, ])dnl
   ],
   [
    ace_user_enable_exceptions=no
+   if test -n "$GXX"; then
+dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
+changequote(, )dnl
+     if $CXX --version | egrep -v '^2\.[0-7]' > /dev/null; then
+changequote([, ])dnl
+       ACE_CXXFLAGS="$ACE_CXXFLAGS -fno-exceptions"
+     fi
+   fi
   ])
 
 
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index 24d4c278725..0fb7b8999a8 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -515,6 +515,118 @@ dnl parentheses.
 fi  dnl test "$ac_cv_func_getrusage" = yes
 ])
 
+
+dnl Check for 64 bit llseek() or lseek64()
+dnl Usage: ACE_CHECK_LSEEK64
+AC_DEFUN([ACE_CHECK_LSEEK64],
+[
+ AC_CHECK_FUNC([lseek64],
+   [
+    AC_DEFINE([ACE_HAS_LSEEK64])
+
+    dnl Check for 64 bit offset type in the lseek64() prototype, if it
+    dnl exists.
+    dnl ACE_CHECK_OFF64_T([lseek64])
+
+    dnl Check if _LARGEFILE64_SOURCE macro is needed to make the
+    dnl lseek64() prototype visible, or if the prototype itself is missing.
+    ACE_CACHE_CHECK([for lseek64 prototype],
+      [ace_cv_lib_has_lseek64_prototype],
+      [
+       ace_save_CPPFLAGS="$CPPFLAGS"
+       ace_no_largefile64="-U_LARGEFILE64_SOURCE"
+       CPPFLAGS="$CPPFLAGS $ace_no_largefile64"
+       AC_EGREP_HEADER([[^_]+lseek64], unistd.h,
+         [
+          ace_cv_lib_has_lseek64_prototype=yes
+         ],
+         [
+          ace_cv_lib_has_lseek64_prototype=no
+         ])
+       dnl Reset the compiler flags
+       CPPFLAGS="$ace_save_CPPFLAGS"
+      ],, AC_DEFINE(ACE_LACKS_LSEEK64_PROTOTYPE))
+   ],
+   [
+    AC_CHECK_FUNC([llseek],
+      [
+       AC_DEFINE([ACE_HAS_LLSEEK])
+       dnl Check if _LARGEFILE64_SOURCE macro is needed to make the
+       dnl llseek() prototype visible, or if the prototype itself is
+       dnl missing.
+
+       dnl Check for 64 bit offset type in the llseek() prototype, if
+       dnl it exists.
+       dnl ACE_CHECK_OFF64_T([llseek])
+
+       ACE_CACHE_CHECK([for llseek prototype],
+         [ace_cv_lib_has_llseek_prototype],
+         [
+          ace_save_CPPFLAGS="$CPPFLAGS"
+          ace_no_largefile64="-U_LARGEFILE64_SOURCE"
+          CPPFLAGS="$CPPFLAGS $ace_no_largefile64"
+          AC_EGREP_HEADER([[^_]+llseek], unistd.h,
+            [
+             ace_cv_lib_has_llseek_prototype=no
+            ],
+            [
+             ace_cv_lib_has_llseek_prototype=yes
+            ],)
+          dnl Reset the compiler flags
+          CPPFLAGS="$ace_save_CPPFLAGS"
+         ],, AC_DEFINE(ACE_LACKS_LLSEEK_PROTOTYPE))
+
+
+      ],)
+   ])
+])
+
+dnl Check what the 64 bit offset type is by checking what the offset
+dnl argument for llseek()/lseek64() is.
+dnl Usage: ACE_CHECK_LOFF_64(LSEEK64-FUNC)
+AC_DEFUN([ACE_CHECK_OFF64_T],
+[
+  AC_MSG_CHECKING([for 64 bit offset type])
+  AC_EGREP_HEADER([[ ]+$1.*\(.*], unistd.h,
+    [
+     cat > conftest.$ac_ext <<EOF
+#include "confdefs.h"
+
+/* Make sure 64 bit file feature test macro is defined. */
+#ifndef _LARGEFILE64_SOURCE
+# define _LARGEFILE64_SOURCE
+#endif
+
+#ifndef ACE_LACKS_UNISTD_H
+# include <unistd.h>  /* needed for lseek64()/llseek() prototype */
+#endif
+EOF
+
+changequote(, )dnl
+dnl Here we attempt to determine the type of the second argument of
+dnl lseek64()/llseek() from its prototype.
+     ace_off64_t=`eval "$ac_cpp conftest.$ac_ext" | \
+       egrep '[ ]+lseek64.*\(.*' | \
+       sed -e 's/^.*(.*,[ ]*\(.*\) .*,.*$/\1/'`
+changequote([, ])dnl
+
+
+if test -n "$ace_off64_t"; then
+     AC_MSG_RESULT([$ace_off64_t])
+     AC_DEFINE_UNQUOTED([ACE_LOFF_T_TYPEDEF], [$ace_off64_t])
+fi
+
+     rm -rf conftest*
+
+dnl Do not remove this parenthesis --> )
+dnl It's only purpose is to keep Emacs from getting confused about
+dnl mismatched parentheses.
+    ],
+    [
+     AC_MSG_RESULT([no])
+    ])
+])
+
 dnl   checks for structures
 
 dnl   checks for system services
diff --git a/m4/compiler.m4 b/m4/compiler.m4
index c533b127428..a44b274daa1 100644
--- a/m4/compiler.m4
+++ b/m4/compiler.m4
@@ -39,13 +39,21 @@ AC_DEFUN(ACE_SET_COMPILER_FLAGS, dnl
  if test -n "$GXX"; then
 dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
 changequote(, )dnl
-   if $GXX --version | egrep -v '^2\.[0-7]' > /dev/null; then
+   if $CXX --version | egrep -v '^2\.[0-7]' > /dev/null; then
 changequote([, ])dnl
      :  # Do nothing
    else
      AC_DEFINE(ACE_HAS_GNUG_PRE_2_8)dnl
      AC_DEFINE(ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS)dnl
    fi
+
+   case `$CXX --version` in
+     2.9* | 3*)
+       if test "$ace_user_enable_exceptions" != yes; then
+         ACE_CXXFLAGS="$ACE_CXXFLAGS -fcheck-new"
+       fi
+       ;;
+   esac
  fi
 
  dnl Compiler Flag Key
diff --git a/m4/subsets.m4 b/m4/subsets.m4
index dbf0b9fcb94..95f6c517d3c 100644
--- a/m4/subsets.m4
+++ b/m4/subsets.m4
@@ -229,6 +229,7 @@ AC_ARG_ENABLE(lib-svcconf,
                   ;;
                 no)
                   ace_user_enable_lib_svcconf=no
+                  AC_DEFINE(ACE_LACKS_ACE_SVCCONF)
                   ;;
                 *)
                   AC_MSG_ERROR(bad value ${enableval} for --enable-lib-svcconf)
@@ -286,6 +287,7 @@ AC_ARG_ENABLE(lib-token,
                   ;;
                 no)
                   ace_user_enable_lib_token=no
+                  AC_DEFINE(ACE_LACKS_ACE_TOKEN)
                   ;;
                 *)
                   AC_MSG_ERROR(bad value ${enableval} for --enable-lib-token)
@@ -305,6 +307,7 @@ AC_ARG_ENABLE(lib-other,
                   ;;
                 no)
                   ace_user_enable_lib_other=no
+                  AC_DEFINE(ACE_LACKS_ACE_OTHER)
                   ;;
                 *)
                   AC_MSG_ERROR(bad value ${enableval} for --enable-lib-other)