PD#138457: close hwc log

Change-Id: If2238c6ef2f2468d91bd37abaff0a68930b92daf

6 files changed, 48 insertions, 41 deletions

diff --git a/hwc2/common/base/HwcFenceControl.cpp b/hwc2/common/base/HwcFenceControl.cpp
index 3bb8781..15c24b5 100644
--- a/hwc2/common/base/HwcFenceControl.cpp
+++ b/hwc2/common/base/HwcFenceControl.cpp
@@ -71,25 +71,25 @@ status_t HwcFenceControl::traceFenceInfo(int32_t fence) {
     err = sync_wait(fence, 10000);
 
     if (err < 0) {
-        ALOGI("wait %d failed: %s\n", fence, strerror(errno));
+        ITRACE("wait %d failed: %s\n", fence, strerror(errno));
     } else {
-        ALOGI("wait %d done\n", fence);
+        ITRACE("wait %d done\n", fence);
     }
     info = sync_fence_info(fence);
     if (info) {
         struct sync_pt_info *pt_info = NULL;
-        ALOGI("  fence %s %d\n", info->name, info->status);
+        ITRACE("  fence %s %d\n", info->name, info->status);
 
         while ((pt_info = sync_pt_info(info, pt_info))) {
             int ts_sec = pt_info->timestamp_ns / 1000000000LL;
             int ts_usec = (pt_info->timestamp_ns % 1000000000LL) / 1000LL;
-            ALOGI("    pt %s %s %d %d.%06d", pt_info->obj_name,
+            ITRACE("    pt %s %s %d %d.%06d", pt_info->obj_name,
                    pt_info->driver_name, pt_info->status,
                    ts_sec, ts_usec);
             if (!strcmp(pt_info->driver_name, "sw_sync"))
-                ALOGI(" val=%d\n", *(uint32_t *)pt_info->driver_data);
+                ITRACE(" val=%d\n", *(uint32_t *)pt_info->driver_data);
             else
-                ALOGI("\n");
+                ITRACE("\n");
         }
         sync_fence_info_free(info);
     }
@@ -113,7 +113,7 @@ status_t HwcFenceControl::waitForever(const char* logname) {
     int32_t warningTimeout = 3000;
     int32_t err = sync_wait(mFenceFd, warningTimeout);
     if (err < 0 && errno == ETIME) {
-        ALOGE("%s: fence %d didn't signal in %u ms", logname, mFenceFd,
+        ETRACE("%s: fence %d didn't signal in %u ms", logname, mFenceFd,
                 warningTimeout);
         err = sync_wait(mFenceFd, TIMEOUT_NEVER);
     }
diff --git a/hwc2/common/base/HwcModule.cpp b/hwc2/common/base/HwcModule.cpp
index af1a21b..9b3a34b 100644
--- a/hwc2/common/base/HwcModule.cpp
+++ b/hwc2/common/base/HwcModule.cpp
@@ -613,7 +613,7 @@ hwc2_function_pointer_t hwc2_getFunction(struct hwc2_device* device,
         case HWC2_FUNCTION_SET_LAYER_Z_ORDER:
             return reinterpret_cast<hwc2_function_pointer_t>(setLayerZOrder);
         default:
-            ALOGE("getFunction: Unknown function descriptor: %d", descriptor);
+            ETRACE("getFunction: Unknown function descriptor: %d", descriptor);
             return NULL;
     }
 }
diff --git a/hwc2/common/composers/GE2DComposer.cpp b/hwc2/common/composers/GE2DComposer.cpp
index 7c3d884..ad1e696 100644
--- a/hwc2/common/composers/GE2DComposer.cpp
+++ b/hwc2/common/composers/GE2DComposer.cpp
@@ -397,27 +397,27 @@ void GE2DComposer::tracer()
                     "CANVAS_OSD1",
                     "CANVAS_ALLOC",
                     "CANVAS_INVALID"};
-    ALOGE("  OP: %22s", ge2dOp[mSrcBufferInfo->ge2d_op]);
-    ALOGE(
+    ETRACE("  OP: %22s", ge2dOp[mSrcBufferInfo->ge2d_op]);
+    ETRACE(
         "       addr     |     memtype     | canvas size | fmt | tr | blnd |"
         "     source crop (x,y,w,h)      |\n"
         "  --------------+-----------------+-------------+-----+----+------|"
         "--------------------------------+\n");
-    ALOGE(
+    ETRACE(
         "  SRC0:\n"
         "   %12x | %15s | %5dx%5d | %03x | %02s | %04s |%5d,%5d,%5d,%5d \n",
                 mSrcBufferInfo->src_info[0].paddr, memType[mSrcBufferInfo->src_info[0].memtype],
                 mSrcBufferInfo->src_info[0].canvas_w, mSrcBufferInfo->src_info[0].canvas_h, mSrcBufferInfo->src_info[0].format,
                 "no", "  no", mSrcBufferInfo->src_info[0].rect.x, mSrcBufferInfo->src_info[0].rect.y,
                 mSrcBufferInfo->src_info[0].rect.w, mSrcBufferInfo->src_info[0].rect.h);
-    ALOGE(
+    ETRACE(
         "  SRC1:\n"
         "   %12x | %15s | %5dx%5d | %03x | %02s | %04s |%5d,%5d,%5d,%5d \n",
                 mSrcBufferInfo->src_info[1].paddr, memType[mSrcBufferInfo->src_info[1].memtype],
                 mSrcBufferInfo->src_info[1].canvas_w, mSrcBufferInfo->src_info[1].canvas_h, mSrcBufferInfo->src_info[1].format,
                 "no", "  no", mSrcBufferInfo->src_info[1].rect.x, mSrcBufferInfo->src_info[1].rect.y,
                 mSrcBufferInfo->src_info[1].rect.w, mSrcBufferInfo->src_info[1].rect.h);
-    ALOGE(
+    ETRACE(
         "  DST:\n"
         "   %12x | %15s | %5dx%5d | %03x | %02x | %04x |%5d,%5d,%5d,%5d \n",
                 mSrcBufferInfo->dst_info.paddr, memType[mSrcBufferInfo->dst_info.memtype],
@@ -425,7 +425,7 @@ void GE2DComposer::tracer()
                 mSrcBufferInfo->dst_info.rotation, mSrcBufferInfo->blend_mode,
                 mSrcBufferInfo->dst_info.rect.x, mSrcBufferInfo->dst_info.rect.y,
                 mSrcBufferInfo->dst_info.rect.w, mSrcBufferInfo->dst_info.rect.h);
-    ALOGE(
+    ETRACE(
         "  --------------+-----------------+-------------+-----+----+------|"
         "--------------------------------+\n\n");
 }
@@ -440,7 +440,7 @@ void GE2DComposer::dumpLayers(
 #if 1
         int32_t base = 4 * (hnd->stride * (hnd->height / 2) + 10);
         char* tmp = (char*)layerBuffer + base;
-        ALOGD("[0x%x, 0x%x, 0x%x, 0x%x]\n"
+        DTRACE("[0x%x, 0x%x, 0x%x, 0x%x]\n"
             "[0x%x, 0x%x, 0x%x, 0x%x]\n"
             "[0x%x, 0x%x, 0x%x, 0x%x]\n"
             "[0x%x, 0x%x, 0x%x, 0x%x]\n",
@@ -455,17 +455,17 @@ void GE2DComposer::dumpLayers(
         sprintf(path, "/data/local/tmp/layer_%" PRId64 ".bin", systemTime(SYSTEM_TIME_MONOTONIC));
         fd = open(path, O_RDWR | O_CREAT);
         if (-1 == fd) {
-            ALOGE("Stark, open file failed!");
+            ETRACE("Stark, open file failed!");
             return;
         }
         write(fd, layerBuffer, hnd->size);
         sync();
         close(fd);
 #endif
-    munmap(layerBuffer, hnd->size);
-    ALOGD("dumpLayer ok");
+        munmap(layerBuffer, hnd->size);
+        DTRACE("dumpLayer ok");
     } else {
-        ALOGE("layerBuffer mmap fail");
+        ETRACE("layerBuffer mmap fail");
     }
 }
 
@@ -483,7 +483,7 @@ void GE2DComposer::runGE2DProcess(int32_t slot, Vector< LayerState* > &hwcLayers
         sourceCrop[i] = layer[i]->mSourceCrop;
         displayFrame[i] = layer[i]->mDisplayFrame;
         hnd[i] = reinterpret_cast<private_handle_t const*>(layer[i]->mBufferHnd);
-        ALOGD("layer[%d] zorder: %d, blend: %d, PlaneAlpha: %f, "
+        DTRACE("layer[%d] zorder: %d, blend: %d, PlaneAlpha: %f, "
             "mColor: [%d, %d, %d, %d], mDataSpace: %d, format hnd[%d]: %x",
             i, layer[i]->mZ, layer[i]->mBlendMode, layer[i]->mPlaneAlpha,
             layer[i]->mColor.r, layer[i]->mColor.g, layer[i]->mColor.b,
@@ -541,10 +541,10 @@ void GE2DComposer::runGE2DProcess(int32_t slot, Vector< LayerState* > &hwcLayers
         ge2d_process(mGe2dFd, mSrcBufferInfo);
 
         if (mDebug) {
-            // ALOGE("hnd[0]->format: 0x%x, hnd[1]->format: 0x%x", hnd[0]->format, hnd[1]->format);
+            // ETRACE("hnd[0]->format: 0x%x, hnd[1]->format: 0x%x", hnd[0]->format, hnd[1]->format);
             // dumpLayers(hnd[0]);
 
-            ALOGE("  same crop");
+            ETRACE("  same crop");
             tracer();
         }
 
@@ -619,7 +619,7 @@ void GE2DComposer::runGE2DProcess(int32_t slot, Vector< LayerState* > &hwcLayers
 
         ge2d_process(mGe2dFd, mSrcBufferInfo);
         if (mDebug) {
-            ALOGE("  layers sameSize is %d", sameSize);
+            ETRACE("  layers sameSize is %d", sameSize);
             tracer();
         }
     }
@@ -675,7 +675,7 @@ bool GE2DComposer::threadLoop()
         // ge2d finished process, make sure fd close here.
         for (int32_t i=0; i<layersState.size(); i++) {
             LayerState* layer = layersState.itemAt(i);
-            // ALOGE("close->layer:[%12" PRIxPTR ", %d]", layer->mBufferHnd, layer->mBufferFd);
+            // ETRACE("close->layer:[%12" PRIxPTR ", %d]", layer->mBufferHnd, layer->mBufferFd);
             if (layer != NULL) {
                 Utils::closeFd(layer->mBufferFd);
                 layer->mBufferFd = -1;
@@ -685,7 +685,7 @@ bool GE2DComposer::threadLoop()
 
 #ifdef GE2D_PORCESS_TIMESTAMP
         nsecs_t afterTimeStamp = systemTime(SYSTEM_TIME_MONOTONIC);
-        ALOGE("Ge2d process Period: %" PRId64 "", afterTimeStamp - beforeTimeStamp);
+        ETRACE("Ge2d process Period: %" PRId64 "", afterTimeStamp - beforeTimeStamp);
 #endif
         // usleep(1000*100);
         // signal ge2d's release fence.
diff --git a/hwc2/common/devices/PhysicalDevice.cpp b/hwc2/common/devices/PhysicalDevice.cpp
index 04b7209..74e950e 100644
--- a/hwc2/common/devices/PhysicalDevice.cpp
+++ b/hwc2/common/devices/PhysicalDevice.cpp
@@ -789,7 +789,7 @@ int32_t PhysicalDevice::setClientTarget(
         mClientTargetHnd = target;
         mClientTargetDamageRegion = damage;
         mTargetAcquireFence = acquireFence;
-        ETRACE("setClientTarget %p, %d", target, acquireFence);
+        DTRACE("setClientTarget %p, %d", target, acquireFence);
         // TODO: HWC2_ERROR_BAD_PARAMETER && dataspace && damage.
     } else {
         DTRACE("client target is null!, no need to update this frame.");
@@ -833,7 +833,7 @@ void PhysicalDevice::dumpLayers(Vector < hwc2_layer_t > layerIds) {
                                     "SOLID",
                                     "HWC_CURSOR",
                                     "SIDEBAND"};
-        ALOGE("   %11s | %12" PRIxPTR " | %10d | %02x | %1.2f | %02x | %04x |%7.1f,%7.1f,%7.1f,%7.1f |%5d,%5d,%5d,%5d \n",
+        ETRACE("   %11s | %12" PRIxPTR " | %10d | %02x | %1.2f | %02x | %04x |%7.1f,%7.1f,%7.1f,%7.1f |%5d,%5d,%5d,%5d \n",
                         compositionTypeName[layer->getCompositionType()],
                         intptr_t(layer->getBufferHandle()), layer->getZ(), layer->getDataspace(),
                         layer->getPlaneAlpha(), layer->getTransform(), layer->getBlendMode(),
@@ -852,7 +852,7 @@ void PhysicalDevice::dumpLayers(KeyedVector<hwc2_layer_t, HwcLayer*> layers) {
                                     "SOLID",
                                     "HWC_CURSOR",
                                     "SIDEBAND"};
-        ALOGE("   %11s | %12" PRIxPTR " | %10d | %02x | %1.2f | %02x | %04x |%7.1f,%7.1f,%7.1f,%7.1f |%5d,%5d,%5d,%5d \n",
+        ETRACE("   %11s | %12" PRIxPTR " | %10d | %02x | %1.2f | %02x | %04x |%7.1f,%7.1f,%7.1f,%7.1f |%5d,%5d,%5d,%5d \n",
                         compositionTypeName[layer->getCompositionType()],
                         intptr_t(layer->getBufferHandle()), layer->getZ(), layer->getDataspace(),
                         layer->getPlaneAlpha(), layer->getTransform(), layer->getBlendMode(),
@@ -876,7 +876,7 @@ bool PhysicalDevice::layersStateCheck(int32_t renderMode,
         displayFrame[i] = layer[i]->getDisplayFrame();
         hnd[i] = reinterpret_cast<private_handle_t const*>(layer[i]->getBufferHandle());
         if (hnd[i] == NULL) return false; // no buffer to process.
-        ALOGD("layer[%d] zorder: %d, blend: %d, PlaneAlpha: %f, "
+        DTRACE("layer[%d] zorder: %d, blend: %d, PlaneAlpha: %f, "
             "mColor: [%d, %d, %d, %d], mDataSpace: %d, format hnd[%d]: %x",
             i, layer[i]->getZ(), layer[i]->getBlendMode(), layer[i]->getPlaneAlpha(),
             layer[i]->getColor().r, layer[i]->getColor().g, layer[i]->getColor().b,
@@ -890,18 +890,18 @@ bool PhysicalDevice::layersStateCheck(int32_t renderMode,
             case HAL_PIXEL_FORMAT_RGB_888:
             case HAL_PIXEL_FORMAT_RGB_565:
             case HAL_PIXEL_FORMAT_BGRA_8888:
-                ALOGD("Layer format match direct composer.");
+                DTRACE("Layer format match direct composer.");
                 ret = true;
             break;
             default:
-                ALOGD("Layer format not support by direct compose");
+                DTRACE("Layer format not support by direct compose");
                 return false;
             break;
         }
         if (layer[0]->isCropped()
             || layer[0]->isScaled()
             || layer[0]->isOffset()) {
-            ALOGD("direct compose can not process!");
+            DTRACE("direct compose can not process!");
             return false;
         }
     }else if (renderMode == GE2D_COMPOSE_MODE) {
@@ -919,11 +919,11 @@ bool PhysicalDevice::layersStateCheck(int32_t renderMode,
                 case HAL_PIXEL_FORMAT_Y8:
                 case HAL_PIXEL_FORMAT_YCbCr_422_SP:
                 case HAL_PIXEL_FORMAT_YCbCr_422_I:
-                    ALOGD("Layer format match ge2d composer.");
+                    DTRACE("Layer format match ge2d composer.");
                     ret = true;
                 break;
                 default:
-                    ALOGD("Layer format not support by ge2d");
+                    DTRACE("Layer format not support by ge2d");
                     return false;
                 break;
             }
@@ -932,7 +932,7 @@ bool PhysicalDevice::layersStateCheck(int32_t renderMode,
                 || layer[i]->haveDataspace()
                 || (layer[i]->isBlended()
                 && layer[i]->isScaled())) {
-                ALOGD("ge2d compose can not process!");
+                DTRACE("ge2d compose can not process!");
                 return false;
             }
         }
@@ -941,7 +941,7 @@ bool PhysicalDevice::layersStateCheck(int32_t renderMode,
             if (Utils::compareRect(sourceCrop[0], sourceCrop[1])
                 && Utils::compareRect(sourceCrop[0], displayFrame[0])
                 && Utils::compareRect(sourceCrop[1], displayFrame[1])) {
-                ALOGD("2 layers is same size and have yuv420sp format ge2d compose can not process!");
+                DTRACE("2 layers is same size and have yuv420sp format ge2d compose can not process!");
                 return false;
             }
         }
@@ -1057,7 +1057,7 @@ int32_t PhysicalDevice::validateDisplay(uint32_t* outNumTypes,
                 reinterpret_cast<private_handle_t const*>(layer->getBufferHandle());
             if (hnd) {
                 if (!(hnd->flags & private_handle_t::PRIV_FLAGS_CONTINUOUS_BUF)) {
-                    ALOGE("continous buffer flag is not set!");
+                    ETRACE("continous buffer flag is not set!");
                     isContinuousBuf = false;
                 }
                 if (hnd && layer->getCompositionType() == HWC2_COMPOSITION_DEVICE) {
@@ -1113,7 +1113,7 @@ int32_t PhysicalDevice::validateDisplay(uint32_t* outNumTypes,
 
     bool noDevComp = Utils::checkBoolProp("sys.sf.debug.nohwc");
 #ifndef USE_CONTINOUS_BUFFER_COMPOSER
-    ALOGE("No continous buffer composer!");
+    ETRACE("No continous buffer composer!");
     noDevComp = true;
 #endif
 
diff --git a/hwc2/common/utils/HwcTrace.h b/hwc2/common/utils/HwcTrace.h
index 7f1bc2c..9626fa3 100644
--- a/hwc2/common/utils/HwcTrace.h
+++ b/hwc2/common/utils/HwcTrace.h
@@ -31,11 +31,18 @@ extern "C" {
 // #define HWC_DEBUG
 #ifdef HWC_DEBUG
 // Helper to automatically preappend classname::functionname to the log message
+#if 0
 #define VTRACE(fmt,...)     ALOGV("%s: " fmt, __func__, ##__VA_ARGS__)
 #define DTRACE(fmt,...)     ALOGD("%s: " fmt, __func__, ##__VA_ARGS__)
 #define ITRACE(fmt,...)     ALOGI("%s: " fmt, __func__, ##__VA_ARGS__)
 #define WTRACE(fmt,...)     ALOGW("%s: " fmt, __func__, ##__VA_ARGS__)
 #else
+#define VTRACE(fmt,...)     ALOGV(fmt, ##__VA_ARGS__)
+#define DTRACE(fmt,...)     ALOGD(fmt, ##__VA_ARGS__)
+#define ITRACE(fmt,...)     ALOGI(fmt, ##__VA_ARGS__)
+#define WTRACE(fmt,...)     ALOGW(fmt, ##__VA_ARGS__)
+#endif
+#else
 #define VTRACE(fmt,...)     ((void)0)
 #define DTRACE(fmt,...)     ((void)0)
 #define ITRACE(fmt,...)     ((void)0)
diff --git a/hwc2/common/utils/Utils.cpp b/hwc2/common/utils/Utils.cpp
index 9104e17..80d5ed8 100644
--- a/hwc2/common/utils/Utils.cpp
+++ b/hwc2/common/utils/Utils.cpp
@@ -31,7 +31,7 @@ bool Utils::checkBoolProp(const char* prop) {
 
     memset(val, 0, sizeof(val));
     if (property_get(prop, val, "false") && strcmp(val, "true") == 0) {
-        ALOGD("prop: %s is %s",prop, val);
+        DTRACE("prop: %s is %s",prop, val);
         return true;
     }
 
@@ -43,7 +43,7 @@ int32_t Utils::checkIntProp(const char* prop) {
 
     memset(val, 0, sizeof(val));
     if (property_get(prop, val, "2")) {
-        //ALOGV("prop: %s is %s",prop, val);
+        VTRACE("prop: %s is %s",prop, val);
         return atoi(val);
     }
     return 0;
@@ -122,7 +122,7 @@ bool Utils::checkVinfo(framebuffer_info_t *fbInfo) {
         struct fb_var_screeninfo vinfo;
         if (ioctl(fbInfo->fd, FBIOGET_VSCREENINFO, &vinfo) == -1)
         {
-            ALOGE("FBIOGET_VSCREENINFO error!!!");
+            ETRACE("FBIOGET_VSCREENINFO error!!!");
             return -errno;
         }