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

Caching the status as well as the result, to allow to cache commands that fail.

Browse source 
Bug 208920
This commit is contained in:
Marc Khouzam 2007-11-21 18:48:56 +00:00
parent 9df59c726e
commit 816a523659
1 changed files with 53 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/command/CommandCache.java
View file

@ -96,6 +96,19 @@ public class CommandCache implements ICommandListener
} }
} }
class CommandResultInfo {
private final ICommandResult fData;
private final IStatus fStatus;
public CommandResultInfo(ICommandResult data, IStatus status) {
fData = data;
fStatus = status;
}
public ICommandResult getData() { return fData; }
public IStatus getStatus() { return fStatus; }
}
/* /*
* This class contains 5 significant lists. * This class contains 5 significant lists.
* *
@ -135,7 +148,7 @@ public class CommandCache implements ICommandListener
private ICommandControl fCommandControl; private ICommandControl fCommandControl;
private Map<IDMContext, HashMap<CommandInfo, ICommandResult>> fCachedContexts = new HashMap<IDMContext, HashMap<CommandInfo, ICommandResult>>(); private Map<IDMContext, HashMap<CommandInfo, CommandResultInfo>> fCachedContexts = new HashMap<IDMContext, HashMap<CommandInfo, CommandResultInfo>>();
private ArrayList<CommandInfo> fPendingQCommandsSent = new ArrayList<CommandInfo>(); private ArrayList<CommandInfo> fPendingQCommandsSent = new ArrayList<CommandInfo>();
@ -239,13 +252,14 @@ public class CommandCache implements ICommandListener
* If command is already cached, just return the cached data. * If command is already cached, just return the cached data.
*/ */
if(fCachedContexts.get(context) != null && fCachedContexts.get(context).containsKey(cachedCmd)){ if(fCachedContexts.get(context) != null && fCachedContexts.get(context).containsKey(cachedCmd)){
// Cast to the erased type of the returned command result. CommandResultInfo result = fCachedContexts.get(context).get(cachedCmd);
// To ensure type safety, we are relying on the correct matching if (result.getStatus().isOK()) {
// of command and result in the cached results map.
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
V v = (V) fCachedContexts.get(context).get(cachedCmd); V v = (V)result.getData();
rm.setData(v); rm.setData(v);
} else {
rm.setStatus(result.getStatus());
}
rm.done(); rm.done();
return; return;
} }
@ -316,14 +330,16 @@ public class CommandCache implements ICommandListener
return ; return ;
} }
ICommandResult result = getData();
IStatus status = getStatus();
if ( finalCachedCmd.getCommandstyle() == CommandStyle.COALESCED ) { if ( finalCachedCmd.getCommandstyle() == CommandStyle.COALESCED ) {
/* /*
* We matched a command which is itself already a COALESCED command. So * We matched a command which is itself already a COALESCED command. So
* we need to go throught the list of unsent commands which were not sent * we need to go through the list of unsent commands which were not sent
* because the coalesced command represented it. For each match we find * because the coalesced command represented it. For each match we find
* we create a new result from the coalesced command for it. * we create a new result from the coalesced command for it.
*/ */
ICommandResult result = getData();
for ( CommandInfo waitingEntry : new ArrayList<CommandInfo>(fPendingQWaitingForCoalescedCompletion) ) { for ( CommandInfo waitingEntry : new ArrayList<CommandInfo>(fPendingQWaitingForCoalescedCompletion) ) {
@ -336,40 +352,39 @@ public class CommandCache implements ICommandListener
// Cast the calculated result back to the requested type. // Cast the calculated result back to the requested type.
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
V newresult = (V)result.getSubsetResult(waitingEntry.getCommand()); V subResult = (V)result.getSubsetResult(waitingEntry.getCommand());
CommandResultInfo subResultInfo = new CommandResultInfo(subResult, status);
if(fCachedContexts.get(context) != null){ if(fCachedContexts.get(context) != null){
fCachedContexts.get(context).put(waitingEntry, newresult); fCachedContexts.get(context).put(waitingEntry, subResultInfo);
} } else {
else{ HashMap<CommandInfo, CommandResultInfo> map = new HashMap<CommandInfo, CommandResultInfo>();
HashMap<CommandInfo, ICommandResult> map = new HashMap<CommandInfo, ICommandResult>(); map.put(waitingEntry, subResultInfo);
map.put(waitingEntry, newresult);
fCachedContexts.put(context, map); fCachedContexts.put(context, map);
} }
if (!getStatus().isOK()) { if (!status.isOK()) {
/* /*
* We had some form of error with the original command. So notify the * We had some form of error with the original command. So notify the
* original requestors of the issues. * original requesters of the issues.
*/ */
for (DataRequestMonitor<?> pendingRM : waitingEntry.getRequestMonitorList()) { for (DataRequestMonitor<?> pendingRM : waitingEntry.getRequestMonitorList()) {
pendingRM.setStatus(getStatus()); pendingRM.setStatus(status);
pendingRM.done(); pendingRM.done();
} }
} else { } else {
assert newresult != null; assert subResult != null;
/* /*
* Notify the original requestors of the positive results. * Notify the original requesters of the positive results.
*/ */
for (DataRequestMonitor<? extends ICommandResult> pendingRM : waitingEntry.getRequestMonitorList()) { for (DataRequestMonitor<? extends ICommandResult> pendingRM : waitingEntry.getRequestMonitorList()) {
// Cast the pending return token to match the requested type. // Cast the pending return token to match the requested type.
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
DataRequestMonitor<V> vPendingRM = (DataRequestMonitor<V>) pendingRM; DataRequestMonitor<V> vPendingRM = (DataRequestMonitor<V>) pendingRM;
vPendingRM.setData(newresult); vPendingRM.setData(subResult);
vPendingRM.done(); vPendingRM.done();
} }
} }
@ -378,38 +393,38 @@ public class CommandCache implements ICommandListener
} else { } else {
/* /*
* This is an original request which completed. Indicate success or * This is an original request which completed. Indicate success or
* failure to the original requestors. * failure to the original requesters.
*/ */
CommandResultInfo resultInfo = new CommandResultInfo(result, status);
if (!getStatus().isOK()) { if (fCachedContexts.get(context) != null){
fCachedContexts.get(context).put(finalCachedCmd, resultInfo);
} else {
HashMap<CommandInfo, CommandResultInfo> map = new HashMap<CommandInfo, CommandResultInfo>();
map.put(finalCachedCmd, resultInfo);
fCachedContexts.put(context, map);
}
if (!status.isOK()) {
/* /*
* We had some form of error with the original command. So notify the * We had some form of error with the original command. So notify the
* original requestors of the issues. * original requesters of the issues.
*/ */
for (DataRequestMonitor<?> pendingRM : finalCachedCmd.getRequestMonitorList()) { for (DataRequestMonitor<?> pendingRM : finalCachedCmd.getRequestMonitorList()) {
pendingRM.setStatus(getStatus()); pendingRM.setStatus(status);
pendingRM.done(); pendingRM.done();
} }
} else { } else {
// Cast the calculated result back to the requested type. // Cast the calculated result back to the requested type.
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
V result = (V)getData(); V vResult = (V)result;
if(fCachedContexts.get(context) != null){
fCachedContexts.get(context).put(finalCachedCmd, result);
}
else{
HashMap<CommandInfo, ICommandResult> map = new HashMap<CommandInfo, ICommandResult>();
map.put(finalCachedCmd, result);
fCachedContexts.put(context, map);
}
for (DataRequestMonitor<? extends ICommandResult> pendingRM : finalCachedCmd.getRequestMonitorList()) { for (DataRequestMonitor<? extends ICommandResult> pendingRM : finalCachedCmd.getRequestMonitorList()) {
// Cast the pending return token to match the requested type. // Cast the pending return token to match the requested type.
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
DataRequestMonitor<V> vPendingRM = (DataRequestMonitor<V>) pendingRM; DataRequestMonitor<V> vPendingRM = (DataRequestMonitor<V>) pendingRM;
vPendingRM.setData(result); vPendingRM.setData(vResult);
vPendingRM.done(); vPendingRM.done();
} }
} }