diff options
| author | Jonas Karlsson <[email protected]> | 2013-11-22 09:45:05 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-02-24 15:16:01 +0100 |
| commit | 3d24208d607501207af371098c1466758844e667 (patch) | |
| tree | eac7ea6e50b820332bcc7dd6c0f186d4265a289e /erts/emulator/drivers/common/efile_drv.c | |
| parent | 7d924d6c1279178db9c81fd04dd87c8d902a6549 (diff) | |
| download | otp-3d24208d607501207af371098c1466758844e667.tar.gz otp-3d24208d607501207af371098c1466758844e667.tar.bz2 otp-3d24208d607501207af371098c1466758844e667.zip | |
ose: efile driver updates.
Diffstat (limited to 'erts/emulator/drivers/common/efile_drv.c')
| -rw-r--r-- | erts/emulator/drivers/common/efile_drv.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c index fbd72c6c1b..7ef985dc41 100644 --- a/erts/emulator/drivers/common/efile_drv.c +++ b/erts/emulator/drivers/common/efile_drv.c @@ -373,9 +373,6 @@ struct erl_drv_entry efile_driver_entry = { #else NULL #endif /* HAVE_SENDFILE */ -#ifdef __OSE__ - ,NULL -#endif }; @@ -768,6 +765,9 @@ file_init(void) : 0); driver_system_info(&sys_info, sizeof(ErlDrvSysInfo)); + /* run initiation of efile_driver if needed */ + efile_init(); + #ifdef USE_VM_PROBES erts_mtx_init(&dt_driver_mutex, "efile_drv dtrace mutex"); pthread_key_create(&dt_driver_key, NULL); @@ -914,6 +914,7 @@ static void reply_Uint_posix_error(file_descriptor *desc, Uint num, driver_output2(desc->port, response, t-response, NULL, 0); } +#ifdef HAVE_SENDFILE static void reply_string_error(file_descriptor *desc, char* str) { char response[256]; /* Response buffer. */ char* s; @@ -924,6 +925,7 @@ static void reply_string_error(file_descriptor *desc, char* str) { *t = tolower(*s); driver_output2(desc->port, response, t-response, NULL, 0); } +#endif static int reply_error(file_descriptor *desc, Efile_error *errInfo) /* The error codes. */ |