merge default into bug21346

Author: tonyg

.hgignore

@@ -1,18 +1,17 @@
 syntax: glob
 *.beam
 *~
+*.swp
+*.patch
 erl_crash.dump
 
 syntax: regexp
 ^cover/
 ^dist/
-^include/rabbit_framing.hrl$
-^src/rabbit_framing.erl$
-^rabbit.plt$
-^ebin/rabbit.app$
-^ebin/rabbit.rel$
-^ebin/rabbit.boot$
-^ebin/rabbit.script$
+^include/rabbit_framing\.hrl$
+^src/rabbit_framing\.erl$
+^rabbit\.plt$
+^ebin/rabbit\.(app|rel|boot|script)$
 ^plugins/
 ^priv/plugins/
 

Makefile

@@ -20,10 +20,10 @@ PYTHON=python
 
 ifndef USE_SPECS
 # our type specs rely on features / bug fixes in dialyzer that are
-# only available in R12B-3 upwards
+# only available in R13B upwards (R13B is eshell 5.7.1)
 #
 # NB: the test assumes that version number will only contain single digits
-USE_SPECS=$(shell if [ $$(erl -noshell -eval 'io:format(erlang:system_info(version)), halt().') \> "5.6.2" ]; then echo "true"; else echo "false"; fi)
+USE_SPECS=$(shell if [ $$(erl -noshell -eval 'io:format(erlang:system_info(version)), halt().') \> "5.7.0" ]; then echo "true"; else echo "false"; fi)
 endif
 
 #other args: +native +"{hipe,[o3,verbose]}" -Ddebug=true +debug_info +no_strict_record_tests
@@ -39,9 +39,6 @@ AMQP_SPEC_JSON_PATH=$(AMQP_CODEGEN_DIR)/amqp-0.8.json
 
 ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e
 
-# for the moment we don't use boot files because they introduce a
-# dependency on particular versions of OTP applications
-#all: $(EBIN_DIR)/rabbit.boot
 all: $(TARGETS)
 
 $(EBIN_DIR)/rabbit.app: $(EBIN_DIR)/rabbit_app.in $(BEAM_TARGETS) generate_app
