Skip to content
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

Jump to bottom

多线程bug,deleteLocalRefs 删除 localObjectMap未考虑到多线程因素 #539

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

多线程bug,deleteLocalRefs 删除 localObjectMap未考虑到多线程因素 #539

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 38 additions & 6 deletions unidbg-android/src/main/java/com/github/unidbg/linux/android/dvm/BaseVM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
import com.github.unidbg.linux.android.dvm.apk.Apk;
import com.github.unidbg.linux.android.dvm.apk.ApkFactory;
import com.github.unidbg.linux.android.dvm.apk.AssetResolver;
import com.github.unidbg.linux.thread.MarshmallowThread;
import com.github.unidbg.spi.LibraryFile;
import com.github.unidbg.thread.Function32;
import com.github.unidbg.thread.Function64;
import net.dongliu.apk.parser.bean.CertificateMeta;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Expand Down Expand Up @@ -92,7 +95,7 @@ public String toString() {
final Map<Integer, ObjRef> globalObjectMap = new HashMap<>();
final Map<Integer, ObjRef> weakGlobalObjectMap = new HashMap<>();
final Map<Integer, ObjRef> localObjectMap = new HashMap<>();

final Map<Integer, Map> xLocalObjectMap = new HashMap<>();
private DvmClassFactory dvmClassFactory;

@Override
Expand Down Expand Up @@ -128,6 +131,32 @@ public DvmClass createClass(BaseVM vm, String className, DvmClass superClass, Dv
return new DvmClass(vm, className, superClass, interfaceClasses);
}

public void putObj(int tid, int hash, ObjRef obj) {
Map objMap = xLocalObjectMap.get(tid);
if (objMap == null) {
objMap = new HashMap<>();
}
objMap.put(hash, obj);
xLocalObjectMap.put(tid, objMap);
}

public int getTid(){
Object obj = emulator.getThreadDispatcher().getRunningTask();
int tid;
if (obj == null) {
tid = emulator.getPid();
} else if (obj instanceof Function64) {
tid = ((Function64) obj).getId();
} else if (obj instanceof Function32) {
tid = ((Function32) obj).getId();
} else if (obj instanceof MarshmallowThread) {
tid = ((MarshmallowThread) obj).getId();
} else {
throw new RuntimeException("未知类型的RunningTask");
}
return tid;
}

final int addObject(DvmObject<?> object, boolean global, boolean weak) {
int hash = object.hashCode();
if (log.isDebugEnabled()) {
Expand All @@ -144,7 +173,8 @@ final int addObject(DvmObject<?> object, boolean global, boolean weak) {
globalObjectMap.put(hash, new ObjRef(object, false));
}
} else {
localObjectMap.put(hash, new ObjRef(object, weak));
//localObjectMap.put(hash, new ObjRef(object, weak));
putObj(getTid(),hash, new ObjRef(object, weak));
}
return hash;
}
Expand All @@ -171,8 +201,9 @@ public final int addGlobalObject(DvmObject<?> object) {
@Override
public final <T extends DvmObject<?>> T getObject(int hash) {
ObjRef ref;
if (localObjectMap.containsKey(hash)) {
ref = localObjectMap.get(hash);
Map <Integer,ObjRef>_localObjectMap = xLocalObjectMap.get(getTid());
if (_localObjectMap.containsKey(hash)) {
ref = _localObjectMap.get(hash);
} else if(globalObjectMap.containsKey(hash)) {
ref = globalObjectMap.get(hash);
} else {
Expand All @@ -187,10 +218,11 @@ public final DvmClass findClass(String className) {
}

final void deleteLocalRefs() {
for (ObjRef ref : localObjectMap.values()) {
Map <Integer,ObjRef>_localObjectMap = xLocalObjectMap.get(getTid());
for (ObjRef ref : _localObjectMap.values()) {
ref.obj.onDeleteRef();
}
localObjectMap.clear();
_localObjectMap.clear();

if (throwable != null) {
throwable.onDeleteRef();
Expand Down