diff options
author | Lukas Larsson <[email protected]> | 2011-12-08 15:29:30 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2011-12-08 15:29:30 +0100 |
commit | 3323324c28d9102099b03e266f5c36aee0183f2c (patch) | |
tree | 63c38335cbae595beb4cf9ce91fe293d9537bf4d /erts/emulator/drivers/common/erl_efile.h | |
parent | 9bc76f48bfbd9773d77d75b1a94cf1097cca9fb6 (diff) | |
parent | e406d3f5471913a971254a8420b7a8a429de3bf5 (diff) | |
download | otp-3323324c28d9102099b03e266f5c36aee0183f2c.tar.gz otp-3323324c28d9102099b03e266f5c36aee0183f2c.tar.bz2 otp-3323324c28d9102099b03e266f5c36aee0183f2c.zip |
Merge branch 'ta/sendfile/OTP-9240'
* ta/sendfile/OTP-9240:
Do not use async threads on DARWIN
Fix cleanup when sendfile process crashes
Return {error,closed} from sendfile if closed
Do not use SFV_NOWAIT as it does not exist on all solaris
Clarify some code comments
Make solaris use sendfilev
Diffstat (limited to 'erts/emulator/drivers/common/erl_efile.h')
-rw-r--r-- | erts/emulator/drivers/common/erl_efile.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/erts/emulator/drivers/common/erl_efile.h b/erts/emulator/drivers/common/erl_efile.h index 5c0b89e850..be1faa13f5 100644 --- a/erts/emulator/drivers/common/erl_efile.h +++ b/erts/emulator/drivers/common/erl_efile.h @@ -67,6 +67,11 @@ #define FILENAMES_16BIT 1 #endif +// We use sendfilev if it exist on solaris +#if !defined(HAVE_SENDFILE) && defined(HAVE_SENDFILEV) +#define HAVE_SENDFILE +#endif + /* * An handle to an open directory. To be cast to the correct type * in the system-dependent directory functions. @@ -122,7 +127,7 @@ typedef struct _Efile_info { #ifdef HAVE_SENDFILE /* - * Described the structure of header/trailers for sendfile + * Describes the structure of headers/trailers for sendfile */ struct t_sendfile_hdtl { SysIOVec *headers; |