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

Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

Browse Source 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: Ia14c98936bb1dc74e681bf2de342ad6861646778
This commit is contained in:
Steve Block
2011-12-20 16:22:33 +00:00
parent dcea17d050
commit 112bc5e57e
15 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/emulator/opengl/shared/OpenglCodecCommon/ErrorLog.h
View File

@@ -20,7 +20,7 @@
# include <cutils/log.h>
# define ERR(...) LOGE(__VA_ARGS__)
# ifdef EMUGL_DEBUG
# define DBG(...) LOGD(__VA_ARGS__)
# define DBG(...) ALOGD(__VA_ARGS__)
# else
# define DBG(...) ((void)0)
# endif

2
tools/emulator/opengl/system/GLESv1_enc/GLEncoder.cpp
View File

@@ -588,7 +588,7 @@ void GLEncoder::s_glDrawElements(void *self, GLenum mode, GLsizei count, GLenum
count * glSizeof(type));
// XXX - OPTIMIZATION (see the other else branch) should be implemented
if(!has_indirect_arrays) {
//LOGD("unoptimized drawelements !!!\n");
//ALOGD("unoptimized drawelements !!!\n");
}
} else {
// we are all direct arrays and immidate mode index array -

2
tools/emulator/opengl/system/GLESv2_enc/GL2Encoder.cpp
View File

@@ -406,7 +406,7 @@ void GL2Encoder::s_glDrawElements(void *self, GLenum mode, GLsizei count, GLenum
count * glSizeof(type));
// XXX - OPTIMIZATION (see the other else branch) should be implemented
if(!has_indirect_arrays) {
//LOGD("unoptimized drawelements !!!\n");
//ALOGD("unoptimized drawelements !!!\n");
}
} else {
// we are all direct arrays and immidate mode index array -

2
tools/emulator/opengl/system/OpenglSystemCommon/HostConnection.cpp
View File

@@ -99,7 +99,7 @@ HostConnection *HostConnection::get()
*pClientFlags = 0;
con->m_stream->commitBuffer(sizeof(unsigned int));
LOGD("HostConnection::get() New Host Connection established %p, tid %d\n", con, gettid());
ALOGD("HostConnection::get() New Host Connection established %p, tid %d\n", con, gettid());
tinfo->hostConn = con;
}

6
tools/emulator/opengl/system/gralloc/gralloc.cpp
View File

