mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-0: Using TaskMonitor.DUMMY instead of deprecated

Browse Source 
TaskMonitorAdapter.DUMMY_MONITOR
This commit is contained in:
Ryan Kurtz
2022-12-28 08:06:16 -05:00
parent c077c60942
commit 70a155cb70
130 changed files with 944 additions and 958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/db/PackedDatabase.java
View File

@@ -510,7 +510,7 @@ public class PackedDatabase extends Database {
private static void refreshDatabase(BufferFileManager bfMgr, long checkinId,
ResourceFile packedFile, TaskMonitor monitor) throws IOException, CancelledException {
if (monitor == null) {
monitor = TaskMonitorAdapter.DUMMY_MONITOR;
monitor = TaskMonitor.DUMMY;
}
int version = bfMgr.getCurrentVersion() + 1; // should be 1 in most situations
File file = bfMgr.getBufferFile(version);
@@ -668,7 +668,7 @@ public class PackedDatabase extends Database {
TaskMonitor monitor) throws IOException, CancelledException {
if (monitor == null) {
monitor = TaskMonitorAdapter.DUMMY_MONITOR;
monitor = TaskMonitor.DUMMY;
}
monitor.setMessage("Packing file...");
@@ -703,7 +703,7 @@ public class PackedDatabase extends Database {
throw new IOException("Update not allowed");
}
if (monitor == null) {
monitor = TaskMonitorAdapter.DUMMY_MONITOR;
monitor = TaskMonitor.DUMMY;
}
monitor.setMessage("Waiting...");
if (packedDbLock != null) {
@@ -780,7 +780,7 @@ public class PackedDatabase extends Database {
}
if (monitor == null) {
monitor = TaskMonitorAdapter.DUMMY_MONITOR;
monitor = TaskMonitor.DUMMY;
}
if (!refreshUnpacking(monitor)) {
@@ -806,7 +806,7 @@ public class PackedDatabase extends Database {
}
if (monitor == null) {
monitor = TaskMonitorAdapter.DUMMY_MONITOR;
monitor = TaskMonitor.DUMMY;
}
lock(updateLock, false, true);

29
Ghidra/Framework/FileSystem/src/test.slow/java/db/buffers/RecoveryFileTest.java
View File

@@ -15,8 +15,7 @@
*/
package db.buffers;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.*;
import java.io.File;
import java.io.IOException;
@@ -27,7 +26,7 @@ import db.DBFileListener;
import db.Database;
import generic.test.AbstractGenericTest;
import ghidra.framework.store.db.PrivateDatabase;
import ghidra.util.task.TaskMonitorAdapter;
import ghidra.util.task.TaskMonitor;
import utilities.util.FileUtilities;
/**
@@ -103,7 +102,7 @@ public class RecoveryFileTest extends AbstractGenericTest {
bufferMgr.releaseBuffer(buf);
}
bufferMgr.saveAs(bf, true, TaskMonitorAdapter.DUMMY_MONITOR);
bufferMgr.saveAs(bf, true, TaskMonitor.DUMMY);
// Grow file if requested
int modCnt = 0;
@@ -118,7 +117,7 @@ public class RecoveryFileTest extends AbstractGenericTest {
System.out.println("Added " + modCnt + " buffers");
bufferMgr.checkpoint();
bufferMgr.takeRecoverySnapshot(null, TaskMonitorAdapter.DUMMY_MONITOR);
bufferMgr.takeRecoverySnapshot(null, TaskMonitor.DUMMY);
assertTrue(RecoveryMgr.canRecover(bf));
@@ -140,7 +139,7 @@ public class RecoveryFileTest extends AbstractGenericTest {
System.out.println("Modified " + modCnt + " buffers");
bufferMgr.checkpoint();
bufferMgr.takeRecoverySnapshot(null, TaskMonitorAdapter.DUMMY_MONITOR);
bufferMgr.takeRecoverySnapshot(null, TaskMonitor.DUMMY);
assertTrue(RecoveryMgr.canRecover(bf));
@@ -154,7 +153,7 @@ public class RecoveryFileTest extends AbstractGenericTest {
System.out.println("Modified " + modCnt + " buffers");
bufferMgr.checkpoint();
assertTrue(bufferMgr.takeRecoverySnapshot(null, TaskMonitorAdapter.DUMMY_MONITOR));
assertTrue(bufferMgr.takeRecoverySnapshot(null, TaskMonitor.DUMMY));
assertTrue(RecoveryMgr.canRecover(bf));
@@ -168,7 +167,7 @@ public class RecoveryFileTest extends AbstractGenericTest {
System.out.println("Modified " + modCnt + " buffers");
bufferMgr.checkpoint();
assertTrue(bufferMgr.takeRecoverySnapshot(null, TaskMonitorAdapter.DUMMY_MONITOR));
assertTrue(bufferMgr.takeRecoverySnapshot(null, TaskMonitor.DUMMY));
assertTrue(RecoveryMgr.canRecover(bf));
@@ -209,7 +208,7 @@ public class RecoveryFileTest extends AbstractGenericTest {
bufferMgr2 = new BufferMgr(bf2);
assertTrue(bufferMgr2.recover(TaskMonitorAdapter.DUMMY_MONITOR));
assertTrue(bufferMgr2.recover(TaskMonitor.DUMMY));
assertTrue(bufferMgr2.canSave());
@@ -271,11 +270,11 @@ public class RecoveryFileTest extends AbstractGenericTest {
bufferMgr2 = new BufferMgr(bf2);
assertTrue(bufferMgr2.recover(TaskMonitorAdapter.DUMMY_MONITOR));
assertTrue(bufferMgr2.recover(TaskMonitor.DUMMY));
assertTrue(bufferMgr2.canSave());
bufferMgr2.save(null, null, TaskMonitorAdapter.DUMMY_MONITOR);
bufferMgr2.save(null, null, TaskMonitor.DUMMY);
// Open saved file and check content
@@ -331,7 +330,7 @@ public class RecoveryFileTest extends AbstractGenericTest {
bufferMgr.undo(true);
assertTrue(bufferMgr.takeRecoverySnapshot(null, TaskMonitorAdapter.DUMMY_MONITOR));
assertTrue(bufferMgr.takeRecoverySnapshot(null, TaskMonitor.DUMMY));
PrivateDatabase pdb = new PrivateDatabase(testDir);
pdb.refresh();
@@ -346,7 +345,7 @@ public class RecoveryFileTest extends AbstractGenericTest {
bufferMgr2 = new BufferMgr(bf2);
assertTrue(bufferMgr2.recover(TaskMonitorAdapter.DUMMY_MONITOR));
assertTrue(bufferMgr2.recover(TaskMonitor.DUMMY));
assertTrue(bufferMgr2.canSave());
@@ -402,7 +401,7 @@ public class RecoveryFileTest extends AbstractGenericTest {
bufferMgr.undo(true);
bufferMgr.undo(true);
assertTrue(bufferMgr.takeRecoverySnapshot(null, TaskMonitorAdapter.DUMMY_MONITOR));
assertTrue(bufferMgr.takeRecoverySnapshot(null, TaskMonitor.DUMMY));
PrivateDatabase pdb = new PrivateDatabase(testDir);
pdb.refresh();
@@ -417,7 +416,7 @@ public class RecoveryFileTest extends AbstractGenericTest {
bufferMgr2 = new BufferMgr(bf2);
assertTrue(bufferMgr2.recover(TaskMonitorAdapter.DUMMY_MONITOR));
assertTrue(bufferMgr2.recover(TaskMonitor.DUMMY));
assertTrue(bufferMgr2.canSave());

26
Ghidra/Framework/FileSystem/src/test/java/db/RecoveryDBTest.java
View File

@@ -26,7 +26,7 @@ import generic.test.AbstractGenericTest;
import ghidra.framework.store.DatabaseItem;
import ghidra.framework.store.FolderItem;
import ghidra.framework.store.local.LocalFileSystem;
import ghidra.util.task.TaskMonitorAdapter;
import ghidra.util.task.TaskMonitor;
import utilities.util.FileUtilities;
public class RecoveryDBTest extends AbstractGenericTest {
@@ -88,14 +88,14 @@ public class RecoveryDBTest extends AbstractGenericTest {
DBHandle dbh = new DBHandle(BUFFER_SIZE);
BufferFile bf =
fileSystem.createDatabase("/", "testDb", null, "Test", dbh.getBufferSize(), null, null);
dbh.saveAs(bf, true, TaskMonitorAdapter.DUMMY_MONITOR);
dbh.saveAs(bf, true, TaskMonitor.DUMMY);
dbh.close();
bf.dispose();
DatabaseItem dbItem = (DatabaseItem) fileSystem.getItem("/", "testDb");
assertTrue(!dbItem.canRecover());
bf = dbItem.openForUpdate(FolderItem.DEFAULT_CHECKOUT_ID);
dbh = new DBHandle(bf, true, TaskMonitorAdapter.DUMMY_MONITOR);
dbh = new DBHandle(bf, true, TaskMonitor.DUMMY);
long txId = dbh.startTransaction();
Table table1 = dbh.createTable("table1", SCHEMA);
@@ -106,7 +106,7 @@ public class RecoveryDBTest extends AbstractGenericTest {
tableDelete(table1, initialRecCnt, 0, 2);
dbh.endTransaction(txId, true);
assertTrue(dbh.takeRecoverySnapshot(null, TaskMonitorAdapter.DUMMY_MONITOR));
assertTrue(dbh.takeRecoverySnapshot(null, TaskMonitor.DUMMY));
txId = dbh.startTransaction();
Table table2 = dbh.createTable("table2", SCHEMA);
@@ -117,7 +117,7 @@ public class RecoveryDBTest extends AbstractGenericTest {
tableDelete(table2, initialRecCnt, 0, 2);
dbh.endTransaction(txId, true);
assertTrue(dbh.takeRecoverySnapshot(null, TaskMonitorAdapter.DUMMY_MONITOR));
assertTrue(dbh.takeRecoverySnapshot(null, TaskMonitor.DUMMY));
return dbh;
}
@@ -145,7 +145,7 @@ public class RecoveryDBTest extends AbstractGenericTest {
DatabaseItem dbItem = (DatabaseItem) fileSystem.getItem("/", "testDb");
assertTrue(dbItem.canRecover());
BufferFile bf = dbItem.openForUpdate(FolderItem.DEFAULT_CHECKOUT_ID);
dbh2 = new DBHandle(bf, true, TaskMonitorAdapter.DUMMY_MONITOR);
dbh2 = new DBHandle(bf, true, TaskMonitor.DUMMY);
Table table1 = dbh2.getTable("table1");
assertNotNull(table1);
@@ -195,12 +195,12 @@ public class RecoveryDBTest extends AbstractGenericTest {
assertTrue(dbh.undo());
assertTrue(dbh.undo());
assertTrue(dbh.takeRecoverySnapshot(null, TaskMonitorAdapter.DUMMY_MONITOR));
assertTrue(dbh.takeRecoverySnapshot(null, TaskMonitor.DUMMY));
DatabaseItem dbItem = (DatabaseItem) fileSystem.getItem("/", "testDb");
assertTrue(dbItem.canRecover());
BufferFile bf = dbItem.openForUpdate(FolderItem.DEFAULT_CHECKOUT_ID);
dbh2 = new DBHandle(bf, true, TaskMonitorAdapter.DUMMY_MONITOR);
dbh2 = new DBHandle(bf, true, TaskMonitor.DUMMY);
Table table1 = dbh2.getTable("table1");
assertNotNull(table1);
@@ -240,19 +240,19 @@ public class RecoveryDBTest extends AbstractGenericTest {
assertTrue(dbh.undo());
assertTrue(dbh.undo());
assertTrue(dbh.takeRecoverySnapshot(null, TaskMonitorAdapter.DUMMY_MONITOR));
assertTrue(dbh.takeRecoverySnapshot(null, TaskMonitor.DUMMY));
assertTrue(dbh.redo());
assertTrue(dbh.redo());
assertTrue(dbh.takeRecoverySnapshot(null, TaskMonitorAdapter.DUMMY_MONITOR));
assertTrue(dbh.takeRecoverySnapshot(null, TaskMonitor.DUMMY));
assertNotNull(dbh.getTable("table2"));
DatabaseItem dbItem = (DatabaseItem) fileSystem.getItem("/", "testDb");
assertTrue(dbItem.canRecover());
BufferFile bf = dbItem.openForUpdate(FolderItem.DEFAULT_CHECKOUT_ID);
dbh2 = new DBHandle(bf, true, TaskMonitorAdapter.DUMMY_MONITOR);
dbh2 = new DBHandle(bf, true, TaskMonitor.DUMMY);
Table table1 = dbh2.getTable("table1");
assertNotNull(table1);
@@ -301,9 +301,9 @@ public class RecoveryDBTest extends AbstractGenericTest {
DatabaseItem dbItem = (DatabaseItem) fileSystem.getItem("/", "testDb");
assertTrue(dbItem.canRecover());
BufferFile bf = dbItem.openForUpdate(FolderItem.DEFAULT_CHECKOUT_ID);
dbh2 = new DBHandle(bf, true, TaskMonitorAdapter.DUMMY_MONITOR);
dbh2 = new DBHandle(bf, true, TaskMonitor.DUMMY);
dbh2.save(null, null, TaskMonitorAdapter.DUMMY_MONITOR);
dbh2.save(null, null, TaskMonitor.DUMMY);
dbh2.close();
assertTrue(!dbItem.canRecover());

42
Ghidra/Framework/FileSystem/src/test/java/ghidra/framework/store/db/PackedDatabaseTest.java
View File

@@ -27,7 +27,7 @@ import db.buffers.BufferFile;
import db.buffers.LocalBufferFile;
import generic.jar.ResourceFile;
import generic.test.AbstractGenericTest;
import ghidra.util.task.TaskMonitorAdapter;
import ghidra.util.task.TaskMonitor;
import utilities.util.FileUtilities;
public class PackedDatabaseTest extends AbstractGenericTest {
@@ -107,7 +107,7 @@ public class PackedDatabaseTest extends AbstractGenericTest {
assertTrue(packedDbFile.exists());
// Open packed db as read-only and verify content
db = PackedDatabase.getPackedDatabase(packedDbFile, TaskMonitorAdapter.DUMMY_MONITOR);
db = PackedDatabase.getPackedDatabase(packedDbFile, TaskMonitor.DUMMY);
assertEquals("MyContent", db.getContentType());
dbh = (PackedDBHandle) db.open(null);
@@ -133,7 +133,7 @@ public class PackedDatabaseTest extends AbstractGenericTest {
db.dispose();
// open for update
db = PackedDatabase.getPackedDatabase(packedDbFile, true, TaskMonitorAdapter.DUMMY_MONITOR);
db = PackedDatabase.getPackedDatabase(packedDbFile, true, TaskMonitor.DUMMY);
dbh = (PackedDBHandle) db.openForUpdate(null);
// add record - hold for update
@@ -146,7 +146,7 @@ public class PackedDatabaseTest extends AbstractGenericTest {
dbh.save(null);
// Test concurrent access by another user
db2 = PackedDatabase.getPackedDatabase(packedDbFile, TaskMonitorAdapter.DUMMY_MONITOR);
db2 = PackedDatabase.getPackedDatabase(packedDbFile, TaskMonitor.DUMMY);
assertEquals("MyContent", db2.getContentType());
// Second update access should fail
@@ -183,7 +183,7 @@ public class PackedDatabaseTest extends AbstractGenericTest {
assertTrue(packedDbFile.exists());
// Open packed db as read-only
db = PackedDatabase.getPackedDatabase(packedDbFile, true, TaskMonitorAdapter.DUMMY_MONITOR);
db = PackedDatabase.getPackedDatabase(packedDbFile, true, TaskMonitor.DUMMY);
assertEquals("MyContent", db.getContentType());
dbh = (PackedDBHandle) db.open(null);
assertEquals(id, dbh.getDatabaseId());
@@ -205,7 +205,7 @@ public class PackedDatabaseTest extends AbstractGenericTest {
db.dispose();
// Open packed db as read-only
db = PackedDatabase.getPackedDatabase(anotherNewFile, TaskMonitorAdapter.DUMMY_MONITOR);
db = PackedDatabase.getPackedDatabase(anotherNewFile, TaskMonitor.DUMMY);
assertEquals("MyContent", db.getContentType());
dbh = (PackedDBHandle) db.open(null);
assertEquals(newId, dbh.getDatabaseId());
@@ -228,7 +228,7 @@ public class PackedDatabaseTest extends AbstractGenericTest {
assertTrue(packedDbFile.exists());
// Open packed db as read-only and verify content
db = PackedDatabase.getPackedDatabase(packedDbFile, true, TaskMonitorAdapter.DUMMY_MONITOR);
db = PackedDatabase.getPackedDatabase(packedDbFile, true, TaskMonitor.DUMMY);
File dbDir = (File) getInstanceField("dbDir", db);
File tmpDbDir = new File(dbDir.getParentFile(), dbDir.getName() + ".delete");
@@ -252,7 +252,7 @@ public class PackedDatabaseTest extends AbstractGenericTest {
assertTrue(packedDbFile.exists());
// Open packed db as read-only and verify content
db = PackedDatabase.getPackedDatabase(packedDbFile, TaskMonitorAdapter.DUMMY_MONITOR);
db = PackedDatabase.getPackedDatabase(packedDbFile, TaskMonitor.DUMMY);
File dbDir = (File) getInstanceField("dbDir", db);
File tmpDbDir = new File(dbDir.getParentFile(), dbDir.getName() + ".delete");
@@ -276,11 +276,11 @@ public class PackedDatabaseTest extends AbstractGenericTest {
assertTrue(packedDbFile.exists());
// Open packed db as read-only and verify content
db = PackedDatabase.getPackedDatabase(packedDbFile, true, TaskMonitorAdapter.DUMMY_MONITOR);
db = PackedDatabase.getPackedDatabase(packedDbFile, true, TaskMonitor.DUMMY);
File dbDir = (File) getInstanceField("dbDir", db);
File tmpDbDir = new File(dbDir.getParentFile(), dbDir.getName() + ".delete");
dbh = (PackedDBHandle) db.open(TaskMonitorAdapter.DUMMY_MONITOR);
dbh = (PackedDBHandle) db.open(TaskMonitor.DUMMY);
assertTrue(dbDir.isDirectory());
assertTrue(!tmpDbDir.exists());
@@ -311,10 +311,10 @@ public class PackedDatabaseTest extends AbstractGenericTest {
try {
// Open packed db as read-only and verify content
db = PackedDatabase.getPackedDatabase(commaFile, TaskMonitorAdapter.DUMMY_MONITOR);
db = PackedDatabase.getPackedDatabase(commaFile, TaskMonitor.DUMMY);
File dbDir = (File) getInstanceField("dbDir", db);
dbh = (PackedDBHandle) db.open(TaskMonitorAdapter.DUMMY_MONITOR);
dbh = (PackedDBHandle) db.open(TaskMonitor.DUMMY);
assertTrue(dbDir.isDirectory());
assertTrue(cache.isInCache(dbFile));
@@ -325,7 +325,7 @@ public class PackedDatabaseTest extends AbstractGenericTest {
assertTrue(dbDir.exists());
assertTrue(cache.isInCache(dbFile));
PackedDatabase cachedDB = cache.getCachedDB(dbFile, TaskMonitorAdapter.DUMMY_MONITOR);
PackedDatabase cachedDB = cache.getCachedDB(dbFile, TaskMonitor.DUMMY);
assertNotNull(cachedDB);
cachedDB.dispose();
@@ -333,8 +333,8 @@ public class PackedDatabaseTest extends AbstractGenericTest {
assertTrue(cache.isInCache(dbFile));
// reopen
db = PackedDatabase.getPackedDatabase(commaFile, TaskMonitorAdapter.DUMMY_MONITOR);
dbh = (PackedDBHandle) db.open(TaskMonitorAdapter.DUMMY_MONITOR);
db = PackedDatabase.getPackedDatabase(commaFile, TaskMonitor.DUMMY);
dbh = (PackedDBHandle) db.open(TaskMonitor.DUMMY);
assertEquals(dbDir, getInstanceField("dbDir", db));
@@ -364,11 +364,11 @@ public class PackedDatabaseTest extends AbstractGenericTest {
try {
// Open packed db as read-only and verify content
db = PackedDatabase.getPackedDatabase(packedDbFile, TaskMonitorAdapter.DUMMY_MONITOR);
db = PackedDatabase.getPackedDatabase(packedDbFile, TaskMonitor.DUMMY);
File dbDir = (File) getInstanceField("dbDir", db);
File tmpDbDir = new File(dbDir.getParentFile(), dbDir.getName() + ".delete");
dbh = (PackedDBHandle) db.open(TaskMonitorAdapter.DUMMY_MONITOR);
dbh = (PackedDBHandle) db.open(TaskMonitor.DUMMY);
assertTrue(dbDir.isDirectory());
assertTrue(!tmpDbDir.exists());
@@ -394,7 +394,7 @@ public class PackedDatabaseTest extends AbstractGenericTest {
assertTrue(packedDbFile.exists());
// Open packed db as read-only and verify content
db = PackedDatabase.getPackedDatabase(packedDbFile, true, TaskMonitorAdapter.DUMMY_MONITOR);
db = PackedDatabase.getPackedDatabase(packedDbFile, true, TaskMonitor.DUMMY);
File dbDir = (File) getInstanceField("dbDir", db);
File tmpDbDir = new File(dbDir.getParentFile(), dbDir.getName() + ".delete");
@@ -405,13 +405,13 @@ public class PackedDatabaseTest extends AbstractGenericTest {
BufferFile bf = null;
dbh = (PackedDBHandle) db.open(TaskMonitorAdapter.DUMMY_MONITOR);
dbh = (PackedDBHandle) db.open(TaskMonitor.DUMMY);
assertTrue(dbDir.isDirectory());
assertTrue(!tmpDbDir.exists());
bf = new LocalBufferFile(tmpFile1, dbh.getBufferSize());
dbh.saveAs(bf, false, TaskMonitorAdapter.DUMMY_MONITOR);
dbh.saveAs(bf, false, TaskMonitor.DUMMY);
assertTrue(bf.isReadOnly());
bf.dispose();
@@ -422,7 +422,7 @@ public class PackedDatabaseTest extends AbstractGenericTest {
assertTrue(tmpFile1.exists()); // still in-use
bf = new LocalBufferFile(tmpFile2, dbh.getBufferSize());
dbh.saveAs(bf, true, TaskMonitorAdapter.DUMMY_MONITOR);
dbh.saveAs(bf, true, TaskMonitor.DUMMY);
assertTrue(bf.isReadOnly());
assertTrue(tmpFile1.exists()); // no longer in-use