diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-07-03 14:39:52 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-08-18 10:53:47 -0300 |
commit | c647fb885cb678471f6b6a66f394b4ca5515a016 (patch) | |
tree | 5c6bd65b90aaf1dbe66e1f98df74906fcf275454 /sysdeps/unix/sysv/linux/write.c | |
parent | a748eb31c137e9b69c3d81765271a544f93f8fe5 (diff) | |
download | glibc-c647fb885cb678471f6b6a66f394b4ca5515a016.tar.gz glibc-c647fb885cb678471f6b6a66f394b4ca5515a016.tar.xz glibc-c647fb885cb678471f6b6a66f394b4ca5515a016.zip |
Consolidate non cancellable write call
This patch consolidates all the non cancellable write calls to use the __write_nocancel identifier. For non cancellable targets it will be just a macro to call the default respective symbol while on Linux will be a internal one. Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu. * sysdeps/generic/not-cancel.h (write_not_cancel): Remove macro. (__write_nocancel): New macro. * sysdeps/unix/sysv/linux/not-cancel.h (__write_nocancel): Rewrite as a function prototype. (write_not_cancel): Remove macro. * sysdeps/unix/sysv/linux/write.c (__write_nocancel): New function. * gmon/gmon.c (ERR): Replace write_not_cancel with __write_nocancel. (write_gmon): Likewise. * libio/fileops.c (_IO_new_file_write): Likewise. * login/utmp_file.c (pututline_file): Likewise. (updwtmp_file): Likewise. * stdio-common/psiginfo.c (psiginfo): Likewise. * sysdeps/posix/spawni.c (__spawni_child): Likewise. * sysdeps/unix/sysv/linux/gethostid.c (sethostid): Likewise. * sysdeps/unix/sysv/linux/libc_fatal.c (backtrace_and_maps): Likewise. * sysdeps/unix/sysv/linux/pthread_setname.c (pthread_setname_np): Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/write.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/write.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/write.c b/sysdeps/unix/sysv/linux/write.c index d49514502e..f8896eb2e3 100644 --- a/sysdeps/unix/sysv/linux/write.c +++ b/sysdeps/unix/sysv/linux/write.c @@ -18,6 +18,7 @@ #include <unistd.h> #include <sysdep-cancel.h> +#include <not-cancel.h> /* Write NBYTES of BUF to FD. Return the number written, or -1. */ ssize_t @@ -31,3 +32,14 @@ weak_alias (__libc_write, __write) libc_hidden_weak (__write) weak_alias (__libc_write, write) libc_hidden_weak (write) + +#if !IS_IN (rtld) +ssize_t +__write_nocancel (int fd, const void *buf, size_t nbytes) +{ + return INLINE_SYSCALL_CALL (write, fd, buf, nbytes); +} +#else +strong_alias (__libc_write, __write_nocancel) +#endif +libc_hidden_def (__write_nocancel) |