Attachment #93497 for bug #223385

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 1-5 Link Here

(-)src/org/eclipse/tptp/platform/execution/client/core/IAgentController.java (-1 / +11 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2007 Intel Corporation.	2	* Copyright (c) 2005, 2008 Intel Corporation.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 141-146 Link Here
141	*/	141	*/
142	public String[] queryAvailableAgents() throws NotConnectedException;	142	public String[] queryAvailableAgents() throws NotConnectedException;
143		143
		144
		145
144	/**	146	/**
145	* @param interfaceID	147	* @param interfaceID
146	* @return Agent list	148	* @return Agent list
Lines 148-153 Link Here
148	*/	150	*/
149	public String[] queryAvailableAgents(String[] interfaceID) throws NotConnectedException;	151	public String[] queryAvailableAgents(String[] interfaceID) throws NotConnectedException;
150		152
		153
		154	/**
		155	* @param processID, destID
		156	* @return String UUID
		157	* @throws NotConnectedException
		158	*/
		159	public String queryProcessUUID(long processID, int destID) throws NotConnectedException;
		160
151	/**	161	/**
152	* Returns the list of running agents	162	* Returns the list of running agents
153	* @return list of running agents	163	* @return list of running agents




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM, Intel Corporation.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.eclipse.tptp.platform.execution.client.core.INode;
import org.eclipse.tptp.platform.execution.client.core.IProcess;
import org.eclipse.tptp.platform.execution.client.core.internal.commands.AgentDetailsCommand;
import org.eclipse.tptp.platform.execution.client.core.internal.commands.GetProcessUUIDCommand;
import org.eclipse.tptp.platform.execution.client.core.internal.commands.QueryAvailableAgntCommand;
import org.eclipse.tptp.platform.execution.exceptions.DataChannelConnectionException;
import org.eclipse.tptp.platform.execution.exceptions.InactiveAgentException;

		return arr.add(agent);
	}
	
	public String queryProcessUUID(long pid, int destID) throws NotConnectedException {
		if(!isConnected()) throw new NotConnectedException(Constants.TPTP_PLATFORM_EXEC_MSG17);

		final Object _launcherLock 	= new Object();
		
		final GenericCommandHandler genCmdHandler = new GenericCommandHandler();
		if(TPTP_AC)
		{
			try{
				synchronized(_launcherLock) 
				{
		 		   try{ 	
			 		   	GetProcessUUIDCommand command= new GetProcessUUIDCommand(pid+"");
			 		   	
			 		   	this.sendCommand(command.buildCommand(), destID, new ICommandHandler()
			 		   	{
			 		   		public void incomingCommand(INode node, ICommandElement command)
			 		   		{
			 		   			genCmdHandler.setCommandElement(command);
			 		   		}
			 		   	});
			 		   	try{
			 		   		_launcherLock.notifyAll();
			 		   	}catch(Exception e){
			   				e.printStackTrace();}
					   	}
	 			   	catch(Exception e){e.printStackTrace();}
				} //synchronized
			 }catch(Exception e){
				 e.printStackTrace();}
			 }
		
			synchronized (_launcherLock) {
				int processLauchTimeOut = 0;
		 	    while(genCmdHandler.getCommandElement() == null )
		 	    {
		 	        try
		 	        {		 	        	
		 	        	_launcherLock.wait(Constants.TIMEOUT_PERIOD);
		 	        	if (processLauchTimeOut == Constants.PROCESS_LAUNCH_TIMEOUT_TRY_COUNT)
		 	        	{
		 	        		throw new TimeoutException(Constants.TPTP_PLATFORM_EXEC_MSG33);		
		 	        	}
		 	        	processLauchTimeOut++;
		 	        	if (Constants.TPTP_DEBUG) System.out.println("The Process Launch Timeout count" + processLauchTimeOut);
		 	        }
		 	        catch(Exception e)
		 	        {
		 	        	_launcherLock.notifyAll();
		 	        	e.printStackTrace();
		 	        	break;
		 	        }
		 	    }
		 	    _launcherLock.notifyAll();
		 	}

			
			if (genCmdHandler.getCommandElement() == null) {
				return null;
			} 
			String commandStr = ((CommandFragment)genCmdHandler.getCommandElement()).getCommandData();
			
			TPTPXMLParse ParseObj = new TPTPXMLParse();
			ParseObj.setParser(commandStr);
			
			
			Hashtable ch = ParseObj.getHashTable();
			if(ch.containsKey("processUUID") ){
				return (String) ch.get("processUUID");
			}else{
				return null;
			}			
	}
	
	
	public IAgent[] queryRunningAgents(String agentName, String[] interfaceID, long pid) throws NotConnectedException {
		if(!isConnected()) throw new NotConnectedException(Constants.TPTP_PLATFORM_EXEC_MSG17);


Lines 1-5 Link Here

(-)src/org/eclipse/tptp/platform/execution/client/core/internal/ProcessImpl.java (-1 / +16 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2007 IBM Corporation, Intel Corporation.	2	* Copyright (c) 2005, 2008 IBM Corporation, Intel Corporation.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 355-360 Link Here
355	*/	355	*/
356	public String getUUID()	356	public String getUUID()
357	{	357	{
		358	//223385
		359	try{
		360	if(this._UUID == null){
		361
		362	this._UUID = _ac.queryProcessUUID(getProcessId(), getDestID());
		363	}
		364	}catch(InactiveAgentException e){ e.printStackTrace();
		365	}catch(InactiveProcessException e){ e.printStackTrace();
		366	}catch(NotConnectedException e){ e.printStackTrace();
		367	}
		368
358	return this._UUID;	369	return this._UUID;
359	}	370	}
360		371
Lines 905-910 Link Here
905	if(s != null) {	916	if(s != null) {
906	long processId = Long.parseLong(s);	917	long processId = Long.parseLong(s);
907	process.setProcessId(processId);	918	process.setProcessId(processId);
		919
		920	//223385
		921	process._UUID = (String) commandHash.get("processUUID");
		922
908	((AgentController)(process._ac)).attachProcess(process);	923	((AgentController)(process._ac)).attachProcess(process);
909	}	924	}
910	}	925	}




