Attachment #155392 for bug #269838

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

Lines 282-287 Link Here

(-)cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java (-1 / +17 lines)
282	currentTarget.updateState(threadId);	282	currentTarget.updateState(threadId);
283	try {	283	try {
284	Thread cthread = (Thread)currentTarget.getCurrentThread();	284	Thread cthread = (Thread)currentTarget.getCurrentThread();
		285
		286	// As a fallback, use the id from the stopped event
		287	if(cthread == null) {
		288	cthread = (Thread)currentTarget.getThread(threadId);
		289	}
		290
285	if (cthread != null) {	291	if (cthread != null) {
286	cthread.getCurrentStackFrame();	292	cthread.getCurrentStackFrame();
287	} else {	293	} else {
Lines 422-430 Link Here
422	Thread currentThread = null;	428	Thread currentThread = null;
423	try {	429	try {
424	currentThread = (Thread)currentTarget.getCurrentThread();	430	currentThread = (Thread)currentTarget.getCurrentThread();
		431	// As a fallback, use the id from the stopped event
		432	if(currentThread == null) {
		433	currentThread = (Thread)currentTarget.getThread(stopped.getThreadId());
		434	}
		435	if(currentThread != null) {
		436	tid = currentThread.getId();
		437	}
		438	else {
		439	return true;
		440	}
425	} catch (CDIException e1) {	441	} catch (CDIException e1) {
426	}	442	}
427	tid = currentThread.getId();	443
428	// Select the old thread now.	444	// Select the old thread now.
429	if (tid > 0) {	445	if (tid > 0) {
430	MIThreadSelect selectThread = factory.createMIThreadSelect(tid);	446	MIThreadSelect selectThread = factory.createMIThreadSelect(tid);

Lines 15-20 Link Here

(-)mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/StandardMacOSCommandFactory.java (+5 lines)
15	import org.eclipse.cdt.debug.mi.core.command.MIEnvironmentCD;	15	import org.eclipse.cdt.debug.mi.core.command.MIEnvironmentCD;
16	import org.eclipse.cdt.debug.mi.core.command.MIInfoSharedLibrary;	16	import org.eclipse.cdt.debug.mi.core.command.MIInfoSharedLibrary;
17	import org.eclipse.cdt.debug.mi.core.command.factories.StandardCommandFactory;	17	import org.eclipse.cdt.debug.mi.core.command.factories.StandardCommandFactory;
		18	import org.eclipse.cdt.debug.mi.core.command.CLIInfoThreads;
18		19
19	public class StandardMacOSCommandFactory extends StandardCommandFactory {	20	public class StandardMacOSCommandFactory extends StandardCommandFactory {
20		21
Lines 44-47 Link Here
44	return new MIInfoSharedLibrary(getMIVersion());	45	return new MIInfoSharedLibrary(getMIVersion());
45	}	46	}
46		47
		48	public CLIInfoThreads createCLIInfoThreads() {
		49	return new MacOSCLIInfoThreads();
		50	}
		51
47	}	52	}




package org.eclipse.cdt.debug.mi.core.command.factories.macos;

import java.util.Arrays;

import org.eclipse.cdt.debug.mi.core.output.CLIInfoThreadsInfo;
import org.eclipse.cdt.debug.mi.core.output.MIConst;
import org.eclipse.cdt.debug.mi.core.output.MIOutput;
import org.eclipse.cdt.debug.mi.core.output.MIResult;
import org.eclipse.cdt.debug.mi.core.output.MIResultRecord;
import org.eclipse.cdt.debug.mi.core.output.MITuple;
import org.eclipse.cdt.debug.mi.core.output.MIValue;

/**
 * This class actually parses -thread-list-ids and converts it to the
 * CLIInfoThreadsInfo 'format'
 */
class MacOsCLIInfoThreadsInfo extends CLIInfoThreadsInfo {

	public MacOsCLIInfoThreadsInfo(MIOutput out) {
		super(out);
	}

	protected void parse() {
		if (isDone()) {
			MIOutput out = getMIOutput();
			MIResultRecord rr = out.getMIResultRecord();
			if (rr != null) {
				MIResult[] results = rr.getMIResults();
				for (int i = 0; i < results.length; i++) {
					String var = results[i].getVariable();
					if (var.equals("thread-ids")) { //$NON-NLS-1$
						MIValue val = results[i].getMIValue();
						if (val instanceof MITuple) {
							parseThreadIds((MITuple) val);
						}
					}
				}
			}
		}
		if (threadIds == null) {
			threadIds = new int[0];
		}
		Arrays.sort(threadIds);
		
		// -thread-list-ids doesn't provide the current thread id so we
		// set currentThreadId to a dumb value. This has the effect of falling
		// back to the thread id provided by the stopped event. See EventManager::processSuspendedEvent
		currentThreadId = -1;
	}

	void parseThreadIds(MITuple tuple) {
		MIResult[] results = tuple.getMIResults();
		threadIds = new int[results.length];
		for (int i = 0; i < results.length; i++) {
			String var = results[i].getVariable();
			if (var.equals("thread-id")) { //$NON-NLS-1$
				MIValue value = results[i].getMIValue();
				if (value instanceof MIConst) {
					String str = ((MIConst) value).getCString();
					try {
						threadIds[i] = Integer.parseInt(str.trim());
					} catch (NumberFormatException e) {
					}
				}
			}
		}
	}
}




package org.eclipse.cdt.debug.mi.core.command.factories.macos;

import org.eclipse.cdt.debug.mi.core.MIException;
import org.eclipse.cdt.debug.mi.core.command.CLIInfoThreads;
import org.eclipse.cdt.debug.mi.core.output.CLIInfoThreadsInfo;
import org.eclipse.cdt.debug.mi.core.output.MIInfo;
import org.eclipse.cdt.debug.mi.core.output.MIOutput;

class MacOSCLIInfoThreads extends CLIInfoThreads {
	public MacOSCLIInfoThreads() {
		super();
		// with apple-gdb, we use -thread-list-ids as a replacement for info
		// threads
		setOperation("-thread-list-ids"); //$NON-NLS-1$
	}

	// MI doesn't work with a space between the token and the
	// operation, so we override CLICommmand's toString
	public String toString() {
		return getToken() + getOperation() + "\n"; //$NON-NLS-1$
	}

	public MIInfo getMIInfo() throws MIException {
		MIInfo info = null;
		MIOutput out = getMIOutput();
		if (out != null) {
			info = new MacOsCLIInfoThreadsInfo(out);
			if (info.isError()) {
				throwMIException(info, out);
			}
		}
		return info;
	}

	public CLIInfoThreadsInfo getMIInfoThreadsInfo() throws MIException {
		return (CLIInfoThreadsInfo) getMIInfo();
	}

}

Return to bug 269838

Added Link Here

(-)mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOsCLIInfoThreadsInfo.java (+68 lines)
1	package org.eclipse.cdt.debug.mi.core.command.factories.macos;
2
3	import java.util.Arrays;
4
5	import org.eclipse.cdt.debug.mi.core.output.CLIInfoThreadsInfo;
6	import org.eclipse.cdt.debug.mi.core.output.MIConst;
7	import org.eclipse.cdt.debug.mi.core.output.MIOutput;
8	import org.eclipse.cdt.debug.mi.core.output.MIResult;
9	import org.eclipse.cdt.debug.mi.core.output.MIResultRecord;
10	import org.eclipse.cdt.debug.mi.core.output.MITuple;
11	import org.eclipse.cdt.debug.mi.core.output.MIValue;
12
13	/**
14	* This class actually parses -thread-list-ids and converts it to the
15	* CLIInfoThreadsInfo 'format'
16	*/
17	class MacOsCLIInfoThreadsInfo extends CLIInfoThreadsInfo {
18
19	public MacOsCLIInfoThreadsInfo(MIOutput out) {
20	super(out);
21	}
22
23	protected void parse() {
24	if (isDone()) {
25	MIOutput out = getMIOutput();
26	MIResultRecord rr = out.getMIResultRecord();
27	if (rr != null) {
28	MIResult[] results = rr.getMIResults();
29	for (int i = 0; i < results.length; i++) {
30	String var = results[i].getVariable();
31	if (var.equals("thread-ids")) { //$NON-NLS-1$
32	MIValue val = results[i].getMIValue();
33	if (val instanceof MITuple) {
34	parseThreadIds((MITuple) val);
35	}
36	}
37	}
38	}
39	}
40	if (threadIds == null) {
41	threadIds = new int[0];
42	}
43	Arrays.sort(threadIds);
44
45	// -thread-list-ids doesn't provide the current thread id so we
46	// set currentThreadId to a dumb value. This has the effect of falling
47	// back to the thread id provided by the stopped event. See EventManager::processSuspendedEvent
48	currentThreadId = -1;
49	}
50
51	void parseThreadIds(MITuple tuple) {
52	MIResult[] results = tuple.getMIResults();
53	threadIds = new int[results.length];
54	for (int i = 0; i < results.length; i++) {
55	String var = results[i].getVariable();
56	if (var.equals("thread-id")) { //$NON-NLS-1$
57	MIValue value = results[i].getMIValue();
58	if (value instanceof MIConst) {
59	String str = ((MIConst) value).getCString();
60	try {
61	threadIds[i] = Integer.parseInt(str.trim());
62	} catch (NumberFormatException e) {
63	}
64	}
65	}
66	}
67	}
68	}

Added Link Here

(-)mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoThreads.java (+39 lines)
1	package org.eclipse.cdt.debug.mi.core.command.factories.macos;
2
3	import org.eclipse.cdt.debug.mi.core.MIException;
4	import org.eclipse.cdt.debug.mi.core.command.CLIInfoThreads;
5	import org.eclipse.cdt.debug.mi.core.output.CLIInfoThreadsInfo;
6	import org.eclipse.cdt.debug.mi.core.output.MIInfo;
7	import org.eclipse.cdt.debug.mi.core.output.MIOutput;
8
9	class MacOSCLIInfoThreads extends CLIInfoThreads {
10	public MacOSCLIInfoThreads() {
11	super();
12	// with apple-gdb, we use -thread-list-ids as a replacement for info
13	// threads
14	setOperation("-thread-list-ids"); //$NON-NLS-1$
15	}
16
17	// MI doesn't work with a space between the token and the
18	// operation, so we override CLICommmand's toString
19	public String toString() {
20	return getToken() + getOperation() + "\n"; //$NON-NLS-1$
21	}
22
23	public MIInfo getMIInfo() throws MIException {
24	MIInfo info = null;
25	MIOutput out = getMIOutput();
26	if (out != null) {
27	info = new MacOsCLIInfoThreadsInfo(out);
28	if (info.isError()) {
29	throwMIException(info, out);
30	}
31	}
32	return info;
33	}
34
35	public CLIInfoThreadsInfo getMIInfoThreadsInfo() throws MIException {
36	return (CLIInfoThreadsInfo) getMIInfo();
37	}
38
39	}