empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Build log sections in series.

Browse source 
Doing them in parallel was causing possible bad blocked thread reports,
since the thread section could be built at the same time we were
building the jobs section.
This commit is contained in:
Greyson Parrelli 2020-10-26 11:07:44 -04:00
parent 5e58f0a212
commit 9fb85f7c76
1 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java
View file

@ -22,9 +22,7 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import okhttp3.MediaType; import okhttp3.MediaType;
@ -59,10 +57,10 @@ public class SubmitDebugLogRepository {
add(new LogSectionPower()); add(new LogSectionPower());
} }
add(new LogSectionPin()); add(new LogSectionPin());
add(new LogSectionThreads());
add(new LogSectionCapabilities()); add(new LogSectionCapabilities());
add(new LogSectionFeatureFlags()); add(new LogSectionFeatureFlags());
add(new LogSectionPermissions()); add(new LogSectionPermissions());
add(new LogSectionThreads());
add(new LogSectionLogcat()); add(new LogSectionLogcat());
add(new LogSectionLogger()); add(new LogSectionLogger());
}}; }};
@ -134,30 +132,18 @@ public class SubmitDebugLogRepository {
int maxTitleLength = Stream.of(SECTIONS).reduce(0, (max, section) -> Math.max(max, section.getTitle().length())); int maxTitleLength = Stream.of(SECTIONS).reduce(0, (max, section) -> Math.max(max, section.getTitle().length()));
List<Future<List<LogLine>>> futures = new ArrayList<>();
for (LogSection section : SECTIONS) {
futures.add(SignalExecutors.BOUNDED.submit(() -> {
List<LogLine> lines = getLinesForSection(context, section, maxTitleLength);
if (SECTIONS.indexOf(section) != SECTIONS.size() - 1) {
for (int i = 0; i < SECTION_SPACING; i++) {
lines.add(SimpleLogLine.EMPTY);
}
}
return lines;
}));
}
List<LogLine> allLines = new ArrayList<>(); List<LogLine> allLines = new ArrayList<>();
for (Future<List<LogLine>> future : futures) { for (LogSection section : SECTIONS) {
try { List<LogLine> lines = getLinesForSection(context, section, maxTitleLength);
allLines.addAll(future.get());
} catch (ExecutionException | InterruptedException e) { if (SECTIONS.indexOf(section) != SECTIONS.size() - 1) {
throw new AssertionError(e); for (int i = 0; i < SECTION_SPACING; i++) {
lines.add(SimpleLogLine.EMPTY);
}
} }
allLines.addAll(lines);
} }
List<LogLine> withIds = new ArrayList<>(allLines.size()); List<LogLine> withIds = new ArrayList<>(allLines.size());