Permalink
Browse files

Merge branch 'anders/diameter/sequence_masks/OTP-10445' into maint

* anders/diameter/sequence_masks/OTP-10445:
  Redo watchdog test suite
  Update/clarify some comments
  Add reopen message from watchdog
  Add options service_info
  Add diameter_reg:wait/1
  Clarify diameter_transport doc
  Remove pre-OTP configure support
  Remove obsolete make target
  Use sequence masks in test suites
  Implement sequence masks
  Document sequence masks
  • Loading branch information...
2 parents acdfec8 + bcc2e77 commit 1262a7cadb69ee503bb5c2586038059b00595c99 Anders Svensson committed Nov 8, 2012
Showing with 1,066 additions and 5,824 deletions.
  1. +0 −57 lib/diameter/.gitignore
  2. +32 −0 lib/diameter/Makefile
  3. +0 −88 lib/diameter/Makefile.in
  4. +0 −65 lib/diameter/aclocal.m4
  5. +0 −1,519 lib/diameter/autoconf/config.guess
  6. +0 −1,630 lib/diameter/autoconf/config.sub
  7. +0 −147 lib/diameter/autoconf/configure.vxworks
  8. +0 −519 lib/diameter/autoconf/install-sh
  9. +0 −124 lib/diameter/autoconf/vxworks/sed.general
  10. +0 −45 lib/diameter/autoconf/vxworks/sed.vxworks_cpu32
  11. +0 −52 lib/diameter/autoconf/vxworks/sed.vxworks_ppc32
  12. +0 −51 lib/diameter/autoconf/vxworks/sed.vxworks_ppc603
  13. +0 −51 lib/diameter/autoconf/vxworks/sed.vxworks_ppc603_nolongcall
  14. +0 −50 lib/diameter/autoconf/vxworks/sed.vxworks_ppc860
  15. +0 −59 lib/diameter/autoconf/vxworks/sed.vxworks_simlinux
  16. +0 −64 lib/diameter/autoconf/vxworks/sed.vxworks_simso
  17. +0 −38 lib/diameter/autoconf/vxworks/sed.vxworks_sparc
  18. +0 −137 lib/diameter/configure.in
  19. +4 −0 lib/diameter/doc/.gitignore
  20. +1 −9 lib/diameter/doc/src/Makefile
  21. +29 −0 lib/diameter/doc/src/diameter.xml
  22. +25 −17 lib/diameter/doc/src/diameter_transport.xml
  23. +0 −92 lib/diameter/make/release_targets.mk
  24. +0 −193 lib/diameter/make/rules.mk.in
  25. +0 −53 lib/diameter/make/subdir.mk
  26. +0 −33 lib/diameter/make/target.mk
  27. +0 −9 lib/diameter/src/Makefile
  28. +6 −1 lib/diameter/src/base/diameter.erl
  29. +44 −18 lib/diameter/src/base/diameter_config.erl
  30. +1 −1 lib/diameter/src/base/diameter_peer.erl
  31. +36 −11 lib/diameter/src/base/diameter_peer_fsm.erl
  32. +142 −113 lib/diameter/src/base/diameter_reg.erl
  33. +318 −195 lib/diameter/src/base/diameter_service.erl
  34. +12 −2 lib/diameter/src/base/diameter_session.erl
  35. +50 −13 lib/diameter/src/base/diameter_watchdog.erl
  36. +0 −9 lib/diameter/test/Makefile
  37. +12 −2 lib/diameter/test/diameter_traffic_SUITE.erl
  38. +354 −357 lib/diameter/test/diameter_watchdog_SUITE.erl
