mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fix for synchronization bug in CFormattedMemoryBlock.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2002-10-31 22:08:34 +00:00
parent 20ae7ae730
commit 33825fd97a
1 changed files with 137 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

177
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java
View file

@ -33,6 +33,106 @@ public class CFormattedMemoryBlock extends CDebugElement
implements IFormattedMemoryBlock, implements IFormattedMemoryBlock,
ICDIEventListener ICDIEventListener
{ {
protected class ByteRange
{
private int fStart;
private byte[] fRangeBytes;
/**
* Constructor for Range.
*/
public ByteRange( int start, byte[] bytes )
{
fStart = start;
fRangeBytes = bytes;
}
public int getStart()
{
return fStart;
}
public int getLength()
{
if ( fRangeBytes != null )
{
return fRangeBytes.length;
}
return 0;
}
public byte[] getBytes()
{
return fRangeBytes;
}
}
protected class DirtyBytes
{
private boolean[] fDirtyBytes = null;
/**
* Constructor for DirtyBytes.
*/
public DirtyBytes( int size )
{
fDirtyBytes = new boolean[size];
Arrays.fill( fDirtyBytes, false );
}
public void reset()
{
Arrays.fill( fDirtyBytes, false );
}
public void set( int start, int end, boolean value )
{
Arrays.fill( fDirtyBytes, start, end, value );
}
public void set( ByteRange range, boolean value )
{
Arrays.fill( fDirtyBytes, range.getStart(), range.getLength(), value );
}
public ByteRange[] getDirtyRanges( byte[] bytes )
{
ArrayList list = new ArrayList();
int startIndex = -1;
for ( int i = 0; i < fDirtyBytes.length; ++i )
{
if ( fDirtyBytes[i] )
{
if ( startIndex == -1 )
{
startIndex = i;
}
}
else
{
if ( startIndex != -1 )
{
byte[] rangeBytes = new byte[i - startIndex];
System.arraycopy( bytes, startIndex, rangeBytes, 0, i - startIndex );
list.add( new ByteRange( startIndex, rangeBytes ) );
startIndex = -1;
}
}
}
return (ByteRange[])list.toArray( new ByteRange[list.size()] );
}
public boolean isDirty()
{
for ( int i = 0; i < fDirtyBytes.length; ++i )
{
if ( fDirtyBytes[i] )
return true;
}
return false;
}
}
class CFormattedMemoryBlockRow implements IFormattedMemoryBlockRow class CFormattedMemoryBlockRow implements IFormattedMemoryBlockRow
{ {
private long fAddress; private long fAddress;
@ -85,7 +185,7 @@ public class CFormattedMemoryBlock extends CDebugElement
private char fPaddingChar = '.'; private char fPaddingChar = '.';
private List fRows = null; private List fRows = null;
private Long[] fChangedAddresses = new Long[0]; private Long[] fChangedAddresses = new Long[0];
private boolean[] fDirtyBytes = null; private DirtyBytes fDirtyBytes = null;
/** /**
* Constructor for CFormattedMemoryBlock. * Constructor for CFormattedMemoryBlock.
@ -196,10 +296,13 @@ public class CFormattedMemoryBlock extends CDebugElement
return (IFormattedMemoryBlockRow[])fRows.toArray( new IFormattedMemoryBlockRow[fRows.size()] ); return (IFormattedMemoryBlockRow[])fRows.toArray( new IFormattedMemoryBlockRow[fRows.size()] );
} }
private void resetBytes() private synchronized void resetBytes()
{ {
fBytes = null; fBytes = null;
fDirtyBytes = null; if ( fDirtyBytes != null )
{
fDirtyBytes.reset();
}
} }
private void resetRows() private void resetRows()
@ -296,7 +399,7 @@ public class CFormattedMemoryBlock extends CDebugElement
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlock#getBytes() * @see org.eclipse.debug.core.model.IMemoryBlock#getBytes()
*/ */
public byte[] getBytes() throws DebugException public synchronized byte[] getBytes() throws DebugException
{ {
if ( fBytes == null ) if ( fBytes == null )
{ {
@ -305,8 +408,10 @@ public class CFormattedMemoryBlock extends CDebugElement
try try
{ {
fBytes = fCDIMemoryBlock.getBytes(); fBytes = fCDIMemoryBlock.getBytes();
fDirtyBytes = new boolean[fBytes.length]; if ( fDirtyBytes == null )
Arrays.fill( fDirtyBytes, false ); {
fDirtyBytes = createDirtyBytes( fBytes.length );
}
} }
catch( CDIException e ) catch( CDIException e )
{ {
@ -314,7 +419,13 @@ public class CFormattedMemoryBlock extends CDebugElement
} }
} }
} }
return fBytes; byte[] copyBytes = null;
if ( fBytes != null )
{
copyBytes = new byte[fBytes.length];
System.arraycopy( fBytes, 0, copyBytes, 0, fBytes.length );
}
return copyBytes;
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -488,23 +599,20 @@ public class CFormattedMemoryBlock extends CDebugElement
{ {
byte[] bytes = itemToBytes( newValue.toCharArray() ); byte[] bytes = itemToBytes( newValue.toCharArray() );
setBytes( index * getWordSize(), bytes ); setBytes( index * getWordSize(), bytes );
Arrays.fill( fDirtyBytes, index * getWordSize(), index * getWordSize() + bytes.length, true ); fDirtyBytes.set( index * getWordSize(), index * getWordSize() + bytes.length, true );
resetRows(); resetRows();
} }
private void setBytes( int index, byte[] newBytes ) private void setBytes( int index, byte[] newBytes )
{ {
try if ( fBytes != null && fDirtyBytes != null )
{ {
byte[] bytes = getBytes();
for ( int i = index; i < index + newBytes.length; ++i ) for ( int i = index; i < index + newBytes.length; ++i )
{ {
bytes[i] = newBytes[i - index]; fBytes[i] = newBytes[i - index];
fDirtyBytes.set( index, newBytes.length, true );
} }
} }
catch( DebugException e )
{
}
} }
private byte[] itemToBytes( char[] chars ) private byte[] itemToBytes( char[] chars )
@ -534,11 +642,7 @@ public class CFormattedMemoryBlock extends CDebugElement
{ {
if ( fDirtyBytes != null ) if ( fDirtyBytes != null )
{ {
for ( int i = 0; i < fDirtyBytes.length; ++i ) return fDirtyBytes.isDirty();
{
if ( fDirtyBytes[i] )
return true;
}
} }
return false; return false;
} }
@ -548,40 +652,22 @@ public class CFormattedMemoryBlock extends CDebugElement
*/ */
public void saveChanges() throws DebugException public void saveChanges() throws DebugException
{ {
if ( getBytes() != null && fDirtyBytes != null && getCDIMemoryBlock() != null ) byte[] bytes = getBytes();
if ( bytes != null && fDirtyBytes != null && getCDIMemoryBlock() != null )
{ {
int startIndex = -1; ByteRange[] ranges = fDirtyBytes.getDirtyRanges( getBytes() );
for ( int i = 0; i < fDirtyBytes.length; ++i ) for ( int i = 0; i < ranges.length; ++i )
{ {
if ( fDirtyBytes[i] )
{
if ( startIndex == -1 )
{
startIndex = i;
}
}
else
{
if ( startIndex != -1 )
{
byte[] bytes = new byte[i - startIndex];
for ( int j = startIndex; j < i; ++j )
{
bytes[j - startIndex] = getBytes()[j];
}
try try
{ {
getCDIMemoryBlock().setValue( startIndex, bytes ); getCDIMemoryBlock().setValue( ranges[i].getStart(), ranges[i].getBytes() );
startIndex = -1;
} }
catch( CDIException e ) catch( CDIException e )
{ {
targetRequestFailed( e.getMessage(), null ); targetRequestFailed( e.getMessage(), null );
} }
} }
} fDirtyBytes.reset();
}
Arrays.fill( fDirtyBytes, false );
} }
} }
@ -602,4 +688,9 @@ public class CFormattedMemoryBlock extends CDebugElement
} }
} }
} }
private DirtyBytes createDirtyBytes( int size )
{
return new DirtyBytes( size );
}
} }