mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 04:55:22 +02:00
Code Issues Wiki Activity

[209825] fix: Update SystemTarHandler so that archive operations could be cancelable.

Browse source
This commit is contained in:
Xuan Chen 2007-11-30 16:45:52 +00:00
parent 1ad0910bd2
commit 78845993fb
3 changed files with 642 additions and 410 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/SystemReentrantMutex.java
View file

@ -8,6 +8,7 @@
* {Name} (company) - description of contribution. * {Name} (company) - description of contribution.
* *
* Xuan Chen (IBM) - initial API and implementation * Xuan Chen (IBM) - initial API and implementation
* Xuan Chen (IBM) - [209825] add some info of printing the lock status
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.services.clientserver; package org.eclipse.rse.services.clientserver;
@ -206,5 +207,22 @@ public class SystemReentrantMutex {
} }
} }
} }
/*
* Method used to debug this mutex
* uncomment it when needed
*
private void printLockMessage(int status, Thread myself)
{
if (status == LOCK_STATUS_AQUIRED)
{
System.out.println("Lock is AQUIRED by thread " + myself.getId());
}
else if (status == LOCK_STATUS_BORROWED)
{
System.out.println("Lock is BORROWED by thread " + myself.getId());
}
}
*/
} }

1021
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java
View file

File diff suppressed because it is too large Load diff

13
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java
View file

@ -1838,7 +1838,9 @@ public class SystemZipHandler implements ISystemArchiveHandler
{ {
name = ArchiveHandlerManager.cleanUpVirtualPath(name); name = ArchiveHandlerManager.cleanUpVirtualPath(name);
name = name + "/"; //$NON-NLS-1$ name = name + "/"; //$NON-NLS-1$
return createVirtualObject(name, true, archiveOperationMonitor); boolean returnCode = createVirtualObject(name, true, archiveOperationMonitor);
setArchiveOperationMonitorStatusDone(archiveOperationMonitor);
return returnCode;
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -1847,7 +1849,9 @@ public class SystemZipHandler implements ISystemArchiveHandler
public boolean createFile(String name, ISystemOperationMonitor archiveOperationMonitor) public boolean createFile(String name, ISystemOperationMonitor archiveOperationMonitor)
{ {
name = ArchiveHandlerManager.cleanUpVirtualPath(name); name = ArchiveHandlerManager.cleanUpVirtualPath(name);
return createVirtualObject(name, true, archiveOperationMonitor); boolean returnCode = createVirtualObject(name, true, archiveOperationMonitor);
setArchiveOperationMonitorStatusDone(archiveOperationMonitor);
return returnCode;
} }
/** /**
@ -1862,13 +1866,11 @@ public class SystemZipHandler implements ISystemArchiveHandler
{ {
if (!_exists) if (!_exists)
{ {
setArchiveOperationMonitorStatusDone(archiveOperationMonitor);
return false; return false;
} }
if (exists(name, archiveOperationMonitor)) if (exists(name, archiveOperationMonitor))
{ {
// The object already exists. // The object already exists.
setArchiveOperationMonitorStatusDone(archiveOperationMonitor);
return false; return false;
} }
@ -1914,7 +1916,6 @@ public class SystemZipHandler implements ISystemArchiveHandler
replaceOldZip(outputTempFile); replaceOldZip(outputTempFile);
if (closeZipFile) closeZipFile(); if (closeZipFile) closeZipFile();
setArchiveOperationMonitorStatusDone(archiveOperationMonitor);
return true; return true;
} }
} }
@ -1924,14 +1925,12 @@ public class SystemZipHandler implements ISystemArchiveHandler
System.out.println("Could not add a file."); //$NON-NLS-1$ System.out.println("Could not add a file."); //$NON-NLS-1$
System.out.println(e.getMessage()); System.out.println(e.getMessage());
if (closeZipFile) closeZipFile(); if (closeZipFile) closeZipFile();
setArchiveOperationMonitorStatusDone(archiveOperationMonitor);
return false; return false;
} }
finally finally
{ {
releaseMutex(mutexLockStatus); releaseMutex(mutexLockStatus);
} }
setArchiveOperationMonitorStatusDone(archiveOperationMonitor);
return false; return false;
} }