From db67b263b9178a593abc04277aecfa85482a8b3a Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Mon, 22 Sep 2014 16:43:41 -0400 Subject: [PATCH] Bug 444636- Make CBreakpointGdbThreadsFilterExtension thread-safe Change-Id: Ied036bba57e3f2c2eca00e791735212b3dc107e5 Signed-off-by: Marc-Andre Laperle Signed-off-by: Marc Khouzam Reviewed-on: https://git.eclipse.org/r/33727 Tested-by: Hudson CI Reviewed-by: Alvaro Sanchez-Leon --- .../CBreakpointGdbThreadsFilterExtension.java | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/breakpoints/CBreakpointGdbThreadsFilterExtension.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/breakpoints/CBreakpointGdbThreadsFilterExtension.java index a9c4e41f203..ef0f3036001 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/breakpoints/CBreakpointGdbThreadsFilterExtension.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/breakpoints/CBreakpointGdbThreadsFilterExtension.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Wind River Systems and others. + * Copyright (c) 2007, 2014 Wind River 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 @@ -7,10 +7,13 @@ * * Contributors: * Wind River Systems - initial API and implementation + * Ericsson - Make the class thread-safe as it can be accessed by multiple + * DSF debug sessions at the same time (bug 444636) *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.breakpoints; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -28,8 +31,8 @@ import org.eclipse.core.runtime.CoreException; */ public class CBreakpointGdbThreadsFilterExtension implements IDsfBreakpointExtension { - private Map> fFilteredThreadsByTarget = - new HashMap>(1); + private final Map> fFilteredThreadsByTarget = + Collections.synchronizedMap(new HashMap>(1)); /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpointExtension#initialize(org.eclipse.cdt.debug.core.model.ICBreakpoint) @@ -43,8 +46,10 @@ public class CBreakpointGdbThreadsFilterExtension implements IDsfBreakpointExten */ @Override public IContainerDMContext[] getTargetFilters() throws CoreException { - Set set = fFilteredThreadsByTarget.keySet(); - return set.toArray( new IContainerDMContext[set.size()] ); + Set set = fFilteredThreadsByTarget.keySet(); + synchronized (fFilteredThreadsByTarget) { + return set.toArray(new IContainerDMContext[set.size()]); + } } /* (non-Javadoc) @@ -61,9 +66,7 @@ public class CBreakpointGdbThreadsFilterExtension implements IDsfBreakpointExten */ @Override public void removeTargetFilter( IContainerDMContext target ) throws CoreException { - if ( fFilteredThreadsByTarget.containsKey( target ) ) { - fFilteredThreadsByTarget.remove( target ); - } + fFilteredThreadsByTarget.remove(target); } /* (non-Javadoc) @@ -73,14 +76,12 @@ public class CBreakpointGdbThreadsFilterExtension implements IDsfBreakpointExten public void removeThreadFilters( IExecutionDMContext[] threads ) throws CoreException { if ( threads != null && threads.length > 0 ) { IContainerDMContext target = DMContexts.getAncestorOfType(threads[0], IContainerDMContext.class); - if ( fFilteredThreadsByTarget.containsKey( target ) ) { - Set set = fFilteredThreadsByTarget.get( target ); - if ( set != null ) { - set.removeAll( Arrays.asList( threads ) ); - if ( set.isEmpty() ) { - fFilteredThreadsByTarget.remove( target ); - } - } + Set set = fFilteredThreadsByTarget.get( target ); + if ( set != null ) { + set.removeAll( Arrays.asList( threads ) ); + if ( set.isEmpty() ) { + fFilteredThreadsByTarget.remove( target ); + } } } }