Project: ProActive

Revision: 10091

Author: bsauvan

Date: 05 Sep 2008 07:26:51

• /trunk/src/Tests/functionalTests/component/monitoring/Client2MulticastImpl.java

  ......	@@ -0,0 +1,95 @@
  	1	package functionalTests.component.monitoring;
  	2
  	3	import org.objectweb.fractal.api.NoSuchInterfaceException;
  	4	import org.objectweb.fractal.api.control.BindingController;
  	5	import org.objectweb.fractal.api.control.IllegalBindingException;
  	6	import org.objectweb.fractal.api.control.IllegalLifeCycleException;
  	7	import org.objectweb.proactive.core.ProActiveRuntimeException;
  	8
  	9
  	10	public class Client2MulticastImpl implements Runner, BindingController {
  	11	private static final long SLEEP_TIME = 20;
  	12	private static final String[] ITF_NAMES_FOR_EACH_METHOD = { "service2", "service2", "service2" };
  	13	private static final String[] METHOD_NAMES = { "doAnotherThing", "getDouble", "getBoolean" };
  	14	private static final int NB_ITERATIONS = 100;
  	15	private Service2Multicast service2;
  	16	private int[] nbCallsPerMethod = new int[METHOD_NAMES.length];
  	17
  	18	private void sleep() {
  	19	try {
  	20	Thread.sleep(SLEEP_TIME);
  	21	} catch (InterruptedException e) {
  	22	e.printStackTrace();
  	23	}
  	24	}
  	25
  	26	public void run() {
  	27	for (int i = 0; i < METHOD_NAMES.length; i++) {
  	28	nbCallsPerMethod[i] = 0;
  	29	}
  	30	for (int i = 0; i < NB_ITERATIONS; i++) {
  	31	sleep();
  	32	int indexMethod = i % METHOD_NAMES.length;
  	33	nbCallsPerMethod[indexMethod]++;
  	34	switch (indexMethod) {
  	35	case 0:
  	36	service2.doAnotherThing();
  	37	break;
  	38	case 1:
  	39	service2.getDouble();
  	40	break;
  	41	case 2:
  	42	service2.getBoolean();
  	43	break;
  	44	default:
  	45	break;
  	46	}
  	47	}
  	48	}
  	49
  	50	public int getTotalNbMethodCalls() {
  	51	return NB_ITERATIONS;
  	52	}
  	53
  	54	public long getSleepTime() {
  	55	return SLEEP_TIME;
  	56	}
  	57
  	58	public String[] getItfNamesForEachMethod() {
  	59	return ITF_NAMES_FOR_EACH_METHOD;
  	60	}
  	61
  	62	public String[] getMethodNames() {
  	63	return METHOD_NAMES;
  	64	}
  	65
  	66	public int[] getNbCallsPerMethod() {
  	67	return nbCallsPerMethod;
  	68	}
  	69
  	70	public void bindFc(String clientItfName, Object serverItf) throws NoSuchInterfaceException,
  	71	IllegalBindingException, IllegalLifeCycleException {
  	72	if ("service2".equals(clientItfName)) {
  	73	service2 = (Service2Multicast) serverItf;
  	74	} else {
  	75	throw new NoSuchInterfaceException(clientItfName);
  	76	}
  	77	}
  	78
  	79	public String[] listFc() {
  	80	return new String[] { "service2", "service3" };
  	81	}
  	82
  	83	public Object lookupFc(String clientItfName) throws NoSuchInterfaceException {
  	84	if ("service2".equals(clientItfName)) {
  	85	return service2;
  	86	} else {
  	87	throw new NoSuchInterfaceException(clientItfName);
  	88	}
  	89	}
  	90
  	91	public void unbindFc(String arg0) throws NoSuchInterfaceException, IllegalBindingException,
  	92	IllegalLifeCycleException {
  	93	throw new ProActiveRuntimeException("not implemented!");
  	94	}
  	95	}