@@ -35,13 +35,13 @@
#define DEBUG 0
#if DEBUG >= 1
# define D(...) LOGD(__VA_ARGS__)
# define D(...) ALOGD(__VA_ARGS__)
#else
# define D(...) ((void)0)
#endif
#if DEBUG >= 2
# define DD(...) LOGD(__VA_ARGS__)
# define DD(...) ALOGD(__VA_ARGS__)
#else
# define DD(...) ((void)0)
#endif
@@ -805,7 +805,7 @@ fallback_init(void)
if (atoi(prop) > 0) {
return;
}
LOGD("Emulator without GPU emulation detected.");
ALOGD("Emulator without GPU emulation detected.");
module = dlopen("/system/lib/hw/gralloc.default.so", RTLD_LAZY|RTLD_LOCAL);
if (module != NULL) {
sFallback = reinterpret_cast<gralloc_module_t*>(dlsym(module, HAL_MODULE_INFO_SYM_AS_STR));

18
tools/emulator/opengl/tests/gles_android_wrapper/egl.cpp
View File

@@ -85,7 +85,7 @@ int initApi(const char *driverLibName, const char *implLibName, T **dispatchTabl
// XXX - we do not dlclose the driver library, so its not initialized when
// later loaded by android - is this required?
LOGD("loading %s into %s complete\n", implLibName, driverLibName);
ALOGD("loading %s into %s complete\n", implLibName, driverLibName);
return 0;
}
@@ -155,7 +155,7 @@ bool isNeedEncode()
{
const char *procname = getProcName();
if (procname == NULL) return false;
LOGD("isNeedEncode? for %s\n", procname);
ALOGD("isNeedEncode? for %s\n", procname);
// check on our whitelist
FILE *fp = fopen(GLES_EMUL_TARGETS_FILE, "rt");
if (fp == NULL) {
@@ -173,7 +173,7 @@ bool isNeedEncode()
char c = line[procnameLen];
if (c == '\0' || c == ' ' || c == '\t' || c == '\n') {
found = true;
LOGD("should use encoder for %s\n", procname);
ALOGD("should use encoder for %s\n", procname);
break;
}
}
@@ -187,7 +187,7 @@ void initDispatchTables()
//
// Load our back-end implementation of EGL/GLES
//
LOGD("Loading egl dispatch for %s\n", getProcName());
ALOGD("Loading egl dispatch for %s\n", getProcName());
void *gles_android = dlopen("/system/lib/egl/libGLES_android.so", RTLD_NOW | RTLD_LOCAL);
if (!gles_android) {
@@ -231,7 +231,7 @@ void initDispatchTables()
}
if (!s_needEncode) {
LOGD("Initializing native opengl for %s\n", getProcName());
ALOGD("Initializing native opengl for %s\n", getProcName());
initApi<gl_wrapper_context_t>(GLESv1_DRIVER, GLES_android_LIB, &g_gl_dispatch, getGLContext);
// try to initialize gl2 from GLES, though its probably going to fail
initApi<gl2_wrapper_context_t>(GLESv2_DRIVER, GLES_android_LIB, &g_gl2_dispatch, getGL2Context);
@@ -313,7 +313,7 @@ static EGLint * filter_es2_bit(const EGLint *attrib_list, bool *isES2)
if (attribs[i + 1] & EGL_OPENGL_ES2_BIT) {
attribs[i + 1] &= ~EGL_OPENGL_ES2_BIT;
attribs[i + 1] |= EGL_OPENGL_ES_BIT;
LOGD("removing ES2 bit 0x%x\n", attribs[i + 1]);
ALOGD("removing ES2 bit 0x%x\n", attribs[i + 1]);
if (isES2 != NULL) *isES2 = true;
}
}
@@ -331,11 +331,11 @@ EGLBoolean eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig
configs,
config_size,
num_config);
LOGD("eglChooseConfig: %d configs found\n", *num_config);
ALOGD("eglChooseConfig: %d configs found\n", *num_config);
if (*num_config == 0 && attribs != NULL) {
LOGD("requested attributes:\n");
ALOGD("requested attributes:\n");
for (int i = 0; attribs[i] != EGL_NONE; i++) {
LOGD("%d: 0x%x\n", i, attribs[i]);
ALOGD("%d: 0x%x\n", i, attribs[i]);
}
}

8
tools/emulator/system/camera/EmulatedCamera.cpp
View File

@@ -391,7 +391,7 @@ status_t EmulatedCamera::takePicture()
*/
/* Start camera device for the picture frame. */
LOGD("Starting camera for picture: %.4s(%s)[%dx%d]",
ALOGD("Starting camera for picture: %.4s(%s)[%dx%d]",
reinterpret_cast<const char*>(&org_fmt), pix_fmt, width, height);
res = camera_dev->startDevice(width, height, org_fmt);
if (res != NO_ERROR) {
@@ -608,7 +608,7 @@ status_t EmulatedCamera::doStartPreview()
mPreviewWindow.stopPreview();
return EINVAL;
}
LOGD("Starting camera: %dx%d -> %.4s(%s)",
ALOGD("Starting camera: %dx%d -> %.4s(%s)",
width, height, reinterpret_cast<const char*>(&org_fmt), pix_fmt);
res = camera_dev->startDevice(width, height, org_fmt);
if (res != NO_ERROR) {
@@ -1029,10 +1029,10 @@ static void PrintParamDiff(const CameraParameters& current,
const char* in_current = current.get(tmp);
if (in_current != NULL) {
if (strcmp(in_current, val)) {
LOGD("=== Value changed: %s: %s -> %s", tmp, in_current, val);
ALOGD("=== Value changed: %s: %s -> %s", tmp, in_current, val);
}
} else {
LOGD("+++ New parameter: %s=%s", tmp, val);
ALOGD("+++ New parameter: %s=%s", tmp, val);
}
} else {
LOGW("No value separator in %s", tmp);

2
tools/emulator/system/camera/EmulatedCameraFactory.cpp
View File

@@ -83,7 +83,7 @@ EmulatedCameraFactory::EmulatedCameraFactory()
LOGE("%s: Unable to instantiate fake camera class", __FUNCTION__);
}
} else {
LOGD("Fake camera emulation is disabled.");
ALOGD("Fake camera emulation is disabled.");
}
ALOGV("%d cameras are being emulated. Fake camera ID is %d",

2
tools/emulator/system/camera/EmulatedFakeCamera.cpp
View File

@@ -55,7 +55,7 @@ status_t EmulatedFakeCamera::Initialize()
const char* facing = prop;
mParameters.set(EmulatedCamera::FACING_KEY, facing);
LOGD("%s: Fake camera is facing %s", __FUNCTION__, facing);
ALOGD("%s: Fake camera is facing %s", __FUNCTION__, facing);
mParameters.set(EmulatedCamera::ORIENTATION_KEY,
gEmulatedCameraFactory.getFakeCameraOrientation());

14
tools/emulator/system/camera/EmulatedFakeCameraDevice.cpp
View File

@@ -399,26 +399,26 @@ int EmulatedFakeCameraDevice::rotateFrame()
mCurrentFrameType = 0;
}
if (mCurrentFrameType == 2) {
LOGD("********** Rotated to the SOLID COLOR frame **********");
ALOGD("********** Rotated to the SOLID COLOR frame **********");
/* Solid color: lets rotate color too. */
if (mCurrentColor == &mWhiteYUV) {
LOGD("----- Painting a solid RED frame -----");
ALOGD("----- Painting a solid RED frame -----");
mCurrentColor = &mRedYUV;
} else if (mCurrentColor == &mRedYUV) {
LOGD("----- Painting a solid GREEN frame -----");
ALOGD("----- Painting a solid GREEN frame -----");
mCurrentColor = &mGreenYUV;
} else if (mCurrentColor == &mGreenYUV) {
LOGD("----- Painting a solid BLUE frame -----");
ALOGD("----- Painting a solid BLUE frame -----");
mCurrentColor = &mBlueYUV;
} else {
/* Back to white. */
LOGD("----- Painting a solid WHITE frame -----");
ALOGD("----- Painting a solid WHITE frame -----");
mCurrentColor = &mWhiteYUV;
}
} else if (mCurrentFrameType == 0) {
LOGD("********** Rotated to the CHECKERBOARD frame **********");
ALOGD("********** Rotated to the CHECKERBOARD frame **********");
} else if (mCurrentFrameType == 1) {
LOGD("********** Rotated to the STRIPED frame **********");
ALOGD("********** Rotated to the STRIPED frame **********");
}
}

4
tools/emulator/system/camera/QemuClient.cpp
View File

@@ -27,7 +27,7 @@
#define LOG_QUERIES 0
#if LOG_QUERIES
#define LOGQ(...) LOGD(__VA_ARGS__)
#define LOGQ(...) ALOGD(__VA_ARGS__)
#else
#define LOGQ(...) (void(0))
@@ -405,7 +405,7 @@ status_t FactoryQemuClient::listCameras(char** list)
*list = (char*)malloc(query.mReplyDataSize);
if (*list != NULL) {
memcpy(*list, query.mReplyData, query.mReplyDataSize);
LOGD("Emulated camera list: %s", *list);
ALOGD("Emulated camera list: %s", *list);
return NO_ERROR;
} else {
LOGE("%s: Unable to allocate %d bytes",

2
tools/emulator/system/gps/gps_qemu.c
View File

@@ -42,7 +42,7 @@
#define GPS_DEBUG 0
#if GPS_DEBUG
# define D(...) LOGD(__VA_ARGS__)
# define D(...) ALOGD(__VA_ARGS__)
#else
# define D(...) ((void)0)
#endif

2
tools/emulator/system/lights/lights_qemu.c
View File

@@ -44,7 +44,7 @@
/* Set to 1 to enable debug messages to the log */
#define DEBUG 0
#if DEBUG
# define D(...) LOGD(__VA_ARGS__)
# define D(...) ALOGD(__VA_ARGS__)
#else
# define D(...) do{}while(0)
#endif

2
tools/emulator/system/qemud/qemud.c
View File

@@ -87,7 +87,7 @@
#if DEBUG
# define LOG_TAG "qemud"
# include <cutils/log.h>
# define D(...) LOGD(__VA_ARGS__)
# define D(...) ALOGD(__VA_ARGS__)
#else
# define D(...) ((void)0)
# define T(...) ((void)0)

4
tools/emulator/system/sensors/sensors_qemu.c
View File

@@ -39,7 +39,7 @@
#include <hardware/sensors.h>
#if 0
#define D(...) LOGD(__VA_ARGS__)
#define D(...) ALOGD(__VA_ARGS__)
#else
#define D(...) ((void)0)
#endif
@@ -402,7 +402,7 @@ data__close(struct hw_device_t *dev)
SensorPoll* data = (SensorPoll*)dev;
if (data) {
if (data->events_fd >= 0) {
//LOGD("(device close) about to close fd=%d", data->events_fd);
//ALOGD("(device close) about to close fd=%d", data->events_fd);
close(data->events_fd);
}
free(data);