Attachment 210615 Details for Bug 369594 – Safer fix

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

[patch] Safer fix

z.patch (text/plain), 3.03 KB, created by Marc Khouzam

on 2012-02-06 15:22:18 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2012-02-06 15:22:18 EST

Size: 3.03 KB

patch

obsolete

>From 8530519d5104baa677e93cac647165cace2b6958 Mon, 6 Feb 2012 15:21:01 -0500
>From: Marc Khouzam <marc.khouzam@ericsson.com>
>Date: Mon, 6 Feb 2012 15:16:20 -0500
>Subject: [PATCH] Bug 369594: GDB 7.4 now reports solib events in MI, but no longer in CLI
>
>diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java
>index 3eb0cc8..d83a41a 100644
>--- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java
>+++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 QNX Software Systems and others.
>+ * Copyright (c) 2000, 2012 QNX Software Systems and others.
>  * 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
>@@ -9,6 +9,7 @@
>  *     QNX Software Systems - Initial API and implementation
>  *     Norbert Ploett, Siemens AG - fix for bug 119370
>  *     Hewlett-Packard Development Company - fix for bug 109733 (null check in setPrompt)
>+ *     Marc Khouzam (Ericsson) - Bug 369594: GDB 7.4 now reports solib events in MI, but no longer in CLI
>  *******************************************************************************/
> package org.eclipse.cdt.debug.mi.core;
> 
>@@ -306,7 +307,7 @@
> 				}
> 
> 				// GDB does not provide reason when stopping on a shared library
>-				// event or because of a catchpoint (in gdb < 7.0).
>+				// event  (gdb < 7.4) or because of a catchpoint (in gdb < 7.0).
> 				// Hopefully this will be fixed in a future version. Meanwhile,
> 				// we will use a hack to cope. On most platform we can detect by
> 				// looking at the console stream for phrase. Although it is a
>@@ -427,13 +428,13 @@
> 				}
> 			}
> 		}
>-		// GDB does not have reason when stopping on shared, hopefully
>-		// this will be fix in newer version meanwhile, we will use a hack
>+		// GDB does not have reason when stopping on shared (gdb < 7.4)
>+		// we will use a hack
> 		// to cope.  On most platform we can detect this state by looking at the
> 		// console stream for the phrase:
> 		// 	~"Stopped due to shared library event\n"
> 		//
>-		// Althought it is a _real_ bad idea to do this, we do not have
>+		// Although it is a _real_ bad idea to do this, we do not have
> 		// any other alternatives.
> 		if (list.isEmpty()) {
> 			String[] logs = getStreamRecords();
>@@ -533,7 +534,10 @@
> 				event = new MIInferiorSignalExitEvent(session, rr);
> 			}
> 			session.getMIInferior().setTerminated(0,false);
>-		} else if ("shlib-event".equals(reason)) { //$NON-NLS-1$
>+		} else if ("shlib-event".equals(reason) ||  //$NON-NLS-1$
>+				// GDB 7.4 reports this event as "solib-event"
>+				// Bug 369594
>+				   "solib-event".equals(reason)) {//$NON-NLS-1$
> 			if (exec != null) {
> 				event = new MISharedLibEvent(session, exec);
> 			} else if (rr != null) {

Flags:

marc.khouzam: iplog-

Actions: View | Diff

Attachments on bug 369594: 210009 | 210615