diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/commands/variable.c | 4 | ||||
| -rw-r--r-- | src/backend/storage/file/fd.c | 57 | ||||
| -rw-r--r-- | src/include/pg_config_manual.h | 5 | ||||
| -rw-r--r-- | src/include/port/darwin.h | 5 |
4 files changed, 47 insertions, 24 deletions
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index 6202c5ebe44..136c584305a 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -1212,7 +1212,7 @@ check_effective_io_concurrency(int *newval, void **extra, GucSource source) #ifndef USE_PREFETCH if (*newval != 0) { - GUC_check_errdetail("\"effective_io_concurrency\" must be set to 0 on platforms that lack posix_fadvise()."); + GUC_check_errdetail("\"effective_io_concurrency\" must be set to 0 on platforms that lack support for issuing read-ahead advice."); return false; } #endif /* USE_PREFETCH */ @@ -1225,7 +1225,7 @@ check_maintenance_io_concurrency(int *newval, void **extra, GucSource source) #ifndef USE_PREFETCH if (*newval != 0) { - GUC_check_errdetail("\"maintenance_io_concurrency\" must be set to 0 on platforms that lack posix_fadvise()."); + GUC_check_errdetail("\"maintenance_io_concurrency\" must be set to 0 on platforms that lack support for issuing read-ahead advice."); return false; } #endif /* USE_PREFETCH */ diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 3944321ff37..c84f089665c 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -2068,40 +2068,59 @@ FileClose(File file) /* * FilePrefetch - initiate asynchronous read of a given range of the file. * - * Currently the only implementation of this function is using posix_fadvise - * which is the simplest standardized interface that accomplishes this. - * We could add an implementation using libaio in the future; but note that - * this API is inappropriate for libaio, which wants to have a buffer provided - * to read into. + * Returns 0 on success, otherwise an errno error code (like posix_fadvise()). + * + * posix_fadvise() is the simplest standardized interface that accomplishes + * this. */ int FilePrefetch(File file, off_t offset, off_t amount, uint32 wait_event_info) { -#if defined(USE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED) - int returnCode; - Assert(FileIsValid(file)); DO_DB(elog(LOG, "FilePrefetch: %d (%s) " INT64_FORMAT " " INT64_FORMAT, file, VfdCache[file].fileName, (int64) offset, (int64) amount)); - returnCode = FileAccess(file); - if (returnCode < 0) - return returnCode; +#if defined(USE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED) + { + int returnCode; + + returnCode = FileAccess(file); + if (returnCode < 0) + return returnCode; retry: - pgstat_report_wait_start(wait_event_info); - returnCode = posix_fadvise(VfdCache[file].fd, offset, amount, - POSIX_FADV_WILLNEED); - pgstat_report_wait_end(); + pgstat_report_wait_start(wait_event_info); + returnCode = posix_fadvise(VfdCache[file].fd, offset, amount, + POSIX_FADV_WILLNEED); + pgstat_report_wait_end(); - if (returnCode == EINTR) - goto retry; + if (returnCode == EINTR) + goto retry; - return returnCode; + return returnCode; + } +#elif defined(__darwin__) + { + struct radvisory + { + off_t ra_offset; /* offset into the file */ + int ra_count; /* size of the read */ + } ra; + int returnCode; + + ra.ra_offset = offset; + ra.ra_count = amount; + pgstat_report_wait_start(wait_event_info); + returnCode = fcntl(VfdCache[file].fd, F_RDADVISE, &ra); + pgstat_report_wait_end(); + if (returnCode != -1) + return 0; + else + return errno; + } #else - Assert(FileIsValid(file)); return 0; #endif } diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index e799c2989b8..e49eb13e43c 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -139,9 +139,8 @@ /* * USE_PREFETCH code should be compiled only if we have a way to implement * prefetching. (This is decoupled from USE_POSIX_FADVISE because there - * might in future be support for alternative low-level prefetch APIs. - * If you change this, you probably need to adjust the error message in - * check_effective_io_concurrency.) + * might in future be support for alternative low-level prefetch APIs, + * as well as platform-specific APIs defined elsewhere.) */ #ifdef USE_POSIX_FADVISE #define USE_PREFETCH diff --git a/src/include/port/darwin.h b/src/include/port/darwin.h index 15fb69d6dbb..6aa2ea70f6b 100644 --- a/src/include/port/darwin.h +++ b/src/include/port/darwin.h @@ -6,3 +6,8 @@ #define HAVE_FSYNC_WRITETHROUGH #endif + +/* + * macOS has a platform-specific implementation of prefetching. + */ +#define USE_PREFETCH |