PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve MTPServer logging of read errors

Browse Source 
Unless MTP debug logging is enabled, you will miss the error and
will not know that something went wrong in the log.

Change-Id: I51f4758b415eb38e808ec8b1c9788b505bf88c65
This commit is contained in:
Ethan Yonker
2014-12-29 09:24:23 -06:00
parent 32f68a3c92
commit ee8b314dbc
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mtp/MtpServer.cpp
+8 -4
View File
@@ -192,11 +192,12 @@ void MtpServer::run() {
MTPD("About to read device...\n");
int ret = mRequest.read(fd);
if (ret < 0) {
MTPD("request read returned %d, errno: %d", ret, errno);
if (errno == ECANCELED) {
// return to top of loop and wait for next command
MTPD("request read returned %d ECANCELED, starting over\n", ret);
continue;
}
MTPE("request read returned %d, errno: %d, exiting MtpServer::run loop\n", ret, errno);
break;
}
MtpOperationCode operation = mRequest.getOperationCode();
@@ -213,11 +214,12 @@ void MtpServer::run() {
if (dataIn) {
int ret = mData.read(fd);
if (ret < 0) {
MTPD("data read returned %d, errno: %d", ret, errno);
if (errno == ECANCELED) {
// return to top of loop and wait for next command
MTPD("data read returned %d ECANCELED, starting over\n", ret);
continue;
}
MTPD("data read returned %d, errno: %d, exiting MtpServer::run loop\n", ret, errno);
break;
}
MTPD("received data:");
@@ -234,11 +236,12 @@ void MtpServer::run() {
mData.dump();
ret = mData.write(fd);
if (ret < 0) {
MTPD("request write returned %d, errno: %d", ret, errno);
if (errno == ECANCELED) {
// return to top of loop and wait for next command
MTPD("data write returned %d ECANCELED, starting over\n", ret);
continue;
}
MTPE("data write returned %d, errno: %d, exiting MtpServer::run loop\n", ret, errno);
break;
}
}
@@ -249,11 +252,12 @@ void MtpServer::run() {
MTPD("ret: %d\n", ret);
mResponse.dump();
if (ret < 0) {
MTPD("request write returned %d, errno: %d", ret, errno);
if (errno == ECANCELED) {
// return to top of loop and wait for next command
MTPD("response write returned %d ECANCELED, starting over\n", ret);
continue;
}
MTPE("response write returned %d, errno: %d, exiting MtpServer::run loop\n", ret, errno);
break;
}
} else {