/*******************************************************************************
 * Copyright (c) 2005, 2006 Intel Corporation.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Guru Nagarajan, Intel - Initial API and Implementation 
 * 	  
 * $Id$
 *******************************************************************************/

package org.eclipse.tptp.platform.execution.client.core.internal.commands;

import java.util.Enumeration;

import org.eclipse.tptp.platform.execution.util.*;

import java.util.*;
import org.eclipse.tptp.platform.execution.exceptions.ProcessActiveException;
import org.eclipse.tptp.platform.execution.util.internal.CommandElement;
import org.eclipse.tptp.platform.execution.util.internal.Constants;
import org.eclipse.tptp.platform.execution.util.internal.TPTPMessageUtil;
import org.eclipse.tptp.platform.execution.util.internal.TPTPString;
import org.eclipse.tptp.platform.execution.util.internal.TPTPXMLParse;

/**
 *
 * TODO To change the template for this generated type comment go to
 * Window - Preferences - Java - Code Style - Code Templates
 */
public class GetProcessUUIDCommand extends CommandElement {

	protected String	_processID 	= null;
	protected String	_commandData= null;
			
	public GetProcessUUIDCommand(String processID)
	{		
		this._commandData = new String();
		this._processID = processID;
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.tptp.platform.execution.core.ICommandElement#getSize()
	 */
	public int getSize() 
	{
		return 0;
	}
	public long getContext() 
	{
		return _context;
	}
	/* (non-Javadoc)
	 * @see org.eclipse.tptp.platform.execution.core.ICommandElement#setContextID(java.lang.String)
	 */
	public void setContext(long contextID) {
		_context = contextID;
	}
	/* (non-Javadoc)
	 * @see org.eclipse.tptp.platform.execution.core.ICommandElement#getSrcID()
	 */
	public long getSource() {
		return _src;
	}
	public void setCommandData(String command) {
		this._commandData = new String(command);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.tptp.platform.execution.core.impl.commands.QueryRunningAgentsCommand#getCommandData()
	 */
	public String getCommandData() {
		return this._commandData;
	}
	/* (non-Javadoc)
	 * @see org.eclipse.tptp.platform.execution.core.ICommandElement#setSrcID(java.lang.String)
	 */
	public void setSource(long srcID) {
		_src = srcID;
	}
	//No TAG for TPTP 4.0
	public long getTag() {
		return _tag;
	}


	public long getDestination() {
		return _dest;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.tptp.platform.execution.core.ICommandElement#getInterfaceID()
	 */
	public String getInterfaceID() {
		return _iid;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.tptp.platform.execution.core.ICommandElement#setInterfaceID(java.lang.String)
	 */
	public void setInterfaceID(String interfaceID) {
		_iid = interfaceID;
	}
	
	public void setDestination(long dest) {
		_dest=dest;
	}
	/* (non-Javadoc)
	 * @see org.eclipse.tptp.platform.execution.core.ICommandElement#buildCommand(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
	 */
	public String buildCommand() 
	{
		StringBuffer sbuf = new StringBuffer();
		//<Cmd src= ctxt= dest= ><></Cmd>
		
		setDestination(101);
	
		sbuf.append("<getProcessUUID iid=\""+Constants.PROC_CTLR_IID+"\">");
		sbuf.append("<processID>");
		sbuf.append(this._processID);
		sbuf.append("</processID></getProcessUUID>");
	
		this._commandData = sbuf.toString();
		return sbuf.toString();
	}

	
	/**
	* Read the command from the input buffer.
	* @return int
	* @param buffer byte[]
	* @param offset int
	*/
	public int readFromBuffer(byte[] buffer, int offset)
	{
		int current=offset;
		String retStr = null;
		current=TPTPMessageUtil.readTPTPStringFromBuffer(buffer, current, new TPTPString(retStr));
		//With the retStr value received parse the output for the specific elements
		TPTPXMLParse ParseObj = new TPTPXMLParse();
		ParseObj.setParser(retStr);
		Enumeration enumer = ParseObj.getHashTable().elements();
	
		return current;
	}
	/**
	* Write the XML Command to the input buffer.
	* @return int
	* @param buffer byte[]
	* @param offset int
	*/
	public int writeToBuffer(byte[] buffer, int offset)
	{
		int current=offset;
		current=TPTPMessageUtil.writeTPTPStringToBuffer(buffer, current, new TPTPString(buildCommand()));
		return current;
	}

}

Return to bug 223385

Added Link Here

(-)src/org/eclipse/tptp/platform/execution/client/core/internal/commands/GetProcessUUIDCommand.java (+161 lines)
1	/*******************************************************************************
2	* Copyright (c) 2005, 2006 Intel Corporation.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Guru Nagarajan, Intel - Initial API and Implementation
10	*
11	* $Id$
12	*******************************************************************************/
13
14	package org.eclipse.tptp.platform.execution.client.core.internal.commands;
15
16	import java.util.Enumeration;
17
18	import org.eclipse.tptp.platform.execution.util.*;
19
20	import java.util.*;
21	import org.eclipse.tptp.platform.execution.exceptions.ProcessActiveException;
22	import org.eclipse.tptp.platform.execution.util.internal.CommandElement;
23	import org.eclipse.tptp.platform.execution.util.internal.Constants;
24	import org.eclipse.tptp.platform.execution.util.internal.TPTPMessageUtil;
25	import org.eclipse.tptp.platform.execution.util.internal.TPTPString;
26	import org.eclipse.tptp.platform.execution.util.internal.TPTPXMLParse;
27
28	/**
29	*
30	* TODO To change the template for this generated type comment go to
31	* Window - Preferences - Java - Code Style - Code Templates
32	*/
33	public class GetProcessUUIDCommand extends CommandElement {
34
35	protected String _processID = null;
36	protected String _commandData= null;
37
38	public GetProcessUUIDCommand(String processID)
39	{
40	this._commandData = new String();
41	this._processID = processID;
42	}
43
44	/* (non-Javadoc)
45	* @see org.eclipse.tptp.platform.execution.core.ICommandElement#getSize()
46	*/
47	public int getSize()
48	{
49	return 0;
50	}
51	public long getContext()
52	{
53	return _context;
54	}
55	/* (non-Javadoc)
56	* @see org.eclipse.tptp.platform.execution.core.ICommandElement#setContextID(java.lang.String)
57	*/
58	public void setContext(long contextID) {
59	_context = contextID;
60	}
61	/* (non-Javadoc)
62	* @see org.eclipse.tptp.platform.execution.core.ICommandElement#getSrcID()
63	*/
64	public long getSource() {
65	return _src;
66	}
67	public void setCommandData(String command) {
68	this._commandData = new String(command);
69	}
70
71	/* (non-Javadoc)
72	* @see org.eclipse.tptp.platform.execution.core.impl.commands.QueryRunningAgentsCommand#getCommandData()
73	*/
74	public String getCommandData() {
75	return this._commandData;
76	}
77	/* (non-Javadoc)
78	* @see org.eclipse.tptp.platform.execution.core.ICommandElement#setSrcID(java.lang.String)
79	*/
80	public void setSource(long srcID) {
81	_src = srcID;
82	}
83	//No TAG for TPTP 4.0
84	public long getTag() {
85	return _tag;
86	}
87
88
89	public long getDestination() {
90	return _dest;
91	}
92
93	/* (non-Javadoc)
94	* @see org.eclipse.tptp.platform.execution.core.ICommandElement#getInterfaceID()
95	*/
96	public String getInterfaceID() {
97	return _iid;
98	}
99
100	/* (non-Javadoc)
101	* @see org.eclipse.tptp.platform.execution.core.ICommandElement#setInterfaceID(java.lang.String)
102	*/
103	public void setInterfaceID(String interfaceID) {
104	_iid = interfaceID;
105	}
106
107	public void setDestination(long dest) {
108	_dest=dest;
109	}
110	/* (non-Javadoc)
111	* @see org.eclipse.tptp.platform.execution.core.ICommandElement#buildCommand(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
112	*/
113	public String buildCommand()
114	{
115	StringBuffer sbuf = new StringBuffer();
116	//<Cmd src= ctxt= dest= ><></Cmd>
117
118	setDestination(101);
119
120	sbuf.append("<getProcessUUID iid=\""+Constants.PROC_CTLR_IID+"\">");
121	sbuf.append("<processID>");
122	sbuf.append(this._processID);
123	sbuf.append("</processID></getProcessUUID>");
124
125	this._commandData = sbuf.toString();
126	return sbuf.toString();
127	}
128
129
130	/**
131	* Read the command from the input buffer.
132	* @return int
133	* @param buffer byte[]
134	* @param offset int
135	*/
136	public int readFromBuffer(byte[] buffer, int offset)
137	{
138	int current=offset;
139	String retStr = null;
140	current=TPTPMessageUtil.readTPTPStringFromBuffer(buffer, current, new TPTPString(retStr));
141	//With the retStr value received parse the output for the specific elements
142	TPTPXMLParse ParseObj = new TPTPXMLParse();
143	ParseObj.setParser(retStr);
144	Enumeration enumer = ParseObj.getHashTable().elements();
145
146	return current;
147	}
148	/**
149	* Write the XML Command to the input buffer.
150	* @return int
151	* @param buffer byte[]
152	* @param offset int
153	*/
154	public int writeToBuffer(byte[] buffer, int offset)
155	{
156	int current=offset;
157	current=TPTPMessageUtil.writeTPTPStringToBuffer(buffer, current, new TPTPString(buildCommand()));
158	return current;
159	}
160
161	}