LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove MoarRam."

Browse Source
This commit is contained in:
Elliott Hughes
2017-12-14 20:44:10 +00:00
committed by Gerrit Code Review
parent c11104dd31 d017964891
commit 3d6d5244db
22 changed files with 0 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tutorials/MoarRam/Android.mk
View File

@@ -1,31 +0,0 @@
# Copyright (C) 2013 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
# We only want this apk build for tests.
LOCAL_MODULE_TAGS := optional
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := MoarRam
include $(BUILD_PACKAGE)
include $(CLEAR_VARS)
include $(call all-makefiles-under,$(LOCAL_PATH))

23
tutorials/MoarRam/AndroidManifest.xml
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.benchmark.moarram"
android:versionCode="1"
android:versionName="1.0" >
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
<activity
android:name="com.android.benchmark.moarram.MainActivity"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>

17
tutorials/MoarRam/README.txt
View File

@@ -1,17 +0,0 @@
This is a simple app that can be used as a tutorial or reference benchmark
for the development of the DDMS native heap tracker feature. It contains 3
unique paths to allocate heap chunks:
1) Java_com_android_benchmark_moarram_MainActivity_add32ByteBlocksNative in
foo.c (libmoarram-foo.so). Each invocation will allocate 32 bytes.
2) Java_com_android_benchmark_moarram_MainActivity_add2MByteBlocksNative in
bar.c (libmoarram-bar.so). Each invocation will allocate 2M bytes.
3) Java_com_android_benchmark_moarram_MainActivity_addVariableSizedBlocksNative
in baz.c (libmoarram-baz.so). Each invocation will allocate 17 or 71 bytes,
depending on the active button in a radio group.
Each allocation can be freed by clicking the corresponding free button in the
UI.
NOTE 09/16/2013
A new feature is added to force a double free. Both debug libc and Valgrind can capture it.

58
tutorials/MoarRam/jni/Android.mk
View File

@@ -1,58 +0,0 @@
# Copyright (C) 2013 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
LOCAL_PATH:= $(call my-dir)
MoarRam_jni_cflags := -Wall -Werror -Wno-unused-parameter
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libmoarram-32
LOCAL_SRC_FILES := foo.c
LOCAL_SHARED_LIBRARIES += liblog
LOCAL_CFLAGS := $(MoarRam_jni_cflags)
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libmoarram-2M
LOCAL_SRC_FILES := bar.c
LOCAL_SHARED_LIBRARIES += liblog
LOCAL_CFLAGS := $(MoarRam_jni_cflags)
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libmoarram-17_71
LOCAL_SRC_FILES := baz.c
LOCAL_SHARED_LIBRARIES += liblog
LOCAL_CFLAGS := $(MoarRam_jni_cflags)
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libmoarram-doublefree
LOCAL_SRC_FILES := df.c
LOCAL_SHARED_LIBRARIES += liblog
LOCAL_CFLAGS := $(MoarRam_jni_cflags)
include $(BUILD_SHARED_LIBRARY)

59
tutorials/MoarRam/jni/bar.c
View File

