JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* posix_ipc.cc (ipc_cond_timedwait): If ipc_mutex_unlock fails, return

Browse Source 
actual error number.
	(_mq_send): Break loop if ipc_cond_timedwait returns with error.
	(_mq_receive): Ditto.
This commit is contained in:
Corinna Vinschen 2011-03-03 15:48:36 +00:00
parent 4b43b20be8
commit b994b83729
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2011-03-03 Corinna Vinschen <corinna@vinschen.de>
* posix_ipc.cc (ipc_cond_timedwait): If ipc_mutex_unlock fails, return
actual error number.
(_mq_send): Break loop if ipc_cond_timedwait returns with error.
(_mq_receive): Ditto.
2011-03-03 Corinna Vinschen <corinna@vinschen.de> 2011-03-03 Corinna Vinschen <corinna@vinschen.de>
* errno.cc (__xpg_strerror_r): Add accidentally missing condition. * errno.cc (__xpg_strerror_r): Add accidentally missing condition.

27
winsup/cygwin/posix_ipc.cc
View File

@ -1,6 +1,6 @@
/* posix_ipc.cc: POSIX IPC API for Cygwin. /* posix_ipc.cc: POSIX IPC API for Cygwin.
Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -177,6 +177,7 @@ ipc_cond_timedwait (HANDLE evt, HANDLE mtx, const struct timespec *abstime)
struct timeval tv; struct timeval tv;
DWORD timeout; DWORD timeout;
HANDLE h[2] = { mtx, evt }; HANDLE h[2] = { mtx, evt };
int err;
if (!abstime) if (!abstime)
timeout = INFINITE; timeout = INFINITE;
@ -196,8 +197,8 @@ ipc_cond_timedwait (HANDLE evt, HANDLE mtx, const struct timespec *abstime)
timeout += (abstime->tv_nsec / 1000 - tv.tv_usec) / 1000; timeout += (abstime->tv_nsec / 1000 - tv.tv_usec) / 1000;
} }
ResetEvent (evt); ResetEvent (evt);
if (ipc_mutex_unlock (mtx)) if ((err = ipc_mutex_unlock (mtx)) != 0)
return -1; return err;
switch (WaitForMultipleObjects (2, h, TRUE, timeout)) switch (WaitForMultipleObjects (2, h, TRUE, timeout))
{ {
case WAIT_OBJECT_0: case WAIT_OBJECT_0:
@ -733,7 +734,15 @@ _mq_send (mqd_t mqd, const char *ptr, size_t len, unsigned int prio,
} }
/* Wait for room for one message on the queue */ /* Wait for room for one message on the queue */
while (attr->mq_curmsgs >= attr->mq_maxmsg) while (attr->mq_curmsgs >= attr->mq_maxmsg)
ipc_cond_timedwait (mqinfo->mqi_waitsend, mqinfo->mqi_lock, abstime); {
int ret = ipc_cond_timedwait (mqinfo->mqi_waitsend, mqinfo->mqi_lock,
abstime);
if (ret != 0)
{
set_errno (ret);
goto err;
}
}
} }
/* nmsghdr will point to new message */ /* nmsghdr will point to new message */
@ -840,7 +849,15 @@ _mq_receive (mqd_t mqd, char *ptr, size_t maxlen, unsigned int *priop,
/* Wait for a message to be placed onto queue */ /* Wait for a message to be placed onto queue */
mqhdr->mqh_nwait++; mqhdr->mqh_nwait++;
while (attr->mq_curmsgs == 0) while (attr->mq_curmsgs == 0)
ipc_cond_timedwait (mqinfo->mqi_waitrecv, mqinfo->mqi_lock, abstime); {
int ret = ipc_cond_timedwait (mqinfo->mqi_waitrecv, mqinfo->mqi_lock,
abstime);
if (ret != 0)
{
set_errno (ret);
goto err;
}
}
mqhdr->mqh_nwait--; mqhdr->mqh_nwait--;
} }