commit 385af286421e983f744f7f5d339b8060ccd36302
author Igor Sysoev <igor@sysoev.ru> Wed Jul 30 12:34:04 2008 +0000
committer Igor Sysoev <igor@sysoev.ru> Wed Jul 30 12:34:04 2008 +0000
tree 81c46d0dad40506cc3a331c6ffaf454da85a0177
parent 749449097847cc3bee9e4e3966122a94149b755b

directio

src/os/unix/ngx_alloc.h

diff --git a/src/os/unix/ngx_alloc.h b/src/os/unix/ngx_alloc.h
index 8b7b766..c7a31aa 100644
--- a/src/os/unix/ngx_alloc.h
+++ b/src/os/unix/ngx_alloc.h
@@ -21,8 +21,8 @@
 /*
  * Linux has memalign() or posix_memalign()
  * Solaris has memalign()
- * FreeBSD has not memalign() or posix_memalign() but its malloc() alignes
- * allocations bigger than page size at the page boundary.
+ * FreeBSD 7.0 has posix_memalign(), besides, early version's malloc()
+ * aligns allocations bigger than page size at the page boundary
  */
 
 #if (NGX_HAVE_POSIX_MEMALIGN || NGX_HAVE_MEMALIGN)

src/os/unix/ngx_files.c

diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index 7ee8cbd..e2148d8 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -351,3 +351,22 @@
 
     return 0;
 }
+
+
+#if (NGX_HAVE_O_DIRECT)
+
+ngx_int_t
+ngx_directio(ngx_fd_t fd)
+{
+    int  flags;
+
+    flags = fcntl(fd, F_GETFL);
+
+    if (flags == -1) {
+        return -1;
+    }
+
+    return fcntl(fd, F_SETFL, flags | O_DIRECT);
+}
+
+#endif

src/os/unix/ngx_files.h

diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h
index 0c080c4..62af63b 100644
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -189,4 +189,22 @@
 #define ngx_unlock_fd_n          "fcntl(F_SETLK, F_UNLCK)"
 
 
+#if (NGX_HAVE_O_DIRECT)
+
+ngx_int_t ngx_directio(ngx_fd_t fd);
+#define ngx_directio_n           "fcntl(O_DIRECT)"
+
+#elif (NGX_HAVE_F_NOCACHE)
+
+#define ngx_directio(fd)         fcntl(fd, F_NOCACHE, 1)
+#define ngx_directio_n           "fcntl(F_NOCACHE)"
+
+#else
+
+#define ngx_directio(fd)         0
+#define ngx_directio_n           "ngx_directio_n"
+
+#endif
+
+
 #endif /* _NGX_FILES_H_INCLUDED_ */

src/os/win32/ngx_files.h

diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
index 0c4e14f..5973e95 100644
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -200,7 +200,7 @@
 
 
 ngx_int_t ngx_open_glob(ngx_glob_t *gl);
-#define ngx_open_glob_n          "FindFirstFile()"
+#define ngx_open_glob_n             "FindFirstFile()"
 
 ngx_int_t ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name);
 void ngx_close_glob(ngx_glob_t *gl);
@@ -216,4 +216,8 @@
     off_t offset, ngx_pool_t *pool);
 
 
+#define ngx_directio(fd)            0
+#define ngx_directio_n              "ngx_directio_n"
+
+
 #endif /* _NGX_FILES_H_INCLUDED_ */