*/
dataArray = dvmAllocPrimitiveArray('B', dataLen, ALLOC_DEFAULT);
if (dataArray == NULL) {
- LOGW("array alloc failed (%d)\n", dataLen);
+ ALOGW("array alloc failed (%d)", dataLen);
dvmClearException(self);
goto bail;
}
length = get4BE((u1*)dataArray->contents + 4);
offset = kChunkHdrLen;
if (offset+length > (unsigned int) dataLen) {
- LOGW("WARNING: bad chunk found (len=%u pktLen=%d)\n", length, dataLen);
+ ALOGW("WARNING: bad chunk found (len=%u pktLen=%d)", length, dataLen);
goto bail;
}
dvmCallMethod(self, gDvm.methDalvikDdmcServer_dispatch, NULL, &callRes,
type, dataArray, offset, length);
if (dvmCheckException(self)) {
- LOGI("Exception thrown by dispatcher for 0x%08x\n", type);
+ ALOGI("Exception thrown by dispatcher for 0x%08x", type);
dvmLogExceptionStackTrace();
dvmClearException(self);
goto bail;
offset = dvmGetFieldInt(chunk, gDvm.offDalvikDdmcChunk_offset);
length = dvmGetFieldInt(chunk, gDvm.offDalvikDdmcChunk_length);
- LOGV("DDM reply: type=0x%08x data=%p offset=%d length=%d\n",
+ ALOGV("DDM reply: type=0x%08x data=%p offset=%d length=%d",
type, replyData, offset, length);
if (length == 0 || replyData == NULL)
goto bail;
if (offset + length > replyData->length) {
- LOGW("WARNING: chunk off=%d len=%d exceeds reply array len %d\n",
+ ALOGW("WARNING: chunk off=%d len=%d exceeds reply array len %d",
offset, length, replyData->length);
goto bail;
}
u1* reply;
reply = (u1*) malloc(length + kChunkHdrLen);
if (reply == NULL) {
- LOGW("malloc %d failed\n", length+kChunkHdrLen);
+ ALOGW("malloc %d failed", length+kChunkHdrLen);
goto bail;
}
set4BE(reply + 0, type);
*pReplyLen = length + kChunkHdrLen;
result = true;
- LOGV("dvmHandleDdm returning type=%.4s buf=%p len=%d\n",
+ ALOGV("dvmHandleDdm returning type=%.4s buf=%p len=%d",
(char*) reply, reply, length);
bail:
Thread* self = dvmThreadSelf();
if (self->status != THREAD_RUNNING) {
- LOGE("ERROR: DDM broadcast with thread status=%d\n", self->status);
+ ALOGE("ERROR: DDM broadcast with thread status=%d", self->status);
/* try anyway? */
}
dvmCallMethod(self, gDvm.methDalvikDdmcServer_broadcast, NULL, &unused,
event);
if (dvmCheckException(self)) {
- LOGI("Exception thrown by broadcast(%d)\n", event);
+ ALOGI("Exception thrown by broadcast(%d)", event);
dvmLogExceptionStackTrace();
dvmClearException(self);
return;
{
// TODO: any init
- LOGV("Broadcasting DDM connect\n");
+ ALOGV("Broadcasting DDM connect");
broadcast(CONNECTED);
}
*/
void dvmDdmDisconnected()
{
- LOGV("Broadcasting DDM disconnect\n");
+ ALOGV("Broadcasting DDM disconnect");
broadcast(DISCONNECTED);
gDvm.ddmThreadNotification = false;
if (enable) {
Thread* thread;
for (thread = gDvm.threadList; thread != NULL; thread = thread->next) {
- //LOGW("notify %d\n", thread->threadId);
+ //ALOGW("notify %d", thread->threadId);
dvmDdmSendThreadNotification(thread, true);
}
}
*/
void dvmDdmSendThreadNotification(Thread* thread, bool started)
{
- if (!gDvm.ddmThreadNotification)
+ if (!gDvm.ddmThreadNotification) {
return;
+ }
StringObject* nameObj = NULL;
Object* threadObj = thread->threadObj;
type = CHUNK_TYPE("THCR");
if (nameObj != NULL) {
- stringLen = dvmStringLen(nameObj);
- chars = dvmStringChars(nameObj);
+ stringLen = nameObj->length();
+ chars = nameObj->chars();
} else {
stringLen = 0;
chars = NULL;
}
/* leave room for the two integer fields */
- if (stringLen > (sizeof(buf) - sizeof(u4)*2) / 2)
+ if (stringLen > (sizeof(buf) - sizeof(u4)*2) / 2) {
stringLen = (sizeof(buf) - sizeof(u4)*2) / 2;
+ }
len = stringLen*2 + sizeof(u4)*2;
set4BE(&buf[0x00], thread->threadId);
/* copy the UTF-16 string, transforming to big-endian */
outChars = (u2*)(void*)&buf[0x08];
- while (stringLen--)
+ while (stringLen--) {
set2BE((u1*) (outChars++), *chars++);
+ }
} else {
type = CHUNK_TYPE("THDE");
*/
void dvmDdmSendThreadNameChange(int threadId, StringObject* newName)
{
- if (!gDvm.ddmThreadNotification)
+ if (!gDvm.ddmThreadNotification) {
return;
+ }
- size_t stringLen = dvmStringLen(newName);
- const u2* chars = dvmStringChars(newName);
+ size_t stringLen = newName->length();
+ const u2* chars = newName->chars();
/*
* Output format:
set4BE(&buf[0x00], threadId);
set4BE(&buf[0x04], stringLen);
u2* outChars = (u2*)(void*)&buf[0x08];
- while (stringLen--)
+ while (stringLen--) {
set2BE((u1*) (outChars++), *chars++);
+ }
dvmDbgDdmSendChunk(CHUNK_TYPE("THNM"), bufLen, buf);
}
break;
}
if (thread == NULL) {
- LOGI("dvmDdmGetStackTraceById: threadid=%d not found\n", threadId);
+ ALOGI("dvmDdmGetStackTraceById: threadid=%d not found", threadId);
dvmUnlockThreadList();
return NULL;
}