• /trunk/src/Tests/functionalTests/component/monitoring/Service2Multicast.java

  ......	@@ -0,0 +1,15 @@
  	1	package functionalTests.component.monitoring;
  	2
  	3	import java.util.List;
  	4
  	5	import org.objectweb.proactive.core.util.wrapper.BooleanWrapper;
  	6	import org.objectweb.proactive.core.util.wrapper.DoubleWrapper;
  	7
  	8
  	9	public interface Service2Multicast {
  	10	public void doAnotherThing();
  	11
  	12	public List<DoubleWrapper> getDouble();
  	13
  	14	public List<BooleanWrapper> getBoolean();
  	15	}
  0	16	\ No newline at end of file

• /trunk/src/Core/org/objectweb/proactive/core/component/controller/MonitorControllerHelper.java

  ......	@@ -1,8 +1,5 @@
  1	1	package org.objectweb.proactive.core.component.controller;
  2	2
  3		import org.objectweb.proactive.core.util.wrapper.StringWrapper;
  4
  5
  6	3	public class MonitorControllerHelper {
  7	4	private static final String KEY_INFO_SEPARATOR = "-";
  8	5

• /trunk/src/Core/org/objectweb/proactive/core/component/controller/MulticastControllerImpl.java

  ......	@@ -261,10 +261,7 @@
  261	261	*/
  262	262	public void unbindFcMulticast(String clientItfName, ProActiveInterface serverItf) {
  263	263	if (multicastItfs.containsKey(clientItfName)) {
  264		Group<ProActiveInterface> g = null;
  265		ProxyForComponentInterfaceGroup clientSideProxy = (ProxyForComponentInterfaceGroup) clientSideProxies
  266		.get(clientItfName);
  267		g = clientSideProxy.getDelegatee();
  	264	Group<ProActiveInterface> g = getDelegatee(clientItfName);
  268	265	//ProActiveInterface itf = multicastItfs.get(clientItfName);
  269	266	//Group<ProActiveInterface> g = PAGroup.getGroup(itf);
  270	267	if (g.remove(serverItf)) {

• /trunk/src/Core/org/objectweb/proactive/core/component/controller/MonitorControllerImpl.java

  ......	@@ -87,26 +87,30 @@
  87	87	(!itfType.isFcClientItf())) {
  88	88	List<MonitorController> subcomponentMonitors = new ArrayList<MonitorController>();
  89	89	if (isComposite()) {
  90		Iterator<ProActiveInterface> bindedProActiveinterfaces = null;
  	90	Iterator<Component> bindedComponentsIterator = null;
  91	91	if (!((ProActiveInterfaceType) itfType).isFcMulticastItf()) {
  92		List<ProActiveInterface> bindedProActiveinterface = new ArrayList<ProActiveInterface>();
  93		bindedProActiveinterface.add((ProActiveInterface) itf);
  94		bindedProActiveinterfaces = bindedProActiveinterface.iterator();
  	92	List<Component> bindedComponent = new ArrayList<Component>();
  	93	bindedComponent.add(((ProActiveInterface) ((ProActiveInterface) itf)
  	94	.getFcItfImpl()).getFcItfOwner());
  	95	bindedComponentsIterator = bindedComponent.iterator();
  95	96	} else {
  96	97	try {
  97		MulticastControllerImpl multicastController = (MulticastControllerImpl) owner
  98		.getFcInterface(Constants.MULTICAST_CONTROLLER);
  99		bindedProActiveinterfaces = multicastController.getDelegatee(
  	98	MulticastControllerImpl multicastController = (MulticastControllerImpl) ((ProActiveInterface) owner
  	99	.getFcInterface(Constants.MULTICAST_CONTROLLER)).getFcItfImpl();
  	100	Iterator<ProActiveInterface> delegatee = multicastController.getDelegatee(
  100	101	itf.getFcItfName()).iterator();
  	102	List<Component> bindedComponents = new ArrayList<Component>();
  	103	while (delegatee.hasNext())
  	104	bindedComponents.add(delegatee.next().getFcItfOwner());
  	105	bindedComponentsIterator = bindedComponents.iterator();
  101	106	} catch (NoSuchInterfaceException e) {
  102	107	e.printStackTrace();
  103	108	}
  104	109	}
  105	110	try {
  106		while (bindedProActiveinterfaces.hasNext()) {
  107		MonitorController monitor = (MonitorController) ((ProActiveInterface) bindedProActiveinterfaces
  108		.next().getFcItfImpl()).getFcItfOwner().getFcInterface(
  109		Constants.MONITOR_CONTROLLER);
  	111	while (bindedComponentsIterator.hasNext()) {
  	112	MonitorController monitor = (MonitorController) bindedComponentsIterator
  	113	.next().getFcInterface(Constants.MONITOR_CONTROLLER);
  110	114	monitor.startMonitoring();
  111	115	subcomponentMonitors.add(monitor);
  112	116	}
  ......	@@ -259,7 +263,7 @@
  259	263	handleNotification(iterator.next(), handback);
  260	264	}
  261	265	}
  262
  	266
  263	267	/*
  264	268	* ---------- PRIVATE METHODS FOR SERIALIZATION ----------
  265	269	*/

• /trunk/src/Core/org/objectweb/proactive/core/component/exceptions/NoSuchComponentException.java

  ......	@@ -31,12 +31,16 @@
  31	31	*/
  32	32	package org.objectweb.proactive.core.component.exceptions;
  33	33
  	34	import org.objectweb.proactive.annotation.PublicAPI;
  	35
  	36
  34	37	/**
  35	38	* Exception thrown when a named component cannot be found
  36	39	*
  37	40	* @author The ProActive Team
  38	41	*
  39	42	*/
  	43	@PublicAPI
  40	44	public class NoSuchComponentException extends Exception {
  41	45	public NoSuchComponentException() {
  42	46	super();

• /trunk/src/Tests/functionalTests/component/monitoring/adl/TestComposite.fractal

  ......	@@ -8,14 +8,14 @@
  8	8
  9	9	<component definition="functionalTests.component.monitoring.adl.Client1" name="client1"/>
  10	10	<component definition="functionalTests.component.monitoring.adl.Client2" name="client2"/>
  11		<component definition="functionalTests.component.monitoring.adl.Composite" name="servercomposite"/>
  	11	<component definition="functionalTests.component.monitoring.adl.Composite" name="server"/>
  12	12
  13	13	<binding client="this.runner1" server="client1.runner"/>
  14	14	<binding client="this.runner2" server="client2.runner"/>
  15		<binding client="client1.service1" server="servercomposite.service1"/>
  16		<binding client="client2.service2" server="servercomposite.service2"/>
  17		<binding client="client1.service3" server="servercomposite.service3"/>
  18		<binding client="client2.service3" server="servercomposite.service3"/>
  	15	<binding client="client1.service1" server="server.service1"/>
  	16	<binding client="client2.service2" server="server.service2"/>
  	17	<binding client="client1.service3" server="server.service3"/>
  	18	<binding client="client2.service3" server="server.service3"/>
  19	19
  20	20	<controller desc="composite"/>
  21	21	</definition>
  22	22	\ No newline at end of file

• /trunk/src/Tests/functionalTests/component/monitoring/adl/Client1Multicast.fractal

  ......	@@ -0,0 +1,12 @@
  	1	<?xml version="1.0" encoding="ISO-8859-1" ?>
  	2
  	3	<!DOCTYPE definition PUBLIC "-//objectweb.org//DTD Fractal ADL 2.0//EN" "classpath://org/objectweb/proactive/core/component/adl/xml/proactive.dtd">
  	4
  	5	<definition name="functionalTests.component.monitoring.adl.Client1Multicast">
  	6	<interface signature="functionalTests.component.monitoring.Runner" role="server" name="runner"/>
  	7	<interface signature="functionalTests.component.monitoring.Service1Multicast" role="client" name="service1"/>
  	8
  	9	<content class="functionalTests.component.monitoring.Client1MulticastImpl"/>
  	10
  	11	<controller desc="primitive"/>
  	12	</definition>
  0	13	\ No newline at end of file

• /trunk/src/Tests/functionalTests/component/monitoring/adl/Client2Multicast.fractal

  ......	@@ -0,0 +1,12 @@
  	1	<?xml version="1.0" encoding="ISO-8859-1" ?>
  	2
  	3	<!DOCTYPE definition PUBLIC "-//objectweb.org//DTD Fractal ADL 2.0//EN" "classpath://org/objectweb/proactive/core/component/adl/xml/proactive.dtd">
  	4
  	5	<definition name="functionalTests.component.monitoring.adl.Client2Multicast">
  	6	<interface signature="functionalTests.component.monitoring.Runner" role="server" name="runner"/>
  	7	<interface signature="functionalTests.component.monitoring.Service2Multicast" role="client" name="service2"/>
  	8
  	9	<content class="functionalTests.component.monitoring.Client2MulticastImpl"/>
  	10
  	11	<controller desc="primitive"/>
  	12	</definition>
  0	13	\ No newline at end of file

• /trunk/src/Tests/functionalTests/component/monitoring/adl/CompositeMulticast.fractal

  ......	@@ -0,0 +1,18 @@
  	1	<?xml version="1.0" encoding="ISO-8859-1" ?>
  	2
  	3	<!DOCTYPE definition PUBLIC "-//objectweb.org//DTD Fractal ADL 2.0//EN" "classpath://org/objectweb/proactive/core/component/adl/xml/proactive.dtd">
  	4
  	5	<definition name="functionalTests.component.monitoring.adl.CompositeMulticast">
  	6	<interface signature="functionalTests.component.monitoring.Service1Multicast" role="server" cardinality="multicast" name="service1"/>
  	7	<interface signature="functionalTests.component.monitoring.Service2Multicast" role="server" cardinality="multicast" name="service2"/>
  	8
  	9	<component definition="functionalTests.component.monitoring.adl.Server" name="server1"/>
  	10	<component definition="functionalTests.component.monitoring.adl.Server" name="server2"/>
  	11
  	12	<binding client="this.service1" server="server1.service1"/>
  	13	<binding client="this.service1" server="server2.service1"/>
  	14	<binding client="this.service2" server="server1.service2"/>
  	15	<binding client="this.service2" server="server2.service2"/>
  	16
  	17	<controller desc="composite"/>
  	18	</definition>
  0	19	\ No newline at end of file

• /trunk/src/Tests/functionalTests/component/monitoring/adl/TestCompositeMulticast.fractal

  ......	@@ -0,0 +1,19 @@
  	1	<?xml version="1.0" encoding="ISO-8859-1" ?>
  	2
  	3	<!DOCTYPE definition PUBLIC "-//objectweb.org//DTD Fractal ADL 2.0//EN" "classpath://org/objectweb/proactive/core/component/adl/xml/proactive.dtd">
  	4
  	5	<definition name="functionalTests.component.monitoring.adl.TestCompositeMulticast">
  	6	<interface signature="functionalTests.component.monitoring.Runner" role="server" name="runner1"/>
  	7	<interface signature="functionalTests.component.monitoring.Runner" role="server" name="runner2"/>
  	8
  	9	<component definition="functionalTests.component.monitoring.adl.Client1Multicast" name="client1"/>
  	10	<component definition="functionalTests.component.monitoring.adl.Client2Multicast" name="client2"/>
  	11	<component definition="functionalTests.component.monitoring.adl.CompositeMulticast" name="server"/>
  	12
  	13	<binding client="this.runner1" server="client1.runner"/>
  	14	<binding client="this.runner2" server="client2.runner"/>
  	15	<binding client="client1.service1" server="server.service1"/>
  	16	<binding client="client2.service2" server="server.service2"/>
  	17
  	18	<controller desc="composite"/>
  	19	</definition>
  0	20	\ No newline at end of file

• /trunk/src/Core/org/objectweb/proactive/core/component/controller/PriorityControllerImpl.java

  ......	@@ -67,7 +67,7 @@
  67	67	Constants.REQUEST_PRIORITY_CONTROLLER, PriorityController.class.getName(),
  68	68	TypeFactory.SERVER, TypeFactory.MANDATORY, TypeFactory.SINGLE));
  69	69	} catch (InstantiationException e) {
  70		throw new ProActiveRuntimeException("cannot create controller " + this.getClass().getName());
  	70	throw new ProActiveRuntimeException("cannot create controller " + this.getClass().getName(), e);
  71	71	}
  72	72	}
  73	73

• /trunk/src/Tests/functionalTests/component/monitoring/TestMonitoring.java

  ......	@@ -34,14 +34,6 @@
  34	34	root = (Component) factory.newComponent("functionalTests.component.monitoring.adl.TestPrimitive",
  35	35	context);
  36	36
  37		Component[] subComponents = Fractal.getContentController(root).getFcSubComponents();
  38		for (int i = 0; i < subComponents.length; i++) {
  39		if (((NameController) subComponents[i].getFcInterface(Constants.NAME_CONTROLLER)).getFcName()
  40		.equals("server"))
  41		monitor = (MonitorController) subComponents[i].getFcInterface(Constants.MONITOR_CONTROLLER);
  42		}
  43
  44		Fractal.getLifeCycleController(root).startFc();
  45	37	start();
  46	38	}
  47	39
  ......	@@ -52,14 +44,16 @@
  52	44	root = (Component) factory.newComponent("functionalTests.component.monitoring.adl.TestComposite",
  53	45	context);
  54	46
  55		Component[] subComponents = Fractal.getContentController(root).getFcSubComponents();
  56		for (int i = 0; i < subComponents.length; i++) {
  57		if (((NameController) subComponents[i].getFcInterface(Constants.NAME_CONTROLLER)).getFcName()
  58		.equals("servercomposite"))
  59		monitor = (MonitorController) subComponents[i].getFcInterface(Constants.MONITOR_CONTROLLER);
  60		}
  	47	start();
  	48	}
  	49
  	50	@org.junit.Test
  	51	public void testMonitoringCompositeComponentWithMulticast() throws Exception {
  	52	factory = org.objectweb.proactive.core.component.adl.FactoryFactory.getFactory();
  	53	Map<Object, Object> context = new HashMap<Object, Object>();
  	54	root = (Component) factory.newComponent(
  	55	"functionalTests.component.monitoring.adl.TestCompositeMulticast", context);
  61	56
  62		Fractal.getLifeCycleController(root).startFc();
  63	57	start();
  64	58	}
  65	59
  ......	@@ -81,6 +75,15 @@
  81	75	}
  82	76
  83	77	public void start() throws Exception {
  	78	Component[] subComponents = Fractal.getContentController(root).getFcSubComponents();
  	79	for (int i = 0; i < subComponents.length; i++) {
  	80	if (((NameController) subComponents[i].getFcInterface(Constants.NAME_CONTROLLER)).getFcName()
  	81	.equals("server"))
  	82	monitor = (MonitorController) subComponents[i].getFcInterface(Constants.MONITOR_CONTROLLER);
  	83	}
  	84
  	85	Fractal.getLifeCycleController(root).startFc();
  	86
  84	87	Runner runner1 = ((Runner) root.getFcInterface("runner1"));
  85	88	Runner runner2 = ((Runner) root.getFcInterface("runner2"));
  86	89	monitor.startMonitoring();

• /trunk/src/Tests/functionalTests/component/monitoring/Client1MulticastImpl.java

  ......	@@ -0,0 +1,95 @@
  	1	package functionalTests.component.monitoring;
  	2
  	3	import org.objectweb.fractal.api.NoSuchInterfaceException;
  	4	import org.objectweb.fractal.api.control.BindingController;
  	5	import org.objectweb.fractal.api.control.IllegalBindingException;
  	6	import org.objectweb.fractal.api.control.IllegalLifeCycleException;
  	7	import org.objectweb.proactive.core.ProActiveRuntimeException;
  	8
  	9
  	10	public class Client1MulticastImpl implements Runner, BindingController {
  	11	private static final long SLEEP_TIME = 20;
  	12	private static final String[] ITF_NAMES_FOR_EACH_METHOD = { "service1", "service1", "service1" };
  	13	private static final String[] METHOD_NAMES = { "getInt", "doSomething", "hello" };
  	14	private static final int NB_ITERATIONS = 100;
  	15	private Service1Multicast service1;
  	16	private int[] nbCallsPerMethod = new int[METHOD_NAMES.length];
  	17
  	18	private void sleep() {
  	19	try {
  	20	Thread.sleep(SLEEP_TIME);
  	21	} catch (InterruptedException e) {
  	22	e.printStackTrace();
  	23	}
  	24	}
  	25
  	26	public void run() {
  	27	for (int i = 0; i < METHOD_NAMES.length; i++) {
  	28	nbCallsPerMethod[i] = 0;
  	29	}
  	30	for (int i = 0; i < NB_ITERATIONS; i++) {
  	31	sleep();
  	32	int indexMethod = i % METHOD_NAMES.length;
  	33	nbCallsPerMethod[indexMethod]++;
  	34	switch (indexMethod) {
  	35	case 0:
  	36	service1.getInt();
  	37	break;
  	38	case 1:
  	39	service1.doSomething();
  	40	break;
  	41	case 2:
  	42	service1.hello();
  	43	break;
  	44	default:
  	45	break;
  	46	}
  	47	}
  	48	}
  	49
  	50	public int getTotalNbMethodCalls() {
  	51	return NB_ITERATIONS;
  	52	}
  	53
  	54	public long getSleepTime() {
  	55	return SLEEP_TIME;
  	56	}
  	57
  	58	public String[] getItfNamesForEachMethod() {
  	59	return ITF_NAMES_FOR_EACH_METHOD;
  	60	}
  	61
  	62	public String[] getMethodNames() {
  	63	return METHOD_NAMES;
  	64	}
  	65
  	66	public int[] getNbCallsPerMethod() {
  	67	return nbCallsPerMethod;
  	68	}
  	69
  	70	public void bindFc(String clientItfName, Object serverItf) throws NoSuchInterfaceException,
  	71	IllegalBindingException, IllegalLifeCycleException {
  	72	if ("service1".equals(clientItfName)) {
  	73	service1 = (Service1Multicast) serverItf;
  	74	} else {
  	75	throw new NoSuchInterfaceException(clientItfName);
  	76	}
  	77	}
  	78
  	79	public String[] listFc() {
  	80	return new String[] { "service1", "service3" };
  	81	}
  	82
  	83	public Object lookupFc(String clientItfName) throws NoSuchInterfaceException {
  	84	if ("service1".equals(clientItfName)) {
  	85	return service1;
  	86	} else {
  	87	throw new NoSuchInterfaceException(clientItfName);
  	88	}
  	89	}
  	90
  	91	public void unbindFc(String arg0) throws NoSuchInterfaceException, IllegalBindingException,
  	92	IllegalLifeCycleException {
  	93	throw new ProActiveRuntimeException("not implemented!");
  	94	}
  	95	}

• /trunk/src/Tests/functionalTests/component/monitoring/Service1Multicast.java

  ......	@@ -0,0 +1,15 @@
  	1	package functionalTests.component.monitoring;
  	2
  	3	import java.util.List;
  	4
  	5	import org.objectweb.proactive.core.util.wrapper.IntWrapper;
  	6	import org.objectweb.proactive.core.util.wrapper.StringWrapper;
  	7
  	8
  	9	public interface Service1Multicast {
  	10	public List<IntWrapper> getInt();
  	11
  	12	public void doSomething();
  	13
  	14	public List<StringWrapper> hello();
  	15	}
  0	16	\ No newline at end of file