summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-03-10 11:06:50 -0500
committerRich Felker <dalias@aerifal.cx>2011-03-10 11:06:50 -0500
commit11dbbe9fbac33ede053803ebf7193550ec5cfb48 (patch)
treed92d978a4cfe5dd5a496dfc7b6e52d5e556a4ac4
parentc8c4ef7d4404b94483c68b7479eb98b9b09f996c (diff)
downloadmusl-11dbbe9fbac33ede053803ebf7193550ec5cfb48.tar.gz
more cancellation points: tcdrain, clock_nanosleep
-rw-r--r--src/termios/tcdrain.c7
-rw-r--r--src/time/clock_nanosleep.c7
2 files changed, 12 insertions, 2 deletions
diff --git a/src/termios/tcdrain.c b/src/termios/tcdrain.c
index c51dd401..8e889b51 100644
--- a/src/termios/tcdrain.c
+++ b/src/termios/tcdrain.c
@@ -1,7 +1,12 @@
#include <termios.h>
#include <sys/ioctl.h>
+#include "libc.h"
int tcdrain(int fd)
{
- return ioctl(fd, TCSBRK, 1);
+ int ret;
+ CANCELPT_BEGIN;
+ ret = ioctl(fd, TCSBRK, 1);
+ CANCELPT_END;
+ return ret;
}
diff --git a/src/time/clock_nanosleep.c b/src/time/clock_nanosleep.c
index c5646de3..ffb9a8af 100644
--- a/src/time/clock_nanosleep.c
+++ b/src/time/clock_nanosleep.c
@@ -1,8 +1,13 @@
#define SYSCALL_RETURN_ERRNO
#include <time.h>
#include "syscall.h"
+#include "libc.h"
int clock_nanosleep(clockid_t clk, int flags, const struct timespec *req, struct timespec *rem)
{
- return syscall4(__NR_clock_nanosleep, clk, flags, (long)req, (long)rem);
+ int ret;
+ CANCELPT_BEGIN;
+ ret = syscall4(__NR_clock_nanosleep, clk, flags, (long)req, (long)rem);
+ CANCELPT_END;
+ return ret;
}