openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 0e59123a: Merge "libsysutils: Handle EINTR in SocketClient::sendData()" 

* commit '0e59123adad22e1dac03e972ea37361056bb382c':
  libsysutils: Handle EINTR in SocketClient::sendData()
This commit is contained in:
Brad Fitzpatrick 2011-03-23 12:04:25 -07:00 committed by Android Git Automerger
parent 4ae741bb34 0e59123ada
commit df42469121
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libsysutils/src/SocketClient.cpp
View File

@ -32,14 +32,24 @@ SocketClient::SocketClient(int socket)
int SocketClient::sendMsg(int code, const char *msg, bool addErrno) {
char *buf;
const char* arg;
const char* fmt;
char tmp[1];
int len;
if (addErrno) {
buf = (char *) alloca(strlen(msg) + strlen(strerror(errno)) + 8);
sprintf(buf, "%.3d %s (%s)", code, msg, strerror(errno));
fmt = "%.3d %s (%s)";
arg = strerror(errno);
} else {
buf = (char *) alloca(strlen(msg) + strlen("XXX "));
sprintf(buf, "%.3d %s", code, msg);
fmt = "%.3d %s";
arg = NULL;
}
/* Measure length of required buffer */
len = snprintf(tmp, sizeof tmp, fmt, code, msg, arg);
/* Allocate in the stack, then write to it */
buf = (char*)alloca(len+1);
snprintf(buf, len+1, fmt, code, msg, arg);
/* Send the zero-terminated message */
return sendMsg(buf);
}
@ -68,18 +78,24 @@ int SocketClient::sendData(const void* data, int len) {
pthread_mutex_lock(&mWriteMutex);
while (brtw > 0) {
if ((rc = write(mSocket, p, brtw)) < 0) {
SLOGW("write error (%s)", strerror(errno));
pthread_mutex_unlock(&mWriteMutex);
return -1;
} else if (!rc) {
rc = write(mSocket, p, brtw);
if (rc > 0) {
p += rc;
brtw -= rc;
continue;
}
if (rc < 0 && errno == EINTR)
continue;
pthread_mutex_unlock(&mWriteMutex);
if (rc == 0) {
SLOGW("0 length write :(");
errno = EIO;
pthread_mutex_unlock(&mWriteMutex);
return -1;
} else {
SLOGW("write error (%s)", strerror(errno));
}
p += rc;
brtw -= rc;
return -1;
}
pthread_mutex_unlock(&mWriteMutex);
return 0;