@@ -1,58 +1 @@
-# Match at any level.
-*~
-autom4te.cache
-
-# Compiler derivatives
-#
-# Do not use too creative wildcards.
-# Those might ignore files that should not be ignored.
-
-i686-pc-linux-gnu
-x86_64-unknown-linux-gnu
-i386-apple-darwin[0-9]*.[0-9]*.[0-9]*
-sparc-sun-solaris[0-9]*.[0-9]*
-i386-pc-solaris[0-9]*.[0-9]*
-i386-unknown-freebsd[0-9]*.[0-9]*
-tile-tilera-linux-gnu
-powerpc-unknown-linux-gnu
-
-# Mac OS X
-a.out.dSYM/
-
-# Anchored from $DIAMETER_TOP
-/config.log
-/config.status
-
-/Makefile
-/configure
-
-
-# General patterns for applications in lib.
-#
-# Assume that all test/Emakefiles are generated.
-#
-# Any application with a checked-in test/Emakefile should
-# use a negative pattern in its own .gitignore.
-
-#
-# Files generated by configure.
-#
-
-/configure
-/config.log
-/config.status
-
-
-#
-# Generated documentation. (ie. not doc/src)
-#
-
-/doc/[^s]*
-
-
-#
-# Files generated when building/running tests
-#
-
-/test/*.log
View
@@ -0,0 +1,32 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2010-2012. All Rights Reserved.
+#
+# The contents of this file are subject to the Erlang Public License,
+# Version 1.1, (the "License"); you may not use this file except in
+# compliance with the License. You should have received a copy of the
+# Erlang Public License along with this software. If not, it can be
+# retrieved online at http://www.erlang.org/.
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+# the License for the specific language governing rights and limitations
+# under the License.
+#
+# %CopyrightEnd%
+
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+include vsn.mk
+include subdirs.mk
+
+SUB_DIRECTORIES = $(SUB_DIRS) doc/src
+SPECIAL_TARGETS =
+
+include $(ERL_TOP)/make/otp_subdir.mk
+
+info:
+ @echo "APP_VSN = $(APP_VSN)"
+
+.PHONY: info
@@ -1,88 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2010-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-
-ifneq ($(ERL_TOP),)
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-else
-include $(DIAMETER_TOP)/make/target.mk
-include $(DIAMETER_TOP)/make/$(TARGET)/rules.mk
-endif
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include vsn.mk
-VSN=$(DIAMETER_VSN)
-
-DIAMETER_TOP = @DIAMETER_TOP@
-
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-include subdirs.mk
-
-SUB_DIRECTORIES = $(SUB_DIRS) doc/src
-
-SPECIAL_TARGETS =
-
-ifneq ($(ERL_TOP),)
-ifneq ($(PREFIX),)
-CONFIGURE_OPTS += --prefix=$(PREFIX)
-endif
-endif
-
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-ifneq ($(ERL_TOP),)
-include $(ERL_TOP)/make/otp_subdir.mk
-else
-include $(DIAMETER_TOP)/make/subdir.mk
-endif
-
-.PHONY: reconf conf info version dialyzer
-
-reconf:
- autoconf
-
-conf: do_configure
-
-do_configure: configure
- ./configure $(CONFIGURE_OPTS)
-
-configure: configure.in
- autoconf
-
-info:
- @echo "APP_VSN: $(APP_VSN)"
- @echo "DIAMETER_VSN: $(DIAMETER_VSN)"
-
-version:
- @echo "$(VSN)"
-
-
-dialyzer:
- (cd ./ebin; \
- dialyzer --build_plt \
- --output_plt ../priv/diameter.plt \
- -r ../../diameter/ebin \
- --verbose)
@@ -1,65 +0,0 @@
-dnl
-dnl %CopyrightBegin%
-dnl
-dnl Copyright Ericsson AB 1998-2011. All Rights Reserved.
-dnl
-dnl The contents of this file are subject to the Erlang Public License,
-dnl Version 1.1, (the "License"); you may not use this file except in
-dnl compliance with the License. You should have received a copy of the
-dnl Erlang Public License along with this software. If not, it can be
-dnl retrieved online at http://www.erlang.org/.
-dnl
-dnl Software distributed under the License is distributed on an "AS IS"
-dnl basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-dnl the License for the specific language governing rights and limitations
-dnl under the License.
-dnl
-dnl %CopyrightEnd%
-dnl
-
-dnl
-dnl aclocal.m4
-dnl
-dnl Local macros used in configure.in. The Local Macros which
-dnl could/should be part of autoconf are prefixed LM_, macros specific
-dnl to the Erlang system are prefixed ERL_.
-dnl
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_PROG_INSTALL_DIR
-dnl
-dnl Figure out how to create directories with parents.
-dnl (In my opinion INSTALL_DIR is a bad name, MKSUBDIRS or something is better)
-dnl
-dnl We prefer 'install -d', but use 'mkdir -p' if it exists.
-dnl If none of these methods works, we give up.
-dnl
-
-
-AC_DEFUN(LM_PROG_INSTALL_DIR,
-[AC_CACHE_CHECK(how to create a directory including parents,
-ac_cv_prog_mkdir_p,
-[
-temp_name_base=config.$$
-temp_name=$temp_name_base/x/y/z
-$INSTALL -d $temp_name >/dev/null 2>&1
-ac_cv_prog_mkdir_p=none
-if test -d $temp_name; then
- ac_cv_prog_mkdir_p="$INSTALL -d"
-else
- mkdir -p $temp_name >/dev/null 2>&1
- if test -d $temp_name; then
- ac_cv_prog_mkdir_p="mkdir -p"
- fi
-fi
-rm -fr $temp_name_base
-])
-
-case "${ac_cv_prog_mkdir_p}" in
- none) AC_MSG_ERROR(don't know how create directories with parents) ;;
- *) INSTALL_DIR="$ac_cv_prog_mkdir_p" AC_SUBST(INSTALL_DIR) ;;
-esac
-])
-
-
Oops, something went wrong.

0 comments on commit 1262a7c

Please sign in to comment.