Skip to content

updating json dumping strategy to gson for memory improvement #9

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
dah-fari7009 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

updating json dumping strategy to gson for memory improvement #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85facd3
updating json dumping strategy to gson for memory improvement
dah-fari7009 Jan 11, 2023
abd8a66
minor cleanup
dah-fari7009 Jan 11, 2023
572c369
adding mvn gson dependency
dah-fari7009 Jan 11, 2023
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
5 changes: 5 additions & 0 deletions Mandoline/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@
<artifactId>json</artifactId>
<version>20201115</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
Expand Down
43 changes: 30 additions & 13 deletions ...ain/java/ca/ubc/ece/resess/slicer/dynamic/mandoline/instrumenter/AndroidInstrumenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
package ca.ubc.ece.resess.slicer.dynamic.mandoline.instrumenter;


import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.io.BufferedWriter;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
Expand Down Expand Up @@ -34,8 +39,13 @@
import soot.jimple.ThrowStmt;
import soot.jimple.infoflow.android.callbacks.AndroidCallbackDefinition;

import org.json.simple.JSONArray;
import org.json.simple.JSONObject;


import com.google.gson.JsonObject;
import com.google.gson.JsonArray;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.stream.JsonWriter;

import ca.ubc.ece.resess.slicer.dynamic.core.instrumenter.Instrumenter;
import ca.ubc.ece.resess.slicer.dynamic.core.instrumenter.InstrumenterUtils;
Expand All @@ -58,7 +68,7 @@ public class AndroidInstrumenter extends Instrumenter {
private boolean isAndroidSlicer = false;
private boolean isOriginal = false;
private Long appSize = 0L;
JSONObject staticLog = new JSONObject();
JsonObject staticLog = new JsonObject();
InstrumentationCounter globalLineCounter = new InstrumentationCounter();
Chain<SootClass> libClasses = null;

Expand Down Expand Up @@ -199,24 +209,24 @@ protected void internalTransform(final Body b, String phaseName, @SuppressWarnin
synchronized (appSize) {
appSize += methodSize;
}
JSONObject job = new JSONObject();
JsonObject job = new JsonObject();
String key = "";
JSONArray jArray = new JSONArray();
JsonArray jArray = new JsonArray();
Unit prevU = null;
for (Unit u : unitNumMap.keySet()) {
if (u instanceof IdentityStmt) {
continue;
}
if (taggedUnits.containsKey(u)) {
if (!key.equals("")){
job.put(key, jArray);
jArray = new JSONArray();
job.add(key, jArray);
jArray = new JsonArray();
}
key = taggedUnits.get(u).toString();
} else if (prevU != null && (prevU instanceof ReturnStmt || prevU instanceof ReturnVoidStmt || prevU instanceof ThrowStmt)) {
if (!key.equals("")){
job.put(key, jArray);
jArray = new JSONArray();
job.add(key, jArray);
jArray = new JsonArray();
}
if (taggedUnits.get(u) == null) {
key = "";
Expand All @@ -228,11 +238,11 @@ protected void internalTransform(final Body b, String phaseName, @SuppressWarnin
prevU = u;
}
if (!key.equals("")) {
job.put(key, jArray);
job.add(key, jArray);
}

synchronized(staticLog){
staticLog.put(b.getMethod().getSignature(), job);
staticLog.add(b.getMethod().getSignature(), job);
}
}
}));
Expand Down Expand Up @@ -266,14 +276,21 @@ public void start (String args[]) {
newArgs[ii-2]=args[ii];
}
AnalysisLogger.log(true, "Soot args: {}", Arrays.asList(newArgs));
soot.Main.main(newArgs);
soot.Main.main(newArgs);
File logFile = new File(staticLogFile);
Gson gson = new GsonBuilder()
.disableHtmlEscaping()
.create();
try {
logFile.delete();
FileUtils.writeStringToFile(logFile, staticLog.toString(), "UTF-8", true);
BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(staticLogFile), StandardCharsets.UTF_8));
JsonWriter writer = new JsonWriter(out);
gson.toJson(staticLog, writer);
writer.close();

} catch (IOException e) {
throw new Error("Failed to write static log file");

}
File sizeFile = new File("apk-size.txt");
try {
Expand Down