ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

am 112aa42e: Merge "SurfaceFlinger: fix 64-bit format string warnings"

Browse Source 
* commit '112aa42e91b4bb0cde334753e2ad05e3f248b377':
  SurfaceFlinger: fix 64-bit format string warnings
This commit is contained in:
Greg Hackmann 2014-03-11 18:51:43 +00:00 committed by Android Git Automerger
commit 645427aeac
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/surfaceflinger/DisplayDevice.cpp
View File

@ -462,7 +462,7 @@ void DisplayDevice::dump(String8& result) const {
result.appendFormat( result.appendFormat(
"+ DisplayDevice: %s\n" "+ DisplayDevice: %s\n"
" type=%x, hwcId=%d, layerStack=%u, (%4dx%4d), ANativeWindow=%p, orient=%2d (type=%08x), " " type=%x, hwcId=%d, layerStack=%u, (%4dx%4d), ANativeWindow=%p, orient=%2d (type=%08x), "
"flips=%u, isSecure=%d, secureVis=%d, acquired=%d, numLayers=%u\n" "flips=%u, isSecure=%d, secureVis=%d, acquired=%d, numLayers=%zu\n"
" v:[%d,%d,%d,%d], f:[%d,%d,%d,%d], s:[%d,%d,%d,%d]," " v:[%d,%d,%d,%d], f:[%d,%d,%d,%d], s:[%d,%d,%d,%d],"
"transform:[[%0.3f,%0.3f,%0.3f][%0.3f,%0.3f,%0.3f][%0.3f,%0.3f,%0.3f]]\n", "transform:[[%0.3f,%0.3f,%0.3f][%0.3f,%0.3f,%0.3f][%0.3f,%0.3f,%0.3f]]\n",
mDisplayName.string(), mType, mHwcDisplayId, mDisplayName.string(), mType, mHwcDisplayId,

2
services/surfaceflinger/EventThread.cpp
View File

@ -328,7 +328,7 @@ void EventThread::dump(String8& result) const {
mDebugVsyncEnabled?"enabled":"disabled"); mDebugVsyncEnabled?"enabled":"disabled");
result.appendFormat(" soft-vsync: %s\n", result.appendFormat(" soft-vsync: %s\n",
mUseSoftwareVSync?"enabled":"disabled"); mUseSoftwareVSync?"enabled":"disabled");
result.appendFormat(" numListeners=%u,\n events-delivered: %u\n", result.appendFormat(" numListeners=%zu,\n events-delivered: %u\n",
mDisplayEventConnections.size(), mDisplayEventConnections.size(),
mVSyncEvent[DisplayDevice::DISPLAY_PRIMARY].vsync.count); mVSyncEvent[DisplayDevice::DISPLAY_PRIMARY].vsync.count);
for (size_t i=0 ; i<mDisplayEventConnections.size() ; i++) { for (size_t i=0 ; i<mDisplayEventConnections.size() ; i++) {

4
services/surfaceflinger/FrameTracker.cpp
View File

@ -17,6 +17,8 @@
// This is needed for stdint.h to define INT64_MAX in C++ // This is needed for stdint.h to define INT64_MAX in C++
#define __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS
#include <inttypes.h>
#include <cutils/log.h> #include <cutils/log.h>
#include <ui/Fence.h> #include <ui/Fence.h>
@ -211,7 +213,7 @@ void FrameTracker::dump(String8& result) const {
const size_t o = mOffset; const size_t o = mOffset;
for (size_t i = 1; i < NUM_FRAME_RECORDS; i++) { for (size_t i = 1; i < NUM_FRAME_RECORDS; i++) {
const size_t index = (o+i) % NUM_FRAME_RECORDS; const size_t index = (o+i) % NUM_FRAME_RECORDS;
result.appendFormat("%lld\t%lld\t%lld\n", result.appendFormat("%" PRId64 "\t%" PRId64 "\t%" PRId64 "\n",
mFrameRecords[index].desiredPresentTime, mFrameRecords[index].desiredPresentTime,
mFrameRecords[index].actualPresentTime, mFrameRecords[index].actualPresentTime,
mFrameRecords[index].frameReadyTime); mFrameRecords[index].frameReadyTime);

13
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -21,6 +21,7 @@
#include <errno.h> #include <errno.h>
#include <math.h> #include <math.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <inttypes.h>
#include <EGL/egl.h> #include <EGL/egl.h>
@ -429,7 +430,7 @@ void SurfaceFlinger::init() {
// FIXME: currently we don't get blank/unblank requests // FIXME: currently we don't get blank/unblank requests
// for displays other than the main display, so we always // for displays other than the main display, so we always
// assume a connected display is unblanked. // assume a connected display is unblanked.
ALOGD("marking display %d as acquired/unblanked", i); ALOGD("marking display %zu as acquired/unblanked", i);
hw->acquireScreen(); hw->acquireScreen();
} }
mDisplays.add(token, hw); mDisplays.add(token, hw);
@ -1639,7 +1640,7 @@ void SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& hw, const
case HWC_FRAMEBUFFER_TARGET: { case HWC_FRAMEBUFFER_TARGET: {
// this should not happen as the iterator shouldn't // this should not happen as the iterator shouldn't
// let us get there. // let us get there.
ALOGW("HWC_FRAMEBUFFER_TARGET found in hwc list (index=%d)", i); ALOGW("HWC_FRAMEBUFFER_TARGET found in hwc list (index=%zu)", i);
break; break;
} }
} }
@ -2224,7 +2225,7 @@ void SurfaceFlinger::dumpStatsLocked(const Vector<String16>& args, size_t& index
const nsecs_t period = const nsecs_t period =
getHwComposer().getRefreshPeriod(HWC_DISPLAY_PRIMARY); getHwComposer().getRefreshPeriod(HWC_DISPLAY_PRIMARY);
result.appendFormat("%lld\n", period); result.appendFormat("%" PRId64 "\n", period);
if (name.isEmpty()) { if (name.isEmpty()) {
mAnimFrameTracker.dump(result); mAnimFrameTracker.dump(result);
@ -2337,7 +2338,7 @@ void SurfaceFlinger::dumpAllLocked(const Vector<String16>& args, size_t& index,
const LayerVector& currentLayers = mCurrentState.layersSortedByZ; const LayerVector& currentLayers = mCurrentState.layersSortedByZ;
const size_t count = currentLayers.size(); const size_t count = currentLayers.size();
colorizer.bold(result); colorizer.bold(result);
result.appendFormat("Visible layers (count = %d)\n", count); result.appendFormat("Visible layers (count = %zu)\n", count);
colorizer.reset(result); colorizer.reset(result);
for (size_t i=0 ; i<count ; i++) { for (size_t i=0 ; i<count ; i++) {
const sp<Layer>& layer(currentLayers[i]); const sp<Layer>& layer(currentLayers[i]);
@ -2349,7 +2350,7 @@ void SurfaceFlinger::dumpAllLocked(const Vector<String16>& args, size_t& index,
*/ */
colorizer.bold(result); colorizer.bold(result);
result.appendFormat("Displays (%d entries)\n", mDisplays.size()); result.appendFormat("Displays (%zu entries)\n", mDisplays.size());
colorizer.reset(result); colorizer.reset(result);
for (size_t dpy=0 ; dpy<mDisplays.size() ; dpy++) { for (size_t dpy=0 ; dpy<mDisplays.size() ; dpy++) {
const sp<const DisplayDevice>& hw(mDisplays[dpy]); const sp<const DisplayDevice>& hw(mDisplays[dpy]);
@ -2932,7 +2933,7 @@ void SurfaceFlinger::checkScreenshot(size_t w, size_t s, size_t h, void const* v
const bool visible = (state.layerStack == hw->getLayerStack()) const bool visible = (state.layerStack == hw->getLayerStack())
&& (state.z >= minLayerZ && state.z <= maxLayerZ) && (state.z >= minLayerZ && state.z <= maxLayerZ)
&& (layer->isVisible()); && (layer->isVisible());
ALOGE("%c index=%d, name=%s, layerStack=%d, z=%d, visible=%d, flags=%x, alpha=%x", ALOGE("%c index=%zu, name=%s, layerStack=%d, z=%d, visible=%d, flags=%x, alpha=%x",
visible ? '+' : '-', visible ? '+' : '-',
i, layer->getName().string(), state.layerStack, state.z, i, layer->getName().string(), state.layerStack, state.z,
layer->isVisible(), state.flags, state.alpha); layer->isVisible(), state.flags, state.alpha);