summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 50f8d285: am d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers ↵Jamie Gennis2012-12-071-24/+10
|\ | | | | | | | | | | | | outside the lock" * commit '50f8d2856b6644059b31684687842bf9c1f2e814': Revert "ConsumerBase: free buffers outside the lock"
| * am d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"Jamie Gennis2012-12-071-24/+10
| |\ | | | | | | | | | | | | * commit 'd4e706208c99ff1716fb0009ec867ff29ff04a7c': Revert "ConsumerBase: free buffers outside the lock"
| | * am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"Jamie Gennis2012-12-071-24/+10
| | |\ | | | | | | | | | | | | | | | | * commit '72c3f7d88160b7c279f90f0efe3c1cb12cd140ae': Revert "ConsumerBase: free buffers outside the lock"
| | | * Revert "ConsumerBase: free buffers outside the lock"Jamie Gennis2012-12-071-24/+10
| | | | | | | | | | | | | | | | This reverts commit b21a4e3b5f7f07ed160ca6e1809313e2a8e2a6a4.
* | | | am 7df16644: (-s ours) am 2d659286: am 2e59d2c3: DO NOT MERGE ↵Jamie Gennis2012-12-070-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | GraphicBufferAllocator: make frees async * commit '7df16644c4e5fbb30d011b9098d9c8833f89f0aa': DO NOT MERGE GraphicBufferAllocator: make frees async
| * | | am 2d659286: am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees asyncJamie Gennis2012-12-072-11/+56
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '2d659286b59dc7ff7378fe967f1c425e92155995': DO NOT MERGE GraphicBufferAllocator: make frees async
| | * | am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees asyncJamie Gennis2012-12-072-11/+56
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '2e59d2c3fdc0bcfedbe9c5d04d7acadc3eff8887': DO NOT MERGE GraphicBufferAllocator: make frees async
| | | * DO NOT MERGE GraphicBufferAllocator: make frees asyncJamie Gennis2012-12-072-11/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes GraphicBufferAllocator::free queue a job to another thread to perform the actual free operation. This prevents potentially slow free operations from blocking rendering. Bug: 7675940 Change-Id: Id61099d66bb4c3949d04184e0d7f192ac18076b4
* | | | am 7bd5a76e: (-s ours) Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-12-070-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit '7bd5a76e2e89ca6d172539ef2dfa43f42f07c001':
| * | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-12-070-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Id716af997b29350c4600ae941107e96d27f1b0af
| | * \ \ merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-060-0/+0
| | |\ \ \ | | | |_|/ | | |/| |
* | | | | am 05989772: am 3ed2736c: am b21a4e3b: ConsumerBase: free buffers outside ↵Jamie Gennis2012-12-061-10/+24
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | the lock * commit '05989772d5b46cd5328e88d546f04deef39cc3c8': ConsumerBase: free buffers outside the lock
| * | | | am 3ed2736c: am b21a4e3b: ConsumerBase: free buffers outside the lockJamie Gennis2012-12-061-10/+24
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '3ed2736c10efb2f18062591e308036837d9725a4': ConsumerBase: free buffers outside the lock
| | * | | am b21a4e3b: ConsumerBase: free buffers outside the lockJamie Gennis2012-12-061-10/+24
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'b21a4e3b5f7f07ed160ca6e1809313e2a8e2a6a4': ConsumerBase: free buffers outside the lock
| | | * | ConsumerBase: free buffers outside the lockJamie Gennis2012-12-061-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes ConsumerBase::onBuffersReleased hold a reference to all its gralloc buffers until after the mutex is unlocked. This prevents slow gralloc::free calls from causing lock contention with rendering threads. Bug: 7675940 Change-Id: I0ec805d1b612afeeecfffec03f982371d27d93be
* | | | | Add LinearAllocatorChris Craik2012-12-053-0/+329
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving from external/webkit/Source/WebCore/platform/graphics/android/utils/ Change-Id: If91830aa9b207dbc8692b2ca7c4a0b76778addd5
* | | | | Use LOCAL_REQUIRED_MODULES to establish dependencyYing Wang2012-12-041-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of using the tricky order-only dependency on a phony target module name. Change-Id: I691f2d352d1bd7f619bdb0b75070709e1b8222c0
* | | | | utils: clarify scoped tracing functionalityAlex Ray2012-11-302-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ScopedTrace objects were being used in place of ATRACE_NAME because of a misunderstanding of it's function. Cleared up documentation for usage. Also explicitly use global namespace for sysprop callback. Change-Id: I7c248b486b614ccdb841659ca0dcfc644fda670a
* | | | | Mark extensions 'Complete', correct some stale version infoJesse Hall2012-11-295-7/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I46ccd8eaeacc647399a5531e262c1b01e0a080b0
* | | | | Remove copy of atrace imported to wrong locationChad Jones2012-11-294-506/+0
| | | | |
* | | | | Merge branch 'master' of ↵Chad Jones2012-11-294-0/+506
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | https://googleplex-android.googlesource.com/a/platform/frameworks/native
| * \ \ \ \ Merge "Add the atrace utility."Chad Jones2012-11-294-0/+506
| |\ \ \ \ \
| | * | | | | Add the atrace utility.Jamie Gennis2012-02-234-0/+506
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new system binary to help with capturing and dumping kernel traces. Change-Id: If2fc074480f822588a4c171312dc4c04fd305356
* | | | | | | Merge atrace/ from platform/system/extras to cmds/atrace/Chad Jones2012-11-294-0/+850
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix buildGlenn Kasten2012-11-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibb398f36a7569af3480e24145da4317bf5b86998
| * | | | | | add asynchronous tracingErik Gilling2012-11-141-8/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5b8660cd4d2af2ad7c6b2548c9572d3527882d6d
| * | | | | | atrace: add sync trace supportErik Gilling2012-10-171-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2cd2f1a1e51f6e3d1ebbde4d5442be68a218b33d
| * | | | | | Add -n and -S options for 'nohup', offline tracesGlenn Kasten2012-10-081-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieef12b36b8519ff689ab5a81447b1b9bf4806171
| * | | | | | atrace: make clock & bus bw tracing optionalJamie Gennis2012-10-051-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes enabling clock tracing and bus bandwidth tracing depend on whether the device's kernel supports these features. If it's not supported it will be skipped. Change-Id: I51d57299693635b0ecebb75de5dccd5b62d47be3
| * | | | | | atrace: add clock rate and bus utilizationErik Gilling2012-10-041-8/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e1764b51225436fc2b3d61454ee822f511a1a7d
| * | | | | | atrace: enable running on user buildsJamie Gennis2012-06-072-16/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows atrace to be run on a user build, where it is not run as root. Some command line options still require root, and atrace will refuse to run if those options are specified when run as non-root. Bug: 6513400 Change-Id: I29984cb8a7c3ad80ba5fa6b031ed8ff81acabacf
| * | | | | | Add disk I/O tracing.Jeff Brown2012-05-222-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6488845 Change-Id: I93acb726f35b114fb1ea7297da4456826f805b7b
| * | | | | | atrace: add support for tracing CPU idle eventsJamie Gennis2012-05-071-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds the -i command line flag to atrace to enable tracing CPU idle kernel events. Change-Id: I4a2c8619224c0f50c7fd7c61c7b24fa2211f656c
| * | | | | | atrace: add support for zlib compressionJamie Gennis2012-04-282-7/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds the -z command line flag to atrace to enable support for compressing the trace with zlib as it's printed to stdout. Change-Id: I45301c63a4d1d388152244fec3c9e05e554598e8
| * | | | | | atrace: make cpu freq governor tracing optionalJamie Gennis2012-04-091-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows atrace to run on kernels that do not have CPU frequency interactive governor tracing enabled in the kernel. Change-Id: Ibfde751da7b6cc9a55794355093a37feb28f5e52
| * | | | | | atrace: add some more command line optionsJamie Gennis2012-03-071-1/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds two command line optiosn: -b for setting the trace buffer size -f for enabling tracing of the CPU frequency -l for enabling tracing of the CPU load Change-Id: Id99851a4c4eba5cfed218f29081e072bbe492133
| * | | | | | atrace: include the binary in debug buildsJamie Gennis2012-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the atrace module tag 'debug' so that the binary is included in all debug builds. Change-Id: I1fdb87be0461daf686e52ded04b37b9a122edea3
| * | | | | | Add the atrace utility.Jamie Gennis2012-02-234-0/+506
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new system binary to help with capturing and dumping kernel traces. Change-Id: If2fc074480f822588a4c171312dc4c04fd305356
* | | | | | Merge "Initial draft of EGL_ANDROID_image_native_buffer"Jesse Hall2012-11-291-0/+107
|\ \ \ \ \ \
| * | | | | | Initial draft of EGL_ANDROID_image_native_bufferJesse Hall2012-11-291-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If9bdd27ffdb13fb85e9ef873b311d6721399f75f
* | | | | | | Merge "utils: Use cutils tracing functionality."Alex Ray2012-11-292-186/+14
|\ \ \ \ \ \ \
| * | | | | | | utils: Use cutils tracing functionality.Alex Ray2012-11-292-186/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracing functionality has moved to cutils. Change-Id: Ie78ccc1d59dd5178f5058fbc3858a37f9adce552
* | | | | | | | Merge "Add LruCache::Iterator"Romain Guy2012-11-291-24/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Add LruCache::IteratorRomain Guy2012-11-281-24/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required by libhwui Change-Id: I164b9a4a82d89d132da01a56535c0df084de86f7
* | | | | | | | | am 6d93da46: (-s ours) Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-290-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | | * commit '6d93da465ab8fff02728f268785e59ab86a2a0c2':
| * | | | | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-290-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | Change-Id: I83096147b7adbf5396fdb88114abce568b4ec0cc
| | * | | | | | merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-290-0/+0
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Add another ifndef and a couple of methods to LruCacheRomain Guy2012-11-282-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new methods on LruCache are needed by libhwui to manage the cache of paths. Change-Id: If54fa325c54e2b04e7fe5dfe6dad66066c40127c
* | | | | | | | Add #ifndef to prevent multiple definitionsRomain Guy2012-11-281-0/+5
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Change-Id: Ib861eee0f333fe29290437b7e67623622d8dabd0
* | | | | | | am 31e84850: (-s ours) Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-280-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '31e8485028e93c16312c57b5bb6b511e3bc8582d': workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]