drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't call broken+deprecated SamplingProfiler.writeHprofData" into honeycomb

Browse Source
This commit is contained in:
Jesse Wilson
2011-01-23 16:40:53 -08:00
committed by Android (Google) Code Review
parent 60c060929f db35269ae4
commit e2be3416f2
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/java/com/android/internal/os/SamplingProfilerIntegration.java
View File

@ -16,22 +16,21 @@
package com.android.internal.os;
import android.content.pm.PackageInfo;
import android.os.Build;
import android.os.SystemProperties;
import android.util.Log;
import dalvik.system.SamplingProfiler;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.ThreadFactory;
import android.content.pm.PackageInfo;
import android.util.Log;
import android.os.*;
import java.util.concurrent.atomic.AtomicBoolean;
import libcore.io.IoUtils;
/**
* Integrates the framework with Dalvik's sampling profiler.
@ -162,19 +161,16 @@ public class SamplingProfilerIntegration {
PrintStream out = null;
try {
out = new PrintStream(new BufferedOutputStream(new FileOutputStream(path)));
} catch (IOException e) {
Log.e(TAG, "Could not open " + path + ":" + e);
return;
}
try {
generateSnapshotHeader(name, packageInfo, out);
INSTANCE.writeHprofData(out);
} finally {
out.close();
}
if (out.checkError()) {
Log.e(TAG, "Error writing snapshot.");
new SamplingProfiler.AsciiHprofWriter(INSTANCE.getHprofData(), out).write();
if (out.checkError()) {
throw new IOException();
}
} catch (IOException e) {
Log.e(TAG, "Error writing snapshot to " + path, e);
return;
} finally {
IoUtils.closeQuietly(out);
}
// set file readable to the world so that SamplingProfilerService
// can put it to dropbox