Skip to content

修复BUG: DataManagerTest中worker的uidsLock未释放，导致testDMMulti卡死 #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qk-antares wants to merge 1 commit into
base: master
Choose a base branch
from
Open

修复BUG: DataManagerTest中worker的uidsLock未释放，导致testDMMulti卡死 #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/test/java/top/guoziyang/mydb/backend/dm/DataManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,19 @@ private void worker(DataManager dm0, DataManager dm1, int tasksNum, int insertRa
uids1.add(u1);
uidsLock.unlock();
} else {
long u0, u1;
uidsLock.lock();
if(uids0.size() == 0) {
try {
if (uids0.size() == 0) {
continue;
}
int tmp = Math.abs(random.nextInt()) % uids0.size();
u0 = uids0.get(tmp);
u1 = uids1.get(tmp);
} finally {
uidsLock.unlock();
continue;
}
int tmp = Math.abs(random.nextInt()) % uids0.size();
long u0 = uids0.get(tmp);
long u1 = uids1.get(tmp);

DataItem data0 = null, data1 = null;
try {
data0 = dm0.read(u0);
Expand Down Expand Up @@ -124,6 +129,8 @@ public void testDMMulti() throws InterruptedException {
for(int i = 0; i < 10; i ++) {
Runnable r = () -> worker(dm0, mdm, tasksNum, 50, cdl);
new Thread(r).run();
// 真正的多线程
// new Thread(r).start();
}
cdl.await();
dm0.close(); mdm.close();
Expand Down