* posix_ipc.cc (ipc_cond_timedwait): Remove pthread_testcancel calls.
(_mq_send): Add pthread_testcancel call at start of function. (_mq_receive): Ditto.
This commit is contained in:
parent
86bf572ef0
commit
74f9ac5be0
|
@ -1,3 +1,9 @@
|
|||
2011-04-28 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
* posix_ipc.cc (ipc_cond_timedwait): Remove pthread_testcancel calls.
|
||||
(_mq_send): Add pthread_testcancel call at start of function.
|
||||
(_mq_receive): Ditto.
|
||||
|
||||
2011-04-28 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
* cygerrno.h (geterrno_from_nt_status): Declare.
|
||||
|
|
|
@ -220,7 +220,6 @@ restart1:
|
|||
ret = EINTR;
|
||||
break;
|
||||
case WAIT_OBJECT_0 + 2:
|
||||
pthread_testcancel ();
|
||||
ret = ETIMEDOUT;
|
||||
break;
|
||||
default:
|
||||
|
@ -245,7 +244,6 @@ restart1:
|
|||
ret = EINTR;
|
||||
break;
|
||||
case WAIT_OBJECT_0 + 2:
|
||||
pthread_testcancel ();
|
||||
ret = ETIMEDOUT;
|
||||
break;
|
||||
default:
|
||||
|
@ -729,6 +727,8 @@ _mq_send (mqd_t mqd, const char *ptr, size_t len, unsigned int prio,
|
|||
struct msg_hdr *msghdr, *nmsghdr, *pmsghdr;
|
||||
struct mq_info *mqinfo;
|
||||
|
||||
pthread_testcancel ();
|
||||
|
||||
myfault efault;
|
||||
if (efault.faulted (EBADF))
|
||||
return -1;
|
||||
|
@ -860,6 +860,8 @@ _mq_receive (mqd_t mqd, char *ptr, size_t maxlen, unsigned int *priop,
|
|||
struct msg_hdr *msghdr;
|
||||
struct mq_info *mqinfo;
|
||||
|
||||
pthread_testcancel ();
|
||||
|
||||
myfault efault;
|
||||
if (efault.faulted (EBADF))
|
||||
return -1;
|
||||
|
|
Loading…
Reference in New Issue