@@ -1,59 +0,0 @@
/*
* Copyright (C) 2013 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
#include <jni.h>
#include <malloc.h>
#include <cutils/log.h>
#if defined(LOG_TAG)
#undef LOG_TAG
#define LOG_TAG "MOARRAM"
#endif
char *gPtr2;
static int num2MByteBlocks;
void
Java_com_android_benchmark_moarram_MainActivity_add2MByteBlocksNative(
JNIEnv* env,
jobject this)
{
char **ptr = malloc(2*1024*1024);
*ptr = gPtr2;
gPtr2 = (char *) ptr;
num2MByteBlocks++;
ALOGW("%d 2M-byte blocks allocated so far (just allocated %p)",
num2MByteBlocks, gPtr2);
}
void
Java_com_android_benchmark_moarram_MainActivity_free2MByteBlocksNative(
JNIEnv* env,
jobject this)
{
if (gPtr2 == NULL) {
ALOGW("All 2M-byte blocks are freed");
return;
}
char **ptr = (char **) gPtr2;
gPtr2 = *ptr;
free(ptr);
num2MByteBlocks--;
ALOGW("%d 2M-byte blocks allocated so far (just freed %p)",
num2MByteBlocks, ptr);
}

82
tutorials/MoarRam/jni/baz.c
View File

@@ -1,82 +0,0 @@
/*
* Copyright (C) 2013 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
#include <jni.h>
#include <malloc.h>
#include <cutils/log.h>
#if defined(LOG_TAG)
#undef LOG_TAG
#define LOG_TAG "MOARRAM"
#endif
char *gPtr17;
char *gPtr71;
static int num17ByteBlocks;
static int num71ByteBlocks;
void
Java_com_android_benchmark_moarram_MainActivity_addVariableSizedBlocksNative(
JNIEnv* env,
jobject this,
jint id)
{
int size;
char **gPtr;
char **ptr;
if (id == 0) {
size = 17;
gPtr = &gPtr17;
} else {
size = 71;
gPtr = &gPtr71;
}
ptr = malloc(size);
*ptr = *gPtr;
*gPtr = (char *) ptr;
ALOGW("%d %d-byte blocks allocated so far (just allocated %p)",
id == 0 ? ++num17ByteBlocks : ++num71ByteBlocks,
size, ptr);
}
void
Java_com_android_benchmark_moarram_MainActivity_freeVariableSizedBlocksNative(
JNIEnv* env,
jobject this,
jint id)
{
int size;
char **ptr;
char **gPtr;
if (id == 0) {
size = 17;
gPtr = &gPtr17;
} else {
size = 71;
gPtr = &gPtr71;
}
if (*gPtr == NULL) {
ALOGW("All %d-byte blocks are freed", size);
return;
}
ptr = (char **) *gPtr;
*gPtr = *ptr;
free(ptr);
ALOGW("%d %d-byte blocks allocated so far (just freed %p)",
id == 0 ? --num17ByteBlocks : --num71ByteBlocks,
size, ptr);
}

37
tutorials/MoarRam/jni/df.c
View File

@@ -1,37 +0,0 @@
/*
* Copyright (C) 2013 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
#include <jni.h>
#include <malloc.h>
#include <cutils/log.h>
#if defined(LOG_TAG)
#undef LOG_TAG
#define LOG_TAG "MOARRAM"
#endif
void
Java_com_android_benchmark_moarram_MainActivity_forceDoubleFreeNative(
JNIEnv* env,
jobject this)
{
char *ptr = (char *) malloc(4);
*ptr = 0;
ALOGW("About to double free %p", ptr);
free(ptr);
free(ptr);
}

59
tutorials/MoarRam/jni/foo.c
View File

@@ -1,59 +0,0 @@
/*
* Copyright (C) 2013 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
#include <jni.h>
#include <malloc.h>
#include <cutils/log.h>
#if defined(LOG_TAG)
#undef LOG_TAG
#define LOG_TAG "MOARRAM"
#endif
char *gPtr;
static int num32ByteBlocks;
void
Java_com_android_benchmark_moarram_MainActivity_add32ByteBlocksNative(
JNIEnv* env,
jobject this)
{
char **ptr = malloc(32);
*ptr = gPtr;
gPtr = (char *) ptr;
num32ByteBlocks++;
ALOGW("%d 32-byte blocks allocated so far (just allocated %p)",
num32ByteBlocks, gPtr);
}
void
Java_com_android_benchmark_moarram_MainActivity_free32ByteBlocksNative(
JNIEnv* env,
jobject this)
{
if (gPtr == NULL) {
ALOGW("All 32-byte blocks are freed");
return;
}
char **ptr = (char **) gPtr;
gPtr = *ptr;
free(ptr);
num32ByteBlocks--;
ALOGW("%d 32-byte blocks allocated so far (just freed %p)",
num32ByteBlocks, ptr);
}

BIN
tutorials/MoarRam/res/drawable-hdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.5 KiB

BIN
tutorials/MoarRam/res/drawable-mdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.7 KiB

BIN
tutorials/MoarRam/res/drawable-xhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
tutorials/MoarRam/res/drawable-xxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 24 KiB

119
tutorials/MoarRam/res/layout/activity_main.xml
View File

@@ -1,119 +0,0 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="fill_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:orientation="vertical"
tools:context=".MainActivity" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<Button
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:text="@string/add_32"
android:layout_weight="1"
android:onClick="add32ByteBlocks" />
<Button
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:text="@string/free_32"
android:layout_weight="1"
android:onClick="free32ByteBlocks" />
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<Button
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:text="@string/add_2m"
android:layout_weight="1"
android:onClick="add2MByteBlocks" />
<Button
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:text="@string/free_2m"
android:layout_weight="1"
android:onClick="free2MByteBlocks" />
</LinearLayout>
<LinearLayout
android:id="@+id/linearLayout2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<RadioGroup
android:id="@+id/blockSize"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="horizontal"
android:gravity="center" >
<RadioButton
android:id="@+id/radio17"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/_17byte"
android:checked="true" />
<RadioButton
android:id="@+id/radio71"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/_71byte" />
</RadioGroup>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<Button
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:text="@string/add_variable"
android:layout_weight="1"
android:onClick="addVariableSizedBlocks" />
<Button
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:text="@string/free_variable"
android:layout_weight="1"
android:onClick="freeVariableSizedBlocks" />
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<Button
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:text="@string/force_double_free"
android:layout_weight="1"
android:onClick="forceDoubleFree" />
</LinearLayout>
</LinearLayout>

9
tutorials/MoarRam/res/menu/main.xml
View File

@@ -1,9 +0,0 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:showAsAction="never"
android:title="@string/action_settings"/>
</menu>

8
tutorials/MoarRam/res/values-sw600dp/dimens.xml
View File

@@ -1,8 +0,0 @@
<resources>
<!--
Customize dimensions originally defined in res/values/dimens.xml (such as
screen margins) for sw600dp devices (e.g. 7" tablets) here.
-->
</resources>

9
tutorials/MoarRam/res/values-sw720dp-land/dimens.xml
View File

@@ -1,9 +0,0 @@
<resources>
<!--
Customize dimensions originally defined in res/values/dimens.xml (such as
screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-->
<dimen name="activity_horizontal_margin">128dp</dimen>
</resources>

11
tutorials/MoarRam/res/values-v11/styles.xml
View File

@@ -1,11 +0,0 @@
<resources>
<!--
Base application theme for API 11+. This theme completely replaces
AppBaseTheme from res/values/styles.xml on API 11+ devices.
-->
<style name="AppBaseTheme" parent="android:Theme.Holo.Light">
<!-- API 11 theme customizations can go here. -->
</style>
</resources>

12
tutorials/MoarRam/res/values-v14/styles.xml
View File

@@ -1,12 +0,0 @@
<resources>
<!--
Base application theme for API 14+. This theme completely replaces
AppBaseTheme from BOTH res/values/styles.xml and
res/values-v11/styles.xml on API 14+ devices.
-->
<style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<!-- API 14 theme customizations can go here. -->
</style>
</resources>

7
tutorials/MoarRam/res/values/dimens.xml
View File

@@ -1,7 +0,0 @@
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
</resources>

17
tutorials/MoarRam/res/values/strings.xml
View File

@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">MoarRam</string>
<string name="action_settings">Settings</string>
<string name="hello_world">Hello world!</string>
<string name="enter_num">Enter a number</string>
<string name="add_32">Add 32 bytes</string>
<string name="free_32">Free 32 bytes</string>
<string name="add_2m">Add 2M bytes</string>
<string name="free_2m">Free 2M bytes</string>
<string name="add_variable">Add 17 or 71 bytes</string>
<string name="free_variable">Free 17 or 71 bytes</string>
<string name="_17byte">17 bytes</string>
<string name="_71byte">71 bytes</string>
<string name="force_double_free">Force a Double Free</string>
</resources>

20
tutorials/MoarRam/res/values/styles.xml
View File

@@ -1,20 +0,0 @@
<resources>
<!--
Base application theme, dependent on API level. This theme is replaced
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-->
<style name="AppBaseTheme" parent="android:Theme.Light">
<!--
Theme customizations available in newer API levels can go in
res/values-vXX/styles.xml, while customizations related to
backward-compatibility can go here.
-->
</style>
<!-- Application theme. -->
<style name="AppTheme" parent="AppBaseTheme">
<!-- All customizations that are NOT specific to a particular API-level can go here. -->
</style>
</resources>

70
tutorials/MoarRam/src/com/android/benchmark/moarram/MainActivity.java
View File

@@ -1,70 +0,0 @@
package com.android.benchmark.moarram;
import android.os.Bundle;
import android.app.Activity;
import android.view.Menu;
import android.view.View;
import android.widget.RadioGroup;
public class MainActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
System.loadLibrary("moarram-32");
System.loadLibrary("moarram-2M");
System.loadLibrary("moarram-17_71");
System.loadLibrary("moarram-doublefree");
setContentView(R.layout.activity_main);
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.main, menu);
return true;
}
public void add32ByteBlocks(View view) {
add32ByteBlocksNative();
}
public void free32ByteBlocks(View view) {
free32ByteBlocksNative();
}
public void add2MByteBlocks(View view) {
add2MByteBlocksNative();
}
public void free2MByteBlocks(View view) {
free2MByteBlocksNative();
}
public void addVariableSizedBlocks(View view) {
RadioGroup sizeGroup = (RadioGroup) findViewById(R.id.blockSize);
int sizeId = sizeGroup.getCheckedRadioButtonId();
addVariableSizedBlocksNative(sizeId == R.id.radio17 ? 0 : 1);
}
public void freeVariableSizedBlocks(View view) {
RadioGroup sizeGroup = (RadioGroup) findViewById(R.id.blockSize);
int sizeId = sizeGroup.getCheckedRadioButtonId();
freeVariableSizedBlocksNative(sizeId == R.id.radio17 ? 0 : 1);
}
public void forceDoubleFree(View view) {
forceDoubleFreeNative();
}
public native void add32ByteBlocksNative();
public native void free32ByteBlocksNative();
public native void add2MByteBlocksNative();
public native void free2MByteBlocksNative();
public native void addVariableSizedBlocksNative(int sizeId);
public native void freeVariableSizedBlocksNative(int sizeId);
public native void forceDoubleFreeNative();
}