diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2011-04-28 12:36:27 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2011-04-28 12:36:27 +0000 |
| commit | 74f9ac5be0eecef2835b0762258b44a6764000aa (patch) | |
| tree | 9d02be587c92dc09e7059181ba12ea28ad70a899 /winsup/cygwin/posix_ipc.cc | |
| parent | 86bf572ef07171999788f0358340c28a1e7ce159 (diff) | |
| download | cygnal-74f9ac5be0eecef2835b0762258b44a6764000aa.tar.gz cygnal-74f9ac5be0eecef2835b0762258b44a6764000aa.tar.bz2 cygnal-74f9ac5be0eecef2835b0762258b44a6764000aa.zip | |
* posix_ipc.cc (ipc_cond_timedwait): Remove pthread_testcancel calls.
(_mq_send): Add pthread_testcancel call at start of function.
(_mq_receive): Ditto.
Diffstat (limited to 'winsup/cygwin/posix_ipc.cc')
| -rw-r--r-- | winsup/cygwin/posix_ipc.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/winsup/cygwin/posix_ipc.cc b/winsup/cygwin/posix_ipc.cc index 600fb0d19..04b3e58bc 100644 --- a/winsup/cygwin/posix_ipc.cc +++ b/winsup/cygwin/posix_ipc.cc @@ -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; |