@@ -101,7 +98,8 @@ run-tests: all
 start-background-node:
 	$(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \
 		RABBITMQ_NODE_ONLY=true \
-		./scripts/rabbitmq-server -detached; sleep 1
+		RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -detached" \
+		./scripts/rabbitmq-server ; sleep 1
 
 start-rabbit-on-node: all
 	echo "rabbit:start()." | $(ERL_CALL)
@@ -115,8 +113,11 @@ force-snapshot: all
 stop-node:
 	-$(ERL_CALL) -q
 
+# code coverage will be created for subdirectory "ebin" of COVER_DIR
+COVER_DIR=.
+
 start-cover: all
-	echo "cover:start(), rabbit_misc:enable_cover()." | $(ERL_CALL)
+	echo "cover:start(), rabbit_misc:enable_cover([\"$(COVER_DIR)\"])." | $(ERL_CALL)
 
 stop-cover: all
 	echo "rabbit_misc:report_cover(), cover:stop()." | $(ERL_CALL)
@@ -136,7 +137,7 @@ srcdist: distclean
 	sed -i.save 's/%%VSN%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in && rm -f $(TARGET_SRC_DIR)/ebin/rabbit_app.in.save
 
 	cp -r $(AMQP_CODEGEN_DIR)/* $(TARGET_SRC_DIR)/codegen/
-	cp codegen.py Makefile generate_app $(TARGET_SRC_DIR)
+	cp codegen.py Makefile generate_app calculate-relative $(TARGET_SRC_DIR)
 
 	cp -r scripts $(TARGET_SRC_DIR)
 	cp -r docs $(TARGET_SRC_DIR)
@@ -147,7 +148,7 @@ srcdist: distclean
 	rm -rf $(TARGET_SRC_DIR)
 
 distclean: clean
-	make -C $(AMQP_CODEGEN_DIR) distclean
+	$(MAKE) -C $(AMQP_CODEGEN_DIR) distclean
 	rm -rf dist
 	find . -regex '.*\(~\|#\|\.swp\|\.dump\)' -exec rm {} \;
 
@@ -162,7 +163,8 @@ distclean: clean
 
 docs_all: $(MANPAGES)
 
-install: all docs_all
+install: SCRIPTS_REL_PATH=$(shell ./calculate-relative $(TARGET_DIR)/sbin $(SBIN_DIR))
+install: all docs_all install_dirs
 	@[ -n "$(TARGET_DIR)" ] || (echo "Please set TARGET_DIR."; false)
 	@[ -n "$(SBIN_DIR)" ] || (echo "Please set SBIN_DIR."; false)
 	@[ -n "$(MAN_DIR)" ] || (echo "Please set MAN_DIR."; false)
@@ -171,13 +173,17 @@ install: all docs_all
 	cp -r ebin include LICENSE LICENSE-MPL-RabbitMQ INSTALL $(TARGET_DIR)
 
 	chmod 0755 scripts/*
-	mkdir -p $(SBIN_DIR)
-	cp scripts/rabbitmq-server $(SBIN_DIR)
-	cp scripts/rabbitmqctl $(SBIN_DIR)
-	cp scripts/rabbitmq-multi $(SBIN_DIR)
+	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-multi rabbitmq-activate-plugins; do \
+		cp scripts/$$script $(TARGET_DIR)/sbin; \
+		[ -e $(SBIN_DIR)/$$script ] || ln -s $(SCRIPTS_REL_PATH)/$$script $(SBIN_DIR)/$$script; \
+	done
 	for section in 1 5; do \
 		mkdir -p $(MAN_DIR)/man$$section; \
 		for manpage in docs/*.$$section.pod; do \
 			cp docs/`basename $$manpage .pod`.gz $(MAN_DIR)/man$$section; \
 		done; \
 	done
+
+install_dirs:
+	mkdir -p $(SBIN_DIR)
+	mkdir -p $(TARGET_DIR)/sbin

calculate-relative

@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+#
+# relpath.py
+# R.Barran 30/08/2004
+# Retrieved from http://code.activestate.com/recipes/302594/
+
+import os
+import sys
+
+def relpath(target, base=os.curdir):
+    """
+    Return a relative path to the target from either the current dir or an optional base dir.
+    Base can be a directory specified either as absolute or relative to current dir.
+    """
+
+    if not os.path.exists(target):
+        raise OSError, 'Target does not exist: '+target
+
+    if not os.path.isdir(base):
+        raise OSError, 'Base is not a directory or does not exist: '+base
+
+    base_list = (os.path.abspath(base)).split(os.sep)
+    target_list = (os.path.abspath(target)).split(os.sep)
+
+    # On the windows platform the target may be on a completely different drive from the base.
+    if os.name in ['nt','dos','os2'] and base_list[0] <> target_list[0]:
+        raise OSError, 'Target is on a different drive to base. Target: '+target_list[0].upper()+', base: '+base_list[0].upper()
+
+    # Starting from the filepath root, work out how much of the filepath is
+    # shared by base and target.
+    for i in range(min(len(base_list), len(target_list))):
+        if base_list[i] <> target_list[i]: break
+    else:
+        # If we broke out of the loop, i is pointing to the first differing path elements.
+        # If we didn't break out of the loop, i is pointing to identical path elements.
+        # Increment i so that in all cases it points to the first differing path elements.
+        i+=1
+
+    rel_list = [os.pardir] * (len(base_list)-i) + target_list[i:]
+    if (len(rel_list) == 0):
+        return "."
+    return os.path.join(*rel_list)
+
+if __name__ == "__main__":
+    print(relpath(sys.argv[1], sys.argv[2]))

codegen.py

@@ -117,6 +117,13 @@ def genMethodId(m):
 
     def genMethodHasContent(m):
         print "method_has_content(%s) -> %s;" % (m.erlangName(), str(m.hasContent).lower())
+    
+    def genMethodIsSynchronous(m):
+        hasNoWait = "nowait" in fieldNameList(m.arguments)
+        if m.isSynchronous and hasNoWait:
+          print "is_method_synchronous(#%s{nowait = NoWait}) -> not(NoWait);" % (m.erlangName())
+        else:
+          print "is_method_synchronous(#%s{}) -> %s;" % (m.erlangName(), str(m.isSynchronous).lower())
 
     def genMethodFieldTypes(m):
         """Not currently used - may be useful in future?"""
@@ -246,6 +253,7 @@ def genLookupException1(c,hardErrorBoolStr):
 
 -export([method_id/1]).
 -export([method_has_content/1]).
+-export([is_method_synchronous/1]).
 -export([method_fieldnames/1]).
 -export([decode_method_fields/2]).
 -export([decode_properties/2]).
@@ -266,6 +274,9 @@ def genLookupException1(c,hardErrorBoolStr):
     for m in methods: genMethodHasContent(m)
     print "method_has_content(Name) -> exit({unknown_method_name, Name})."
 
+    for m in methods: genMethodIsSynchronous(m)
+    print "is_method_synchronous(Name) -> exit({unknown_method_name, Name})."
+
     for m in methods: genMethodFieldNames(m)
     print "method_fieldnames(Name) -> exit({unknown_method_name, Name})."
 

docs/rabbitmq-activate-plugins.1.pod

@@ -0,0 +1,37 @@
+=head1 NAME
+
+rabbitmq-activate-plugins - command line tool for activating plugins
+in a RabbitMQ broker
+
+=head1 SYNOPSIS
+
+rabbitmq-activate-plugins
+
+=head1 DESCRIPTION
+
+RabbitMQ is an implementation of AMQP, the emerging standard for high
+performance enterprise messaging. The RabbitMQ server is a robust and
+scalable implementation of an AMQP broker.
+
+rabbitmq-activate-plugins is a command line tool for activating
+plugins installed into the broker's plugins directory.
+
+=head1 EXAMPLES
+
+To activate all of the installed plugins in the current RabbitMQ install,
+execute:
+
+    rabbitmq-activate-plugins
+
+=head1 SEE ALSO
+
+L<rabbitmq.conf(5)>, L<rabbitmq-multi(1)>, L<rabbitmq-server(1)>,
+L<rabbitmqctl(1)>
+
+=head1 AUTHOR
+
+The RabbitMQ Team <[email protected]>
+
+=head1 REFERENCES
+
+RabbitMQ Web Site: L<http://www.rabbitmq.com>

docs/rabbitmq-multi.1.pod

@@ -15,22 +15,30 @@ scalable implementation of an AMQP broker.
 rabbitmq-multi scripts allows for easy set-up of a cluster on a single
 machine.
 
-See also rabbitmq-server(1) for configuration information.
+See also L<rabbitmq-server(1)> for configuration information.
 
 =head1 COMMANDS
 
-start_all I<count>
-    start count nodes with unique names, listening on all IP addresses
-    and on sequential ports starting from 5672.
+=over
 
-status
-    print the status of all running RabbitMQ nodes
+=item start_all I<count>
 
-stop_all
-    stop all local RabbitMQ nodes
+Start count nodes with unique names, listening on all IP addresses and
+on sequential ports starting from 5672.
 
-rotate_logs
-    rotate log files for all local and running RabbitMQ nodes
+=item status
+
+Print the status of all running RabbitMQ nodes.
+
+=item stop_all
+
+Stop all local RabbitMQ nodes,
+
+=item rotate_logs
+
+Rotate log files for all local and running RabbitMQ nodes.
+
+=back
 
 =head1 EXAMPLES
 
@@ -40,12 +48,12 @@ Start 3 local RabbitMQ nodes with unique, sequential port numbers:
 
 =head1 SEE ALSO
 
-rabbitmq.conf(5), rabbitmq-server(1), rabbitmqctl(1)
+L<rabbitmq.conf(5)>, L<rabbitmq-server(1)>, L<rabbitmqctl(1)>
 
 =head1 AUTHOR
 
 The RabbitMQ Team <[email protected]>
 
 =head1 REFERENCES
 
-RabbitMQ Web Site: http://www.rabbitmq.com
+RabbitMQ Web Site: L<http://www.rabbitmq.com>

docs/rabbitmq-server.1.pod

@@ -16,43 +16,57 @@ Running rabbitmq-server in the foreground displays a banner message,
 and reports on progress in the startup sequence, concluding with the
 message "broker running", indicating that the RabbitMQ broker has been
 started successfully. To shut down the server, just terminate the
-process or use rabbitmqctl(1). 
+process or use L<rabbitmqctl(1)>.
 
 =head1 ENVIRONMENT
 
-B<RABBITMQ_MNESIA_BASE>
-    Defaults to /var/lib/rabbitmq/mnesia. Set this to the directory 
-    where Mnesia database files should be placed. 
+=over
 
-B<RABBITMQ_LOG_BASE>
-    Defaults to /var/log/rabbitmq. Log files generated by the server
-    will be placed in this directory. 
+=item B<RABBITMQ_MNESIA_BASE>
 
-B<RABBITMQ_NODENAME>
-    Defaults to rabbit. This can be useful if you want to run more
-    than one node per machine - B<RABBITMQ_NODENAME> should be unique
-    per erlang-node-and-machine combination. See clustering on a
-    single machine guide at
-    http://www.rabbitmq.com/clustering.html#single-machine for
-    details.
+Defaults to F</var/lib/rabbitmq/mnesia>. Set this to the directory where
+Mnesia database files should be placed.
 
-B<RABBITMQ_NODE_IP_ADDRESS>
-    Defaults to 0.0.0.0. This can be changed if you only want to bind
-    to one network interface. 
+=item B<RABBITMQ_LOG_BASE>
 
-B<RABBITMQ_NODE_PORT>
-    Defaults to 5672. 
+Defaults to F</var/log/rabbitmq>. Log files generated by the server will
+be placed in this directory.
 
-B<RABBITMQ_CLUSTER_CONFIG_FILE>
-    Defaults to /etc/rabbitmq/rabbitmq_cluster.config. If this file is
-    present it is used by the server to auto-configure a RabbitMQ
-    cluster.
-    See the clustering guide at http://www.rabbitmq.com/clustering.html
-    for details.
+=item B<RABBITMQ_NODENAME>
+
+Defaults to rabbit. This can be useful if you want to run more than
+one node per machine - B<RABBITMQ_NODENAME> should be unique per
+erlang-node-and-machine combination. See clustering on a single
+machine guide at
+L<http://www.rabbitmq.com/clustering.html#single-machine> for details.
+
+=item B<RABBITMQ_NODE_IP_ADDRESS>
+
+Defaults to 0.0.0.0. This can be changed if you only want to bind to
+one network interface.
+
+=item B<RABBITMQ_NODE_PORT>
+
+Defaults to 5672. 
+
+=item B<RABBITMQ_CLUSTER_CONFIG_FILE>
+
+Defaults to F</etc/rabbitmq/rabbitmq_cluster.config>. If this file is
+present it is used by the server to auto-configure a RabbitMQ cluster.
+See the clustering guide at L<http://www.rabbitmq.com/clustering.html>
+for details.
+
+=back
 
 =head1 OPTIONS
 
-B<-detached> start the server process in the background
+=over
+
+=item B<-detached>
+
+start the server process in the background
+
+=back
 
 =head1 EXAMPLES
 
@@ -62,12 +76,13 @@ Run RabbitMQ AMQP server in the background:
 
 =head1 SEE ALSO
 
-rabbitmq.conf(5), rabbitmq-multi(1), rabbitmqctl(1)
+L<rabbitmq.conf(5)>, L<rabbitmq-multi(1)>, L<rabbitmqctl(1)>
 
 =head1 AUTHOR
 
 The RabbitMQ Team <[email protected]>
 
 =head1 REFERENCES
 
-RabbitMQ Web Site: http://www.rabbitmq.com
+RabbitMQ Web Site: L<http://www.rabbitmq.com>
+